gentoo resync : 26.08.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-08-26 00:09:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-08-26 00:09:36 +0100
commit: b1c81de4fadbd00897700a7321f03b390d952b2e (patch)
tree: e6cc812351d4f105c110cfc363ebb497e996f47a
parent: 7c59acba5699c9c58090a7a738669669a7307023 (diff)
2908 files changed, 32759 insertions, 27605 deletions
diff --git a/Manifest b/Manifest
index 7929e3cb220a..5496b2f75fcc 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29308 BLAKE2B 840fc33c0ac4ffcdcadfc3f9d12e739309308ba73e05f98c467a17df2003c1659261c5d09d0bdc50752306ba0e0fe4da35d2d94878b4df558e6c313edca3ad0b SHA512 1fd80bce47a1408b99c94ffeb806c614eea5d8dec6f030e0ba02ffa94a6261397933fffa399d67f6f61af7a819bc1b651189294d21b10d3d0f60884190a8c377
-TIMESTAMP 2021-08-21T21:39:13Z
+MANIFEST Manifest.files.gz 29306 BLAKE2B ecf0caba2b1a03c16fff7d165defb7ce2c14b4f9b15f7e42099054ba2c604653ff131248d1f77eb23cced569d7ed5131057330e40cc12bf54952fb347bd7920f SHA512 441e9b8ce30f9df1e8b5aab7c6419bcd44acae64c50ad0ee8332ded40d42d643cbf1e2cdf18c0e58fdabe752543fe2472cdd84a84d5a9f1958ed853ceb5ff68a
+TIMESTAMP 2021-08-25T22:39:13Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmEhcoFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmEmxpFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCP2xAAsB/ylNLRymeDa3eQQTRelbMgHk0z5tJtMfv5Obe2wZ02/SaEnpQuzA9j
-uk1r7XVVQFmhauCrgBaY7CTIxNcsc/OhrJEzw3J0ptMxdhJaOsRMk04Swhm1jbRu
-3u3V8AFkUGrtZEvuLP8BrQKSQav3iZoKC5EBVs3ju7OB3L5vYtiClkpmO0NwC5gf
-qTFrOz7v6RU+ZEV5UXSrJArelzpEprUeFeqACDqS0WpSIqWlaFFvAvXdqwccfSYK
-BSMRllD2woxL7XQgmkvYrVO7puigtjrUxJWk333SaXGiSA8KTFEKiyk4mmmvsRZx
-HBp288QL9wuyXcfR0LPJnnJQzpKt8c1oyDZx498irc6Zkxfw7ysNcbIYAi3b+vc5
-aM9UAW4Kf76Ucc8ydOBebhJerqrqkHe0M0jMysDpsyqyNIyYlfGFy7fqT9zXrUxO
-MDfnT+VJsZudBcpZwFp9oIM2McTmAbI4oZAZRNDLWNDYPotj4NDNQSJgooN/8HWL
-KzgyXtqD14qAY799bsm+xA8xs9uT4ZqANbdVbt0pPtLcXYrollVUoNbJwCswwEkB
-h9INfFv3wjEuffXoIkTBIUuW7lQmCRnlw+96Ot+a/tjckuDnQKjsg61n/krR3Gq8
-ANmDlysZlxF9qfJKyYaw+x2eduHsIkG0YvZqlhl6rKVeaz32xH0=
-=xSe9
+klBOPQ/9F2NuwVxSdshh+yMuT9eVGTq1PJiIZBy/qX/GsfdkvYBAGipc403q6AEy
+TZF/hizhfYdqvXTwXkbkVmKeUtrLtdbXzeH1kn6U+1Ng/Yuj8bf1AFc04PhR9Wcp
+e6B4LuI7/KSWAsCvtC54XGuCYNXf7UwmVDpIaWykgX79VPhNDOZIi7+cuZV4sLP5
+AqgtIBlVAO/ZPsfFxW4o4EMPtE4p+wbjW4+t6q+0indlgc1Z9+adk2CrKLAkI8hZ
+gc+wVplC/m1YclI9DDMhSO9uMNlCiiwTYmzQrwYlfaGTP1w5Q7JxnlkKuQl+Uvzl
+xrQ/ZfUHwzIcI0rlnJ8rDSRS2IQyRkmpISmkaWwP1fqdKfzVdYFIwE2aA/IkA6wG
+JR4LdKHnDMzBeop6LtGgW7iO34hvl+Wj46DFK/vca9qMF4hrmMxf7tE3WZ/Rk2ou
+TCpg0Pbpld2rait9MNJc+FwAWV/F6C/+AXqSGU1UosCD1m2YjMLnjXg9hW1FOAkO
+6Cka01lDnAVCJOKTMb9/+AsSfl5T59zKoEk0GQg4bT0b4x9YMkC7Q2Y4QhHY3WbS
++ecMYw1gTOYBnstCMa7+Xci/SrOVvj1xjUj5FPaaCMDNQ8osf39Fp13Jz0B0aa9a
+U2TMakO9ShCJXxJ3y1zprCepTFIMD9SBPvuLnyjQ8sisGkgZALE=
+=xzrg
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index efcaadc09d40..b71f50532449 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 4d3ab8a6b1eb..1204025fe0bd 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/caribou/Manifest b/app-accessibility/caribou/Manifest
index bda247bae8ea..656ea361ff3d 100644
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@@ -1,3 +1,5 @@
+AUX caribou-change_autostart_cinnamon.patch 461 BLAKE2B 54d0975875c6295577bf2fb915b8d659a08120f007ef6ff1f0ad465ff835ed063e54f4335b8e20c5df6bc6024422033dfa37304c1a71b0e8a259ab3d7502b3eb SHA512 2a5666c87569d36fcc581fcdbd6e9d33ebfbaf786e332c56dfa08a867ebc5d5f4e0ee0136a9529dcf28bae06878316dd90f8a5e93cbcd2f30fb34b497eb7c50a
+AUX caribou-drop_gir_patch.patch 3482 BLAKE2B f3dbfdc0c9864cebfb5d63e139fee5dbbb6f4a56c2020d9bd7c8e343a04bf7df498eddb89af312d5dc47eb7a1721832ebd5bf44f385e3a163990e77e05a1d99f SHA512 771d5c84adbf1bf959d02c35268337e8eb61a1b4b4457c2b44adf71f576bae01ba736d5cc34765cf44d75db113ff4b8a72418611edacb7b9db3ea7a4e4fe9775
 AUX caribou-fix-antler-style-css.patch 857 BLAKE2B e909c15b5907f80d24a719c9533cedf1edb5abac49d5e7b56ddadcd93a49ba6a23a27f99ca0a34983e4d4a62bef0ec2ff0c4200deb19241978acdb9562abe04f SHA512 d4129de776b424522e6df7f88858630fe130b805f705f41ad8e993fb57aa99c0b3a35f1cfb6d7d184540331aeb2f78abf05bd44257ae87f61bd0bb8ed40afbed
 AUX caribou-fix-compilation-error.patch 890 BLAKE2B 5e86e73326ba924d8f73121a031b57beed1fafcf53f0f09793ce61e1d6251b5ab3bcf19f791085ef141f4417d6df6f9d04ad5d0506779991f1af40942d06ccc2 SHA512 99e199361a9c50c65eec98a887734df3cbf3bfee3da588f24a76088c335e5f7ef3d750f223524c305360a4155b4812e512895301fdaf2b820f8568b72ef7bcb7
 AUX caribou-fix-python-env.patch 2508 BLAKE2B b27a37c5f14affb2610b6a2caca9827a4b51676fe36350e666960559322e42b9bb38e044708cb390726cca3ef2f276210ba01d6322450145bb8931615613abf7 SHA512 0b972f72e0d7d5c9ddb4b3b6ca874343f2e023f7123e9671773fe394a4a062aec7cec8badec9b13b400575c1eccc28dff4b32a0486a9d477b3cc22c0b85aa1c5
@@ -5,4 +7,5 @@ AUX caribou-fix-subkey-popmenu.patch 916 BLAKE2B 5f833fded2a5d1dedf613aecd1e473f
 AUX caribou-fix-xadapter-xkb-calls.patch 1840 BLAKE2B c752a1e7f9cee33ed8ecdb5c9d72267e11b3881c6c1e4e7576b070088ecbe7893c9d5ef1dce8483b062ef31083441072a3b88309db523832a8b06e2254e65a82 SHA512 122b1004e601f3c669d8f8d33d4fd167d662086f54e0376f4cc6147e470b07a1345af99581313facb286c4392a2ae17b39565d36cca32fd5eeb7a44a49807999
 DIST caribou-0.4.21.tar.xz 426516 BLAKE2B bd5e27bbbdb08fc31edce3b65124177e30b6d51e0071601bcd84c325b5794ce936b3f782ac8639dca332c246e329773f462dcecc0f236f52aeb0dcc7c5607a24 SHA512 5fc0cf54a1cad50d41e659adbbb932b51d69d18951562f87497e99aaae17ac72b453b759dd7289ff8f68a79574dfce510b9de6bedc61408c14cb48b83eaf08da
 EBUILD caribou-0.4.21-r3.ebuild 2151 BLAKE2B 832b4c0988850899014970bd158d907c15a38fe79f2b2d7f06bc18624c09ec5b1004703a1de306a14e82981fc9c609a930110f276a13c2ef82ad46f3a8ef6b35 SHA512 f266db24f6feb28c36b70850465b2c05cbf81d2a74670cc0e0301314095d6ab95aba8a9894c43597d6d7ef7627db92f5f7d894334ae4508c81419d955e378dff
+EBUILD caribou-0.4.21-r4.ebuild 2242 BLAKE2B 71eb5e5483b3e133cd3e4e9665d908ed5a4ed5ddd9ed67b06b44533458e824eee9ee841ef3c8418bbfd08dcb3c1471bbc99d3367b36298539e4507657b4f7f95 SHA512 0c14c735a7c1bd09d0a0ea0c35668b7de84fdcf714c2949ad48828d2850f103572a7ae14cfc4c5d73979f1e94f42533b6bebf580eb5f227b18dbbbe9f4d626be
 MISC metadata.xml 839 BLAKE2B 139993feb8299a6fe4d363ec5a11e07128656c7d3f17c2888c76181e54c2ac1f30b3d3159cdab42653a1d04d452e71d41b10eb9380cb92281ba73f6f66d34ccd SHA512 66a2ed68edb2fd15f71a6a4afa566e5fa5b9dff7bdb53f626e6efad4474fb1bde6f9427fe0826b077d2bb48653f915b87afef5fe3ad9c3ebb037178528e2f6bf
diff --git a/app-accessibility/caribou/caribou-0.4.21-r4.ebuild b/app-accessibility/caribou/caribou-0.4.21-r4.ebuild
new file mode 100644
index 000000000000..a142e1c4d332
--- /dev/null
+++ b/app-accessibility/caribou/caribou-0.4.21-r4.ebuild
@@ -0,0 +1,99 @@
+# 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 autotools gnome.org gnome2-utils python-single-r1 vala
+
+DESCRIPTION="Input assistive technology intended for switch and pointer users"
+HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-accessibility/at-spi2-core
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+	')
+	>=dev-libs/gobject-introspection-0.10.7:=
+	dev-libs/libgee:0.8
+	dev-libs/libxml2
+	>=media-libs/clutter-1.5.11:1.0[introspection]
+	>=x11-libs/gtk+-3:3[introspection]
+	x11-libs/libX11
+	x11-libs/libxklavier
+	x11-libs/libXtst
+"
+# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
+# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
+# librsvg needed to load svg images in css styles
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-libs/glib[dbus]
+	$(python_gen_cond_dep '
+		>=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}]
+	')
+	>=gnome-base/gsettings-desktop-schemas-3
+	gnome-base/librsvg:2
+	sys-apps/dbus
+	!<x11-base/xorg-server-1.20.10
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/libxslt
+"
+BDEPEND="
+	$(vala_depend)
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-compilation-error.patch"
+	"${FILESDIR}/${PN}-fix-subkey-popmenu.patch"
+	"${FILESDIR}/${PN}-fix-xadapter-xkb-calls.patch"
+	"${FILESDIR}/${PN}-fix-antler-style-css.patch"
+	"${FILESDIR}/${PN}-fix-python-env.patch"
+	"${FILESDIR}/${PN}-change_autostart_cinnamon.patch"
+	"${FILESDIR}/${PN}-drop_gir_patch.patch"
+)
+
+src_prepare() {
+	default
+	vala_src_prepare
+	gnome2_disable_deprecation_warning
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-maintainer-mode \
+		--disable-schemas-compile \
+		--disable-docs \
+		--disable-static \
+		--disable-gtk2-module \
+		--enable-gtk3-module
+}
+
+src_install() {
+	DOCS="AUTHORS NEWS README"
+	default
+	find "${D}" -name '*.la' -delete || die
+	python_optimize
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/app-accessibility/caribou/files/caribou-change_autostart_cinnamon.patch b/app-accessibility/caribou/files/caribou-change_autostart_cinnamon.patch
new file mode 100644
index 000000000000..f55ddd276e7d
--- /dev/null
+++ b/app-accessibility/caribou/files/caribou-change_autostart_cinnamon.patch
@@ -0,0 +1,13 @@
+--- a/data/caribou-autostart.desktop.in.in
++++ b/data/caribou-autostart.desktop.in.in
+@@ -2,7 +2,7 @@
+ Type=Application
+ Name=Caribou
+ Exec=@libexecdir@/caribou
+-AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-keyboard-enabled
++AutostartCondition=GSettings org.cinnamon.desktop.a11y.applications screen-keyboard-enabled
+ X-GNOME-AutoRestart=true
+ #X-GNOME-Autostart-Phase=Initialization
+-OnlyShowIn=GNOME;Unity;
++OnlyShowIn=X-Cinnamon;
+
diff --git a/app-accessibility/caribou/files/caribou-drop_gir_patch.patch b/app-accessibility/caribou/files/caribou-drop_gir_patch.patch
new file mode 100644
index 000000000000..bbcf1ddee9e5
--- /dev/null
+++ b/app-accessibility/caribou/files/caribou-drop_gir_patch.patch
@@ -0,0 +1,117 @@
+From c52ce71c49dc8d6109a58d16cc8d491d7bd1d781 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Wed, 20 Jan 2021 22:59:49 +0100
+Subject: [PATCH] Stop patching the generated GIR
+
+---
+ libcaribou/Makefile.am |  8 ++-----
+ tools/Makefile.am      |  1 -
+ tools/fix_gir.py       | 53 ------------------------------------------
+ 3 files changed, 2 insertions(+), 60 deletions(-)
+ delete mode 100755 tools/fix_gir.py
+
+diff --git a/libcaribou/Makefile.am b/libcaribou/Makefile.am
+index 05f2774..0634374 100644
+--- a/libcaribou/Makefile.am
++++ b/libcaribou/Makefile.am
+@@ -7,7 +7,7 @@ libcaribou_la_VALAFLAGS = \
+ 	--pkg xtst --pkg gee-0.8 --pkg gdk-x11-3.0 --pkg libxml-2.0 \
+ 	--pkg libxklavier --pkg external-libs \
+ 	--internal-vapi caribou-internals-1.0.vapi \
+-	--library caribou-1.0 --gir _Caribou-1.0.gir \
++	--library caribou-1.0 --gir Caribou-1.0.gir \
+ 	--symbols libcaribou.symbols \
+ 	$(VALAFLAGS)
+ 
+@@ -63,9 +63,6 @@ gir_DATA = Caribou-1.0.gir
+ typelibdir = $(libdir)/girepository-1.0
+ typelib_DATA = Caribou-1.0.typelib
+ 
+-Caribou-1.0.gir: _Caribou-1.0.gir
+-	$(AM_V_GEN)$(PYTHON) -B $(top_srcdir)/tools/fix_gir.py $< > $@
+-
+ Caribou-1.0.typelib: Caribou-1.0.gir
+ 	@INTROSPECTION_COMPILER@ --shared-library=libcaribou.so.0 -o $@ $^
+ 
+@@ -81,8 +78,7 @@ CLEANFILES = \
+ 	caribou-1.0.vapi \
+ 	caribou-internals-1.0.vapi \
+ 	Caribou-1.0.typelib \
+-	Caribou-1.0.gir \
+-	_Caribou-1.0.gir
++	Caribou-1.0.gir
+ 
+ DISTCLEANFILES = \
+ 	caribou-1.0.pc
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 3a9bcdb..89f753d 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -1,5 +1,4 @@
+ EXTRA_DIST = \
+-	fix_gir.py \
+ 	make_schema.py \
+ 	convert_cldr.py \
+ 	basic.xsl
+diff --git a/tools/fix_gir.py b/tools/fix_gir.py
+deleted file mode 100755
+index 182d108..0000000
+--- a/tools/fix_gir.py
++++ /dev/null
+@@ -1,53 +0,0 @@
+-#!/usr/bin/python
+-
+-from xml.dom import minidom
+-
+-def purge_white_space_and_fix_namespace(node, indent=0):
+-    if getattr(node, "tagName", None) == "namespace":
+-        name = node.getAttribute("name")
+-        node.setAttribute("name", name.lstrip('_'))
+-    for child in [c for c in node.childNodes]:
+-        if child.nodeType == node.TEXT_NODE or \
+-                getattr(child, "tagName", None) == "annotation":
+-            node.removeChild(child)
+-            continue
+-        purge_white_space_and_fix_namespace(child, indent+1)
+-
+-def find_ancestor(node, name):
+-    if getattr(node, "tagName", None) == name:
+-        return node
+-    parent = getattr(node, "parentNode", None)
+-    if not parent:
+-        return None
+-    return find_ancestor(parent, name)
+-
+-def fix_vfuncs(dom):
+-    for f in dom.getElementsByTagName("field"):
+-        callbacks = f.getElementsByTagName("callback")
+-
+-        record = find_ancestor(f, "record")
+-        if not record:
+-            continue
+-
+-        name = record.getAttribute("name")
+-        cname = record.getAttribute("c:type")
+-
+-        assert(name.endswith("Class") or name.endswith("Iface"))
+-        assert(cname.endswith("Class") or name.endswith("Iface"))
+-
+-        if len(callbacks) == 2:
+-            callbacks[-1].parentNode.removeChild(callbacks[-1])
+-
+-if __name__ == "__main__":
+-    import sys
+-
+-    if len(sys.argv) != 2:
+-        print("supply a gir file")
+-        sys.exit(1)
+-
+-    dom = minidom.parse(sys.argv[-1])
+-
+-    purge_white_space_and_fix_namespace(dom)
+-    fix_vfuncs(dom)
+-
+-    print(dom.toprettyxml(indent=" ", newl="\n"))
+-- 
+GitLab
+
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 81582df52bd6..75390985e853 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index 339727761166..5a2034125b1d 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,12 +1,10 @@
 DIST ansible-base-2.10.10.tar.gz 5986488 BLAKE2B 5c793d25ac5a216d05e15f49cd447cbdfb2ef97c2881bca60be5c23e3245262e15304a63431704d8b69fff56594e25517c0e5e1f2641b3eca5ad6a1e76e4d7b3 SHA512 b599b498a20b77cd3346f5b865b5a0436cdd835af250e8cc4ed20d61ac6a4929bf4ceef9a95c6e7b8e825c5f513d33ea32b24661c58e2f1d285db0569d71fc1b
 DIST ansible-base-2.10.9.tar.gz 6039597 BLAKE2B de455cc402ae4c5c4acd6b1c3d3f2e16572d4a4e79c5f3e4151ec8b913a3be0cfbcb42e5743fe627b7aba9b0e6b004189960cd5a17ff46166cd033a952d3c560 SHA512 093514230a3f6680ddeda07c24e77c2e793475895f44da6e5dd68335341d6fefe10091a124cf84e18475257a099b39fd2c16e6fc0dae0bbaf2d26e70b09c277a
-DIST ansible-core-2.11.2.tar.gz 7081783 BLAKE2B 64a2e02c4e44e72383bfb291efcde07a85ae553418e27687fbc12acdc45608e9b89e9f64943ad7f98a6de094f61765ac3e89fa84e66ed634e764a5f9581c6bd5 SHA512 8b4a8e329be9375d3226f8b992223198913226527278c14ccec01d8e7c546cca847cf7d2415440be995d236bdd88640c0dd6f740e91ca748de2d1c5b7b52c921
 DIST ansible-core-2.11.3.tar.gz 6841255 BLAKE2B fde1143515d04121de79ddb2c14bf326f9efa596c39418b9def1679539dd144551b64dff83c66795e44f48e776dbc60bc456125904bbb64970f8c44e072b5abf SHA512 93a28200dd0ab289cc05add5fbe46a1cfbbd4ba91fc7d7e95ee4060dc4f126bf4bd4affce5e44dac9cf2c12792b2a2a10b97d96b795f5bed579959391b7c4a65
 DIST ansible-core-2.11.4.tar.gz 6843603 BLAKE2B fa8e72a9e77633b1b43a9a290d92db009e95ed87357f666059ed7898031f584c993ebeb6acec8cad29376666f3a714a742f4e52ac8f2baaf5d01c02796b64acd SHA512 9385a3877e6e9a25d244c855cf50c0c6b62a91cc9cebc5e7b5b5ec23424b3e3dcddd71e7367482a03996fcd5d591ad29771edd19d62758ae61473f97a5c9351d
 EBUILD ansible-base-2.10.10.ebuild 1633 BLAKE2B 425db4ea1e64c960b86d56cccddeb59edd838f389bb685c145babd0e885677de76b364383b801f7ffbdc61fd6a46f8baa24c26e45f00e984aa162bbcac4ae24b SHA512 2b67326ac2653e03b37829db0952232183b2f79d7e66c3d5a78847f17b2f5f93f27bccf39e164af56f80c1ee8acb69c3379bb6107c0e987aeeabb6caf3547c52
 EBUILD ansible-base-2.10.9.ebuild 1630 BLAKE2B 1893c43eb9482e3899c4695a6378f85f945fb71ae968845672a6f806be576d5746ef505b0ef63c87b49e4e7a406d772353846ae923c363844d2fe2dc66b5a33b SHA512 66db0cdc15878cc5378a8b63644b7e143fad646342d763c83b8a58de3cc117093495f8a5945daffb93b3219beaa47a0c1564c8fba14611c5a1054789ac8dc99b
-EBUILD ansible-base-2.11.2.ebuild 1603 BLAKE2B 8ca4f3d4c4a1e494e0efe5bba55de5e71ca5e229c86c5046181d8d89e890115b823ad99d133c3ec22b06dd653cd23b65b159bc83cdbe990c2c527c0bb8bca9f5 SHA512 2513a5654edbce7a6161044f6983f3b8f041f1b158598c64d14e242afc642309be559b89899472ceec5b253a1792909ccc1bd20d3bf82175eeac360ef6568d4a
-EBUILD ansible-base-2.11.3.ebuild 1606 BLAKE2B f5d805b706337149762eab7784e4c5bfff8496942c28393cf3828b4b54295eefc3e54a1c2e39a4587f67efb2364e60dcda2db9def915c7f384b938ed8cc004e9 SHA512 e4078679b5219f77b3fb3bea15625ab34082a4b09cf4a83555e52b88a682d6ad42f8a345933c8143609c0492b4d6a70ee7093aa8a96503ab68188f9b258b149f
+EBUILD ansible-base-2.11.3.ebuild 1603 BLAKE2B 8ca4f3d4c4a1e494e0efe5bba55de5e71ca5e229c86c5046181d8d89e890115b823ad99d133c3ec22b06dd653cd23b65b159bc83cdbe990c2c527c0bb8bca9f5 SHA512 2513a5654edbce7a6161044f6983f3b8f041f1b158598c64d14e242afc642309be559b89899472ceec5b253a1792909ccc1bd20d3bf82175eeac360ef6568d4a
 EBUILD ansible-base-2.11.4.ebuild 1606 BLAKE2B f5d805b706337149762eab7784e4c5bfff8496942c28393cf3828b4b54295eefc3e54a1c2e39a4587f67efb2364e60dcda2db9def915c7f384b938ed8cc004e9 SHA512 e4078679b5219f77b3fb3bea15625ab34082a4b09cf4a83555e52b88a682d6ad42f8a345933c8143609c0492b4d6a70ee7093aa8a96503ab68188f9b258b149f
 EBUILD ansible-base-9999.ebuild 1606 BLAKE2B f5d805b706337149762eab7784e4c5bfff8496942c28393cf3828b4b54295eefc3e54a1c2e39a4587f67efb2364e60dcda2db9def915c7f384b938ed8cc004e9 SHA512 e4078679b5219f77b3fb3bea15625ab34082a4b09cf4a83555e52b88a682d6ad42f8a345933c8143609c0492b4d6a70ee7093aa8a96503ab68188f9b258b149f
 MISC metadata.xml 1039 BLAKE2B f5dae1c1a1b61e63b24a07d2de97caa4e50b7ef0d5d19b094e917d31e24fe7eb187505fd2841cd6e5a3ad20461a0f645b30732d7ac909503f35cdfb1f2bd3316 SHA512 6431f60bcde845ad153894cb4149418918a2250f7011ca73794635334ca12a1e550c40d002eaf45ae725d0ff510b8fb3b0815e94df69b744f027ffa797534a32
diff --git a/app-admin/ansible-base/ansible-base-2.11.2.ebuild b/app-admin/ansible-base/ansible-base-2.11.2.ebuild
deleted file mode 100644
index a1ac0e17abf8..000000000000
--- a/app-admin/ansible-base/ansible-base-2.11.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-else
-	MY_PN="${PN/-base/-core}"
-	MY_P="${MY_PN}-${PV}"
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
-	S="${WORKDIR}"/${MY_P}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
-	<dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile() {
-	export ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
diff --git a/app-admin/ansible-base/ansible-base-2.11.3.ebuild b/app-admin/ansible-base/ansible-base-2.11.3.ebuild
index 459607c5a037..a1ac0e17abf8 100644
--- a/app-admin/ansible-base/ansible-base-2.11.3.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.11.3.ebuild
@@ -19,7 +19,7 @@ else
 	MY_PN="${PN/-base/-core}"
 	MY_P="${MY_PN}-${PV}"
 	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 	S="${WORKDIR}"/${MY_P}
 fi
 
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 4521c1dcfb64..72e8507a8797 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -3,5 +3,5 @@ DIST ansible-4.1.0.tar.gz 33999079 BLAKE2B b7c512ed01f220dbfdd5c90cd67c88cc3b50d
 DIST ansible-4.3.0.tar.gz 35135987 BLAKE2B 6f4bf55f07275b7264a7fba693816bf925d574d4da3d4d13af9b85c44d4b5adf9e823b9bd936408a0e424273f8f2aa529e960105842444d26eb3f45973109ec5 SHA512 035a236d0762e425c4ce4ffd709386075aee438bb8085a25920543bb2378feb07fb8f0a50ce9fb6b0d1f5dde1f27a408b828c286bfc1173d38da5f8c7b572c3a
 EBUILD ansible-2.10.7.ebuild 1480 BLAKE2B b69ca1d077f02df2047cc868fbf47a1d7b5fb254e5d3b1df1b338185817d62e754d9a7ec1dbd7142a70693b05e39cdb521e8857602ff1cf8687ed42047ba0a0f SHA512 b7c2c77bfed222420589930162c334b2ddc5ee5db2cf5476886bc6197025d25b57459b01e7988b74a11b7fafb11e1f1f9914d306ea3dba7eeccc176aa464c14f
 EBUILD ansible-4.1.0.ebuild 604 BLAKE2B b7a1d083d07356d05fffab56e1154c81e641cdd03cc0944fed45d6ac64c5dc8c02cc774a9d949b555ac0081219e8d49a03ee50d18b141d3ee6776c9831d8255e SHA512 35f8cb7f3c876b8a19cfcccba9156e22a13e042d5847fd6be6813b16ad620a90d8abee0f3c83d514a157c8575ae4272cd8f1f107663372afcf43fea3bdbfa26c
-EBUILD ansible-4.3.0.ebuild 697 BLAKE2B ea53fc76991ee7470e5fbf667e49d0dd58a476ea06fd39aed5af1e26e4b5fba44e18d14d0e753668b12149fbf82123eabb1ab754e0adb5c80b449732fd5eb4d1 SHA512 2492cb5fcc3ab10e275ece25748b4c90ae5587fbfb3f3055b26d24b94753839fe33a21107fed237f3ffff0611e97970405397228b5249fb41d6107c0a6d89a14
+EBUILD ansible-4.3.0.ebuild 694 BLAKE2B a90c02e47057da9ef270d615a44be25fca41500156a296572048534b2d97da44269d220738cba30cde7cc002998c7eaa3d502ba2aa1a23eeed80a4ccdf915980 SHA512 ffbc14601b2cadb6157b30eddc20ec3e83131fd38e25aa71377b7636391f138c76ba266f5e04d9b015c502c70082a4d7508b1831d386e0e6a64d2cec69a874c2
 MISC metadata.xml 725 BLAKE2B 3d7a1655261b538ceb1511d626df23c93d0c30a0ab3b1ba38e560b4b43ffe7a82c6e207d991680bc321f6698596b1a61ec2182ae1c42c296a91b9f98896cff70 SHA512 bb3b5e0d20f530c1961bf19060ce1e5d087384008c116c4bc0af3e86368e9e9fdbce84d22b6f7b4f6760f039b180805364478e8e3d98b9b4d4d2600f9de62e6f
diff --git a/app-admin/ansible/ansible-4.3.0.ebuild b/app-admin/ansible/ansible-4.3.0.ebuild
index 45a02aba0ec9..44f65f4dbc22 100644
--- a/app-admin/ansible/ansible-4.3.0.ebuild
+++ b/app-admin/ansible/ansible-4.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 RESTRICT="test"
 
 RDEPEND=">=app-admin/ansible-base-2.11.1
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index b153a6148d67..09eca85a3a53 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,11 +4,15 @@ DIST awscli-1.20.21.tar.gz 2055227 BLAKE2B 6448527363ca25f039fa9e461bf5f6451e2ec
 DIST awscli-1.20.24.tar.gz 2056924 BLAKE2B d76475f3ac63ebf5c8e46154cc884b52c59b897cdddd709ed9c143dbb4f0a7169ecdf4eb01b423e352a32e740649c7a609a7dadc950a61eb20b553d4acdcdc2e SHA512 143d932707c42dffe1089671ec527f2c4e72410692122bbb22633bfb46a2b277b6aa9e43b2a532ab62aa95b9ebc460885ba1a8f987b0aa37f0f40f7850af102e
 DIST awscli-1.20.25.tar.gz 2057639 BLAKE2B 83a899405c1b6837f79041a66ed060e6a9a6bc140e8ec0fbe40a2aa7423dd5911102245cf2236703199e380e25ccc421220d18c03c145295eb3f95830b4b48c0 SHA512 b2eb5d448153b5017806355d2c8a5f60fd847fb757b34b48482713fcbb30713733ce83c22fdb84f71a1d50506a2478cd62d7f6b259912c580930cc058fe9f20c
 DIST awscli-1.20.26.tar.gz 2057909 BLAKE2B 92ed26ae13b4c6626dcf7cacda761cd8ab93ac3de18de133b33bfe9120f23cd65a08da4e5beaabd498ce6e93f05b439420595145cb692c3ebf32848c8a9c31c6 SHA512 512201626fc2abfaced61e5e8bd2ba649e6c3895f5e6de7f1bdfe1f6ca7676306fa14ef0e58a50865a083cfb8e4199a90afd09f004bfdda8706982f4ee1e0e1f
+DIST awscli-1.20.27.tar.gz 2058499 BLAKE2B b8de3aaad76bf957b1aa4dec114fcc13650f0b19af747eae9c166f105101f78a499cf9e0827636896a0aad8f32fc7786ee0319310dbec674aceeb93127539a3f SHA512 e4564b2feb35857a3afea2876aab1257a211e8b5ab6282ab23b30bc2499f14ef4554043dab515b2df7b4e004432762b86d87d57d8438508d51133c916b56da08
+DIST awscli-1.20.28.tar.gz 2058578 BLAKE2B 3f6993a41f46ad9d8d45cebc0d5ea95a954e15c73d236426590c389aba6de6a99b6a5000f065f932733151c14f3112bacc25c670a05d2a991a976669ce54554e SHA512 b75974450cea3744ed15cf00ca82a35aa377c55e0ef67bb5536ed136e768d5030e6707f12e2e7de8bfce48296295ff4ed4c9f9b15c642104ea34c7492291135b
 DIST awscli-1.20.7.tar.gz 2045304 BLAKE2B d8f086d8d2eb36645e77fa3d9ae7c196ed3a3fddcc2a0218696f92bd69e10b453be1340b965a8d8e6697bbd3c45013d72de3ed0d31b5823515a5a0092a812858 SHA512 a41bd3ebc34a65add66ef95d5194ba07907a08f7368b0fcd6551af2070c46c4a509af47d30aeadabddce19d1a61200a58faf40a7e2f759e64915cfb2826666ab
 EBUILD awscli-1.20.15.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.21.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.24.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.25.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.26.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.27.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.28.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.7.ebuild 1465 BLAKE2B 0414a41a1f6a9234c4c74ed23e4ce30b1801ce885e556b290ede026239d537d38912c4557b11985e8e25d95916fbae319876900c46e89e5858ea051ee6a18373 SHA512 ed3d2f988845db9dfff03a8c64373a19dd7719945370e374092403c8a022a9a2f6acd294ed1ad857a40c76730a9a4c42d5a1da4b84cc5f37401317f63b19694f
 MISC metadata.xml 446 BLAKE2B ec9df05d20b2bb8838cd4dfd9671124c638130e9ef249041ecadae1f9ec8894f143bbfa12bde776b02e3bca073f36a836c2a7d3575f5d4a1dbe64dec8fab1367 SHA512 bf0f41deac11dcc66ce93e230d7892215501d10b4fbb0fa5b83d7003185037b6d90dfe7ec2e06ed4bed3ff3f0966280cd4316ad0293a7b4921aaabeb2c85a635
diff --git a/app-admin/awscli/awscli-1.20.27.ebuild b/app-admin/awscli/awscli-1.20.27.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.27.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.20.28.ebuild b/app-admin/awscli/awscli-1.20.28.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.28.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 67491c1da4af..d5b3ab6272c3 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,5 +1,5 @@
 AUX calamares-3.2.32.1-remove-broken-tests.patch 1682 BLAKE2B 1d41c22b99797d41066e55b21bd5b9957411c210be3d1a8c01470694211387aa7e8b931d5499143d7d2747657625ac1c3db17d67bac9f741aada25fde93f517a SHA512 1c4a5a2d8b6c96299f45d3ef7581dfdca81c0854c9c746e6636a07101fb4e0d05809a4d64d826180599969c6fe398175dc7f5322ab52ff6c61dac4925919f275
 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
 DIST calamares-3.2.32.1.tar.gz 3425260 BLAKE2B e10174d400a402cfe3d7a015f4fe7a02ad1653e5a4cdf65c31360467e3b3ff10629d991dd206424d51c67533f8ab550e09e74b4334dbebe9e5fec1a06ed0dbd4 SHA512 30e523dd3c340f9c4385a53a4011ed0f16e317572fa2e5b6acfe638aaf029538f0ab85924999e9683ba10014be99b3c35ff3234bc85cefa2ccd14e2715c87222
-EBUILD calamares-3.2.32.1.ebuild 2168 BLAKE2B a52cd95e17d698cbdbdf97972681f9bc9998e9a456d4519b8a207a31c027f49a04a0e206f7bcc931050c455c59d37c8b71a02ae06c2e6264501e06c0615e2fb8 SHA512 209f80646c32fa5f9e6f938ed9c4c40bb502cf8c2264c7548b64549a2d855086e20de074d2d6555d7a35495acc21b8915947051598d9d35dfdee64c51f6488d6
+EBUILD calamares-3.2.32.1-r1.ebuild 2188 BLAKE2B 5e867dae027783603a5959405118b5127e7e2b7f7dc05a44e2274c12c458da88bfb753e618772f24abbfd4e1a43a3aa62d06edb9c313168a31b898463afba810 SHA512 f5cf285a7fd9e792b6c720ab45c4b0703f2911d29c7d0b03a61ff97b0f8339d6507732d3d39b6a5696642316c822f9b67c6f6cc452847d6fec0c10910e65bb1a
 MISC metadata.xml 858 BLAKE2B b66d7a5fa62cc1a83bba80a4d166e3985fb0bae043b5fbf03328e2c838543ae072322aa376751da8ee3912e8c8cdfb9e5aec8ee4700346543464a117d57933f9 SHA512 b333853647f132719762811ecf38e8a9dd3794dee3b944d3771204849f8ebe60f179759c5c9bfed4ed358174921c16b45c175a7598074814342225134f0bb700
diff --git a/app-admin/calamares/calamares-3.2.32.1-r1.ebuild b/app-admin/calamares/calamares-3.2.32.1-r1.ebuild
new file mode 100644
index 000000000000..8777435dad90
--- /dev/null
+++ b/app-admin/calamares/calamares-3.2.32.1-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit ecm python-single-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="+networkmanager +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-cpp/yaml-cpp:=
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}]
+		dev-libs/libpwquality[${PYTHON_USEDEP}]
+	')
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	kde-frameworks/kconfig:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kcrash:5
+	kde-frameworks/kpackage:5
+	kde-frameworks/kparts:5
+	kde-frameworks/kservice:5
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-auth/polkit-qt
+	>=sys-libs/kpmcore-4.0.0:5=
+	virtual/libcrypt:=
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-admin/sudo
+	dev-libs/libatasmart
+	net-misc/rsync
+	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
+	sys-boot/os-prober
+	sys-fs/squashfs-tools
+	sys-libs/timezone-data
+	virtual/udev
+	networkmanager? ( net-misc/networkmanager )
+	upower? ( sys-power/upower )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2.32.1-remove-broken-tests.patch )
+
+src_prepare() {
+	ecm_src_prepare
+	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+			PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+			PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+			PYTHON_LIBS="$(python_get_LIBS)"
+
+	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
+		calamares.desktop || die
+	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
+		calamares.desktop || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_CONFIG=ON
+		-DWEBVIEW_FORCE_WEBKIT=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
+		-DWITH_PYTHONQT=OFF
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	dobin "${FILESDIR}"/calamares-pkexec
+}
diff --git a/app-admin/calamares/calamares-3.2.32.1.ebuild b/app-admin/calamares/calamares-3.2.32.1.ebuild
deleted file mode 100644
index ee3b007777a8..000000000000
--- a/app-admin/calamares/calamares-3.2.32.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit ecm python-single-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="+networkmanager +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-cpp/yaml-cpp:=
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}]
-		dev-libs/libpwquality[${PYTHON_USEDEP}]
-	')
-	dev-qt/qtconcurrent:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	kde-frameworks/kconfig:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/kcrash:5
-	kde-frameworks/kpackage:5
-	kde-frameworks/kparts:5
-	kde-frameworks/kservice:5
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-auth/polkit-qt
-	>=sys-libs/kpmcore-4.0.0:5=
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-admin/sudo
-	dev-libs/libatasmart
-	net-misc/rsync
-	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
-	sys-boot/os-prober
-	sys-fs/squashfs-tools
-	sys-libs/timezone-data
-	virtual/udev
-	networkmanager? ( net-misc/networkmanager )
-	upower? ( sys-power/upower )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2.32.1-remove-broken-tests.patch )
-
-src_prepare() {
-	ecm_src_prepare
-	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-			PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-			PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-			PYTHON_LIBS="$(python_get_LIBS)"
-
-	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
-		calamares.desktop || die
-	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
-		calamares.desktop || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_CONFIG=ON
-		-DWEBVIEW_FORCE_WEBKIT=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
-		-DWITH_PYTHONQT=OFF
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	dobin "${FILESDIR}"/calamares-pkexec
-}
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 8a44af2ca3b8..ba68dc70a624 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.40.3.tar.gz 5487663 BLAKE2B c56a4377785f268ee50e222086a8b152ca2f60a9aee95331240764a1e769d044fb2e8a10e1c49fd473b51ed4635584f55f3d93752ace28d8d5363260f643cfd2 SHA512 7010be6c9acf3da9b8abe85c9a2f23696f4fdf81a8148e87d07077b6b65f364a9b0e2923985adbf4081565e7d7e855054c1386844e51848a9d79bbea3823fd29
-EBUILD exo-1.40.3.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
+DIST exo-1.40.5.tar.gz 5488454 BLAKE2B d6312b5d843ba0989899133af651b7fa1cbf04cd6b9bd68ecdbeab5ca59e2322bebcba45fdb82aa10097c3c5d7619371869c8502490bb46cd7612d8099ba75cf SHA512 a2f7b95b6687754295dcd2f05f25cbadb91e43b2f71543f39e9b9c1f60d7326b240e8ab9baff1dadac4b3dc293df2f57fbffe985d1ea456a8fe8365e21f7d99d
+EBUILD exo-1.40.5.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
 MISC metadata.xml 333 BLAKE2B 7158aba785c9b503c94098e7d68a820475660172b369a4adce5c68a50f21741db69e58ed9e946b792cd30a8e7b9506efaad35e48f508c4e292ee224be9b34c1b SHA512 0a6b2be31cf0944ea9077c8b2cd9da50dfd87568be72bc00f44822930487f8bcaf2da4324c5a3a35cbdfd69173673122660f3dba3e4189205d45e6b75c1c1f67
diff --git a/app-admin/exo/exo-1.40.3.ebuild b/app-admin/exo/exo-1.40.5.ebuild
index 49b1772f318b..49b1772f318b 100644
--- a/app-admin/exo/exo-1.40.3.ebuild
+++ b/app-admin/exo/exo-1.40.5.ebuild
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index e0a4cf8c9f5a..5a836f1a5888 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -3,9 +3,9 @@ AUX monit.logrotate 146 BLAKE2B 89bbe7c69f50dbca3f3c443d56da6eae6aab7a4976f90c20
 AUX monit.pamd 120 BLAKE2B 76744f79babaa99fa2961f73158ca755f885e9ea8e20b76dcb29f8fd10be6b5804b09b3c90f59ada7ce81eab90713ba43d2b2f28a6abc278fdfc75b356af4e67 SHA512 75c5fbad1c04fc5c9c0de224df245d64f4e59e23f79f4037edcc94623795852900318747e8a71946cab406009834643e84e1cd40b27854951d5462e740712b5c
 AUX monit.service 226 BLAKE2B 3b3041900987acd5bb6faa770c6631f6554b2e4360520252369951b3f7f87a3dd96440a58c9d2c4973ce9980a00ab7085c92af1e6542ae10d679ba352d170b19 SHA512 3ca0499ebd21aee812b78883c144c0a346a8cb6106392544836bf76d594e96b7e77be4b32b8c3170273e8236b25000c268724148252d98a4b99131f8b0ce4e88
 DIST monit-5.27.2.tar.gz 1463790 BLAKE2B f00733261fd941f47ec04e63ed9e3617991cd8a069a14e59941e85d3a342537892019864d4716f821428adb57979aa270fcba9d57f573d49e897dfcd77cc133a SHA512 a45cbbf0905b165767e21d66103b460ea48948824d043881aba3de752e34a67bfb3b97f75153e3672d87a34a702d66ceee28160110654aa52fb82c668aa135b9
-DIST monit-5.28.0.tar.gz 1480041 BLAKE2B 3ac9930efc89de8b4f65dd197c4f4289b3410afac38950c83b459436720d2c786e89d8bad22e4a7688af9c6111021500b9f3c6f0a8e8cee3a6b0e2f5058ec148 SHA512 3805a8cd5ad2ef9c94832a7fe3a09cf508eb857c92cda129d914db8656613e26eac5fefdaa4530b3403b4f6eb0c4cccdc620c12461dbebcda738ba9535ffa885
 DIST monit-5.28.1.tar.gz 1470342 BLAKE2B 134f63f4560cf26a563cb8e1f063b291dd6d87159878a1918aef62d8ffe6138a64b4e34c1713b46cb80bfd04eddb0abab725aa7cbe59331dac9e41d0f286f883 SHA512 2683084aea88567309b4693247c27312e1cb4225175cb8643a1f980ed8fc8ecd549818e157e1bb6c0feafc306bc9217bbd2c0c501cb75ea2425b646955076e5a
+DIST monit-5.29.0.tar.gz 1476102 BLAKE2B a4037c61e8d893b194317dc3c79d37f9b449d3524b91a06c0ff36a9c39016b12b0ce970c969fc10421412e6406c680714522379780cd80897a7a467f7b08450f SHA512 a69125bfa6fa9ea837f396e762a45e0cb41258c175d120c2af999ae1b500ce5cf5b57d774cc89299f70950a25ced5368c85455fffafd75677311c7912f86c49d
 EBUILD monit-5.27.2-r1.ebuild 1162 BLAKE2B 71b1d1a5e10520af69bebfcab81f17c7a72e43753d7fe1f0c421c4d2e738d20248638f6860baa9bcddff82294d0855cb004d974430dcff6a5de6cf2d6546f753 SHA512 70657c77855021896681345dc5fc4d654d356e559bd83f7ac92561e5e154aa5ec12234699a7e85551e92cf19a6eff54bba956a41f0180f5af909c1515b0465a7
-EBUILD monit-5.28.0-r1.ebuild 1165 BLAKE2B c6ef0342430b3db2a28b3a6fba3e839f62669bf96d364905c8e7dd1b992bfbf13a26c2d74d16a9a6377c4700c995dcfef8b8ce9c32e1ece39a3ad4b8cacaa133 SHA512 b9ddf767729170ba218fe35bc3dc49efdf3218d5cb19b4312d2f6e8d1fe65c1c5a88a6b61c1bce766c5b5a4079f62f3add5bcce325659b6a228d3bea4530b79c
 EBUILD monit-5.28.1-r1.ebuild 1231 BLAKE2B 1de7222521a60adfaf6abc1a2fc8b3e75bfaa669d167734a4c0058aead6f419f38b63dc01a9aee6ddd8b9934a0e87cb7bc0d50ef454ab80792bf117ee5eb3e7a SHA512 cf682f1d976b4ec006ad9429c4e06948a7857802f35f767d2b12728186320053332a2e59b74cdb2f2b91ee54eaea5c19e770329e95e89e6e3c5c21a080c4a854
-MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
+EBUILD monit-5.29.0.ebuild 1232 BLAKE2B e0707d96305124d2f61eafeec10fc490f48f38dbde7810b346e7eef0a56cc97bff8c5c8c8b365e0edbcad2b02957de96c347925856b8a5abc15e34b54b486bec SHA512 c2306c9fa4ca9e96b1eefe4df75668bf9108555ed2f7d66511c547db94915a0c1ef1cadd0f8f28312bc190f9a9a52a058af5c9e2f228035c0585f4c4fff16f35
+MISC metadata.xml 359 BLAKE2B 2b4f20e0e06f04b8410f064adcf76e76668bf3263ddbd5e8e3c3c0b0feebc3efe60adcb56e9239801d5e1876332e8fc8b340d7a1dd96dd2570d907dc79c1cce1 SHA512 46be1f63b127a5a88d2153cc469bd4e4ed66c694e4d41f6bcbb8750fca828ca9a4c3c30f75ebbe0cd76b3cf877e67afbb6572f3fc62304cc5e8784d7554e2aa7
diff --git a/app-admin/monit/metadata.xml b/app-admin/monit/metadata.xml
index 40aa45df2b01..8c744d2fe62d 100644
--- a/app-admin/monit/metadata.xml
+++ b/app-admin/monit/metadata.xml
@@ -5,4 +5,8 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/monit/monit-5.28.0-r1.ebuild b/app-admin/monit/monit-5.28.0-r1.ebuild
deleted file mode 100644
index ceaf6baf0908..000000000000
--- a/app-admin/monit/monit-5.28.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 pam systemd
-
-DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
-HOMEPAGE="http://mmonit.com/monit/"
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="ipv6 pam ssl"
-
-RDEPEND="sys-libs/zlib:=
-	virtual/libcrypt:=
-	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-
-src_prepare() {
-	default
-	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with ipv6)
-		$(use_with pam)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc; insopts -m600; doins monitrc
-	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
-
-	dobashcomp system/bash/monit
-}
-
-pkg_postinst() {
-	elog "Sample configurations are available at:"
-	elog "http://mmonit.com/monit/documentation/"
-}
diff --git a/app-admin/monit/monit-5.29.0.ebuild b/app-admin/monit/monit-5.29.0.ebuild
new file mode 100644
index 000000000000..5baeadcf536d
--- /dev/null
+++ b/app-admin/monit/monit-5.29.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 pam systemd
+
+DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="ipv6 pam ssl"
+
+RDEPEND="sys-libs/zlib:=
+	virtual/libcrypt:=
+	pam? ( sys-libs/pam )
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+src_prepare() {
+	default
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with ipv6)
+		$(use_with pam)
+		$(use_with ssl)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/monit.logrotate monit
+
+	insinto /etc; insopts -m600; doins monitrc
+	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
+	systemd_dounit system/startup/${PN}.service
+
+	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+
+	dobashcomp system/bash/monit
+}
+
+pkg_postinst() {
+	elog "Sample configurations are available at:"
+	elog "http://mmonit.com/monit/documentation/"
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 82efc99e1f19..86a551bab051 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -6,5 +6,5 @@ DIST puppet-agent_7.9.0-1focal_amd64.deb 20934808 BLAKE2B 4b5c529e1a5cb5877a753b
 EBUILD puppet-agent-6.19.1-r1.ebuild 2112 BLAKE2B cb5c39b4053e2e7f9476d36571ef2d7ffb232dc61c01517d1cd1fd0dee6d093b9b07e95962d8bd3c7c8db47bd9fe70fadf49446dc0f0702271b01d7c40e59d80 SHA512 552fa439fcdac6b76218401a2a60c042261e27fafa2cda93e5b2bb52b7708488292f167e5102e1dcff42913abe779f5202d69fc241e38ecb140a11d8f2ba9901
 EBUILD puppet-agent-7.10.0.ebuild 1965 BLAKE2B bc57deeb3288dbc8fb4d33037ef62b12a0cf2369046b82f8479c6b221feeef52e892e31ffbd5a1c54aa25325952eeb186c6976e3dc73e8cf79f2ae3b4c28c0d4 SHA512 e33f11ad7c5db62c045e754bba406e4409b149527f9b1de4d1247cb6675fcb2059362aef912be490657aede0c270f466b6a3d3ebe7ada328d993bd9a3e988520
 EBUILD puppet-agent-7.8.0.ebuild 1965 BLAKE2B 9524398bc6ddab603236762a151940c3a0c0ea55cdc686516904c0a1282248f6f9d1546ac1b792b22a4d3ad2d0998056c3c2485c6801fe5bf0e2be93b62c5967 SHA512 1f77777cee4cb41c8f53ba79784631f4549c1233aeb4896d870787fc4b3c7f5d98702d3bf5186b18f8b58b1c9c4f13dfc2f00826b3d57e2e11876f3c6aed8b02
-EBUILD puppet-agent-7.9.0-r3.ebuild 1965 BLAKE2B bc57deeb3288dbc8fb4d33037ef62b12a0cf2369046b82f8479c6b221feeef52e892e31ffbd5a1c54aa25325952eeb186c6976e3dc73e8cf79f2ae3b4c28c0d4 SHA512 e33f11ad7c5db62c045e754bba406e4409b149527f9b1de4d1247cb6675fcb2059362aef912be490657aede0c270f466b6a3d3ebe7ada328d993bd9a3e988520
+EBUILD puppet-agent-7.9.0-r3.ebuild 1964 BLAKE2B f5e86b40715313179474474ede2a92fd8d13cd548a23796094ebaec2e43ba60712b9a5fcfa496903a1cbd21595e89762ee427dc68def1f980c59a1fd1b9d1dba SHA512 3155da6f7e138a462e07cabb7ac78c14028bbfd801db1bbe747c5b3f42acdc5bf0c985590ca315950abafc23c85b5f1412e26f1c78146d5b3ab03904e2262bcf
 MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7
diff --git a/app-admin/puppet-agent/puppet-agent-7.9.0-r3.ebuild b/app-admin/puppet-agent/puppet-agent-7.9.0-r3.ebuild
index c24ff0f353a2..1af71eb6f52c 100644
--- a/app-admin/puppet-agent/puppet-agent-7.9.0-r3.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.9.0-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index f43624fc3a13..f19a76f0a49c 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -10,5 +10,5 @@ DIST puppet-7.9.0.tar.gz 2899891 BLAKE2B 06f675fc9eaac4ddfa7957847abe33928f0779f
 EBUILD puppet-5.5.22-r1.ebuild 3751 BLAKE2B f651b0c7d9196a83b00533a2cf6cb3b28e8b5de366cd792ed7194e84b93d971042c3e17a50abefe56e18f67bb0cd3d694604f19dc02c3ed7d72e11f1e0b71d22 SHA512 5d50d74214db6abac3fa66a5249b8b5dbfbc6340c6815e99611e2c62ff6347f2e9c96c53ad79221865e78eeed3e2796941cc50b5a979bdc8a589f57e6681ce06
 EBUILD puppet-7.10.0.ebuild 3540 BLAKE2B 74d2e019ac3823979cb19d845d1acc1556003bd7c9fa4eb6083a34d3352d93f9e94315d50708c585acd72aa9756a416245b14d3f4e71e29e8c948fa0e6708cae SHA512 9e98044702d8b596c3acb31adbab0738977fdf1accedcd7e74a962f74d606d6d5453c322a5389434f494fa46403f362c089e88389b6eec2fd59e1a8d1ba6af6c
 EBUILD puppet-7.8.0-r1.ebuild 3538 BLAKE2B ffa6662cfe92ab50890fdcdffdf397c709c93f1a37e0cc12c6029fa718f78367b2ff4548757d5c1a798f46ad7243a3483d8066bdf29e1a9d78866dca16a64b34 SHA512 80f2fe881dbfee31b3e7fb81d0f9e2d029c696fb3c54d63489da74845c296bba7eb821124170c58dc992887817d2725f1a2bbcdb4e1efbadd1bea69c87ee107e
-EBUILD puppet-7.9.0-r1.ebuild 3540 BLAKE2B 74d2e019ac3823979cb19d845d1acc1556003bd7c9fa4eb6083a34d3352d93f9e94315d50708c585acd72aa9756a416245b14d3f4e71e29e8c948fa0e6708cae SHA512 9e98044702d8b596c3acb31adbab0738977fdf1accedcd7e74a962f74d606d6d5453c322a5389434f494fa46403f362c089e88389b6eec2fd59e1a8d1ba6af6c
+EBUILD puppet-7.9.0-r1.ebuild 3538 BLAKE2B ffa6662cfe92ab50890fdcdffdf397c709c93f1a37e0cc12c6029fa718f78367b2ff4548757d5c1a798f46ad7243a3483d8066bdf29e1a9d78866dca16a64b34 SHA512 80f2fe881dbfee31b3e7fb81d0f9e2d029c696fb3c54d63489da74845c296bba7eb821124170c58dc992887817d2725f1a2bbcdb4e1efbadd1bea69c87ee107e
 MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198
diff --git a/app-admin/puppet/puppet-7.9.0-r1.ebuild b/app-admin/puppet/puppet-7.9.0-r1.ebuild
index c1c0ce4f6d0c..f2b79f3d4dc9 100644
--- a/app-admin/puppet/puppet-7.9.0-r1.ebuild
+++ b/app-admin/puppet/puppet-7.9.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index ffea482733f5..98458e122b10 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -3,5 +3,5 @@ AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0
 DIST puppetdb-7.4.1.tar.gz 47409868 BLAKE2B 0ac4234547b27e9ad12c9c008d76be8fff7f724d93acc2ca26700d18ac2e30bf9689c46550a8976b90e662d7af97994d7e299b94e2d68e5b5f7d1166a54d4ff8 SHA512 64c42477554039991b35dfd2d29f4fa507226cc3256b07ff3524cd287c1dbf09bdf60116dd12288d1340ca74ced2872ac886f4eadde8bd83965976579e99738d
 DIST puppetdb-7.5.0.tar.gz 47469411 BLAKE2B 98bf574e8b4edba47f58b899bdc3b6037a3ae79a2a8d8b3f69a108c416648fdc35f804d71fc412bcc257f7609be9b4d706af7e28d2fd05d3768a02e9efd95841 SHA512 94bf5bc9a95cacb1a3a7f0fb5b04a05eab5ded7d18c2fb396e616b44e429a4a6299e6802fc0fd72aa832a6d8181a7ecf6ef6aff4696d4c9bc16a1954aee6f77c
 EBUILD puppetdb-7.4.1.ebuild 2680 BLAKE2B cb171464987e15cb5c4ec154ce8e1fa99437236a824968a3961abe3ca67eb34ccd0db9c781923c3e2a5d4bd5f7e85a1eba5de8138af9fe8ef892bec463a937d3 SHA512 255fadfe0392069b4b79e25769b9823fda49bbb7885a265d3305a35983d3bc8568f4c79c961943308a82bfc573028209829f68c7df979179a980893626a2fe42
-EBUILD puppetdb-7.5.0.ebuild 2682 BLAKE2B bab62e7ca9d5f0ba712eb97c678ec2a0b82b0f33c048c503ed4414e92381619f9e46fb1450e47c7a45473adf885ed41e3f48e4861698bbfc533f390e6538dd23 SHA512 c0884f8d30d42e542650d12cce68c4613e4c76459dd9a3b5f063d29b2ff44c17b666e517558090a17818085460e0b4aafbbcc200b1ecd4dad81d3e0767fc5dc7
+EBUILD puppetdb-7.5.0-r1.ebuild 2715 BLAKE2B 68d24327f5a873b964636dac583abd03997f7464901ed367c430417b637aea1bda2f6d22a68c39e4f331b12769d290e5d5a43a3d564f7d22ea47332fa68753ef SHA512 fea2907f21a276ce273c0d6c459a7df944aca133dd8f7ed2f9497016e97a112b5b820ac67423621167e06e63b766d23d55bbae31caa94d7a4c19f8c4a90b97d1
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-7.5.0-r1.ebuild b/app-admin/puppetdb/puppetdb-7.5.0-r1.ebuild
new file mode 100644
index 000000000000..dbb521426d94
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-7.5.0-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd tmpfiles
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="amd64 x86"
+
+RDEPEND+=">=virtual/jdk-1.8.0"
+DEPEND+="acct-user/puppetdb
+	acct-group/puppetdb"
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	doins ext/config/conf.d/auth.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	newtmpfiles ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	tmpfiles_process puppetdb.conf
+
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetdb/puppetdb-7.5.0.ebuild b/app-admin/puppetdb/puppetdb-7.5.0.ebuild
deleted file mode 100644
index d3f27c98cbb9..000000000000
--- a/app-admin/puppetdb/puppetdb-7.5.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd tmpfiles
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+="acct-user/puppetdb
-	acct-group/puppetdb"
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	newtmpfiles ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	tmpfiles_process puppetdb.conf
-
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index ae4ae055f0cb..aaef833ffd29 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -4,6 +4,6 @@ DIST puppetserver-7.2.0.tar.gz 62897576 BLAKE2B 63a8a7ea001757e15224ec819d9a23e2
 DIST puppetserver-7.2.1.tar.gz 62917686 BLAKE2B 2a77423a932d7c75a164818d011feee1b789759046551be0d0275436295c47af6398222a223409a28b83c8186caf0d9f6e2d9ab4fc606214119bf0b56dc4d4d0 SHA512 ac960b756e6cbf32e70d1d209c6202973ffec17b553a68eaf9c0580ff4925656ae1a7616e45bee11f2a06544157d61e58b94bf700d39affd5d0116840c3fc10f
 DIST puppetserver-7.3.0.tar.gz 63289430 BLAKE2B d434c63dd189bfcb0ddcb9e286f0e46e5ac3d0f3612bcbeb52b582b57035d9edad2bc38856c9936cb35fccee34f93d7a22f4ea2b088b1e3bef619e69f014bbe2 SHA512 db38fb040e559eff8e219ab56c01bbb0ac1092c193095b79c5edb4206cd11f4ce211b5a4217f4027f31f46060937ca31a99bd77f3352813d1a5b56af35a36927
 EBUILD puppetserver-7.2.0-r1.ebuild 5330 BLAKE2B dfa1d0d6d15ca5e965ac2bd7dd8cbc89044db60ec4eb1bc71d17bbb8243b29ad6c5a75a623846f576e06edbd997a5b525ce2cbe1c044c7a4493083bc13e5e376 SHA512 f42646b2e12797783a3c1b67c06adf1eafacb734108c7b42d6a68595f51ae751b00cf74657107983a65ca7192aee7929d96f971dfc408176cceb421d19839376
-EBUILD puppetserver-7.2.1-r1.ebuild 5331 BLAKE2B 999b5de0b2165e1e198abec668f9dd8d5efeee7f8282a9bed8df074e8a1d8e0b73cc6fae5eaae0c6916b9931f92480ad90516b625e435c214c525d83348e4014 SHA512 1ff8e175a7b11f5398f49bfc4e3fa426ef7c5eb1fe229d50d12427955e322a51cd19b7c888d568ebd63ee11a199eb03e0af71eee42b69bcaff3e93741ba1ff09
+EBUILD puppetserver-7.2.1-r1.ebuild 5330 BLAKE2B dfa1d0d6d15ca5e965ac2bd7dd8cbc89044db60ec4eb1bc71d17bbb8243b29ad6c5a75a623846f576e06edbd997a5b525ce2cbe1c044c7a4493083bc13e5e376 SHA512 f42646b2e12797783a3c1b67c06adf1eafacb734108c7b42d6a68595f51ae751b00cf74657107983a65ca7192aee7929d96f971dfc408176cceb421d19839376
 EBUILD puppetserver-7.3.0.ebuild 5331 BLAKE2B 999b5de0b2165e1e198abec668f9dd8d5efeee7f8282a9bed8df074e8a1d8e0b73cc6fae5eaae0c6916b9931f92480ad90516b625e435c214c525d83348e4014 SHA512 1ff8e175a7b11f5398f49bfc4e3fa426ef7c5eb1fe229d50d12427955e322a51cd19b7c888d568ebd63ee11a199eb03e0af71eee42b69bcaff3e93741ba1ff09
 MISC metadata.xml 340 BLAKE2B 91985e6677e8a9d4428356eb316146949d82a250f0a0995308733c4348cfeebabe01990a0cde9e580bc61c8b5c7df44ba92b347d90b9eb9c1f6f9fc38efa899f SHA512 9bc170ecf1a1b3810b0f9a5838ad5eb994169d7b50f5d0c0cfba279649ed7665f8d8a627a463dd35029610c554f8b0e5d76b759218802e3b0b9fa09c45c4ee5b
diff --git a/app-admin/puppetserver/puppetserver-7.2.1-r1.ebuild b/app-admin/puppetserver/puppetserver-7.2.1-r1.ebuild
index 15e9859ee758..c2df215b358d 100644
--- a/app-admin/puppetserver/puppetserver-7.2.1-r1.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.2.1-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index a9906fd0df21..a460da34364c 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -8,10 +8,13 @@ AUX rsyslog.service 644 BLAKE2B 311072ff896b07d82e9d88b34120b4fa903b7a84c5ac9686
 DIST rsyslog-8.2102.0.tar.gz 3123684 BLAKE2B f5c4e00d68ec82ed3f7b89dd5e888bebda9c4eb38185dfd8ecd96c1bf77380385aaddac73ab1de8364e1239a3de746f160c18b0f135d006f473f9e40be2c18a1 SHA512 281b0e5d5cb548c39a6e514e5fd5b1bdbe8ca0bdd9234f4fea581ed7679f76d2d75b65d14c3c5e799f86f91600074ff75b467aa1ff27cdbec0f4197261c5aec0
 DIST rsyslog-8.2104.0.tar.gz 3175254 BLAKE2B ed772d4e460105b8406305574fdbe4aeca7ba57ba975b78f91d279460fee0faa767fcda3d2d8a4ba6d543bf9e920f9b7cf5ddf9e4d3ccfc9ae3b08c318a6c5b0 SHA512 15ded57f32259bb12b3378d10bc2d4d6eff39623f1195357dafa58e5c1154aedc0d60ff0746599707f380cf3bfc5ca955f15f1213572fa447cc333d479e0eefc
 DIST rsyslog-8.2106.0.tar.gz 3180745 BLAKE2B a949c36e0c5251fa3cd7748387990b667564561a5fcf0250bb19ebf62bf88f367814f86d743c64e0b5e5a184e2160ec0c2cd2600ac0ffc655e41d651495e9311 SHA512 309bba7e53f0dc6462f8cac781f567ce879f31bc020b233e80aa4461cc4c6e9279ca1c65c910ce3015fcab9ed663020db84ff4073c03a436b5be66e57a99164f
+DIST rsyslog-8.2108.0.tar.gz 3204178 BLAKE2B d120f2b20521a40fbe985a4ba751edd51ed5917fcd0db5d7abb35ecada3ada31f99d34f74cd3278736356e8f09f13b79ca2166e4732676a97655c189d257e3fa SHA512 95096660bc93f7808d22c39549d7429deb340ef8d706f08dc8be35f48d1c7e3d389907fdf18ba04dd54fb59c9780fdb267eef7985184f0e5932bf11f46c5423b
 DIST rsyslog-doc-8.2102.0.tar.gz 6419104 BLAKE2B 134c7ccde6f7435b35840fa37f5774223ac1ebd7dc10db961900a7b1600483156518433c7f70d0981e96ea750e1916ab53e346abacf58066bf141e85c719ae00 SHA512 a5dc4fb9bd8892fac693c5692b926c8d7d9fa36667d6b4c6eccba750713af88d4317f6232efc2a16de38c2e58c4a8bc4d04c9ebb2e7ebc3b0878d53eef20dd2e
 DIST rsyslog-doc-8.2104.0.tar.gz 6451275 BLAKE2B cb8a38b28caec17babd190e463070b862071a75c4c63a7208e56f039f84ae7a5c6045112697c61635d328e56d9427f692e67a9d6fefc94b59ad28481210f1481 SHA512 6c898fa606190c5cf214822503f060b1692cd907731858736a395511b66d7b0d1cf6dfcc90c4cecbe21b099197ae2187db53d719f44f85f26a1bd34971539d36
 DIST rsyslog-doc-8.2106.0.tar.gz 6500747 BLAKE2B d004af40dfc82577fe262993b10497cbf50142295ccfc046126e0d8cc85dd964cca7798732d2f41ef9d776096b3ec99a8c835bb037a78c9030ea6cd596d1e057 SHA512 04c205ea463f7487baedf60d0469f3752edfb60a0833954a3f208d52ed6495152c785a4a8ea47396ac85b581ced0657f7b51d313c2d4295e26d547b996ff4ca3
+DIST rsyslog-doc-8.2108.0.tar.gz 6527584 BLAKE2B b7974d2f723603017f1c725f820e03f355af1805d77143e6ff9eeb02e54a991ba4c143fc45b48b3e1625328e68113df36d71abd0763983a8db655081c5d81abc SHA512 d4ca8c91cbdd7be458083ffec9d933e5d1e175dff93fdf9274f5ca444c9cfe8710349c16de6edfd3e12cf97fc889a9e71059ef1d0b85fda4ed335fb107b98a9f
 EBUILD rsyslog-8.2102.0.ebuild 12832 BLAKE2B f514b2f410ee6abf3273d5c5a299cbea087397e22d4559d6bdf9966de8fdd214cb53c3af05e60b48ce50845f7458cd59df8251c9a871732482acb28c46c97b86 SHA512 f0f10f141cea6694b9541729e26c8b13bf808a353bd029645970598d92e56e4e0d2ef2f847aea5bc5df6874d682e4f1cedc20108c3fefcc27e5df1dbc651a600
 EBUILD rsyslog-8.2104.0.ebuild 12868 BLAKE2B 5da76dd6fc4e5f74b8fba99aeed95fcff313c9ddf1893b459eca2ccff4396b58822dd3402b96ad56f705ba47a6072294e887eef9eb701a3e33070a0da7a08c74 SHA512 7e2e0a905548bec785bf86198ca6822528209e9f4faa51599ebaeb472d9ad78b847bf983ddbedc6ae03c1ee2fa85a88eeef8a75843d0a335cb0c30a9c2c0ed71
 EBUILD rsyslog-8.2106.0.ebuild 12892 BLAKE2B 1caffbb31eef1c4080f731aab4556992734ca8e96e0b6077586709c2f911de895b8ce006d28a58ada529e5c2e2076e1a29e619f5877e00359c607ec910f02134 SHA512 5ade4c892a3697a97398e8f85c89f720e8931c4d41670592dc88892ac5aa7f02f97d2f6e3fddf0f34cec66d3c9d65812df6dfe28aa5f8cb77c4a4d2efaddba6b
+EBUILD rsyslog-8.2108.0.ebuild 12892 BLAKE2B 1caffbb31eef1c4080f731aab4556992734ca8e96e0b6077586709c2f911de895b8ce006d28a58ada529e5c2e2076e1a29e619f5877e00359c607ec910f02134 SHA512 5ade4c892a3697a97398e8f85c89f720e8931c4d41670592dc88892ac5aa7f02f97d2f6e3fddf0f34cec66d3c9d65812df6dfe28aa5f8cb77c4a4d2efaddba6b
 MISC metadata.xml 3871 BLAKE2B 33e83d286bb5a62a851dc3ca10e8920071c9c16c9c7f54bde875a97d195e2b0c34615318adfc6d919df7cebd33e053b398267e4159753e597c97551b8ff0fbb7 SHA512 275939880de65c264e14b782169d760a61f0e5d9ae49e3f14861c9ddf5e66c0a78761cebc6c62e2f18426530ac4145bf8b8e71533eb103776be3164127c1b585
diff --git a/app-admin/rsyslog/rsyslog-8.2108.0.ebuild b/app-admin/rsyslog/rsyslog-8.2108.0.ebuild
new file mode 100644
index 000000000000..c03f64233c71
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.2108.0.ebuild
@@ -0,0 +1,483 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit autotools linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+
+IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
+IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
+IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
+IUSE+=" systemd test usertools +uuid xxhash zeromq"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	imhttp? ( www-servers/civetweb )
+	impcap? ( net-libs/libpcap )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	normalize? (
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		>=dev-libs/openssl-0.9.8y:0=
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			dev-libs/openssl:0=
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-4:=[drafts]
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-libs/liblogging-1.0.1[stdlog]
+	)"
+
+if [[ ${PV} == "9999" ]]; then
+	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	BDEPEND+=" >=sys-devel/bison-2.4.3"
+	BDEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${PN}-doc-${PV}.tar.gz
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without dependencies
+		--enable-imbatchreport
+		--enable-imdiag
+		--enable-imfile
+		--enable-improg
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without dependencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmtaghostname
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		--enable-fmunflatten
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmdb2diag
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis imhiredis)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable imhttp)
+		$(use_enable impcap)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/${PN}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/${PN}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	if ! hash certtool &>/dev/null; then
+		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 8f5fa26e5017..87734bce0d9c 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,13 +3,1741 @@ AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f
 AUX vault.initd 573 BLAKE2B 444541b8912910cf6b5d038e466e18baebb7dfd2905d802217baf9e861bb7f2a3e032716545c74e269782aa420fbd052745322576b4bcb8c4cf53ba07471b261 SHA512 11124e6fc656977c20b55b578e30fd76b8f6905760c2f17f93b960a317975f1914c6bd8d4ffd3741ba405bfe5aa0cecb68067f8ce52b2df9015863d31f9a7aad
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 677 BLAKE2B 0d9c6636c841ff33fa38afca10f10c62d273dc1c6419e35e2fa844472de0c963e177c80a6db3e95230db6f641ab50148843085cb4f141fa2dd2765aecf8457d3 SHA512 15951d095181fb1b1a5f79e0f385bdb96812a517ea59e05017141a29ed880d0e6f29d377e7c4bc53d5b70175122785a39923297b8e3304fc46a63835d2d2ec50
+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 cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod 1059 BLAKE2B 175c6f53a17c785d18eef838f35553aeb65463c35c4c56f617be30971ff9196d6642629eb71abf95ce39c4d5f6b1dd93b3e21c1f71f901e7a5c6eaf655b0aeab SHA512 8c0fbd092acafa28279d7255079d433968960cc57cffc36d69df114e9f9e87ba06e3dbf4f39fb5bd8ff60c46be965a6d3a74fc680a12fe45b935613537399333
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod 960 BLAKE2B 879529244d38fbecdaea27588031c2d0d82551d8173f7e41f004dae8356e2264259d80e66953e941aa856a9613ae82211ea8dc0b12f9188f65bdf54487052952 SHA512 cbe178d04fe28f9b7dd07b0317fd4404d805e80ceada4953ad47763bafa2f215f88464c1315261a902ebcc52145af09df4c96a341e42644d38526909fcef313c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod 1129 BLAKE2B 975226b22ad0291e83a5e47d901c79ac5a7c684010972581dc15f9713154141f3d6dd7231407255240620e29cbfeb877f05f5b5d388100a70d381f8f54f7db5f SHA512 70400a50eedc5305fef765d38f0428f636f439195d09cbb283ee7779b8aba1f881f83d894acbc6ee90ff016358aa9b117c79557da15d10fc60264eb36ed3fe3c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod 1226 BLAKE2B d0544ce288b6beec6b76bfd106924e8a9ad50913946ae7e8243dc3e61356363a361384ee6c827bb4040976d783b217ad1619be3a34cba533940ed4ecfce4be41 SHA512 104e7cd0eb1c4a3bccfca3feb31f1530973d4829d853ee30e8e03c2ef80ccef784bc0560342d31d8dcdc6d410fe8f64a302140e452fb77d96ea2b342bfb8b319
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod 1149 BLAKE2B bc4e8c16d0c809b4f5d46d8b29112192ff51066e7df99242923eed643339599ca3d1180afe571c3e826d656d935ccc9ff1ba1b79701de859cc15364415bb35ae SHA512 de15381b36dd6691bf40592be83b4ae5b58fc92111a3ccb8cb4b540e1230dc0798d86c149884e8dfb6f93ec827447acdd7ccca2f2942c81aeafd1b035f5c482a
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod 982 BLAKE2B 9e5e32bacbfe15d8c72b4ee66a6e4124a3d58b989ecf022cdcda38e99b83924382f412067de8f6bdf3b1ecf8deffdf8fc74a8be671221f39fc2c8b11b2919e88 SHA512 86e2e042bcb371780189029b21afe24ba8ee166a9c0a4eacc314444844cfca3dfdace1678b01a213b7452cd69acd1d46b7051614569b99ac6fed84887b0e3097
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod 1048 BLAKE2B 8e1306450c5e8dbba561b9b24ed532f78fdd40a27c989b2bb6a981f4583959f4ab71e913685444c291648254455662909243a547bd623aecc426a1a6971d0376 SHA512 deb18eadb388fdf52fc6345b05c30a459777f3cfc67ed44d072a16e214c4ad1ef88d4775d38a3abf03df26d42fad13405f6fba081c5c19c129ec39df1973d8fd
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.56.0.zip 1365713 BLAKE2B d6dcaeeed2ba93cc3c8da0f92685d0c14252827497bbf54a736b6284c92b599cd4e176d6c458b643ab1d41b91499c3b0fa8e6a8265e52e432162a034273155f6 SHA512 b82cefd32e011cd1d821ed93665e0f08be55d81c33397587120d05fef31a3941d2dfdc84399414636170bbc3553f5ccc3048621ae6417d6b9ec07804546d27ab
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod 555 BLAKE2B 6707e248be1fa35970275388888eb7692f976a8fca6ddc7cf02e355f8d44264c7eef6d093d90c115670b7a3b495658b79e622c47d1c90b95684b8d32547d7342 SHA512 2df2dbf07037f027100f8beba6416c00fc115fcde2dce19ea4c0fe4a036e8f66f7ae278e9765d0fc80149a330e6dd90eee8e9a0c93aecfe16da65d02320aabd1
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod 631 BLAKE2B f7d342f7b6a9e0cc3249d9133a5408e9738957c57cedb13a64bd54d638cf85a17902bade3b452660b5e8b6aa6dbd76e0e93f0b0e4f5711856916879049f28e13 SHA512 3de4d1cf52d35112353c8d7e76df9915e92ba8addcbcf4c72e6d24c677bb642ff0b1011fca4e17dd9d364a03443710f452effb51965d95fd1571358b9aed7039
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod 489 BLAKE2B 036e068699429032701dd26044fd2353645e54260a7aab7f924fbfa1e1954eb814addbd9a0751ed1c786ed6c44566db5289cd4ba9e54727d5b24b6edd38a8562 SHA512 5f6a8f8f2d4ab26bdf3f150f22e6ef4feb26f264630315fdde8c171b6c2da5314057c4d763d4c61a66bc42badeba2745f576d52009c4549919e4afafa748b3be
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.6.0.mod 536 BLAKE2B b8801d3059ef182c553bd1ca819d1a070cf7c36f8b747a7c3adadc9582a4577dddf1803440a26b935bc0cf028e72ae2c4dd8e1de28899da3421efdeb75c5932e SHA512 7123466378058ee09bb558b200c611861f204d9bd1cac4655e304a07623587ba4f2f6c634fa57dafc00f8a6b5e19be6c952b9b32d4bad729391eb7a885490f75
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.6.0.zip 415819 BLAKE2B a78ea9935113bce203a26279abf91ac10cbfcb18765b058aedc0c305d9abeb9ad49ccb7a8bea0fe61458c6f723c68d7d28f1ca7a28372a0dccb66ce0ef6c91ec SHA512 36c13daee0e57fb5c7bebffbe16e7ab38cce244a375d515d5dfcb99b095a699c8269d213734aeac1b9f13d3b9eda986c82df5b02533131ad5f980998b05b3365
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod 566 BLAKE2B 93ded2035caa89bff7ac5a432c713751fa04791c513b9464c409524157c62d0ad19929a65126785a1d167c499fbca2289da6e6657ab182bf38234a4d2f380d72 SHA512 e7056a89df84a1027e2dcb4e15c6e89e0279d4a8bf5a45dad7778587bbd06f5f359c7addde5a5a62e0cb454032cc3ae0fc443477bf2adc3422cb0c38009f4e52
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.zip 279892 BLAKE2B fd5e1c812d8f1205c9618fad851923013eb1451463e96b472ddb1b355dfab1abd41b469e49da0329687a3d7876578127a47fc91bc95efb2e6547570b8f2cb5c0 SHA512 08a1fad4b3a243f047da01abdeecd206c699f6cf5910c8bea430b478d383c8f0a49e54576a51277d292cac1bdfdf739702e67bb1c869e92a5a8b37e05c52c882
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod 755 BLAKE2B 2a2aa8bcee45060e8a277379fabf5ce73a2c0a0abea8802c1bf152e31522b565b969ace4a49367048672908e55142c18b3c4ad60c7a468866ddf3316c722699a SHA512 2b2720ffcf11b02b3e12e794132f0d25e5e0afa08e4d617f9d4147d8bafbb6f00c8aa4c5776e039eba4ff5c8add0b4e73c8c928f4b155c5c386f09a4e06b765c
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod 858 BLAKE2B 7efdc0f9b152a5f49c07fb611f1807548f81f18f3a63b54d7f6d49a2f27c40941dc2c266e2abe0cddc60844ccb237bfbfd8afa3daa3f13c3a7ee34093e1a437d SHA512 de93e34151997c18f5d0211702ffbc19cfa1bbcd77fa6d194747e1094ffdefe7014a197f3a7c28fe99ae7677dce76e049566caeaba8a067bd4507dddeafc4f6a
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod 625 BLAKE2B 43378388e5a3391a431d0e842e23ef1fc74263a797bfefacebb61ad88b42f21d133d99638f06e03cadb7894d271884f06d1f3ad9743648c31b7d22bf7e19283d SHA512 0e2dc636df1de8119b3b4153466d8f31b4e2e9fa637c625ea0a7fd94951ee38edc02064cc00d7fe9a4d9f7e3d1ed521809003602398d68508772b11939755cdf
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.zip 155284 BLAKE2B 2f34e52933d8270823785913452ef79e28734c0b9854ced38e741a40d710ab44e43e7a4ca15f7b7f94f3d267743e3e404cf34d99746443514668c3c4d89e407e SHA512 fe4b98a54e759038763f6b83a4fc34af85e1b9815b0ff86db179d516b7ce4a7e7330c52fd553f5bd7de15358cfcd6c48212cc11f3eaae3ecc98ea4a0d3ecf082
+DIST cloud.google.com%2Fgo%2Fspanner%2F@v%2Fv1.5.1.mod 584 BLAKE2B 5ffb819c2982c6062745b0b5d5deb573c807df94b8ff28ab3b24977de73312f5448bb095d5151aa6c032e1a987d84b15eff69b4647fdd6c8352b0454606ff3f2 SHA512 05126f3ce9e44853fc48d9a7153b787a5553f6d1a6fdab0757dd1ec91cc21948ef71118c5fabdda52c994795750629c87cc70eed7e1406cc9c124fd6125f3c8f
+DIST cloud.google.com%2Fgo%2Fspanner%2F@v%2Fv1.5.1.zip 367877 BLAKE2B 3fe9b17dae410b7bb3385a62da958850918962cc2442dc1cf4ec762a5ebeb9c9c29cb927f30b90902156e718fc488cb47e73705d84861e08423f598a69581556 SHA512 1ff7b5547e5945fce0fc1c73ce6cb18aa09efeaa66cd77ce65bdac6c37cd9bb714ec528524ae120bb155279023eaee29e3308c2af1ce877e358712d9b6d23186
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb60561cfd33b1f70839691a3970669c34c0bc1ede45a31ea53624d9c4d2b16de25533d3121792739006faecc1086afd2539e2a1c7e9b37fc6bead SHA512 33dacd4dc65bf8a7ead2e660e6719beb7024b1603e47e705ee657cf3024e5ec06c44ba88dfd05192142ce880903e94f8dd628d059ddc357e6b42e395953a86ba
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.zip 404449 BLAKE2B e67aff98ecb8012e57b9841c0996b726e971360f34e4c5e8d6f61e3c27edcf7f1d0e9df4c69dcb37a912dbb6fb1edee9d240af5f17a57b5a6d6fc47d0151a3d3 SHA512 a802c27c2d24ca5af622e3fd77e46ceaf74f45e09a5aba54a0f31f3860c36ce31bef4034151c3c1b0671c9113840fb8c8b8fbfeb74716c6ed1708e5c7ee3c229
+DIST code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.mod 41 BLAKE2B bca35efaa23c2a66f01e01b2d9cd64e51b8f411e8572ca6320ea7760a56d1b0a0c538bbf1119537aaf31d53b6ec9e9faece12ac445b9ded22ebe25726f8d46e9 SHA512 3ca9c17bdc51bffb36023f0915da4104b8b15578c8008bc3767e1ed2799d0bb0c5845245609171643b65a4feb982ea974852a2840d8dfe0b60d9fcb1baa36419
+DIST code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.zip 17448 BLAKE2B 3ff76e66254d1e560b1e2c33394b6454df4af12cd34d9ef87ba5219042f00204ff15fbfae3be1c6d3f931f5c526ae6768ea5990446852d00ca4c7d9a6c4706da SHA512 dd71ffaae6b26a425e7ea54a026e584644e4fa7aed258943e25ddf7db59a086e24773eadbdaf50202cb7a876aa60b93ff301e000ae7c4ea6c50c59b982c14db2
+DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
+DIST git.apache.org%2Fthrift.git%2F@v%2Fv0.12.0.mod 33 BLAKE2B 1876ea8756f905511c9bb18327d11e071b5595ca315e60fbb613b2bf441656e4bbb304198aa3937240a9641f51c147ab61701c6bc39978583147ebd4e62f2627 SHA512 20958dd7849b90732d66ff46316a8e234839491c7bb2688c59f9c755ea7458d810a345362d0145c9e4c15311f0d999b030a7ba53dac7266ab7b95b926de6302c
+DIST github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.3.mod 130 BLAKE2B 3e94c2178b0aeabcc5391ab0d7d7684378d2d84fcae0b098a1aad2b08f154e0299879769c307eed0e42340c4bc06eb68881dffb04d6c9241a808ac2348aa83c2 SHA512 be347e2e234c217a9e0f4221a5e2cd6878141dba894c757440e46e55cb111e696e971ecff6159eaada4125594b42c65eae5db4658f2c0bc7bc488cc9ac9e9c31
+DIST github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.3.zip 22813 BLAKE2B 608887bd25846bd5dca5445a10525d798aedf84881c9abb38537f86c485a54691219e5475bed9e0d33f19910ba1d37189a78c936b6223610294df8c3b132483a SHA512 510b422b6ea699208856a29b8b17a42e231ffa95e165275d9e07c6c7011e25b06e19f2f1a4f6a7378d0f4f1de493ad47ef146879b0e2fb0470449c4757fbef28
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv36.2.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv44.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.1.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.1.0+incompatible.zip 51384794 BLAKE2B 9de740aab299d1acaea8614517dbf09429cff83154ad8327aaa9c4a81397ea6f6340e65273e493454c0051b17b5d370a9ec30aba4498778bdf0533ca5b80f6ba SHA512 9dc11ff998b3b86599514f6b4db8627b9a413e5bc8f8682f92e30b94c1b08453e7f9aed845a8053e4de8fffe2eb7c04e01c7ae74213b0bb9f23eb7ad0c8bd785
+DIST github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.11.0.mod 375 BLAKE2B 367ac4fd7825a113be85f2566394a365425dd08f53ba624d1aea0105ab148ea801290d466b7b00436918a94912f6c3ddcca7bf7f5b01f0cddc9f9ffa4d5781db SHA512 765a9e197a8cb3a9eeddd3601918633240f598b84cf28f9d2b3c702d252e8d5bc6ca8edaf6da877c68d94071f771820e6ff942c639422bb52ec429a711ab239e
+DIST github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.11.0.zip 284623 BLAKE2B b31ffdb10306cbebef76a71b8943058639d20323746a442aa5561fb0e39cb1878182722b66c49a2a01fb03f426b79931c827b410fb2a9a70b33dbd830fabcffd SHA512 76c57a1a2d16a320bec959d2617007d549815d2555d97bea0fef8128c48581d9ed6799c7a8dfd77736812aec939c76c4322f391c84e20b1a7f31781882fafc57
+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%2Fv14.2.0+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
+DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip 24733 BLAKE2B 66be4a311f84fec9bf833da384747f93cded83fb7cfe07481ef9a8a5747b626c3da56437e24b687524403d463463599c193a0e4dd367f4afd4b7c41fee7dbea9 SHA512 b5615d6e8b8e3d1550218258027891063d3296af88918fd63559d2c108a5faad4ee1281c57dbbe51057f1c417ba94895a59e969550acc0ed276a7cf648ff6ac7
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.1.mod 315 BLAKE2B 649b180d4b41279bde5a3ad4e7a8380b3e23d9428af2b2904612abfce99e5abf53ab7fa27ac7805faff0be8c2d52d685c7edc1380b909ad2c033beaae87be7f3 SHA512 eca3516d2491afa621522aae14e0e5c8632b984d8c6daff3a69df9b2b46416eeacdbd11de8cbc2247fb1119051466d24a4c178b065b630a684be8476be1ef15c
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.0.mod 366 BLAKE2B 97345e1c4c80024fd786edc92d87c2429bfb7562be7e96648e887d44bbc8d7b4a28da6510910feb8eafe4a390339e83a394ee64ce0686f18fbb291a4792d5c1e SHA512 bfb202512ad2101bd0d0bf6bd3e712f528a5f3b280ccaabe96c54ae06e5deb474cc0bdef0be5f3faae1dee6ca676531acfb4c4e53a5c34022a718e73f457c9e7
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.17.mod 366 BLAKE2B 74f1d402b4fc7bb6bf54c6467067256504fe2e37419de2a5be55b9c105ca2d1c7951ece398fac6cf98d02b990da9ad0d2aa1f4d12c17dd99ad3b6df068d4e727 SHA512 67b890270798e538335a74754514d4f2fde7e012f1201d30d3450087866612b88c5613185a5dbc899af84d65fb4265fec59ea064eec3e9362aeecd1187dbfd30
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.17.zip 111983 BLAKE2B e1b2157674fadfcad9c1b22d9359c654a012aacf2aa9f871b1e667cdc1a16ea8d89c857b17fedadde30ea5cb81baf02b398fb42d7454677721d9855e516c09a7 SHA512 d23ca114a646d04b124952edf07344891c849f90a525f9dfdfaebde02b6f618af30d0cf770d8c98d66369425a503d3290359411c1931d4a6603c41b4760f0640
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod 315 BLAKE2B 08bd66cb04b1bd32588ef1eb6059f3a2cd208a20a9ba12816e50fa39f6258d1e50ced24d78da3df80f9ebbf19db7a6c42d04fa1934eb66637ec612da86704c6e SHA512 72bb5cdb3b87c148cf4b613f3976076ffa0f8406d0d85b92b8f0311ca260e643c7855a939292dd82c66a71d4c5a1419a90b13f886bd65c7138062c34eaeae0b8
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.2.mod 315 BLAKE2B 08bd66cb04b1bd32588ef1eb6059f3a2cd208a20a9ba12816e50fa39f6258d1e50ced24d78da3df80f9ebbf19db7a6c42d04fa1934eb66637ec612da86704c6e SHA512 72bb5cdb3b87c148cf4b613f3976076ffa0f8406d0d85b92b8f0311ca260e643c7855a939292dd82c66a71d4c5a1419a90b13f886bd65c7138062c34eaeae0b8
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod 315 BLAKE2B 2f508451778b22bf72bb0e6b4479991dd1dda0b474ed3f09d4bebdfdde1628c780d70c9c0edc38fb91c6b7568eeb0db63e7c8500a908adf967370fe16682e24c SHA512 72629745cdd14c9c66a696700baecb37589b565862873cbdb9711545df08c7af659aeb4dc4725c7ef9c19af9889b9007935487530a87ff97267f98811b701924
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod 325 BLAKE2B 1ff6851c8e73b2a566cfafdc2ebd259478b39258f785040407cd853433312ef10e492da8dc0dc9cbd4a2d2470e2715ef5ba4c05100c35f5b0664c9b23879e721 SHA512 61c06f593c1759bb078042d461319db2f91afcbddf50186d09195021eab865159ca5c017eb078d354d7db590365846e401ec3f91a2cbbf753bc32d7111683bd2
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.6.0.mod 371 BLAKE2B cd0bcfc08f429e4c64a921f2df9a243f4198bea6fd7d80f74d9bab21f4d9891ba4a9c40ea3b389c9953c722b46a95d17e39f09e735e3c5850dc4565116fcfd16 SHA512 6c4daa23efdfe8ba8d2a9e31cbffade7636519c56af858f24c7ab154924fb5915c13030e5ce1aff2a7f23e99b0b48dc692744109fce7da66e77ab12fe45980c6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.7.0.mod 371 BLAKE2B cd0bcfc08f429e4c64a921f2df9a243f4198bea6fd7d80f74d9bab21f4d9891ba4a9c40ea3b389c9953c722b46a95d17e39f09e735e3c5850dc4565116fcfd16 SHA512 6c4daa23efdfe8ba8d2a9e31cbffade7636519c56af858f24c7ab154924fb5915c13030e5ce1aff2a7f23e99b0b48dc692744109fce7da66e77ab12fe45980c6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod 371 BLAKE2B cd0bcfc08f429e4c64a921f2df9a243f4198bea6fd7d80f74d9bab21f4d9891ba4a9c40ea3b389c9953c722b46a95d17e39f09e735e3c5850dc4565116fcfd16 SHA512 6c4daa23efdfe8ba8d2a9e31cbffade7636519c56af858f24c7ab154924fb5915c13030e5ce1aff2a7f23e99b0b48dc692744109fce7da66e77ab12fe45980c6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod 371 BLAKE2B 778ec4567ccf1533e9815f0f855933c94c2a4aed6285f10815258c71a39fb706ed130db03c85f8b944b764978ae584f7cc675cdd3688e6a93961f4437bf3aca2 SHA512 02605c296a8277e72074a0b3049ef0ee87597b67ba8d1e008d17746ee2dfc2551e2517e60f972135d368b27b899452e1c768c3b13afb9315da48173733450fe7
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod 371 BLAKE2B 778ec4567ccf1533e9815f0f855933c94c2a4aed6285f10815258c71a39fb706ed130db03c85f8b944b764978ae584f7cc675cdd3688e6a93961f4437bf3aca2 SHA512 02605c296a8277e72074a0b3049ef0ee87597b67ba8d1e008d17746ee2dfc2551e2517e60f972135d368b27b899452e1c768c3b13afb9315da48173733450fe7
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod 376 BLAKE2B f7e3a3f97b6a61ca9d5497ff96984c9f445d2c138f9d90157658cc697d9531cace1a87f6e2a18414ee2f7f54eee81d7652b3006b8be6c0137a2c794d37bf845b SHA512 684a7c8f51caebd1bb90c7eac482ebf9a52228c57a5b31ea1b3d3019864bf669688742bf5f9159995e5a6ddb3786aad9dd10c37925767ce9f38641c9a7448e3b
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.11.mod 424 BLAKE2B a2f4e0d3fc79a44d64421a8eeeefe2c4efa2b3332edce3517118387a0e74e23a37ef32fc0e5394ec3e03de0f0a19f559bf6f92a6e3689ed635d278ce4fb4dd3d SHA512 63dda9bdc3865c5b3d147dcf392855417c49eb133cdae0a3772c2a8f5a000b004d429325115e500d83095305e4fcc0c13ca613cf48222525351a32f1a8b2f5eb
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.11.zip 47764 BLAKE2B a54af01d578c478ada79bf0eabebd233f2a63f1bed98cd26b1a488c2e4304e78522ddccd3a32e6a0af17a5878e9b4878a6ffa9e8e931b85095db180cb8e022f1 SHA512 41860f086e5ad6c17caa155ee13dc24d2856a854ec2a3aa12d4b1ceba8d29d5d81096a109451dd1bd95b823d6ecd64471ad6b40f4aaeadf7a0baf05a9d17ef6c
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.2.mod 376 BLAKE2B c253fab694ca80ff126b627e21c99664b9707dbab0086a87253b627165d8dc63abca656b6592cf15432b2726b2640c095417b45e8ad677c327e460e70ea983f8 SHA512 99fc883cce6e127149af8daba32c4126fb2fb3680f62d63d3a4ec60cd35662f840a929f30009d425fd5dc5363a93e867aaf481f15e4ee878c4892986906b08cb
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod 380 BLAKE2B b6ea0cb491b11963174850acd4d525607eec5b63196c774afd73f974048a9a99d0ad6209fff72bab5238109d80d7498b4f8bb126b3c8a170f34373d69d96f4ba SHA512 63536f9954ee05c36e35abee4e91f9791fa97e10a945bb51c710cb2aeaf3a567d999193f968ce54e8d530be617fb55dd6e3a0c0b88f8edc96d1f92d348b13cac
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.0.mod 324 BLAKE2B 070668a5e85edbf765b7992660528b113bd9e34e4bf23d80568ed4d90a8e6ce8f848f70e2a034a7b0a73bc19279c19e1e5287ffcabd3484e8626eec1f577e632 SHA512 9b07afe60f46928af14a70532cd0fd59fdb2961a60e36c3efa621f945a95a84d6e01acfbce444e7159e5011830c82250fad8ba42d122be47943c5dcff59ee2c0
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod 324 BLAKE2B 1098a558b4802839f636e6a0adafd495bd65ca95352ee1839d8a8708ef33fc17c6f0a112104ddee27d423b7af8676b92621b0a1e77b5324de8977b12df1d92de SHA512 bd16fa0408713689dead4e6ef5503a83489512de98535a55dc0662f626840bcae0373f19379ee0489c32531350383dbee7c645071c5d5e83552053be564d283a
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.0.mod 376 BLAKE2B e0cfd3b0dcb1c758ae64ecd6ccb67e1ae2560b2d8782839e63a4e61c59d174b25fe670cd31c0779f92a07f98455d42320b0103845cae48a22826ae14649bb3f5 SHA512 b6ffc605f956e93338dcca4df3b218f5cc7f4a85eb5c889194ffcce6e7210ee8f0f0e5cf392d66f9a50970bd2bce417e5f6f23ebe0dea97fa5d95d0d181ef12f
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.7.mod 434 BLAKE2B 7179dcbadda054412e3b41e71a3e4710dcd67b4dfeaac8044923492e1848a97f649457fdba6f88223092048b57b057cda800d309bfbebfd4b82e0ad1034c3661 SHA512 496db051275d6e1ce042d3c59b6630141d9dbd22121e489d5a91041f0cacb5cb420bf5ae3a0c79e835fb447afa228638c2db44923c609031bacb552de86650ae
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.7.zip 16383 BLAKE2B 1877efa335ec6e40cd2bb87a716e85199e05c5bda850af41845fd055b9ade10979e6b6500dd6b331dba5a4e8d67afca032075a2d372316a966f0028ef8964846 SHA512 8214a3ff6364af5f423ba30896b6ca0707cbc7ac055d38e4d02f198beb51f35b860a06dcc525c67d7f329477236d3c41d91bcfa43c2fdd01de360d29038e77b9
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.0.mod 302 BLAKE2B afe841f1cdb7364a3da99230e3cbdd500630d16f78147862122885f0af683aac1207e6790e751bc282eaf3beab6de08c9420b4dce3af4e4492903f2133217c43 SHA512 54a5cc08f53b1caa34cb2d26519fae2e23b0c48806588085b95fc9a4951ed9bd5ab7158fd97345fb004984cbedcd4c14e5a6912c31062d8628edb1cb9616c699
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod 302 BLAKE2B c913350af2596f077dd70ccd71c3a50c3edcb8027eeb2a3a8e5f92636debdaec2bba056077fbeaa1a99ac1f7a52fa72072b61c0e89a588d324d60df80b19517f SHA512 09e11d4655a40002fff8472827035f1834881b689f84aaebcbe3a9795f94bb9ce8b281a6a5bd02fa0e310912822f2c3dee5da2fc794bc5c34cdc9afe1000e306
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.0.mod 307 BLAKE2B 6c70ad9ab3dae3c55241b402d1986fb10ba792f37298dd4b996a2860cde1f01ff7954431b74397c34ae3151af15f87191732708e6fc16f021d18e7b4532881a2 SHA512 21bd40b791b24d729380a1467a60758619dad88440f9a3b26fa6b933a109c6ffa2c821b13ba6eb6e73fe983c93e67cb32556ea8755c07e730be690f57adb9a10
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.mod 307 BLAKE2B 9c1c9564a0795362c025c90df035bd4a15f91629f45c9b971179bf6025a9a47f838052c0f78a012a7406c1413fcc5852b6b555401fa22fb95f4e502efbf2cc0a SHA512 ac9b1bdaaf749350c3d122ac6730add5c399102004330fbf354834b07898b08a94fb7e5b65cda53409a584b1e370c1ae2bd58d880ed035f4be4e9846e8e6f50e
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.zip 10615 BLAKE2B 62ff9960bfbb12fe0c04b350034269c8b0f689d608a9fa872d8dae33637a76bb132ac8e3f4ea6d28e3c61b4fa04a28d0e0311a03827fb2633398c1435254a061 SHA512 68738597d748aeb770ad5e052e45bc05be6cd7231091d3067b15edbb8ea4a096da8685216490f5b1d8b0127926c748267185c2198b61c4be088082d78ebb45c2
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod 59 BLAKE2B 7816ef9919ec514b2eafce6a859edeae85735475da10c34c64ecaf9a53a07748b02a424bd0a16b0413c499a2eacea0fcd6ce7807b651acd9f67ecd00b5fe55ce SHA512 d5eb17738399f8b8e1a1be409ba5b24520b848b3be5fced46c726499f9df5bf5a54233c6c0c9b8fe896834bcf5132f39ba0b91bac0ce6347b9aef7c8bf93f912
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod 113 BLAKE2B 7822bd4ddff863c4fe4e3caf59e722121828f61b08d5504216e1fea40401108199708fb07d7cef2b9dd7ddc7ed7d8feb4e0c823b8a7962217881601107404ca2 SHA512 08860dbcc27a83f322c07cb64b9fb1dad3810f8a7dda4ad5914b3fb8dcdc14fd20640e5aa78ad5dbd220c6dd95b8c9ab6e15c4bd75dc476db743f1c5df1fac95
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod 118 BLAKE2B 6c3b0310b2a333471afa5fb1c2cee19265ab4180b71cbfaeb875ae27e5db270fdbd141eb8d498e0e8dc300e4e0d9ea681e99e1a2a3b52c891cad52155cb88a58 SHA512 d48c483ef76bb5ec8d721ba828cade25defd91bb2c0dfc3b44df36742b86e8e0650a2d010bc7843a0b4317633676c393f4044998cf7f953125bed93bb7fb9375
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip 18297 BLAKE2B 5691fe3176a689e7f79f39cac16d24e00334f2107892df1b4f38d0816a69decd6ad0a906a4932e0d79db60723f51d3a92a87b359bbb87df8b0ef2131dc097ef5 SHA512 9e4a0d741c735d4e285ce8b0fbb7f19e98424593cadc64a5b958e273bab208e8102140c4570069ee4e35ae3c1f5bcddba3cda854f7a6df6b50f736008a5a34a5
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod 114 BLAKE2B fec15aa5a362d73dbe839818a965fbf0a0183e7de3fa5b739739e7dcac4e88ae037848ccd7e6a35a4f6c3d7bc26988e0e1219ef6a3527c2533598777a0e5fdd2 SHA512 a119491d5a5b513a2ec0d0f5960ce04d03c263842f35a86a3efcb3931b5fefd19ef74df546e4b79ec119fb20dfa62d0f251c7812f144bc8258bf3acd902b693e
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod 119 BLAKE2B 079ec8baac7694b3a9080e10de4b2b23ed2039493614e4b9080461b3ffb3e3c2521d8a8764388f56454b3654983f2f2554a2b1596a4c1ce37004423c6f420939 SHA512 6a9196afd0b5bcafef72c001742e1c8e45ffd0d7f53ad64ff33a8388b71d90917cff08687ffdcc80f5f64806269c120ffd3ae7d0d718c6fb8b2810b2fc2b5e28
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod 119 BLAKE2B 079ec8baac7694b3a9080e10de4b2b23ed2039493614e4b9080461b3ffb3e3c2521d8a8764388f56454b3654983f2f2554a2b1596a4c1ce37004423c6f420939 SHA512 6a9196afd0b5bcafef72c001742e1c8e45ffd0d7f53ad64ff33a8388b71d90917cff08687ffdcc80f5f64806269c120ffd3ae7d0d718c6fb8b2810b2fc2b5e28
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip 9299 BLAKE2B ade95bdf956e40a7c5a6e44d75d4b1b999aa02ef7b3a8bb6c33dac291d2ba06d4c691dc87ddedd6c3218b67b1fbb512529eea41d2d62a18226a82de2e01c0df6 SHA512 ff018e85092e3aaf288aba57d453088eaf24d22638f57f0d494dfa36899070c07938e50362d22267f1b40a65a69e7930a3214ea29f02ba6406a1de2b3c770de5
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod 111 BLAKE2B c5ae8e34a416406d265d2cacc6ebaf2e3f801eb0338d488eb413da396159a70b217309e4d560f1d50d173e3c717c7248f8969ba6da948bb86cba04ae0e30f32e SHA512 e3af601d732c07f5e995c21ea484fc2087aa693afacd77df8e9c1abf687c1476e41b50cd5178d07585672f0ef52cf454879ed13bd1a1ab6611428a320b73ea9d
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod 116 BLAKE2B 064d7cb8cabde1b322a8bc6d6bcf80acb5e25573d4bb50d0b9753421412ffb140f8db409903aff01a67d399773c94a0eac85734f05dae36b98402d4bb2fc5bfd SHA512 1b6a8f2c23e225f4f83de03e4e23e2ad31357785ec5e8d23e8300f249048f7d8e14419f991b509f6a3c8a05cd5ffd61e2385703e950cf1eafffdab95df4a8b02
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip 8129 BLAKE2B 235415e90169c74bc7a78bafbc4e98751fd7a57a6676e74bc05152d0c40b211cf7e9b27ebfb510952fa890c0e66d43f76e8585bdd12aea4ef0fad47df96b40c9 SHA512 4198cfaca3923afd7dfd6eb7ab5ea3fc01a03543b771995d38000f0bddf2ce02cc44f77782878ae05ab44f121bcf7ab4c5ba046e49807ca306883e9db410c8ad
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod 160 BLAKE2B 57c363c25bf42b884a85ac5a6f152745ba3138a2869041fb383de44432f6c38f39a8b11405ec9134a3e940d66d864d3686769686d81d7ce1e99c2dd22bec2cd1 SHA512 6fccb53dcdc93b44c1f2c071f09c27b0536f6ef071b6e96296c31b50e81eee3d4224e9d3e863f84c85fec70adb48f57324d363b735d4eb1ce5aa5709fd4889cf
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.0.mod 165 BLAKE2B e9cebab5c6e8af36d160a6cc9afa1f857ddd347bc18d4c2f69fecdee2c6b612af20a3622abdb1d5336d4b1e9dda97a32ec89f4dd0792a2e4569cf8da1868443b SHA512 c71897f18a99fd5d01dfd6d2a6a4d1c451497e08d756a878a2f2c5b30dea3131f8cdee708e5d8eb6add7aa9c2ad789e6c413c35fbd20b7bee441207be93b95aa
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.mod 165 BLAKE2B e9cebab5c6e8af36d160a6cc9afa1f857ddd347bc18d4c2f69fecdee2c6b612af20a3622abdb1d5336d4b1e9dda97a32ec89f4dd0792a2e4569cf8da1868443b SHA512 c71897f18a99fd5d01dfd6d2a6a4d1c451497e08d756a878a2f2c5b30dea3131f8cdee708e5d8eb6add7aa9c2ad789e6c413c35fbd20b7bee441207be93b95aa
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.zip 15606 BLAKE2B d12ada3cb02c1999145b3b2ee3b739cb6c846f4f6c43150e71e4bed4d07f441d40a02e47294f79e7c3d724b5accc9e5a04236921f02f6a8928ebaca2d8eeded5 SHA512 a906dfdf08cc5b8a5d09700d73b52aedb66ee586024fc31396d4ce2542a83f4998c138738b354c5611b7d3fe4d09f3ea9cfe384241199c4d5b77d89a15d8a56b
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod 52 BLAKE2B 83e3b09b165e45af373e2e62dc0b7799ac204794e1922b4134ebbeba4cf6cd9b6d883f6035624f2421e8ae613d071a2e281379ee4935e55b73540ad8104d79cd SHA512 ad433e42696f3b605cdb12c70438d3b1a4d4d52890cb28b8e76cb26bf1ae51f324e6dbe2043bd74bc9086efe743da65b8cbddd10618f4b59d27858e0898279d5
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod 111 BLAKE2B d97433a5745f1479d4c0aa7ed6b6cdf09827fe8cfb41ec000a0aa6162ba01629c76abf9491904397650b65ff74caceae9255faa97f54d0fde0756cfb1b09b494 SHA512 bc44b8d16bbfa4fb5e5f6ad015165f03ca8c747096d4618aac083a22313451fb283f0061fab90e6148e5a52279e839101561feb358cfa77e26028fcfa5a4fc9d
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.zip 10521 BLAKE2B 0b4ff7f99d953966ccf4f17cc32b3f0875bf7087ea5caf7bbeaece451fc8cb9fc4285e5d79d2880165e70f738edffe709efc54a32367a3c666d2a1b383b139c7 SHA512 45e35c16a3e2d0ba3e765f85e80ed2d8ac65c227bc260df910f0959a8642bf0bafd1ba20a2dcf0b69fc6a371bb4a4c8026e54bf15628119d68df4d063756bc3e
+DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod 53 BLAKE2B 6fab3fdcfa8f595bbd52845b0b4f7b0e47df93fc624820a661b38bff1d51e0a57c89b678e0cf271ac6575b6a77c48d3ca93d5307d6cad98b35f79f1142a27795 SHA512 b1f9bd825933cac8ecd5416f86748f26e5cde3fe87266e35ee794cd1f59ce0fa81c0e62169e838e70afa71b0680a89fd8f2beafb3c1411eceadf48a154a08f9d
+DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod 112 BLAKE2B 37e4e4987feb544f6382e506e0721975c975cfd239138221555dd238350b534400256fa7118705a7ded177877f3ead64275789839cbeff8c175aa3e4f8b9c8e5 SHA512 a513562aef7037e4f62d099d2fb3ee2015bb43d6bb32b734ef2597d32642d7cf7eb13f1e9a71edf424e274912d90de5db5c038b8cdc4276836740bc045cd1a90
+DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip 7440 BLAKE2B 51b84bff91f8490df83c9a013b58acc0cbc6fccb77ee765379e94797073521242aae7066de134c1064f460c15df57d9bce42e934d95336160413050c61b69276 SHA512 b602a1a658c95e12e71c814c40ca44356a615d48c1cc8f1aeb0130edf0c5eba10f2da2e335ff70989a1dbe4dfe789b86ff5f02424d6ae4ff3f5117e292951b3b
+DIST github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod 35 BLAKE2B cb1abbb2d5d094d5946f868ec3fd1b6ce72721b5e220ddf2be7c8376195fda1659112b93b7af24b08c66b441c950e6d555c858e51e81c9d3d29bc5b72271379f SHA512 b9bb8b7bd45785e18073235507b6e570ae27df026d38676e0b36cb19bae6b53a085099fd23d4a0bc456dd9bcf3459f1f53d0e8d11b6bfc7e61a88f8673a3ca9c
+DIST github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip 13778 BLAKE2B cb389977b9c081b3531f0d62708b8f0202deb17ac651100343b6e59c668c7135e1eb0ea0c0dc4ebb953b6d8c8df40498e09362e8415f6daa8725e4c768813082 SHA512 0b87ddabac154fad7ea06ed88d28fc4586dd41afac9a2eedb2b0b3a695ef52354d3bb6f087c2422b88cc58778afa0e6a4da19fd2fb0fae5a125aaad79fc92d53
+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!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
+DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod 37 BLAKE2B 74a94066231395cbd85f1dbbb68408161ef74781c0c686746f97365dceb3ca69e3b924a86e6639b5e4cbcf64928fa21245e6828339105a779a86bc4f132a5bf5 SHA512 da3a3499834784b7ace8158659956206fdb113000fdc84d54b6525805727e37029bdcf263afcbabe724d8b10f6601f1f38a985e6ac10fd0466907ae56da3edd7
+DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod 37 BLAKE2B 74a94066231395cbd85f1dbbb68408161ef74781c0c686746f97365dceb3ca69e3b924a86e6639b5e4cbcf64928fa21245e6828339105a779a86bc4f132a5bf5 SHA512 da3a3499834784b7ace8158659956206fdb113000fdc84d54b6525805727e37029bdcf263afcbabe724d8b10f6601f1f38a985e6ac10fd0466907ae56da3edd7
+DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip 34337 BLAKE2B 7caec3639ca080f2da9fe83a9d7d68d7038d5f926bace22c149a52b0c1b09e97a9c37c1c408a77add3391412249f74687ccb8237376122ae307e899df1e09e04 SHA512 f16a6a25abaef19382e50de8c791947ef9d65ed69c275bb20b38aa72c03e6b161b5db1974908c223cb62d393eeda0d9317f6ca9ab1db2fc5f7db5e967e3d730d
+DIST github.com%2F!jeffail%2Fgabs%2F@v%2Fv1.1.1.mod 31 BLAKE2B dba6e642ecaacad24e399aa389816bd01352ee098c1fa0ce6d8404c1ad944b14c8a72b27c03cef2fd7920e45d476fd430c3017b86c9ec64bcb16de247a783879 SHA512 95cfada0aec42a43bfe5a6b12b2307e67b9f140c71778eec9416fd1391559fdd0f43b7b2bfba2dd497f5c8b90633bbbaf7170d9a4acc058531960663eb34e474
+DIST github.com%2F!jeffail%2Fgabs%2F@v%2Fv1.1.1.zip 176466 BLAKE2B a2abb85567910c7ac30d309e892c9e92ab38d95a7f2f1510b474360da18d0930f743cf660b556bfa6e41edf8ce78b194aa3e85727788e004c865972cf1ccd44f SHA512 b4840fbc1191827c104ac34dfdfabf710a1d6191904bc11d5ff90f3bed6e3bb04de6fdd575ab962b30a17ff9763805b13a43e93c6ff86d58604d026f042c8734
+DIST github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod 35 BLAKE2B 68297267e33add40ca12e681b6b4461ef8a3dd23eb205a365b13b158d0e055e3650fa9539eae43bbbf4ddb559c872b95ed541a3f4330a0ad3395089c4cb9c9f8 SHA512 73bd53e14c96c10e3288cd859b5d7758e6d2897369060b1581b6a4290e233877e408c9dc6350b763c2ab678a2e8f3e8f7f3bf563928b43ad37a48187ccc0ee7b
+DIST github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod 38 BLAKE2B 6bb3112d9b8ba6f9cf4d0c4ee376da93bf21b139563a211c51ee44a302caf9670181cd27f7e21c6fd05bf87c9273daa726c942749ffb18b623d17c7170aba6b1 SHA512 a3c38d1db1472c71e1c47b936d47ac2ecfb49519c2e78dd453d234f1a6153bf007eb96fabe0be7dcbd868160a3869e854ec6776356b9011fe7ef51a634b30aad
+DIST github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip 21259 BLAKE2B 6ebd8152517cfcd5e883bc56dbb3d347fce7ac09589e8ad5a96af8d39c5e18b284e616cb1a6f6641084a34c07e59d4ded65b600dcc9041c9af59d26afd368993 SHA512 5800ddecf3717ea31dd991068c785053b9c6cb5ffdbc97b681bcce4219634362acc7811eec766117f0087536abaf0eaa22b8d66a44103a1644e5907e3174dfae
+DIST github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod 37 BLAKE2B 60b2ec6aeaaece8fbe3ca154b432f677dbb46672fdbc95b503f613190df535c7254900c9cfaa3319ab2d7562513640c7cc9fe650d75d97dc09fe84a17e359a86 SHA512 4f01cd11b3ae6f26266154ee37e7a4084e61e865fa9427187a24a02631415f2367a4afad83b4e1cf772b263aaf8f180b4b177e30ae884cdcab239919c9e08bbc
+DIST github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod 37 BLAKE2B 60b2ec6aeaaece8fbe3ca154b432f677dbb46672fdbc95b503f613190df535c7254900c9cfaa3319ab2d7562513640c7cc9fe650d75d97dc09fe84a17e359a86 SHA512 4f01cd11b3ae6f26266154ee37e7a4084e61e865fa9427187a24a02631415f2367a4afad83b4e1cf772b263aaf8f180b4b177e30ae884cdcab239919c9e08bbc
+DIST github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.zip 38193 BLAKE2B 13e82289c645e2a34250f8822274767c45c79bd6e54f505f20995c0c17a83b807be68b490c481fc9595637dbf2e0da4494cc230763a7138658a11aca9cc6b3f1 SHA512 4500f7ea6c626f82689009f5439d541a048918a986adb2d5e2d629fa96d2877783a33bb0c059a510788722a8ebf324c6c6a7ebc23174d1d9e7842cf5da55a96b
+DIST github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.mod 36 BLAKE2B 39effbee6cce58e89a4f700e32424a1353ae2c4410579a0cdccce4e5e44cb2e8f0bf9c5419eb199628b1be549d4c3deb890a3675579997096ace6393ab5267a8 SHA512 86c3285d609dcf781e8ac5d63a6d320af0cee0465e7071caa925e5c7cb259f46451b570c1a6c122ebd6b099e2fc2a5ed4bf6da7fff906a62709982649cbb9a72
+DIST github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.zip 60916 BLAKE2B 342cdb2be3f2e185e0096e80bb1d0504441420ea3c707ac5b0baeec006b7dbf45544ddbdc880df79ea62294ec4ad16bbea90b0ba086e08911af0ff620c59bfc3 SHA512 b448168ae1cb6aa89f1512c4bc68928e84d85507fd3960c28215cae75f8ccab5424f58107f22c09a20e05c4eec557642e3cfc374cfd2cc70b3b7a138c50f6fe2
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.13.mod 177 BLAKE2B 1b5b5169436173ec669c16023c6993e233f5fadbb574533e7e2db2140c2db22cd9b8697135a46fe7d8787b8e5ae8c16019f15e5cd7a8c4ad59a46f6e6db9bb5e SHA512 83b5d04d488db971f78cd1853903e7f5cb1d547d5b5270bcaf35aff4240f0b96c300ce311014775028e1424c6fad714991c27f0c676d8b8eb37aaa62330450ec
+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.16-0.20201130162521-d1ffc52c7331.mod 177 BLAKE2B 4dc3ea105907151260d8473539a5e8c9c32efea3087590cfc5521816e52da19dcc0f7d57ed067a15e82de427abed5a1271c45d5d3c7b284e6490251b0b29f289 SHA512 df4e0266024f6899aceda327e2634b0552f19bfc15db0dabd394cea6a15d3076b210800a083b79e4fa23a78852aab214325bd23040d5e064faaeb34af4ec4bf5
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16-0.20201130162521-d1ffc52c7331.zip 115655 BLAKE2B 8875c30be4a4223b7bbfdb8b20ee3f99a40615259e02112f123b481efb59c2561f21168a2d814876a5cfef1eeb46bfab974121510ed637874d272afa9131de68 SHA512 e2c095bf198a0333a33d7cfc621ee78fec4a6edf01e60dbc7c036ca98ae825d6e33d45e25137b3f6d440910ec591a5eb3e8c7b68059e6d396d8ecbe5f1d21150
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.mod 1658 BLAKE2B c431a7025ea626886df3db5f97d03fcc46048cf2987af517d53d6ed088aba9cd023b3a298477fbbeade46c61a2dc2329901b6bbab6c2dd5166153cf571c8f02a SHA512 366574210523371803b9065deccfe090b868fcbdd6484722393e2cb8fa2f1e6a501dcea261c404ce03568f6359d9c9d3bcfda84aaf288f18e9d2235015e80e92
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.zip 554711 BLAKE2B 289a468e46ad365db7ad45746095ecbf0cc9b301b0e70e14cf841a65d1fe66d3dbeff0b80fb3745e952dbf728a394a6166a498788bd85deef63601b198babaa7 SHA512 c5c1e25e13b2a4a2d999994847373fc07896cc2c055f527e3ed720a9128d6052df7f40b3011e5640ed1c4452ae05b5b0928b702b6d84ece8e7671515bccf7952
+DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod 38 BLAKE2B 3f0ac051b31c84f5e98663c1e6245a4e2bde2be5c0be61ec80764d753bef5479251bbad3cedf6fb998d1a4a4e66a80beeafa6f3291ed45f46d643f7be109004a SHA512 aa1f503fe0c19002da21ae30df5393c15f2b2243ff415493420204d11032a562d5d40047705b1644d031523881dbbf284d3c56ce8106a2a969d2610504426762
+DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.mod 91 BLAKE2B 4b450a7c1f230f8be959f6c2edfd47669015738deea7de2ac6347699a1671ec7e0bd66d134fd5fad079ebd9fd64eb4000ada8c91b2fe9193048eb4ac3c36735f SHA512 0e1988e2b81b9f2c0531c5fba44524f81fada3338c323141b1e4b49f5474c16b8ccb60bee17d204f17afaef228fcf4dda47ef125b48ff209ca49eb9d6a233745
+DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.zip 55401 BLAKE2B 7604f64a9d9941b2d4f8430aedfaf02570a99d2b4321760574e777ab1ab87029af2cb629634fbae3859a478471591c0f66e4452445f40d556bd6ee9cdcc01570 SHA512 01c31a36b6c9dcdd10558f1341741d4b3ff181b16ea45114fb06598831690503e131b91d5a9b3e531102d6ad0e645c733c7bc50121932da470035677bae21ff4
+DIST github.com%2F!nvveen%2F!gotty%2F@v%2Fv0.0.0-20120604004816-cd527374f1e5.mod 31 BLAKE2B a9858e56714c0ef3f20576058bbad347aa76d00379ba71c7944479abe032692c3f0d33303ca82ad6d140ff529b0c6bf23a844c4c0b8b655c4fd23f6df414ff02 SHA512 ee0d1ac5d8bed0498ae9b304c1f3b07566a2e192b6f7cf706b4d801e74e62ad3157b101be9878733b48a06d5aaec3ee916336c7f73bf155d63f606d039f8c6e5
+DIST github.com%2F!nvveen%2F!gotty%2F@v%2Fv0.0.0-20120604004816-cd527374f1e5.zip 12531 BLAKE2B 0435dd738f6fe3b88b291f0744bc33659a47191cd6a091ca471f34690078b3d376e8794ac47133d2275d409646a28ee3899965c90037af293628f7b16543a23a SHA512 9f57f79977f08762c6b6cdc5bbe94f00b578046e08832afad7b5d9b860ba4ce23f13252a39b144f9878c5c1433e1fe8c44de465591c19549d686abe7a753f3b2
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
+DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
+DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod 37 BLAKE2B 28c9393f5171487d23b732afcbb1d3d835d13d1a63b7e852fd3205925742fcf5a686c39b0600359e9052770360e9396f6bfe52a0000ecb51e3ed0a23611a2853 SHA512 a2b3211e3520fdef3d5c1991b5ad4b3745f4bb1b49be3afc5b1936c82b2a3058231b6cc17c63c85402cae0b80f037a70051d42738e89a708865e43dabf7b7b8a
+DIST github.com%2F!s!a!p%2Fgo-hdb%2F@v%2Fv0.14.1.mod 63 BLAKE2B 916adc4bf5f7566a39df9925dee67a62ad78fea197e51413ed236238494b1b2bc7fb6523a523f209664d53b884aa05a723bc155bef5be87a8a68ffc1f440fe74 SHA512 c7241375a4ca60dc0dd2e5493bab005c56e48e75da6d5a1cf5efcb2fe6ccb9bfc9f82941ec26649248f47c2b95cb5be28a00813b7603063bba830e73827dd97b
+DIST github.com%2F!s!a!p%2Fgo-hdb%2F@v%2Fv0.14.1.zip 145421 BLAKE2B 251c09b229b34fd8da88ebc060a3b60035fd3d3f52418e0ddc3e839ff7d8e69a41e2907c24c0b54284c93a3e45a737bc046b3e1e9ac20208b277dc85a55e08ca SHA512 57dc8e27f2bd7f039668d9690f56fcf0f04be4ff6849986ad17a67d0be31d5d767e391dd08f8bd2953cb016e5517ed85d405d1498b919cd15ea00e31c959d5d8
+DIST github.com%2F!sectorbob%2Fmlab-ns2%2F@v%2Fv0.0.0-20171030222938-d3aa0c295a8a.mod 37 BLAKE2B b9e9be10d8940ff02e7dd997ba4203dfc4e13c9661010f7ea61a1568c27f1a6fdf53046fc7cf26f77318518839d7db6fd60368c2a91204398b0bb374e2894265 SHA512 38f53de08d3749e50167502841eb7822c0c21aae452e2633a4eac9ce0ed0671b071a063965f945ec25b23409ff82696bde2145711f85f280832085ca23ddf3af
+DIST github.com%2F!sectorbob%2Fmlab-ns2%2F@v%2Fv0.0.0-20171030222938-d3aa0c295a8a.zip 53878 BLAKE2B 7ea512098e14b757b15a4df6aa59b3bb4b0d8d8245dba696fc72ad4f27e4dd6ddab170b5643db8b5306f51ce90f3e0c6133769d2d25e987359b7c8cb0b2141cb SHA512 764c1f1333634ec3bc0f3b9c5e125fcc581f35f2a519f4b9de6f654d705ee048c0f731b68164eae0a53a79b0722f7092eba48d9d09c519eb7753d10458e91d57
+DIST github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod 33 BLAKE2B 7013f44d03c22c21595c5369c52e1538a526891c9fc4cccac37373504f13c66d7c504552251f46632917739dfa1d6c3a15e15aec4dc03b9c69902b0bcfc8785c SHA512 db3271d8abd514934ce5d06fd20f7490db8368e57822a2379bbfd4ccb94e67354400d487d388a57467a5a16cec339cbae9488cecf82e41d85918639bedaa0a87
+DIST github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod 36 BLAKE2B af7b84d9f1cd163555b32bcf960b28b64a5689a1c9694f430af310f5041cd967fcf0d6c1a6c4020478544d347e4ba5b2fd16a6ef54258d33314ee0ad9239752c SHA512 917ada7ac198a013d2b090dfc59a45bd2619dcb7227df1521ca38a0d822fab12ea8c158c526257fef4ef506af29d9fa678e8dc2a73fc13c8dfeb57b398801744
+DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod 36 BLAKE2B e15c1ef74374320cc49b3509a1fa8d7f63c8566920ba56f8b6f293e3d331f5587d45b35284af52b40f329e116f570543a7df50ab1888c4238b28c2ea583d2fda SHA512 83f296ee872570bab84dc3e3f7984f155f5a9a4f95ca7b23a5f39dd47b54eb87ceb2eaa4db00a3966def5b41fb0250de18bcde32610c350206b6d0e744353fd7
+DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip 14905 BLAKE2B 9aa626472e6bebbcb1d454f892ebf3c5f953ccf952e6ca7e60715211d418ab9c8d54832f9949824702278cd753758425dda72867e61ece209da688196d13d2ef SHA512 82818b2eb7e8f7265b814f202c420e5a187fd5e9a43536a062715e1a3d1d5717acc8d2daeb1f678dd13bf5703545309ad9d4b4e78fbb6e9befd9bb7370ddaa3b
+DIST github.com%2F!vivid!cortex%2Fgohistogram%2F@v%2Fv1.0.0.mod 42 BLAKE2B 8afd8d85fc5969d9c4b82c26f852d82fcdb08677ccf0d54d8d65b89af3ed5897125aa0d1f5fa6adca14e8b47850da8d5a70b5b3fb2f42a83ee84576137a2fc6a SHA512 e25b80b5e74a374b055238fc017a8c64ea89180ca07417abe673ad5eb0b53c9489b9d93f638da5b5cec250fe9a478345093dd2d1bf0b82fdfffe938ec1aa874d
+DIST github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod 31 BLAKE2B 6ff35fdee07deeeee5ac0412b923e2a76ffb19646b121dcfa6b3bda5400b9813375f7659a42b8141ffa6c29e79a4f1009a946ad3bcbe943889f20550bba73627 SHA512 975a6684c6f7eebaec8a757656fb51a4bd9e7ebedce12bca267fd69ae505bd81fd6296fcec6a3b45973f841982defb9311e405aa349b2c7e664384ca05a920f0
+DIST github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip 7070 BLAKE2B 8a387a04a8d6cf7d548f2032820a02dfa7f0a078f3ad04b97643ff46ca3436776692d620e5424f51504519551a8c4e48135e37e47eb73bfa7f7de254ab9c9838 SHA512 05b98a368bd2a312fcc487a5d17cd051318f2234a570ef416464206193e62fd1a43169a150a5194f7416692771fc53132fc5352f05872cf95fc1e9402cea21ee
+DIST github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv3.1.1+incompatible.mod 48 BLAKE2B 5828a106b0c2aac15695edb54a3f66353f1858e5ce038f95759bf1af87902a4d9be1de48f7b96893b25bb2651b79a8831010b777683e887ad2f7e93480ab135a SHA512 cf61a77ab7768d54a756f54dcb982ca5ef32d51de0e8ea3f632ff3b3c185bf3cd96ca4e1bb7b39b7334c3eb6f2a02a9017e6e92fa12a933e9516ab36f000653a
+DIST github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv3.1.1+incompatible.zip 477180 BLAKE2B 70fef062b1011df67094bf2c881c5e8a7a158ce2d3a5c6043de8675f0cfda1bdbcbdacb88eb5415f8b04ed29047d42476a1876d5ada395693082189b2e9b09b7 SHA512 0e87cd6e7a9bea379c0e281cbc22204cc4d6b9aa245854fd55ff9b8c896915c667b23a3d0e656a8bf0ddc9420d9b103091bdbd90c058f14d13375a38aeac598f
+DIST github.com%2Fafex%2Fhystrix-go%2F@v%2Fv0.0.0-20180502004556-fa1af6a1f4f5.mod 34 BLAKE2B 325996884246cd840e22801dc089388410afc2bd8ab7c5c1f4bac6aa6ac035f387e1b896a91702386edde85ba82efde16aa8d7bb55a7644fc3f530a36eabe89d SHA512 dcf507ac7e50307fec43fdc5e5dd93f0c8509ac99033500d1ff3414ac0a2419ddb10a688b17cd9d0035c36814a25ac68b771285ae21415eba7a55586b91fed7c
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod 79 BLAKE2B 51cb1c2c33300626f74f843ce56c333b194b9a46230d3befe94343fe9daa62314a59b74a6d78c97415f839997fb42700c762fe02ef76240924ba52d18f723ad6 SHA512 df2dd357e057bb1fc65ef4869f64149f6446257406886e89a39f7dbc7e6c9da25a8c17567b14c8d3adefaf21fba98e0f2663924c7d32a4f82d30377ab4032162
+DIST github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190412020505-60e2075261b6.mod 46 BLAKE2B 86188ba06e70b77421a7b156c3a1955d5a5f93dc3ac34d6c93247e5c12cab23d6c2e9f0f3486d91deb4e60df94e5e75cb7575ca32967ea9c8522f66f27831139 SHA512 cd235a247bbbec18565d56a2de766574c7a9d1e40f946d9c93e8b23c7642ac048389ecc57a1fe0a4ecc4724b007a2afe40f032e80f5da7e025931d50eca596cf
+DIST github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190620160927-9418d7b0cd0f.mod 937 BLAKE2B a4f614d4bf6feeca480ca90d6f581e0b96b99d32fbdf7eaa1907ec8bbebf468c22b989dbeafaabb6bc735273ac0540a8f1ca75c9e02e204efccbb6b9c22d89fc SHA512 dbe74e04b1eb2c7c15f5cf1042de37b0ef9ddd0588eacfd0c68bc361e5d4940c7a5e275f29e8983865730135fa13f0dc6114f877c370fed1bb95afb6db1cdcc2
+DIST github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190620160927-9418d7b0cd0f.zip 13237442 BLAKE2B ba55b3dbd36bc3fa2b8266a6d7bc7846b24d1a189cd54ea1374954e18f2f00138355333e10939ce5a6dd85d5289764ed80f4c3b6251427a02786607b7ea0bae1 SHA512 d76bc2e8cbaed1cbe98d758c731719be6bc39f85584133e8865e13dd483ad74e259e492b299510793c9985a969cf33910d76835875a3f7a338320707c9d282eb
+DIST github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190307165228-86c17b95fcd5.mod 43 BLAKE2B 4ad44ed79c3a1293847e7fb6ac4751a1188e294eb1eac69b6e42afd58f272bc64ecdc478ae78a4db170bfa295d5e4c7db3e0d7ac8852710cf902685d24b47895 SHA512 6db56823eb55279ac19e6127768c0763bd3c754fbf1b8e57c354a30fa4a0f13deb9ad31b5b7d109dea3ea844d69663e2be1e05788da76926f6d94a78fe8aef71
+DIST github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190307165228-86c17b95fcd5.zip 640072 BLAKE2B d80bf52544f4adb5151773374b6406fcba0772124f35d4ceea0d666b82eb55ee16ba05fbfc156bd762d707f0ec8a9e2905ba2c3da3f655e0c86a57897e2919e2 SHA512 c5761a3cb53558aba63c1de4f547d02ddbc6adac4fb8eb815f6dd2ce98be4c6aabab32571f9a5c2d99b81a9ca55689709f51b622ea79bbbda3aef98c74286225
+DIST github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20200601151325-b2287a20f230.mod 1087 BLAKE2B 92fdd8020c4e2a405418577e22c65fae5c1a485ef9990b300eb357c68b7953b1a1725251714d79e87114741d0e8a388eadc6047e915a80a6051bfa75e9197daa SHA512 9c39b9c6183b9fc0b975cb95aa0b7676771a4101255db290e4aebe40eebf02ca0e07fb74b5affbcfca8d22c619925a5777bf20eca23f9c90d2e12b879d58762a
+DIST github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20200601151325-b2287a20f230.zip 418244 BLAKE2B f952df6d29655e181c3cac902d9add6941a17dd4d60ce0b00bf3f4a55450e188d707b6aab511cb741aa15aed4afefc1db09977604de2b5cc5e28b25ef26a848e SHA512 a4d2b2d45c4adde269feb5a8f80bbdf8163e7ae64e20c6687b542fecad8a6eae46ba461d4d1b8b7e59e5604e390cf7616e732982af2bb06c50bbb94d17c3e545
+DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564
+DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.0.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564
+DIST github.com%2Fapple%2Ffoundationdb%2Fbindings%2Fgo%2F@v%2Fv0.0.0-20190411004307-cd5c9d91fad2.mod 168 BLAKE2B a48650bd4a60af2d817199debb8cd028b0784b5423f74c976f1e9b2e77479988fe5191cf0cc5eebb11d94a052e8ccabc7a72356317195766cca0a9f2cbc115e6 SHA512 8cfffdb94dcc6da762ad8dbe01e0dcce3688054e60a3076dbc1ac56cc9b7c6a1fd9b2fb6a31b0daf4cb1d4c025403640d3b8ae947eccee982f498394635cf860
+DIST github.com%2Fapple%2Ffoundationdb%2Fbindings%2Fgo%2F@v%2Fv0.0.0-20190411004307-cd5c9d91fad2.zip 133929 BLAKE2B 319afa870010c189d578ec51d136655128d576c6c97cbacff7c87eba4f819b9fa01a3d6bb49a65302c77fcc868df671cd69dfb238552591d01bde37ac21ccc9a SHA512 eef4fe06051bd37f08c4293e8b0f637ad14a95ab466dbf148ed0e699d7723ebda2a2c7800aecbaae4bdb3d9656edb03372988ca82d6e535f9f049e4fb2db8462
+DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
+DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod 582 BLAKE2B 92aab40d86d733eb8f751fb23e40621b5b3bbfbd8b1d194bc6e689b6df763b4030aa83ab78654dc8e536274af6de247b8fc7e4e35e6cbf2f6fb5532291deec6b SHA512 aa43d2e262a603661ac3dc7aef111aea6e348e11c5384840d2be06224a6c2c580fcc0e3c6645a0d48b48826b0aff92562f0c6504eae980ff5610d2ffd2255d88
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod 753 BLAKE2B 5d81e99f1c39cafd4dd39f7202f71ea5fa3eba3f1c970e9c51e674e9aba8ce527034679105ed92843c7c69caec3770ef6fad38cc172df670f1643270300fb821 SHA512 8a04b0f60d9393afdc4b106413a1022e213509cadc222d592b8a98cc06188eda9ab8b7fdc346e8e70e15f40294ed41fe5510205d64ff40c427a6fbbcbd16f530
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.3.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.7.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.7.zip 48368 BLAKE2B ac9f73d4b6a01930573c4e08004c145cd68ebc6b222c088e23e80a0e7be2d5a8394486baf566500d87c241822c10e8acf05175e0b400dbdaa8c734f70169346e SHA512 d25aa935c9e7cf2e0908085aef4f5cbf7e703d529b928cae345b43e903272e20aefd41ea759c27515211a6e2fbeac52e4881fb56cf2a68ea6e3ee9f53c4bf201
+DIST github.com%2Farmon%2Fgo-proxyproto%2F@v%2Fv0.0.0-20210323213023-7e956b284f0a.mod 38 BLAKE2B a8067b43011340d8e8f8633a53cb5a490c9bc30e3e6ef978df0c674d01f0bc3fe66e023ea1724d1177253a27c0d995244ca8a7fecaa766af9ebdfc00e6038ede SHA512 58469177e0a1b95f54b4649621c01e45cd0899a8b5fbc640c671c1360dfa9470617c4bed0111eccbf58ecea9850d90a7a9fd09e2213533e12ac4959ab60b38ed
+DIST github.com%2Farmon%2Fgo-proxyproto%2F@v%2Fv0.0.0-20210323213023-7e956b284f0a.zip 6449 BLAKE2B f7d986c8a30349b9613d828d9c5973a4ced768daaa0dcb5221506f315670ed258375bec5d31f5e1c025279c3e60caba04364cc5c886a62e8bccdc44e2aa45571 SHA512 45e2687073bf05f547dcd762b599ec77fc0aa85f5be1fbf4653dde81532bec00036489a9e51c5335440e3d1cc88185bdfa686a7eba0a824e5691d200ab07292d
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip 7144 BLAKE2B d223f96d7bdb87d77573fde857a61d518336b60ab04e2a3cafbbfde23ecd65511553d9bd6360b1a9c17b394f77c7cd37e3c74df827a65b0e79580e1695723652 SHA512 c3d4056c34241f73d9f79801ea6a6d03697f2a6f151ceb5239458cf50c715dab693ccc0b5593f51cde8e2fff5f4959c72ab4e95197be3f65cae8185b6cbda06d
+DIST github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod 33 BLAKE2B c5557c9c02300d9fc6ecaac5694461cd440f5a1f5cf9ddcdb38e6fc51d9a55d9ca1e98bfabecb6c83fce81e87979e66e56c585760ef61fdf1866480c0e32eab3 SHA512 15b2cb1fba3e5103879548ffdad032ae30f0e723cfd26fa6bcf69afff14b18c2cf3373f511702b3690fbdb7040996c437f9cd0253bdfbf211b665ff14e97aafd
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod 41 BLAKE2B 48814730032a11998c9da84351b2ed6e2a6aae70d2666dde457814f07c5348b067fe1832743d216272f2bc058d87eb4be2e926733e1934b163ffada3b6a4a13c SHA512 dcbb60f73a4fc4ef5c571978543be889675d86be078f19fc715baea2aed99de0243e8d8c3a968f047f648a883bed366a909a0c56f2ebc44780d5236868543618
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.zip 59552 BLAKE2B 03bfa36f21efa3ac3d14aefd76fc8a0415e39182bc5cd1e4c8a03f2093aa49221ace08abee81401f714cea31ef92d648a35e4fafef0f45a76aa690725547a80a SHA512 c856b20bf0189e22a9eb0adb47d1267f4ac610f49c09fee30d2bd99219ccbe97cff2f89b0eb8f42e1d3abf4ab99a285d74a5489e43c9ecf75cc62ad29ce484e4
+DIST github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.13.3.mod 125 BLAKE2B bee4d59ba1392d0211558f6ce3511c887a474463f784cd92069df7be6de5281079d579613f0e5988ad1f3355bc8ccbecdae7f1fd551fb122f7a0e8ef11523e1d SHA512 7e6ec3815d053e7d49d2b0a3d4fdde6c6eeac6048ad0eb681da1305f6d9d5bb6671e31834ff6e5d840d9a7944efa52707d40fa737fa9ec3d3ed9d130b589f9c6
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.0.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.27.mod 217 BLAKE2B 37aad2fa34cfaa65bef0b9aeaf421a69fecaea85895b1c30b24c31335ec7ce59e989478c08b1241fb5344d4c5708e1fab48e3b14c090eafc051b20df429e2969 SHA512 ec22b59d6d5febbe206b6697008cbea27b5ae35ee89799b92d7f137e205b6b4a65d2ebcc4ee00d41eca181a09ef8411513fc0ad851a6fb23db80c589a4d5c49e
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.28.mod 217 BLAKE2B 1ecb795a3b0fb98e5a1a90fe90bd37f399fa3668cce958c78343c2fcf9823f2a375a6faae68a552f74952cd8ad15897cf83760ceec9c54a3c104d535807a35ab SHA512 04f1943e2b78bc1480478a2946bcb0e15289008e1ccab9e0d7fddef8862750de3d22635b11b09b377b3abf0a51f38adf7ec13a246fd3cbf5f7dff7734c6ee2e1
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.19.mod 178 BLAKE2B 1aa7ac654a0577f654dd63b5950fe13b02c6b0cce274f43cef0c850b44e507fe37a78286cb3326a5eb1c6ce15e969381dee14ff2a474f7a183cc40e56d81efa3 SHA512 376db876c55dce630bbe0b3bc3898bbcca0169965e8d12a76a1018da34301e1654159957142b4e6f103c0d9e1713e9e158fcf598e5c87131a3904e4452f12a7b
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.19.zip 19947552 BLAKE2B 5d1dca7d3afe8a2703a03f85332b97ffde861ebf65f9432743f6981163fdfdfb133abb728f974107116c0062bc61a20610128eda4c92319382bcf5c558b72ce0 SHA512 2cd591210982503756065bf56673357bc0bc592d380c11e8a685eb1193b9ac370bc99189ec57a564088c5eca86a61a9dd3e31a3ec46928858e19de9f5e09b45f
+DIST github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.18.0.mod 444 BLAKE2B 330419975445f724ee7b9a3ef8395fc7a153f189012dbe70e982865f5f556c2ab0d41a3465ec5cfddad034f12f226f77fcee9e3c1024693a0f9b13ee26f18092 SHA512 bfdf66b04b9c41824815a5a2707acce5c3f74aecf15a510d45adc84b732367885a18920d3dc50d968d0bc5e8a4fe3d519f7212de80baad4656c6867357c8fca7
+DIST github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod 45 BLAKE2B 224d034afb0473cdf6f065978a0b8cbaea268a46e3dc6b1b8ea89bed2d013ff52bd32408bb6d768097d3ddb20f95e35953b9b679439309ff832b2481d4e35401 SHA512 b398c531571bc397b2d97f369731fb7bbe8e07328f95043dec62c9be4a9f09562a0ef0faebeb05f1bafd488a77c30e6e957189d54548ddb94b9dc115b85dff53
+DIST github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.zip 7657 BLAKE2B 068727abe4a8d862a04d3d269d431af59cf048d596dfa951112c40e249b623278eaa74aab6a0afeab45bb62d77ce7fa3c5f341d3236c4ebe1c7c92fe48984b31 SHA512 c147af6f868c87dc6b1b311f5c78496dc8cc65e2cc3c3984651751f58a1762941d555f74936554a0beab1bb8530f7c6e8c249d83548a348fe83918644b89303c
+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%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc67b83a1e493bc73d4439de7962f7f1472dc267be9a9408b5ddda66b8ee2fdadf18b2973648035fb3907fe539a8b7ccb768b8c99c4cae573eab SHA512 f973efba5ce7c651d9c3e4e467a1423b00b102034a054874d09977957b7b55557e05da06fb4c158e693db7bac01bf601f950cae0d411dc92afd0686d7e1de4cf
+DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
+DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip 9262 BLAKE2B 50feca006319c5a8d957976be1c02a0a6a7247441fa0e903b1a03de85859f2afd0c93cf8599f60974686f47bdb7f0c94e58c6ec01ffa3fc33cf5d04da3bfd08d SHA512 0e52838ad73009c795d6a43d7d52d082b0ec134e0f07015fa51caab7d1dd141b19df7807a7ab146312848567f8635966c6ce7ac22b934a630e0131383caef9cf
+DIST github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.0.0-20171023180738-a3a6125de932.mod 36 BLAKE2B 9a9fd665364fadf00218aecef99b039654789694d1906eadf5dab5e30a660d1ba3a40815b37ee1c32427c82b1fdc4bd556b30fd6fe665e0269ddc51761499e82 SHA512 b971a7e860f61fffa9943ebf8aab7f91db84aeb329338310bbd37f4c3be4df71a757aeb6dd4a74c82e3df685c12976678c269ac9a2d7c42744d8e51954bf29d2
+DIST github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.1.0.mod 89 BLAKE2B b68fd2c6a898a78e0ef4c6221cb03178392bc0ce452a41e9ac949323c23c9f936a808c458e635193354476fe1fd4590f423bd465b1362f423bf6bcfcf708bb9b SHA512 a8e8f81ee547936bad0ed6edc017302dc6cd21159d08d699f2d7d757ff5a202a0b91e860d941e1338d5e005f035bfc19c8f09304903f396e00508f7f468145fa
+DIST github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.1.0.zip 10765 BLAKE2B 3d3551ddbfcc012b9750dbf1975b46e9858b6b2087e2cc61b44955b928983398c7817014e1451866df7039682debabcb5122a0b2954a7e813d51fc18a81b8c36 SHA512 0bcd62b9934cfc33e95fe1b3ddcbdc34ad8e1f25d48ec971c64b2c498ea59242e5350543915bdc47644db8e82adfe120669f04ce114bdffa33bcdba3d1c27d74
+DIST github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod 35 BLAKE2B 253b8f5c57339e04a68fcd945f25b655ae0d9b6a265fc3e02c9ab2a5cd0e41d68f5866e80aad321eda2e3fe0ae8b311ec0c4eb922d67e0c7f425ebff5d6dba69 SHA512 c19ab1ccc5297aae6bc7e3536b97091f3f877b1b76e5d93b89842e48ae3c9d4cf49a471ecf72ce6e2da001bd51ef3eb126a83bf5a35e50acc30a43db4d37c301
+DIST github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.zip 2791 BLAKE2B 1b30acfdb53d25ff60ec9041b3b07a54e8dc30b17c39328b0d93cba3ed86f9eba4ba2f8cc2d907910fe899cd9ac9061c53cacb7bade5695896d58ae71bd4c1a7 SHA512 808ca0f09864cb498234e6309ad017ec92b379068c407f1a9fc640dbbfbc9ff8b4f1b82db9dcccec294e8c70dc2df618203ce5ac1134abe70dc364d4458cd871
+DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod 30 BLAKE2B bf7d457fdd333781e403b93aac891f5a0a8e202c62983ec6e34ab559ea5624c3e6cc525416fe400c7a0af20a3f647b49eac5717aa749d9ff79b02fe994c36d42 SHA512 7a1ef7d0fc6d5a3a8530b44dd5aa23d4248d952fd573b9f0f6f630b1bc38fa5c9c65ecc4894734c7115a8a0c7c71e8d0e2da0773ed4c5779c23f7f294e1e7d5f
+DIST github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.1-0.20190219062509-6c824513bacc.mod 36 BLAKE2B 357371a37d5f2ee657900c4ca455d9aa8aa993989fc6829e182a2c72586f18447600442e31110c5a01f6fbb8de8a17f881d86ee6b882b4b27db1bc566ca33fb4 SHA512 1487d5ffde5f6d64bc21be1aa02926261a519fad462731254f03cf124758162cb6f6848fe412cd5b02606674f566ed213ae4fb7b5e54afe29df5ea60e08d3c03
+DIST github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.1-0.20190219062509-6c824513bacc.zip 89256 BLAKE2B 27127a6badaaf38ae3da05614ef5b83449ca6af65188d4ce8c23e02aed11177cb01bd9cac09499d4f00a11e7d6b9a4614ede7858a11aff4d0ce016fff7228768 SHA512 5ee5fe1288e593efa2ee87ba131b74c6dd51f1e9649093cd9cc728f6f20a5113e716a94f2568b58badb102547084b733a64bc3a5c172b1bc316ba6bda39a1106
+DIST github.com%2Fbriankassouf%2Fjose%2F@v%2Fv0.9.2-0.20180619214549-d2569464773f.mod 36 BLAKE2B 186bca77fbc60adb5f4c57c0b9d462ddd97012664ff3f276b932e596fe61346e95b0605bcbc089b6f306856db9ff6ce7c48b3f4bdc762ac0ff796593b87d6985 SHA512 8805ef4518c34f01e7b4bf731037b98ae478f4161e606e683f5f566e22fe995bbecb3b7cd6a618ba4a3a29f4af739fe18485fade8da7989d9e2ca4c61067385c
+DIST github.com%2Fbriankassouf%2Fjose%2F@v%2Fv0.9.2-0.20180619214549-d2569464773f.zip 57384 BLAKE2B d62eff15e9187e9d38219d3bb736a8834ccf64ebbc4511d076749e01177315126364da2dbf650e1593b3900f6b5d96338eaac2a2fc61a073092ccca67c1e3ef2 SHA512 8ca1fb5b9b386fb40e7505151cc391f7f84a34b714343324bacfb60bf22915c884c5074d6ea0bcea75c81990eaa03a186f07c49290be7441135c74342baa0da4
+DIST github.com%2Fc2h5oh%2Fdatasize%2F@v%2Fv0.0.0-20200112174442-28bbd4740fee.mod 34 BLAKE2B 2e469082d73b68e8c5cff1450b2c42a365ca8edb7273c9b62ef91f28015d6a4a4acc5d7d61620539b6a2a9050b15b605666f2a4e399f47c2d6f071b85c23bce7 SHA512 1800482a405d15faf2ad38b33a57b529e6ebad290d26625f6f508f4a5818a737923cc9a2e68a4c9c598c23ef2103c58108bff7f42902d40e2444457d0808b430
+DIST github.com%2Fcasbin%2Fcasbin%2Fv2%2F@v%2Fv2.1.2.mod 122 BLAKE2B 47d561554f8fc26402a1aff96895741d9d50e201237346d2d147eff3e5977f356a3dbadee8c8b3c492bba7f6be33d48ad89dbd8a02e710dd96a4b29b1f3c1fd6 SHA512 1f9d455792a66a48351a4ca57810d37306ff60474da6e8e308f983fcaca4326f6f64bab9c677900e014271b52333d1588e287493c2fa853bc7fa40717556a670
+DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod 35 BLAKE2B 6b99dc9054d6616c7f66e1f0a76a11cadf095b8661aa92aaa97aaac4c2fd943a972f9947fa64167241747f633ca9f2a74e9ddd122dc39a083223912886e04b24 SHA512 b21cab6683819e3029097ac203e35963aa69e47c32cd88017f640f976da0fb64dae5a62d9c76f64868618be6df14603c9a72f24333d1639e654eedb5125421ab
+DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip 14190 BLAKE2B 068cbd85a43c03d801420e794a87bca8d06aac5650cbd8597eff929bb3634edf85f33342b9b111626f995a340f77c76f60aa436c25654f47b3ed5c87af847c17 SHA512 cba946a17b3237fc696dcf45a7d2ab8e08795aa9a6b6a2dc9bf032cc26b15933d5b2d799a30e6631dbf6b2913c8cbf4f1833c6eedfe45b954a6cc1b6703a1b4a
+DIST github.com%2Fcenkalti%2Fbackoff%2Fv3%2F@v%2Fv3.0.0.mod 47 BLAKE2B 8e7e16fa5e3538dde53ba6ca7be4fe7fcb4f010ea8ca8ed54d19883e231f6c2652162580421547d5e67498f0635a2e72c6162e7488b654bacacccf73539a6d30 SHA512 5e35c77db398e3bea053d04e5f69071d74956f4fa45431ba3e74d9ba7d1137021f17c9493dd3ffd11e30f58477417eaaa1b78cc96a33d4797fddded1ec69dce0
+DIST github.com%2Fcenkalti%2Fbackoff%2Fv3%2F@v%2Fv3.0.0.zip 14083 BLAKE2B e7214d4782db68fdfb3ec1879ee3d940fd34bd30b488c02e159ff9efcf1181ebc821ebc5a526fbea6b324d8b9d2f23a4ca3bfb929260b588e4dc6775dda9744d SHA512 5286699a13dba5411318741086c2882db72a76305997daad8dcd454903548402069d28d68017bb91b04cd378c185d75eb203f2461239bc71b9f39a9bdf8bf085
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fcentrify%2Fcloud-golang-sdk%2F@v%2Fv0.0.0-20190214225812-119110094d0f.mod 44 BLAKE2B 3cb130a194e3e6b66f1203a593fb065aa299dc8b1fed88236cee0673ce4713e0d211ec5623346434ffea4c648f794ac602aaa895e5180bbcc9f6e7654c2535d3 SHA512 370a549f864eeb8f543c154dcba187bd0699439d2092190608173ccf1e82afe5ba2b76aa0443b2f8b4da24047cd66597c8c77a3bf52ceb80331bd65ac3dc02dc
+DIST github.com%2Fcentrify%2Fcloud-golang-sdk%2F@v%2Fv0.0.0-20190214225812-119110094d0f.zip 11140 BLAKE2B 3d6be180f6017605205d5a605589ca5f1c4dc048d7dec73834dad766f1545f94a974572fda92225783f11e3815663d2c793c702a12d1b926896d2c3ef1dd2c4f SHA512 479665cc6e20046aa994776c7b55c01b4a60e75071dc790b19eb8eee66db6b27ece504d81a209f82c60bedc2a565e62484917c6ca84c67fbb957944b29c8f72c
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6
+DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
+DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486
+DIST github.com%2Fchrismalek%2Foktasdk-go%2F@v%2Fv0.0.0-20181212195951-3430665dfaa0.mod 40 BLAKE2B a5501163e9721e927491ac4ddb0938195054478df50e03b856cf3e2f13ce0df63ce0bfc4d67e10029cd7e15bcd42f6e100fa122df1c3a0bd96ee05e08da730ab SHA512 64528b1f7c6b48a0ca2e47ed1545457537f07f8cf176745cae45588032798a59903016f0d5e9acb0de6fa33535d776a479687d3c00f217e3d180894761498ffa
+DIST github.com%2Fchrismalek%2Foktasdk-go%2F@v%2Fv0.0.0-20181212195951-3430665dfaa0.zip 27308 BLAKE2B c13f86bd1f2574346b991a15a1b5516bb216d45feea759f0645944186fa4eb46e8749c8fc09df1f1e49260fd43a28ec1b0224027a73d9b8e02df1fd080aeec33 SHA512 d15208fa6bb3e87e37f1c7ee035de33f5c57d9f5cd3be1efbb7783c3f0fbf355b873591ea48c35afc3bdd756dad8c01227f9899e816dc20164a016b2ed564bb3
+DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
+DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d
+DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556
+DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod 135 BLAKE2B 1b785fb4e0af530378f15100e4523543e22b2f5f7f350eb46cb16290c1e2f55b18a9f8894024a472c7e9d45deacb1e7a3828a54368ce1ef83095916e2262c194 SHA512 242e8e3859ac02adf7d059da6d2fd5f774892e8a11b69d8e22bd2de43c534f7d4a472e9b3bde5e5bac106211f41546614cefd078ac23115557e26c3d8457d7d0
+DIST github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod 51 BLAKE2B 3d0af1f8d7979de88067539579b73ce3d5d81a477ff042831692c738e9b4c99de13a3beb20fde003df06145e26d472621a2ff2857fd584aa1527df3730fc5efd SHA512 d1c83d2dbd4e242bfa9d8b9b58cddbd4a1ad112d1f5d1ca757fc31c6a31bf460d08cc3c9bf14c977fa74d2099ec83d5e45c05fd6121f800e26da6a837d862ccd
+DIST github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip 148431 BLAKE2B dc5c356b179df55561c4b673f7c9b4e7eac70388410f3ead0c3a23165450d12154cdcf44eae51550e8e5f0dcfa92fa4df0439a320feabf8b00a6aa6afc134401 SHA512 51705b4747969ed96b7233c2c0159e8a81c6be1bd35b68e3058fcd9440185df30105293d9b936388aabf9bfefe9670cd930c608ad4058e0285f9b7d2d86352a4
+DIST github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod 47 BLAKE2B ef512f7530c4c3fc3319129afa2fdb655d40af9aca697d22e4470528cc41ef9dd5ffea2258792d0efc7e1e5de2de2fe760651df84c3d39989c4d96b58e85371c SHA512 027b177fb04d5bcfaa0e524e6682b639bd91f7aad9ba14e22cc1b4f352e2c3bcd4d93348ed013cd839eccdb01449db40170243e7895c2cfa3f6980279faf39e3
+DIST github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip 10851 BLAKE2B a0ea711e6fae09612c3911f4526816c7decd163860d5c8bd6c7cb55d4fe30c485d735bc76b817125a8bed9388e17e48fd595dabed55e26b5d7b685f5fb9bf485 SHA512 2908d5b1f9beb4fed31923fdf77ab83d7c992245c4bd08b7655ba3fef1ac0ccefab66fa4c7b06f67a7960e16069f611cb44ff1d9a675bdd2750934349752a030
+DIST github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod 32 BLAKE2B 5483978ddce5f57e08f1358c34e5ea6b26a234e017b2e3a9af91296de3c79756f73f8cd9629b7d04c88e2135f30781cd0f43fbf9eceacebf26f141bb297f376a SHA512 865b4cc3ac91138e9b4581be778685f89bb93cdaf2372bb7b5db6227e249a2be89d5d14c89bd0e874e01d744aafc08b30b3ccee18a472981bed0e7740d892da0
+DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.zip 246908 BLAKE2B 94b71d3c77553dca4889c6f066f6741fa9d17a0ea86b564e3e8ff05b015b87c18fd3fcbe2b3d942a8569c99ef4bdf42c686bd58485e9373447d25724ceb934ca SHA512 47991999bacf78ddfd33a4af3c0d5b8a418cb7664e05bc59d886150025a1d5aad831deacbd6da76d5a21a97ed115d4210c374459e7af8ed7b93c4c1c0e7a42fa
+DIST github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190201205600-f136f9222381.mod 1026 BLAKE2B dfd981695444778727f8facded66d8ae7aa51e2b82557ebb7cdefbca523c1942c2c15fe448f900296bfb92e0643d36a44ab8ee39f290fc8079787cb9d45b2748 SHA512 c59cbf2c57675170a5aae7a1da11e4496c5a2de7ff303751a5e92f16339adb95e75b4b8b6e09ad9b7e4f2827e84a291418d4a67af0026728da89963e49d26757
+DIST github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190201205600-f136f9222381.zip 147347 BLAKE2B 2fbd25e8f5f2efda57ef8c18108aeb4fb8ac33cf9dd24072c549905a76f5275dc0ed9602361b47cd77fca35891a52667f8c49d3cf6ed5e8f4e2b65af9b7929b5 SHA512 a66deea0bf0303fa5696e1bbd69088112abe030503ebfcbf13171aab922b87af3a17ae8093de30fd909d928f6a0607ffddb1532d6eeb9b29b09593d1cf60e9aa
+DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014
+DIST github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod 34 BLAKE2B 21714162b9a8fd9c535eb49321b31d8c574339b2f548a64d4c224323f87e795b5412d502499e83917a1395dabcc9e2455f5e786ae2c3f204688d5c6ca402cdfc SHA512 58f3cc974ff4897b4f160dc47440241bc7084dd62f20c16c019b0c3090d3c8a8adb46ee8cab1afa675c9d3830cfb2eee97e1eb1315a683307d87ea3d2b403efa
+DIST github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip 319838 BLAKE2B 3ee867c0230906ed6f30b32c00e20eff9a087e2b5524b862fd8d7dffbf8145a9511c2cb91e475e50b5415a87be9fd1944fc85019273be4f0b83d4d2dd4504ce6 SHA512 73dae30bad1f236d871b0e4420426a339427150e7bd9ac60f588131a09d267286ac22a9fa907d7c7c7f79bd5935de02666bab0f0c18b9ae7f711deeeaf9115c6
+DIST github.com%2Fcockroachdb%2Fcockroach-go%2F@v%2Fv0.0.0-20181001143604-e0a95dfd547c.mod 43 BLAKE2B 02885f6db5d659f31f974914c84aeb59594bb00f0c5a7bb0d1903bd3e9f7033922e0c2511fa5859a9a6c2ab2957323fb3665076d1abb87119ba2b36a4c8618b6 SHA512 d1d57273fda6fd9f4240c5c648b5568aa0ddeb05f5e1d63c11d32e2d74382ec42668bb12d0064c0f31133a1ee0847b0c447c5c7bcdc886969aa661f225c6b8db
+DIST github.com%2Fcockroachdb%2Fcockroach-go%2F@v%2Fv0.0.0-20181001143604-e0a95dfd547c.zip 18232 BLAKE2B 8d35cba6ec40e69d22a9135d388f938c4948ad4555fc6d4d8ee2052ff41b313e131d8a184baec67c6cf8d4640806239870554d01ac3306c1560cc64ef36689d5 SHA512 afb4a7b04e1afa4745cac53ec823de81b743bea7e665e424bfbdef735947864a45e08864a2fd71868853e98ce52506e0a9e5a944e9ab5dca923566e93c00e5f3
+DIST github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod 41 BLAKE2B fce07437afe34fbb38dc2b3c8695440413610213aa82b910471dfdd37a5dfabd332513dff18fbef7b84469c0c137530e821e2a5adf0e660a96bb78446a084cc6 SHA512 180a8be6b0f3596aa376ec5f264ee545a082328067b3ffa5523634cc95b106328fbc6330fffcada0a1cf250c3a988971073441184b9194fe0d05fd62a33901fa
+DIST github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip 12336 BLAKE2B 9af04c73a7345883b0255c644a2ff626825cd80c98b8254e270c338e796ff594f2c14ca3fe3e6f8fedb54d6ad471a88e4c8d1fcd13bf3830bbe0231c68ab6f32 SHA512 b3b5b92200ee866c9d587be1e3a0dfdcd237ec787fc6cf35321306363bb64a5080291ff6f14be4c387a2f76437559fc85c11da9ccddd0894a0016e637a83950f
+DIST github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod 40 BLAKE2B 58aa150182b5b43107154bd337eb024049bc2c7e2d26cf4344c97d554e03d4175862ecbd1b65527aecc85b9824c474c3e5a49eacaad18e253cec50785963b18c SHA512 8a0be9bb45924e5d384fa68dc2e990a4705b46e8878558d4db10fb794c8e20b13ec54831e7387cf425613f3f33b5952702deed074bee5818fed3fb9cff7b4259
+DIST github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod 37 BLAKE2B 2eba24c8176edb0f06c1c186ae603a840629c759182375dab9d574ed3a0b5fd28ba9d329ff01b3fa6bb908b3f50a6a739863cce2b808067d89bcc121edb31e6e SHA512 e31d6cb7f9669adba2a4b79be3af5724ba5807233750bb2273ac1aa4817c58477fffa079775709eb2f93a6c2accf0f1291c663f068b31ec20ebe22b39b6b6249
+DIST github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.zip 7438 BLAKE2B a70c27d0c79e95186e9d21fee8a4c70011c21c06c1f351d1d02bde12818a3df4b0af98566470a3d39713c8b0d21811af63421944cc39e372d250e512b9dea650 SHA512 c6b9ea0ed6bcc33e0c11e2ef4d8034480f73d89e840f1855130d674f6ff7d462762fec6f5ebd9b61b5155e1ddf18962e18e1b686c3fc7e30870a3acb617df53e
+DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.mod 618 BLAKE2B 085fe180576e1d1d581d2072cd295ca43d305685ce160e77c27d47e4138ae8ba865c249c4098c8cf51943d65402b57b3942fd48fe7b933f1858bb705d578aa40 SHA512 8dd3e2b3e6b8f2c315289626450c89aae9827dae8a3d314f7372ad473165ee773c38afb4fb7364abde2f0543c66aa268d6f79c455c0c166e7bf1bcae20b8e679
+DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod 37 BLAKE2B 7037e2b6c6f7927a37d8298f91976232fac6e1723d9ffda59b2c01bf81c24acaf124fceeddd8791b6a6bb1e81b03e1bd5ba88ec9613784462a235bdfdea76498 SHA512 3d4ac776b750aac30718ecb1a3efdb383cf39d0838ca60db5ba266152baa1dcbee739a8f384965b5b8d39b9d9b18561ac317eb8c64c61076986db66bc10bc1dc
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.zip 1760119 BLAKE2B fc1a1b58c00568fc72f1d5252379ad9224b0a5062bb2fb3f50a8d0767f42e96d4396c7a1ac0eec1005269df6b698a1b8f6d81f7ce9e2116ff68ce73f498b567b SHA512 fe0532e268ccbe5af37c0e6bc13317c8d7caa7f895e6270d5195d0843d5e01c47068f380b828f177dd700ae02ab7490954e05fc39426d04975fcae67884c1f2a
+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-20190827140505-75bee3e2ccb6.mod 40 BLAKE2B d99a912436af30ef3f5fd53f6348367016633170289e08c271f0148a47db1f9c5ac5da362fcc3f6fa5a7e7977377299adcffe63e9c3315c45ec173d55248006c SHA512 442fc394b0be5c87d2b9edc858f47d52b1027acf1fade259879bac7c598e51692199cba7d4e175f21f772193f1570e47e82d6c6c6fa160e253eb49b09cbca793
+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%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod 37 BLAKE2B b3d06413bdfc072eba71c8b51cb7aaf27ca29ba736959bd0fc9ef2de8fe3dbf3f194cdff7d030aa259c8e78fcc9003dee040be0d1b858a677d9e306c89a3542b SHA512 62de290e5234d6bd82d9a865d1ff592736f075130d1c29e9d9f2544ca3f9514c4a81ce1a726cf8fc8be8404e8ca41a88958dac755174ef2c20ec9b455d0cbc50
+DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod 35 BLAKE2B e2c6e0700e40d563dc690884628fa22b6dd56872a63ada54374c07cd6328aa332b6df2396300090da5c9f7ac730b6b9bd60dbc776557c4614d5ab3ce003579f2 SHA512 93f981daaa62351a480595cfb2feffad6c34770cf89f35399d777096fc524cafa50d0dd3f56231ae41b15e56061ab83f0f6829190730dbfc7f9fcd594af7b054
+DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod 37 BLAKE2B 109f32f2dc537cfeff1699937e93eed980f34a37faa111ad3831be6dbbb1df965c56ef266deba48aa1390fd94bdedfda9ba3a51f4f6d9519ae24db6b99dfe1d4 SHA512 6485196f4703578401e82673647b49d58fe60d7f90c311294096504d3e11477c75fa50684f00c7b378b2566e6e8683cf18d99f2ac78043b077318a643fb11720
+DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
+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-oidc%2F@v%2Fv2.2.1+incompatible.mod 33 BLAKE2B 8c1815001cb2ba1108f60c9959fc87e81146ab7a716f48de7c679e793ccdec03d7324413333cf9dc6adae620298b5c637e0a126eeb6361c82ad16138749ea759 SHA512 5617723462dc0028176687327ac1144b1046a84c9bcf518e2c553a94c9549594c28345a5b875cfbefec148d625ff3525bfec17a97e4a84831dac4fd65d61f886
+DIST github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.zip 33893 BLAKE2B d1fbb5e96f23eae61da9becab3f45439a745d7f5e9b0114addd51fce611927fbf1a45d22e5f3789a62942cc156db923dbdb91da7b7a3998f53c6d30f5f4e3a47 SHA512 a612211cf608fb0d87e13632aef091e43f86a98bec01051634a86b427101e3e8f46f50fa1c3ee5975a09e60b8e8e692542f87019a0e0b27ff479aa649531301f
+DIST github.com%2Fcoreos%2Fgo-oidc%2Fv3%2F@v%2Fv3.0.0.mod 295 BLAKE2B 8e4b1f8c3ec936d2b509b2e055466cad8ed5957e88d6a72064917c1c5291e954366a4c560afe2469992b694f5e92d8358c2ce1242898eac457d499ab00f2260d SHA512 a98eda780afca6d9348f3708200a890db8d77d93f916304a9a8595d371234d2025d078faf3645f7cd2eef954138f064d9dbe88c46b99345dca77f413afbeded6
+DIST github.com%2Fcoreos%2Fgo-oidc%2Fv3%2F@v%2Fv3.0.0.zip 38210 BLAKE2B 2b35738db2862ae3a975e9414589688432c7f42ecbf41028a470955bcf6de2da5e8c3eb76dfb46190fe8cf4da008c1254c8ccce906bed58454eb0b7ad371633c SHA512 c04c5dd3c23f000fa9e2ef954880dd3c68547b0b52b5a4f18307d5cbea26aff4e956cb2ebb422e886912f998e35e22599e5c9a4c316162b94df44491842190e4
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip 10848 BLAKE2B 6bafaaca5b1bf59ac01421e1726f48de06015b36217f9f08ac776428a9edf089bc64382b251be8a02ac537366542ab160c028af668316a0a821486e29b012116 SHA512 7ec927cc2547c8307631198f09d32507176af71bbf03e7192025798dfd34eed3a8350cc0c5b388069eb6f426352d0688e3ee4baab9cf78b18176eb7e46bfc09f
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+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-20191104093116-d3cd4ed1dbcf.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.zip 117502 BLAKE2B f48ebeda7dd6c8c8a6f19c1ddba7edf74bf5195c352f9cf163f8fcc4aab0732da39bc64bde0b4aac2586d8fe830807cf5b68ffa65d651b0b1a9616d8e5a8d9bd SHA512 47765e8266cce494796ff20deae6bee7a5fe819b351f64b6e53d4af24ced3dc0db9b007e8163fcbd4e27abfe521501729298629fc333f23aa359f69602943dd4
+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%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcouchbase%2Fgocb%2Fv2%2F@v%2Fv2.1.4.mod 288 BLAKE2B c7a39db53b3ca54922b8ac25cecb18d12a1a8e415caa401936e43546a9b4e71bee2b23a98320ea3dcf6f9ef7f7e35188a7fa5656b4d3271d4a681e2f92e0cd12 SHA512 8a9e7d193c61605536db4696cd7953eef38a597f5f0e45ba1ed5b240a249a6ec28be4bd939319c04fba74c05d1cb09cf28bcf7f92b2a0b5a803a09f4540aaca1
+DIST github.com%2Fcouchbase%2Fgocb%2Fv2%2F@v%2Fv2.1.4.zip 194228 BLAKE2B dc3ef40a758085380b78129cbd29b25de0779252dc0df9d589990758e656c2f48941f14cbf80a2202ad96969f53677087903ce0ea4ddbd775088b2352a5ab272 SHA512 86f444bc686739513e090fea7a96ea0a4530d918e7242c898694700a8ab372c3d94b62f2feefbadb69c48dd373eacf3f414383d5938ec3d65420169a6991bf72
+DIST github.com%2Fcouchbase%2Fgocbcore%2Fv9%2F@v%2Fv9.0.4.mod 162 BLAKE2B 5633d1580c5ba03f19e77dc6b2f9cfe780eeb743c928789e7dd1fe5a9c1c68613dc741c0325f0e7171147d3d8c15590eb89c3115176f38483df37e446861671b SHA512 fb7a68cf7b8af760081b6da3db734b6937ef486c5df959015f2974e5849234a5634a7349ad2d4ff84b3e21f8120b5a2a06b13450ffb16aa661024a980433975e
+DIST github.com%2Fcouchbase%2Fgocbcore%2Fv9%2F@v%2Fv9.0.4.zip 243230 BLAKE2B 35810a89b1be9e229acdf3cbd95b38be814345d0a6a81a62f589ec9c1540b2194f76f918aa6ddd3f66bf80786f9ba3258d74a82168b30c54e162dba3fe653785 SHA512 5c3af1fb6e8ac122cd38070db9ea5a53489bc40dcdcf5dfb65782f45eb1630edafcde2362b6f4a2865c20458f55661b3f096581012bde1294f13830a9cbcbf95
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod 94 BLAKE2B 94e391c9c787f7b0b9d238f1fc61ac5e90d4d6658f7d60a4c143bbeae999ea0ca23d28f2ca204523e44b61807afa23e8690af850d14203e5755717b0a1f5981d SHA512 b54a3715ce2745ef68bf269b09d458d3712d8ec7a876eff53f5c171d23d992a5391552651c56f7adf5b90a356bcefab552a7ef8dd3a0d562fd396434970963ab
+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%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.zip 19440 BLAKE2B 6a8bbf9d62017ca1b87fcf4bcc1de1e968acfcd28e20bfbe140150bb24dea998b7bae1acd18db0168aaca02fa0502769bdc9e9f698294f429c7a03384d80511a SHA512 fb756e3ca66d8968c9059e59c8488108623b536e6619454049904372f265e7dba23be6bc35f9f4c7fcd38f95c4ef20efec42fbe7b9c7148b392f94f6774921ab
+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%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200428022330-06a60b6afbbc.mod 182 BLAKE2B 27d2e8f155923769d6df395281d9d2967f2bee262faff767c586e851c1595d8c74db1f890809bce63cd9544c4dfcdbda89e518a25e1a8925ff78607940e2a374 SHA512 14925087284b332c5458fa81d0e92f2a33b4a59e98b93dc6c99e0943f03c13165e8dbe1a27fe5a4d78b62b3b3bdc84d634bc31f346a70301cdf7da7463c85f92
+DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200428022330-06a60b6afbbc.zip 570910 BLAKE2B 5a83effe3dc148aec4b6b3fd8693b1c7f14e4dab200aec4e1e9ff8483f27bca8420f8b8091ad37bffceedc1cee0fe8190de11ba9d067c5ef0b34b85c44697257 SHA512 13c836503ec27b83734b005395321f3e122bbe836b9e472471d4ad2b02e754887c3c988347a1098655b94e4177514ac8f2487974857c92381419136572ae63ce
+DIST github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod 38 BLAKE2B ca172597deee09bc6129ff6d8a27b70cd49f5891f9db37e73f1178996255cd0548405d7fdfcffed3745777a332d3e979195e4da827f45e00305725f119332cc1 SHA512 086ced52944283fce02fb1b53de3748e32fed8a90dbab1d69e9ade5ff40c47e3fa1277cb3ce7bcdce2dc36d903eb52d3d3e723801fa8f6265736badba1ae935a
+DIST github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip 260624 BLAKE2B d5bdd0d1eaeae944e56fb8dbc9a6aab791bbaa432f98802d8f2ddd0f26279a7760004cd6b7aed818f978b07e05542ecd6dc6127f24891ead72add4ac6147089d SHA512 5d1dac9c1b320506077df9084b734b5b8c1feb26d565d4a7765b6b1d9b2c983638f1f09c06102825eca283140c4142e1dd8d61ea03d3d04f20b96ebf9c670d09
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip 57069 BLAKE2B 2c921bf5a88bf293a4c86bbaed6d7c391a323cf3ac39a54ac10fb74da5498e0f565db5e5220a9871ad5c4dedad7eacc0657ad9f8907c2bfccf147384b53b37b9 SHA512 c937c8b98196eb8496735410324a6a845e618d47e4631c500c9def70d8effb27cfb4efb17f81a8d304ce1a9d27fa6fbcfdec11ea10355de3d1918f1ddeef81d2
+DIST github.com%2Fdgrijalva%2Fjwt-go%2Fv4%2F@v%2Fv4.0.0-preview1.mod 112 BLAKE2B 755edd2ecf415fb5672be22d9f344d1f33d097607b3198df5f5dd207b72c8ebf97a302cbd7a2227d8303c0721cc68c6b3e8e7e9d08d7fb4c6d10ef5e886d6eb2 SHA512 321ed7d217224697718f001c3d1fd7a56334acc30506464c77ba6fcf54134115f4519f8ea2d28e94724cdc2d02b66a186f1a5c35098c66a53aa436f8f5612300
+DIST github.com%2Fdgrijalva%2Fjwt-go%2Fv4%2F@v%2Fv4.0.0-preview1.zip 70002 BLAKE2B 0c5d262392627c2f5d534384c6d73ddd577452b00c14305159885204767660df1829ec455a22878b839f45dc008b43e38e2ae807cf38c1cefc38418a023ecec0 SHA512 d1a72b32581c20f178eaae169d07218f9745c753e48c42588a7a8ede5117b1d6edb7f0dde49c391c3ec5dfb028ea7a1a39813d58760272f2a0582926e2400925
+DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e
+DIST github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.7.5.mod 36 BLAKE2B b2d14ed2b18ba9e3045a221d8fcae5b3bec5ce4dc1b8c919abedfaeaefff1acfa4092c2d5f7608947b87a017eb2c669c3844fdc0fff530578865a5cbcc98a6e2 SHA512 141b803e807cdeb49160790c358603a86e140ae05226d26149232da13a3c8f05e3c6391a13a442f0eaa02a4e95c7e5785e49dcff7f635a26e667456c77cedfa0
+DIST github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.7.5.zip 90897 BLAKE2B 54a61bd06de67ae8ad879790fdb7247a1e476cca4333056b24ce566d8f5ed7e56855d33e92e3711367f7f9528a9bf833f50ca8b13fb49e9fee803740ba639b78 SHA512 d04ab172c60bb1a37f8edde54acef9175c13498100ddd1b40f7e3a1e78b3d9b7a8a683276c2eca4d85ba16f553460b6729c20c25f458d783f45815cd023e2d45
+DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod 35 BLAKE2B 4e9e86f0f7f18e47c80b9f4a0abff3f07d47814a9c54b297a2419265fd91b16c2780e170ded80589dac290cc3262aad162911b789510703d973f3f891d5e0849 SHA512 6a786a38aae43d8a7532621bac8c4c053624f39573a37bd66fef9048a7eff36ea55778ac8a4bf3d18cc1e6faf352dc2365e6f819053359df9ac98129e16f422f
+DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.mod 36 BLAKE2B fc3f6a7a743de397801f3814ff9d164976370c0b4084806b72d93b027c85f95a2a4beeb7b87082b0c2795f3108e95b1906b16e04317eb0722dbcd558cce03733 SHA512 61f4f9c015313ad381be1c47d53278f5215c2aea5ca778bd117061652e6a879cb77b3f786797fd6fca3247f2ff22d4657d0dac2f8a8105758bd4223fe3f5d7ec
+DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.zip 9862 BLAKE2B 1afeef2dded5ca4ee36d0f29821cc9eae0a40b605b5a82caab987b7269fefdf4379960ad0565b21ac33c2fb64c8fc1c5fbab078fe75e7e0d2b2725c66c9030de SHA512 2e1990eecfb1d73d4c3cf8205e700009076ff7745593d8cfb1f9a010dc2a96d58426b009c7b86042dbba69c40a8ffc82997dc4935ccf7f48f45fa2f26c36cae1
+DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod 32 BLAKE2B c96afb14f9809bf9dae22bd2260c31921b0435d4459b4386ee016514b84580aaec258fb1f8347fa6447524376de742135ff87b170f40cbaadaa41c41b553ae25 SHA512 320a96424fcf2296f59f8ba247cc9dfa43c35e2e500fc1dd990a69316d4ccb68437e4c4f98e849173161490cad216c15eee039134b3028afa7dcf82d9b8e6423
+DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip 27506 BLAKE2B 0c2accaecec1942bcb9febbe1986e283e3e84e82731a847711fe33031b84122a239561bb6bf7c35015b4bf3c53b77879d44a52ab1b184c5ed37ce33c8a418b32 SHA512 f445307fe15f2abdb2e8c0be22f1c180716411d413b8d27d1b46f00e5ccc49b963a7bc675021e03831fede8470b3c0b384d0cf0f4736256114dde204f5a56611
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod 38 BLAKE2B cd95ca3c9baa32743ad6a0c2359dfb95eaa79009366a4019e5e1a4d3ded54090b005d307ef18942fe4de4027e7fe688e7ad046f226c77a3495e2ec579223a9ee SHA512 662e7810daa3242958f5ac7c71bccd25fc39ce814db684641cf69e96a5573dff638faff15aad77b7abddce767f4ddbfbd8a1bbb85a2aee5a0e80c96baa3f39a3
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip 662227 BLAKE2B e9c50aec1dd4d34aab11819bd341b1f0f6fdc32bac63124930d45f76f0259aa5e1e4781bb408411e643574112ecbe57c3b9c4c5fe59399c153d48dc5eb5bea41 SHA512 aff78c88f3bdb596f1855ab993d8ec3315de9d4809757e2cba6fe22ad4d5dc220242f90e73d9d0a33f9a13521705b82c8526082e26c752fb027dee4b28299d52
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200319182547-c7ad2b866182.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.zip 4184798 BLAKE2B 167014b70cca181219efb5c95173310a19a4c9432a78933509005752f9bc8804c4d02cd287d87cbd22bcda988ed708b9241e31e05b794ef48fa2640a7b1e8387 SHA512 4a6063569942bdcffdcc15f41077e391e948318885d6c3f7361870416b60e19e8937e96db67d6df7b2d80de55dd92c50abaf014588e4f805261fb4e2769967bf
+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-units%2F@v%2Fv0.3.3.mod 34 BLAKE2B 37c07a43d4e36f25bb5bbc10a863a717fa114a5eb980f17942f5bc5b1d1a4f58de5301ce871ec5d41f5dae3f05edd7c03a5c9246317ebf089c1cff27d6634aa1 SHA512 53dd482245593fe74b94c319cf4f3079b47313a22aaa69ba023b9e60e8b5dc81177ecfac49e0cbd9b1eb6706f654f387301ceb00313f8cbe530b4dc24eaefe97
+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%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod 36 BLAKE2B d46b14a3eed14f8d5886e333deada157d9484ad3bab124d3d57d9fd6a39242c2272417df8bb31e08361f2be8b11dda9e96600aa800879f393c8753330eac4e68 SHA512 7ffd6ce59d5c5fffc6ee8e8f48e1e7114628ee2631abbb1a3591b794c23b2ce6dab10f67b8b76bf82c73e1cd8614313b2bb1152b829a8875425f1a603ee394d4
+DIST github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.mod 230 BLAKE2B 26d8e2a5e9603273dd84ed9aae1bcf49e1fece530a5dc41cae3b5d2ca8bb4288023ac8eeedd0ecc76fa355bc9dd808d06196db03ccda186df5184fc6134e121b SHA512 132067629eb47d7ba22dcedd81467693f7abda7b050244bac8b8ddc9f8dec5d1ff4fd64a6ed0ed1537f400c516594df0f3a2aa392258dfc817176e4030f81cac
+DIST github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.zip 10103918 BLAKE2B d484c7a50585a27d9910c4f9c4c0f179346bea4f373c0fec5b6af24205f69ca6afc4dda6f9b069f23617487f8edd7422379478d88a5a1e113104098fb2476cf3 SHA512 5c16e51cd71051795ca20e338b3eb4fe17e423fa26c4e188d966761ee7d23cf5b21d37a6cca7faf8f31c3110289d2da4e18e6777b8b26cc69563b244d94fc17d
+DIST github.com%2Fdsnet%2Fgolib%2F@v%2Fv0.0.0-20171103203638-1ea166775780.mod 30 BLAKE2B 3601cf72262d9c828eff3520a9375eb981b2a9193aee46e93406d491cb8db7b864c3eb32f65f02b75284170856b2264a1a24cc63196695e58365210b216cedbc SHA512 36ff5f52bec7fbf395cce04f20bc61cbe4e5f77ed550a5a869967d1e145e2dcd8e7bca23c3cf81882d8f7053e566dd95e78e97cdcf06c1556b78a5b9b51662d1
+DIST github.com%2Fduosecurity%2Fduo_api_golang%2F@v%2Fv0.0.0-20190308151101-6c680f768e74.mod 45 BLAKE2B fe58b099dc1758d288d4ed070e48a3dbca4f45397eb1727c7ec729a3d7ea7b6b40dcd0eaab670a75a00e9eea12e7d4636ea5d0060cf8f69dd8320a39f58f4b18 SHA512 7b0eb9b4c74c244f0834f7e9db12ac77f14b6ff375ebafdd84bba15a5c6cc470e99c2af5b42437ee1497284d0774c17caa38a21d81903043f427a83f6a999483
+DIST github.com%2Fduosecurity%2Fduo_api_golang%2F@v%2Fv0.0.0-20190308151101-6c680f768e74.zip 27511 BLAKE2B ba26371bbe471b6c9ea283856e21f287f3ba7bf095df20a1cc9ce1e2b55ffd2ab9cec381f857e7cc38d233124e52639756745839a4967c5cff391ed78889bde9 SHA512 fc33ae12ea9c6bb7b90dfeb8c69e49aba659a97fec223e9c738ead8ae8a17b8105f8bc065f2d4e98e01a8a634ab2aa83418381c1240ddb35cfef62af9f772e1e
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip 26356 BLAKE2B 665fb778605fc05dc686b59a3ad82a6df9020017243cc84498e4113c7b18343507a0084cd67febc329fa6b44e675696f99f632cd282ead5bb06f93ff3bd50bea SHA512 88e19d0139de7de602272e14586a99eda26b2867ea60ef56b517d13b37c0d28b1ab62c05b2f9cf1a9b8dcc8e5afa9c915baf7a30b0f17c4fbd47d5c71d0a3965
+DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
+DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod 43 BLAKE2B 500b3a85f43db1d61f037f437b3290888204aef8b80aabf42d70c37607fdac86e8b1f7f4e41ad3709ad7015a78b934ed7d6d254522eb3e2baba4ae24619ea4d2 SHA512 da87f8eea5497796badaa6bdd1c67ae04e75deb7595f10739f30f20364f22e588a449aacf603f2c8d738b365ac14211c7cfe8e1bfb91f220f5c9d547007ad453
+DIST github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod 32 BLAKE2B 51c322074fb7a69418dcdfd2e54b187fbfe541c21a979c8bf8b155a6264cc670eeaa95c2949f2b760b187fa582e86688a045f3f022cb45f053a58e00ec2c0c60 SHA512 bc43f85d5a21cbdf4b3821e707c845d08f8a6d8f2c6ef0f6ec76f7711c53bb4407f2a356c79bbbda438fe138a3cf74a4b279e8757cec7aa134a93f2173b931a0
+DIST github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod 33 BLAKE2B 52211e27792f060734989af8b47b48f3f9edbdc94b49917d715bd8853a3f05ac714cfbf752d3171b4c223a8787497df16e1ee46b07203a6d2c4cae3540c66af1 SHA512 ddf8e796d04c0741342eae18ad343861ad7a76d030a5dd9a27b1a68b2944a0f94ec21b1513640179c73c16d79ac309b8552dae42d6e45bc0f03d33269666bbf6
+DIST github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv1.0.1-0.20200509193318-234c15e7648f.mod 45 BLAKE2B 53afd9bac3239067917b3d730bb8b2775b196d3258695342047e9a49894ab1b585d36c664e3651f71dc0a5f68523648dffc0276000fddc7d5a2b0db328115b1f SHA512 0185b47e73f67a822bd73467f1f07982722d10f59c298592440e1217c31d308547e61067d47ed9aaf6ed802823878d9ec01ef6cbc1aa60fa833e246cec260d69
+DIST github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv1.0.1-0.20200509193318-234c15e7648f.zip 5509 BLAKE2B c5fb67bc0ab6598708aa9ec7a5240967811f9cf6bbccc958b600df5ce8565138055b08a97582fcea63a77892650f54b40dacb0a6c71831652b8e93fd6bc1c2e6 SHA512 0a5a2b6c161b15f9d9766a2692231db5cb534e748ee4c565408864f02df79b0ae1f6a5b289496e99d930a7eb08ec5b002736623f2da6969c47d7e1f041731f8c
+DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
+DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
+DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod 46 BLAKE2B 26844d83faf5b29bc13a3a48ccf6a3648324503647617e8ff13baeabe4d95ebc0e4f2ca5014b553148964625323dc1a11bbc0a4fb5357be97770a3b6cf808bc5 SHA512 5ec3e01429b0c86caa7ee04de7fd70505cacce1ed540081ce4c40143c8776cbb75443dbaa47642da02e263c02c7e3557d6425c3cb60f03a5bc296a1cc3b6541d
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
+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%2Fgo-control-plane%2F@v%2Fv0.9.4.mod 471 BLAKE2B bc51330df71ca612b3a573a93a8ebe57ef4e677157835221dfc5f7bcbada1fd90f7a6a3a002cbde08c6a95642477789d532ddc80e7ecae1f9e6e7c081364e970 SHA512 323c4b1c27bdc5bfb1795f1353d21ad6b7a2056bb0b364adab5960aabb7bea20ab3287ba60685df130abddbd66c3d82dc98a291aff1849dbce8c182c63c7b0bf
+DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20190203023257-5858425f7550.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.11.0.mod 126 BLAKE2B 3ad1240496ce1f7c94c224a1eca571a3671851bdfebb40b243cb4aec90e329c820788c6080083e138240b9aa0a6e980701e12349058a1fd7e9c972faf7085fd6 SHA512 d7e895c4a2e515a0d20f8839b4f6d52f3aa3d000b97cecc99fbeeb5080e53c260ebc3aba0ca6ea180a2f5c88d5ae303fb94a257cb55aa9430773f6f5b4048d87
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.11.0.zip 12350 BLAKE2B 768230cd188206896241c678c36826ba9d097c304cd6c5130fe61aae8ca8689f4d3c318803cb75b136c6aad6f45aad76082cc5baa2e778e97b7025c51a502af8 SHA512 eaf674e7e86855f9990bc271078e016aa473bb40de7baaceeaba65afb93cd926dd199c521a6b2fd66408d767d01bf8dddfb3304053a5bac824911f006f97a3dd
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
+DIST github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod 32 BLAKE2B a73ae1e577fbb84fd72de422c367c1003355c117a9660cadbb5d6d52fcd0c102fa3b22c7c7dfb6e149dc14ddcb9b5fef847fb2a7b9379a35405c7bd9d83ff1b5 SHA512 2ef8ab60b4320b9358614a28a02b4207f3986c4a06798c3e253a79bfb63692dfb1765476e9d154e15f9d5e30983609c98b6ee39ae910c678a3773fddca208cee
+DIST github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.zip 17890 BLAKE2B 663ee535dd3ddf1a89ae274a400bb744d6e22689a212b58e6f6a3ae45890be76761fd4cd08d1836ffa3b8fc290249a408c798001b343104d0f06d7e2abede6a2 SHA512 e42c37f71719ed662a4b3efc9c03725a3569ce04849d6bc845bb7967228b0e648d6b2cdf73ea18430e54df85486b2a3819aca6170538eca4401ac3ea4a512d3c
+DIST github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod 39 BLAKE2B 03c2848adc48e404015826fc857d2a7b923efe39f2b11ec28e238ad2b06b0c5f4539f256443f91a116bc135923de7c4013a44285763b482d2baab5db1bdbefc8 SHA512 6c5546d979277d5488fb31eeb9fc33999dea631baec6902f937e19f4d65a23a2bb8620481c3ec69606eabd019be0096553097040bc778522b05f85ebc56bb787
+DIST github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip 59458 BLAKE2B 3e319bcc242e354aac2efbc31d978bc5dbc0b1af3911835f96243d3077fa12ca37b16256e89223b95d1c89f0fee1cc8105210c6cd74a04a01b69d7c45d4da3ae SHA512 77e29db3609028cd2026db97add708afa8a0688ed76d40e2beb64e5cf93004714605d8cfb83cd2668d1be1c5401747652b09d0f6e7aecc3ea0a3a1e08c957f06
+DIST github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod 33 BLAKE2B 69d161a91f7a47f08054ac8715154885a3615d8366b32d226a08f3bc975f6c87d168006620ab53fff5ca938232f06ac9eccb1b7c0621c91f9d7368b38cf29bf4 SHA512 9376e6913b3d764bcf0de41f4d6cffec4da5a8d387488cf531113e1597371b838fc398020bc85fdbb0583fcd9fbc2fbcb23b246c3d8147a6c606bee3f0974882
+DIST github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod 32 BLAKE2B a4dc1d6fd70150916e3bab8b310fe7ba5c26aacb90241b18ddb51f2608ebcf4e82f29495e663181f5a7b1f0f09e0659607eae17850dd0bd3ea8dbdc0f4fa6ad1 SHA512 1e3cd7f2ca465a9930734e27984262e81d563551917c8af55c521f15cfbf56a423ef918fbd282b4947c81a65ffa1c17294d4cc83aae639d9432dd3a52fbe8e83
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.0.mod 121 BLAKE2B df6f2856196cda33d5d86cbb3443360c1f381d842261a64c28a1a89101a6c4f5af653408ee33e8130de15efe433e95a4b8062002baae4a8306e821405c04b15d SHA512 43bb0fd886f395a7d1838529ac0e29a5d93231851c38bfac1df2168d482cbcbed8d0e0187ff34ad86caac7d7364e8dbc805d9376ed6140dbcca21d76c5b6ee62
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.13.0.mod 121 BLAKE2B b9eefdafabba19b234f26fc96699f115cc162acf96c32c2e54a2a0cfcec31b01c5063286c7aaa220d3f724ef0ff72bde0e71d0e655359413e066a15737367160 SHA512 6ea1110f1ac24fdbc455349359ae66537d604c0266d7ae84d31d3d9314c0fcc686124155dc0892ee9f70f44f107faeb6a467ad7622d826833bb4ba2a028b51b2
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.13.0.zip 50699 BLAKE2B a73ff5d71333eabfe4c82e0ac7d0867a52ed7e457f081dd486db3f935b59cd89f60176c72f55c4712770d4d62df60d57f0d6868892120a971450e3bc17c88e7b SHA512 9f9fdd240ac161e5a093b789e093cf8f689218e7f130da867719bbd300d04a6665c75c48d3fd6b7cab77115cd0adea3187da7c9416b0a963ee23e0b652ad5889
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.0.mod 112 BLAKE2B d5d3a6674d915a64981d16e50519ddcb083e77a5bc0e2474fb1e2d718512edd48534c11e13c4acc7d403da5778cb6f04c275c8f208d14d54880cdceadbfff872 SHA512 b2b728fab00b8cfb86dcfb042631a37025bd981364c068990abca3ed57b3f47837ae71e568bb2a60a2c941aa2a35ff1bb24a336e786d20ff0bebb63384fee5a4
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod 112 BLAKE2B d5d3a6674d915a64981d16e50519ddcb083e77a5bc0e2474fb1e2d718512edd48534c11e13c4acc7d403da5778cb6f04c275c8f208d14d54880cdceadbfff872 SHA512 b2b728fab00b8cfb86dcfb042631a37025bd981364c068990abca3ed57b3f47837ae71e568bb2a60a2c941aa2a35ff1bb24a336e786d20ff0bebb63384fee5a4
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
+DIST github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.mod 35 BLAKE2B a429dde238710a24e360e6aaf3631eeb28f1ebc1b75fadf44978ff339735683c81910ed7e7c9349d73d06721bcaa68fd526d5f31fae11dc153627de6878fcd1d SHA512 c79cfbe12d4b0cf8e79d2b652665bd6c81b0983fae996b472273cc0163eedce3beddb73e784fa37fda5442096b00aa5135df6fd06c2675942fdcb79b069f2667
+DIST github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.zip 26848 BLAKE2B 81eeb65593680fef314780e9a5b32a7cb1847a2af56f682de4d95d3e875a96ae402f18d8c17cea33971813b36bb4cbc6dbeed7f77ed26c61a6ba1098da260812 SHA512 2a05a588daac0e1a5fc22275ad0e02f366e07808d30b47ae44c54a9d2ea63a4f9c3e79c1b2e105d31dd128e42d841bf8614dda36d71af57b842a79c76cc7620a
+DIST github.com%2Fgammazero%2Fdeque%2F@v%2Fv0.0.0-20190130191400-2afb3858e9c7.mod 34 BLAKE2B 7bf82bfad36efcc91744d7987e47ff7f64cc6b47f419ba912dba77fd39326aae98f157b7a5fa4aad57d4fdf71335af0061593925b52fcc8254cd6a3500feda05 SHA512 ff4a5789c7863f7b9ebe1f136b5428d3ce5a287d4fa452639b18849c0f20c59924345870f15fa8e303893b287802b434b01cd00c56bb3209890ef9782ca98243
+DIST github.com%2Fgammazero%2Fdeque%2F@v%2Fv0.0.0-20190130191400-2afb3858e9c7.zip 9533 BLAKE2B f7ec4adf0771de7641aaba8d3d765dc4acefd25a1f08a0e4d34ef03fa65319d76e3f07600eb62a45e3bef3afafd8a7a5bfda028ee83ae86105be3d1e8c8d3cb4 SHA512 b9cd5b48c471b09897d5f1fd9f8923445e452bc348ad3c9ffd9b84ed2124e9ffb4535e3bbbecbbf27d92d6b49d7ee22df5f6498012fd53f406f7d7e9c5670b5a
+DIST github.com%2Fgammazero%2Fworkerpool%2F@v%2Fv0.0.0-20190406235159-88d534f22b56.mod 39 BLAKE2B 3f49caa886c87be075b687a7c62035b93cfc85afd6473f42461fe6297c422e723e2f70a443908c06de23356a54bc3e9d3c4aad40f6125da95cdf77f50aa22c1f SHA512 4ace6813d796d14ae30b2b2c8c1e9e8f90887672d9abc6937a6e18a4f987a439881b5547f0d443f59f93886851606589a69f7a7ab76c7a433b776910c26396e1
+DIST github.com%2Fgammazero%2Fworkerpool%2F@v%2Fv0.0.0-20190406235159-88d534f22b56.zip 13036 BLAKE2B 6630cc45e285215de6965801e3c8ad41079a6de1fedb396efe4f0e6460ad6ef25fdb5dd98b1e3ec0577780134910cb523cff3521cdcc8ee3a51b35d43fed7dd6 SHA512 733e1c0914821dfbf839470a529a87196485ca9c8f1f83875d89c9a8b862a5d239fd0314cbe7f8e7b83f3d46c8bebe10456c6aae906a11621ce7643e61917397
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.1-0.20190212211648-25d852aebe32.mod 63 BLAKE2B e418e27df957221db7dab3effe8b7b68da72098f4a90ff3f78902c446dcd25d720874a1d5f8fc6dc916f32fd7d87a79ced65c792e6e7b2f670d32cb78c8fff8f SHA512 041fc2aa6cc90c78e270fb4d902d857f83b7837d3bc0c4073cd4efacb078016d740fbd9b3e0d78eb1984071974a2efe1a04dd5d2cc474b8b29de60e6fd1638c9
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.1-0.20190212211648-25d852aebe32.zip 18157 BLAKE2B 542e807e061369d9aff457bdd1ab4dcdab25378d6766ee2d7b618093e06a15d3cec0c1460613e81160fdd8f5da6732fdedbbf7203ebad80892aac70f3ae9fa1d SHA512 132d763eeb2d4729d86e2b7a0afd15f9f0b3f5f9380529867bbd6e71cc827d73664b96a7ccf84a44590a4d8eeca311b6ff83497ced3a0ebb2f7c1ad66cbebac0
+DIST github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod 48 BLAKE2B dc30053a3f292ba19e5dcf7d7f287a15a970703b98bc83525dad946a8719b42e5a12575baa4206ed4237a202f1c4d57874813badff88aa80723d743a61c5e86f SHA512 e129ba3d01fa1a966c010ec4b453dccdb191dd7f8cf4f8295294e0a69f1a03d9d8cbc738d3fd3347a28beaccb205e443a40786866953f1c4dd761ebd2c889bbc
+DIST github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.4.1.mod 48 BLAKE2B dc30053a3f292ba19e5dcf7d7f287a15a970703b98bc83525dad946a8719b42e5a12575baa4206ed4237a202f1c4d57874813badff88aa80723d743a61c5e86f SHA512 e129ba3d01fa1a966c010ec4b453dccdb191dd7f8cf4f8295294e0a69f1a03d9d8cbc738d3fd3347a28beaccb205e443a40786866953f1c4dd761ebd2c889bbc
+DIST github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.1.mod 48 BLAKE2B dc30053a3f292ba19e5dcf7d7f287a15a970703b98bc83525dad946a8719b42e5a12575baa4206ed4237a202f1c4d57874813badff88aa80723d743a61c5e86f SHA512 e129ba3d01fa1a966c010ec4b453dccdb191dd7f8cf4f8295294e0a69f1a03d9d8cbc738d3fd3347a28beaccb205e443a40786866953f1c4dd761ebd2c889bbc
+DIST github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.1.zip 32728 BLAKE2B 7d14cb8bf2b31f6ea7a8e27b236038eb32e59d1f01e6c3d025cf3404166f03becae88566c23e338f54452a651df51d2213cb222f782209b470e10ab003ed5f22 SHA512 dc5853337d8273170b0e7d01d2e48617a6c498da7e969c557aa064f18118f520f420b42b24d275fe66ccccdf156c952dc7847713e005e0fa008a793dcb68d5d9
+DIST github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod 35 BLAKE2B 088adc516e2f6f0a693c745963d6daaee2c196b1407e36a469eec392b232ed26b03f9c515d422b8e536c2b2ac8bf199cb3db5ba4ad19ab71fc338919f57a3a53 SHA512 787962ce037cb9143f496d5a7dd11ab1a487180cb57ad498e6c24a8da7a5bf36737b0b2730d2e0837c60a08bc7467ffba744026ce6962885fecdcdd1bb6c07b7
+DIST github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip 11197 BLAKE2B fbc5efeb39aa911465f17b41e15574564dd9f6711ddac8fefb6db2fcdcb1c9da86d352aea7ed9ec53ffc01d16361985cefa171c240e55a8689d3f16e01f3a64d SHA512 c11ab427de7456beca56fe2c3539161bd92c20dfc345e8b52f5752bad387e93396929bc42057e09f82038f0e59471f0a0450b66693d11e2199a7ad69eba79f01
+DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29 BLAKE2B 1cefa73995b3d0b4206aea263f55c672b675dd22d42c61a92f7380b6e726f2d7ea40e0a9e456181f34808f5386eae3c485bd2872857caf1824254fe4a55cb635 SHA512 a709c650da5d5f513e94891b88c26697826fafebc1ca964fb9544415637ca14e3b9f1f4ddcf738e28032e10a2d39b619678ec5c8d44cc0a1dff738c75645e2f8
+DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
+DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod 2670 BLAKE2B 211a6d7642da991f148a7998fd35875f316a143c62337214ff428b4eecc7dee7db044e42f337edf531edc70b9aa99f46e349821864a63d384c7d050e414a608a SHA512 fdfed8273d2014838eaed6d4d2b0d92ae905fd796a0fec6c5a0eb27d15ec31c72e1e79973d909a1ac01df1a2e5afac99bf17d5cc7d08f507474c8e8e7ea88ef8
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.10.mod 91 BLAKE2B 5246926cf56768959aa69eff9fcc70c7a880bfe1879c03dc933d798595640dc81ff1d018a4e05f5867de5afb40407b4c2803e883b8eef005b1d6e1ef3f1e7bee SHA512 03e84e2a11f843cf54622151d4e65aaa1a783a258250acb54fd432d9f175fc1a6c92db5ebe11f6e35a8deed537a805cbf2104b57beda3b34e96ebb2c499a768a
+DIST github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod 91 BLAKE2B 4aa00d10dbc5cf003c458093f8a81e56c440ddfb3e060c40cebcbeea3f04b152c19a6c879460a164e07e7df2b9a6ed86e16cef70ca34396e8fcf384907d5c606 SHA512 7ef69b0fa12691253fc58e94d67162abb06b86a762aaec858611cd1885bab3b60f14ccdf9cf75eefd24c0018aded83408461d7d709580fc89c123ee5a2e64614
+DIST github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.7.mod 91 BLAKE2B 5246926cf56768959aa69eff9fcc70c7a880bfe1879c03dc933d798595640dc81ff1d018a4e05f5867de5afb40407b4c2803e883b8eef005b1d6e1ef3f1e7bee SHA512 03e84e2a11f843cf54622151d4e65aaa1a783a258250acb54fd432d9f175fc1a6c92db5ebe11f6e35a8deed537a805cbf2104b57beda3b34e96ebb2c499a768a
+DIST github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.4.mod 228 BLAKE2B c0f23b1715e8da3161bb37d3d4f95d3ddb68a0c226dcba912b0649d064ddc40b2789a5a4e6c1a7dd7857571124fe1ffa1fe138ee4c060aeda2529256579c095e SHA512 6af381258c6b002f862b909d463d1eb0f11e1c37083a304e8f91e41c05d9322c0dff0a3b4dec8caa2e53733ee21bbb8ab8dcaf744dcd947007bc5495d060946f
+DIST github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.4.zip 56002 BLAKE2B fdd384eb98edac6904211e122c838ba36e57f4393ff3329ac3d230f61566dd0d53fd39eeb86b9fd8e925d0de6b43ae9a6af37a037f91f0c763669a09a88a85d6 SHA512 a7a6883fc2a5cd92d65102b0053e0250cb91425e26c12d67d1c8a2ae86925d67d2852f141360f2741f79ef7b10228e305639f5bb23be043ab9f13f1c4486f8e4
+DIST github.com%2Fgo-ldap%2Fldif%2F@v%2Fv0.0.0-20200320164324-fd88d9b715b3.mod 140 BLAKE2B a966f089fdbe0a15bd3c2c04966fc71e0626bc9945933dadf873c008c9cdab45d3ddf14dffbac9969b02f407a364b5983cfdc64906835ff3fd8851fa42433c95 SHA512 0dc11f16789b2aa0c06fd8a4af71edafe9fbd19d226f19193368fe01e2189701671d237aac3faa945e937ef513c11c838c61c60b6c1bd2a52c3ed4af90fe8ab9
+DIST github.com%2Fgo-ldap%2Fldif%2F@v%2Fv0.0.0-20200320164324-fd88d9b715b3.zip 16261 BLAKE2B c1396338e574140e2a7a001253559155b94e16c98ab75ae1ec2c29bcd9874e9c4b19ebe71d006776e938e9a3c826c1896eff257f37eca8b9ea9d6b535962eef9 SHA512 f6f73f76a516bfca1de3a4d4a8b7d42d7b6dc2d6966dfda5b4c1a0f4ae322d0f552c12455fd35507ad439e23dd451e24f178655ae327e3eb76618c90b10448af
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod 44 BLAKE2B 0122d72cea88331beb9500849a0936a966e7a48abdd2e76363151bbb124e35481e7248fd896523eba3c51c5f4575dbc13304c2471477757c1eb2f8fb2eee9cc1 SHA512 bfebb8d865586729abcb0dcf4c19a8938f06f9b502c78bed92d01c18d1d037f7df44cc1a1fbd4ca094b1835b8aefbd48fb5988e2884656ca44be0aa83206aadd
+DIST github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod 31 BLAKE2B d141d98fd2673b422369b754fbd430a465f08bcdb07fbbf1ed626304ecd0843255fd2e909fc395b04c7adec18a15dea65ede0c64689be98b7491729d13363db7 SHA512 45bbb63ae2dda8c2ea63c9e38405b379708326c3f2e7963e3589ea53d06fd3bdce1613b5a0c1ef66f9c6ddc21374b1669218bd6b3210918df0a4b205116f3e14
+DIST github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod 37 BLAKE2B 2ebc74d62cb97bf929cc59df3774562560bc2c1c5e1717380b05fd79f98b1a4396082d62c4992751207915c03c7ea983f8eb91b604d03f628b06d3dc804815dc SHA512 94811e2f653bfc9aa65b2f21212d65e96e0415541152a8607f9ab0d44bc1ab46175f39362cc9c1174aa0b1ea60e00fa977287905096a66a0ecfe62ee75ae1c6d
+DIST github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.zip 93913 BLAKE2B 083da0dda5ec6e4d8c9bb983caded3c5cd6e723b15f4f9ea8e643d578b171208347a72f34765daeb80551a3c16819bcecf70a9ebc37d3bd587b1ad1f19e50ed0 SHA512 0355660d8521b8853c9449d2fdbc45c3b0243b456fa6fcf627c611c4edbbd7ed8faac5505f464d13b2609c5dc12996332884fdf78b78a2ff7ebf74c8d6184831
+DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod 41 BLAKE2B 62bb3af3f58b23321cc389ceca36d28e4f32cb1470b6c54c4af55ef927ba84284858765b5b333c3bbdb042826550fe4f0d22022078e2b34e340098465e21f3e8 SHA512 1e8d650a965637bd0974b8f42e207155dd1bac307e9ecf4d294cb4ee0f1c694276062d46318d113326b9c1bfdc379a7d8b8fa2c18e4a08ed9baefcae67db88d2
+DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip 79799 BLAKE2B 1677e3977fcf1499a1d6d3b0dda2f990b12a9f5464ff8a7aca6752951b395038ea2e3a38224d24eff0e6df6a2cc92f5da47daef9ceb237433bd2370d70eb7737 SHA512 9a67b0101fc1afba75179246e1498c41254d8379f78ef65877166bf9a5b7f7ac9e29f270e9186f13a26891389ab4e9ef309c4e90b2e79bffc3ade49e39fe2af1
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod 41 BLAKE2B f496cc326aeee2c6f1547b802fa1ea13a578144331451bb772a33e2934dcc655c9355f06f7845684130c6647d00decfa937c839909baa01a6d84f6e601a427e8 SHA512 56fe1d995f8f51197d68494fb2edc2d5c5cc863c881ed640a74ba80e292a54a0600f10c727b3dc8a209fc33c750d92ad658374d0dc3d083fa9750bb7174f5613
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod 43 BLAKE2B ab024fc86c325a82315f5a99c39e1fc08440ee35d81fe09959816a0fff09aa5d852431fcc370dde082963ccbd0d79d74d987f1bacdd4796d6d1d11eb80089d63 SHA512 b3548cd55d406b9148e992e276f7178d68116825198f359971f22a1d9e7e2548cdf9605a1b8b6f04b3b66d92faa906dae781a53624344733fc471452f16f4312
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod 34 BLAKE2B da7fc8b2c3dd4e49dc2efc50ae5d50571e906f68ebbaaeb863f4b3f6f03160a381d7b0e743863cb4253ba36afa2f5d7e518ac08fb4d6c08566d9931396d87fa9 SHA512 b75a0212825e9e0554f7654b1da4050ddda233853ddd86fcfeaac0202dcc4605f0608f3e5ea90056407ccef504330ac407493187a759a36fd716f508b20dc60c
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod 34 BLAKE2B 3eae155bd845592809662beb61207107add5a1e0edf380e313e262699dc421b3bbeabad5ea9ee73d29b6a694b2e58854b888e8fdb3dd9c7176ce637056cb90cc SHA512 81cbe6c6c48012994253a40b9c897207b8b4b79f35c09ede64ad7f8d22db8861ec823f2b4a7185334554c75bae3b614de236f804312c77b0027e97114ed4839e
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod 47 BLAKE2B 7252c3d085ad65bc8d2694f6fabeaf42736c8af8f4e061f1b6f254c35859619db00c1e204057cf355434b40f403b1c67c29fa5f93661626284bde20c8877a606 SHA512 149783bbdf84f15c29931e06d98707db26048d13ae9fd157600b522c0ddc60612c39764dc177e063f844205321ba98a01eefc1744dbc6f786861d0607dbdb0bc
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip 113293 BLAKE2B 1bc68747a73c39e2b21bd2c45dbdc3cb41a6c69f9a2a5167a6960b4ed583fbc888a41f559a8866a004703939230ccf3536cb2dae43ff5a078d21151a115898c2 SHA512 d18a710e77e830e7a1e80a16a7743cfac418832c16a8e08da7749af791e2bc8116c2c3e7f028bcf9c4431cf8e61478d6f1a3549a47e569f725db2a623460986b
+DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
+DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip 10204 BLAKE2B 37977dbc6c256bcd404d5b7076ac49d1c3c3c495ad0869cbdf8943b24b80ea5f155c80a0a23571b778e7fcb381140988fd19cae6b8ad681e115260b0fe19394c SHA512 1e834ba368fcac6e13fd8b3a478cbe9b181ec3660087733b68adc0dd41838e54367d22f9bc53e602ece889e6051e319fbf80d5874abcf4daeb0bfb9b64e298e6
+DIST github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.1.mod 31 BLAKE2B 5b9a7c710473f58b57d11fb76ec3ea044f5c7bcf2532298a7bd687897e4731416f423c051c601e7012426958060519f664e9c481ac5a791b0b1603e83b406bcd SHA512 2dc02a7038b6c4e9f172e5787e70de1dcf44d1abe19fba03c586d7051f723e78bef3067f25d1bd47ca591b4f252fd76febf8494af610d8a2bdec57c306dfb496
+DIST github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod 31 BLAKE2B 5b9a7c710473f58b57d11fb76ec3ea044f5c7bcf2532298a7bd687897e4731416f423c051c601e7012426958060519f664e9c481ac5a791b0b1603e83b406bcd SHA512 2dc02a7038b6c4e9f172e5787e70de1dcf44d1abe19fba03c586d7051f723e78bef3067f25d1bd47ca591b4f252fd76febf8494af610d8a2bdec57c306dfb496
+DIST github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod 31 BLAKE2B 5b9a7c710473f58b57d11fb76ec3ea044f5c7bcf2532298a7bd687897e4731416f423c051c601e7012426958060519f664e9c481ac5a791b0b1603e83b406bcd SHA512 2dc02a7038b6c4e9f172e5787e70de1dcf44d1abe19fba03c586d7051f723e78bef3067f25d1bd47ca591b4f252fd76febf8494af610d8a2bdec57c306dfb496
+DIST github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.7.mod 40 BLAKE2B 85a731224d5ee0133e78887541189838b2459182d9d6de2fae4bbae159fff4ac44e02862652a6dd508e72e3cf561d93dc17ec9bfad78873fbcc31c5989f50b2c SHA512 798975a528035109053bc6640944adfc8626cafcd0437063fcac0dfa89a34567ead293d369069501ff39130c2b0e6b23373e70672280b38c87591a528c542242
+DIST github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.7.zip 12508 BLAKE2B ac3b7b06019fe4a60630907cfe79039a46015502d186d4fc51bb1176bd246e254b7c6ea13f7abd8ebdedf0575fbb991ce24aa2a670b4e3af71ae53bcded2ba2a SHA512 a841e1ff6833ae09f8bb7d671c41c9e5146fde0f2b9462c2a678498a081faf37f067dd293dbb8a1fecd15c3f03f02fb880a16dcbf30bd0038d42c9db72cc65ab
+DIST github.com%2Fgo-yaml%2Fyaml%2F@v%2Fv2.1.0+incompatible.mod 31 BLAKE2B e875af65753b9850bbe280b0e62045515084d046ec73eb9133648e612e214e28de57427701116759b873d4e7a5f3811167fd0b5501c964eadb872e95b7b99b11 SHA512 e46c47a3feb64fa369f82f5e9f96d6137a8fcf5d80f668a438d3fbfdd5e950678994131dd2c28f4d2704e6b2a78dab5638967f9531c049ae74afb8a1481b2def
+DIST github.com%2Fgo-yaml%2Fyaml%2F@v%2Fv2.1.0+incompatible.zip 77250 BLAKE2B 32096811796402f8909bdff16bd84de55c453d5c6c7c37c5c66c858aa682bed1b974d2007cb37b9a00e8c9d6f745f01db2f1424f2a6f45509cb8d8396a5a8413 SHA512 14405c9eb96466fc25a849ab0253e0b8d12e43ec67831e010d237bf4555341c0722a7b6206977ec9778d2028e70b449cb7526117462ac06f60128e04176b4f7b
+DIST github.com%2Fgobuffalo%2Fattrs%2F@v%2Fv0.0.0-20190224210810-a9411de4debd.mod 148 BLAKE2B 8937f897a2766b1f4bcb20e5a25d72d987720a4858d18140868a8e0c5d625128d52c2a08376e34955f6869c620877d193163e00545312ee28000698b29576cb3 SHA512 d06d1db00a1d7e1a3c41410e101c80b3888ad5d271559817687a35b1ec130b98812c058cb151813292e249303a3d5cf527578428c3c8284bb0e4fdb075fe700c
+DIST github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.0.0-20190329151759-d478694a28d3.mod 35 BLAKE2B 60a83f9e36c829f2df2cecea9e8313d9164a0438215098b84580dda457488a3a77dd01b04925be7f449c641e304d8bf8ee31374cf98b21d48fae7b6d47f80d04 SHA512 abe9637868866cdf5270b0cdf68a0dd1100badf3eadbd17799fb51a94b7d850f55c326c30c2c477254e6c1056c01e5ed6b0a32c042f0306e2dfdcb16cf76d3b4
+DIST github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.1.0.mod 230 BLAKE2B 7559593fdd40706271ad62288cfd7a15619e36be5fdf178fd8a701abefe5afb63b1d414f89deb1dfe861aab0f41e607c784a29179e8c252c77911a115e05e43f SHA512 03e8b675d774baeb3f49136380757ad34e61a7f5eb9b2dde49f0e39de30ceae72698ab0aee7846bba36983d558157e05db0f4d09a4d2bc4d8eec006c29c5b2a8
+DIST github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.6.15.mod 202 BLAKE2B 52f0ee72de8be8043df75bdc9b888601b25557a690be151d1696949d73fe3239eeee938de9a44801d8bfa940b15ae1749cb6a14249b3fb755e2d296b55c47c9b SHA512 33236cea065ae18acdb40c50731135610d8c5f3685b1c14eda46d99da5705d2eb3457e9c60e6ca60e39860a18343d9877480a183a6242667989cbea501807d20
+DIST github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.0.mod 202 BLAKE2B 52f0ee72de8be8043df75bdc9b888601b25557a690be151d1696949d73fe3239eeee938de9a44801d8bfa940b15ae1749cb6a14249b3fb755e2d296b55c47c9b SHA512 33236cea065ae18acdb40c50731135610d8c5f3685b1c14eda46d99da5705d2eb3457e9c60e6ca60e39860a18343d9877480a183a6242667989cbea501807d20
+DIST github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.0.mod 130 BLAKE2B 5ded6225f9bf41543f60e4224c3489ed745d0855fb17a7027efab5bc5e51a692c56bfb370010e063e6d640d2a8433a32e5d72cf35e51bde5e7e0b05114f8a21f SHA512 52492adce1facd2235caaf0d3c4f7aecf25cae21d1a87b051b418c2b056f1d81e6f49ff37a50c403223ad97ecbd88a5742ef41e5f59700703e216a3d471b10af
+DIST github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.1.mod 78 BLAKE2B 445af2b56365266c2c008c57e619e33eb62db1037e680324765fb9c004eda7915d0e61b3d8ac8c37667e2469dad8193b2c45cd20e5c11e7fa9d325e66e728f72 SHA512 94a7ec2a36fa54c762ccc641dea5b73bea6d68eeb638a3073e7b4412b8c6ed098faeb467db3533ff23b0b196bf35fb719823f9a0ec4c5d5c93544dab99aaeb66
+DIST github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.3.mod 78 BLAKE2B 445af2b56365266c2c008c57e619e33eb62db1037e680324765fb9c004eda7915d0e61b3d8ac8c37667e2469dad8193b2c45cd20e5c11e7fa9d325e66e728f72 SHA512 94a7ec2a36fa54c762ccc641dea5b73bea6d68eeb638a3073e7b4412b8c6ed098faeb467db3533ff23b0b196bf35fb719823f9a0ec4c5d5c93544dab99aaeb66
+DIST github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190329151137-27723ad26ef9.mod 34 BLAKE2B e9532be4fafcdfb516038f30c7b93ba537702a5833cbeb07b3d7eca560eeb308a5bf689b33332e4740acb9435aca9cdf66921fc55158fde696bd9a70ef65c4f6 SHA512 cabd1a4ec03cb48e0e239f2793f558881360b89fc8a178f4ba52c236474f21e820cb8cd74aab3acd89a09942a643a4fb0cf5bead59f46cbe8a1776c23823e637
+DIST github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190403191548-3ca520ef0d9e.mod 769 BLAKE2B 8ec4b44157eba530f29de853263be0196cfb60b42ff0cb79a521fb0e743d8c9a10ebe21690d4c9957f28abce7be19f6bd6200be807e782fc31ee4aee22f95847 SHA512 afe0813966422a1b074fb9d474674d1056ecdb1e70452466f37c3b309db83d36d3662d6507ae39635bfbd62d880e8e66761ddbac5b07682f29f9e9f4db6c6b14
+DIST github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.0.mod 868 BLAKE2B 51eb3e1a0e9125b1c4af1d22c3a912830a835993ab3b91abb4795fcd38c8b124254a6f6d8465b2c37679c8652f556e78bf70d7a8c74ce74830b0231a9037f510 SHA512 d5aef9c8593dde4953907da95b47fb3c68e5b7b97dd45d41ba56beb7966ddcf2ef5e532d0f46ca5edd4f609c584e41cf62337385930e7509b680a532d1f1e442
+DIST github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.1.mod 888 BLAKE2B 57651d970b40132299103e1a2f86846d243ae8383b3c6dcc9b8dd1276f436db79fd43dd3cec161dedc1cb8a352ce1880d6a79e76a7b992d110cdc0ad9050d2f2 SHA512 c5e95c442b489c7e2bc04aff487b7da08ac6cc4ca133c9f23d00e4d89877fb103f5955a2b1ab0c5efbe0429ab09448390be3414377f40d558b55cb2cc31cbf21
+DIST github.com%2Fgobuffalo%2Fgitgen%2F@v%2Fv0.0.0-20190315122116-cc086187d211.mod 35 BLAKE2B 4a75dc59561b6ad5a4914fbaec620dbb37c8097fa5ce5577d03df73dcb423d13b1229db1da1f428de0338a82c3f6f2be7b620072ba9ea9ac391b253c18ddfee5 SHA512 ed460e05ed530341bff610f4d2d72e67d61648c591a219f25cee365b0b874e7a9e9403cf9080f96632d06931409709fb2bd67220330c8ba921e6056e1bf86ac1
+DIST github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.0.0-20190315121717-8f38393713f5.mod 34 BLAKE2B 040068387a0623c4b48854786b73ff75eaa13df0a8eaa1092f40f37cd3cc416bbab0c6eb75b2e807a0f88925e5167b98e6bac18a99d70c8df931e48e06e8571e SHA512 e72986700b9cf60852a736b1540a9b74c99b34af5519582d0a953bfa6aa3a4aa105bb73f250e856b6c3a3dbcf79c2ca81045ffefffd624850b0365890d0b10bf
+DIST github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.0.mod 318 BLAKE2B d72d6ebf8f93cdcf4b2c9b7e6d3038e14a2506d8487b3074d8955e95b6db696934c7a74c08ddbddc1409c7126efa10200d42ec791b669da4204e5e64d5cb1e4d SHA512 f44072bb3cf44d9ad022e8ecabba525092318449f27b94e9d1575a96e752500b9aaa8b79e4af8dce365534c4e5e56accde07b3ac1bd22c32b08582f28c95787b
+DIST github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.1.mod 309 BLAKE2B c5165ba369dacb269419034c090cc0710bab36c2b7cb170de9e841f1ff4284c3b8d86e0c8ed9893cd50a42cf44301b1b963ef4a550e705b13b926548246a6456 SHA512 30480cfba42c831ce3e0a5d78aedb43f1ce88f8af43edd53c61c4ee311c27c7c5ad8defce05ace9cc29b3942797483c8f6c9db6b71afdeb3b8853cd4eec79b81
+DIST github.com%2Fgobuffalo%2Flogger%2F@v%2Fv0.0.0-20190315122211-86e12af44bc2.mod 35 BLAKE2B af76920cfe2eaf97b47a0c21b775e805a4257648af9d35f12814b4d7534734f24d83a881edc8f5e6951e72675fc769d6971708a7398f7f07715326026f29e926 SHA512 129509b3db5baea4bec598671363fc03d6af7f1b418f07a9ff48e9a4834e92515be742b7d5ea445423b5bf02908014df6c898ff40dd6d0bc3d6beb267ca99ef4
+DIST github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.1.mod 209 BLAKE2B b872565189be65ab8a0dfcba181a18371afeba4c2f5510edf1592595ee18fff5137c96f91a390bf76341f91f81790acc11154c95903adc7768cfaf5c7a312b38 SHA512 7db0b2946a16520b0eaaadef0a4334b3a3426d3c9f94c8ff18f0619e2b75559a92ff0289cf19d8fc5fc503678b2428b1e272127386f3a758f6b3e0b8f278a6e6
+DIST github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.2.mod 209 BLAKE2B b872565189be65ab8a0dfcba181a18371afeba4c2f5510edf1592595ee18fff5137c96f91a390bf76341f91f81790acc11154c95903adc7768cfaf5c7a312b38 SHA512 7db0b2946a16520b0eaaadef0a4334b3a3426d3c9f94c8ff18f0619e2b75559a92ff0289cf19d8fc5fc503678b2428b1e272127386f3a758f6b3e0b8f278a6e6
+DIST github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.0.0-20190315124812-a385830c7fc0.mod 176 BLAKE2B b56b780594926fbf5c5cd71f4e56ed2405e62ae620468c563a9309bafca35962dbad39e49ed199e5569ef9afca4a3a78be1d2e502f8c9e312b2e6223e2111879 SHA512 d6cee8b8666cb35d0806456799dd91692fd25f09b4e44fa67feb1fd20c425205bb195f068f28631347ae2adf2d0b1603e3a9d61cbf7d5945722b4ac1abb173ba
+DIST github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.1.0.mod 176 BLAKE2B b56b780594926fbf5c5cd71f4e56ed2405e62ae620468c563a9309bafca35962dbad39e49ed199e5569ef9afca4a3a78be1d2e502f8c9e312b2e6223e2111879 SHA512 d6cee8b8666cb35d0806456799dd91692fd25f09b4e44fa67feb1fd20c425205bb195f068f28631347ae2adf2d0b1603e3a9d61cbf7d5945722b4ac1abb173ba
+DIST github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.0.9.mod 899 BLAKE2B afc5ad3cbf7c93354e7e85b90fd91410cf9086148f8a9e0e394acd08d1c680973a72f7a313759cd56c71c10e245ce04adb25e869976ca1fcd584e2fe4c672d2c SHA512 463dc53ec72b0dbeccbbaab43249a9f21eb00157f0306a0b253a55ff67070abfeca23b18084192408e09589c5eca2c3338b0a346cf7ff0c28527ad16d7cbd5bd
+DIST github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.2.0.mod 752 BLAKE2B 45ddce0b2f5a32cfa6cc2137a41b47c9278314348c3afbf1754048e8ef05f6958cf24c28ca9e9c23d5c2c5135457b06eeb6e0cba3081111dd9c86507bcf296c0 SHA512 47bdc60efd108ad1335f7da69dd774adfb4f542f2f9978df69660520a715edb285c30453c678657f01169ecff23feb760a534b46db88e1ed83171c5c5def1a2d
+DIST github.com%2Fgobuffalo%2Fsyncx%2F@v%2Fv0.0.0-20190224160051-33c29581e754.mod 180 BLAKE2B 3b1bdaa97b34b89903a4d9375a581a5318f75635f04b1e2c4f4a927b8a5cae4638a6cb55ecbf6908a18d04fd77177286952153e2fb73ddcdc22a9d1e6bfb8776 SHA512 cecafca4c0b08807902f0fbe560252fbd7901a258c57c374939013ca857e0082fa7af5b95bfd72625a10a441d169cc1728342754d6e0e924867d4dc120d6a43e
+DIST github.com%2Fgocql%2Fgocql%2F@v%2Fv0.0.0-20210401103645-80ab1e13e309.mod 447 BLAKE2B bb371af2c7cc3836555cd72720f7a11abf67ed77b961c31be1901350bd958b9dba939cff8a683ba6a0ed546dd20e3cd5965c8751120014e27c4b3914bd0a0774 SHA512 001eebf47eb1ff965f0928bb9899fbe39bf0c6e2f18482b63c4e5f750d8b14ec0e14f905fb0851dd9938e7de86d8c7fca8b6ebf3e09c71e140eec1d701f101e2
+DIST github.com%2Fgocql%2Fgocql%2F@v%2Fv0.0.0-20210401103645-80ab1e13e309.zip 253055 BLAKE2B 0340c1d5318e53409abdc9e5f58324d03f92784868215d54138f20570b2857d8943e358ac78180436e84b19913e7ee108ae76aa45e2a837ab22195f12e23b1fb SHA512 5a98d39be2ba1e52f83e5c43e1d59d57482236f94eff1e023cbcb3e0c1d3839c25228adbdd6105e8c552b5d2088ca8ff7901c7b57e52a6471d757024a2ea4ef5
+DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod 42 BLAKE2B 79541bfacd3378a6c6dbe9591309a80390444f2dc2419fb0137c723c6a2ec1e0588c00704ce3c19dc93297b19db89f79bfa09daa2632f6674e35e76819473cb0 SHA512 b9aad4f1c1d4f2c43b293b0c9ca8a600a37ca407ba8b22b0f826c8355828cb7860a96a85df84f720fe8aa2840974807ea7ea7b790790c6dafed794e761f1f26b
+DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod 34 BLAKE2B 92cad2efe22c009b9447a03343841c211ee06e0a78939c6ecf3e367dbd50c725562f6c09705f8fdf8131a9264a814d6822d3724a15682f446ed869b97febe388 SHA512 38d3341ba73f1537bc4df9c5a3938d1e0effb065122b4b1ebb3277a33c3e70674b28a32ffe8a79ee8b6a353233c6ead616b7749244a3af10306bcaac678aca8a
+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.0.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.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%2Fgoji%2Fhttpauth%2F@v%2Fv0.0.0-20160601135302-2da839ab0f4d.mod 32 BLAKE2B 277920ac439062c049c6bf823817eb494f74b04c4e98fce8697b0fa7e73495681d209fea12d9265e7800cd8740a68ae3aba0837a6e76fe18df052734a13d40a3 SHA512 7a77a04ed51e7bf75d80d8accd810ef16587e1d941496c8f57517c7a8f185b3c00e01a456b8473c2d89e324175be7ad7e1cffc12c8d97209e0164cb60b24afbc
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip 39701 BLAKE2B ecac1c4212267252571babe2c7332b517c22a7c535777a40b6e318299bc284ba3676ca75df60670dad69698450e97dc614b98c6c9fa793a4f3daa3bf88859167 SHA512 e4cc88b9e484d43a328c2ce80b812d4886fee13b915a41fb64b28cacb163960059de066b9be8aec33be081fdcd3db847ee491aeeb1a74b25aadca2c206c9587f
+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%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.zip 96207 BLAKE2B 237265e691ebbc93bd0906c79c29826a43bdfa2a2967b82f0513d2856090b5118232c84028c6668b0c2d6d3f25a3b3ebe0a44c68a12a3d1e7dd225af25ae8492 SHA512 cc3e9455289dda38a8895a0388641724db44ff7408c6d05d01a5a9df8e3e9d4b0b62c9bc9e6083438c0c6530d213c590b290d3e45ba8f4516b62fb2556bb98a9
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+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.4.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod 42 BLAKE2B 5e9f93d89d4f9aa6ac98c9fcf3f44177e95f08fa3d86789f56b6c52afa19c663fb36ec477a04611be15f51e8862ba90641fef9bac7c09b1baa7321b71b5c31e6 SHA512 603005008f167e32ed8984657a85676cc140d57adf0177895f6f4282a301c7f1fa2d826abddc0c59c725c810cf2356c820ac7fd64c6ccb2be132bead79603090
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod 151 BLAKE2B 9c1bc32114f742984396777149c3fad997bb47288dfe265614a1d17412ae3946581c2e60ff9ab87e784d71cfbe423b7ed1ea5864b6cd3f81f35e9103c8c08a00 SHA512 431b8d4756fe79e43cdc2f8478f3171ac9c90912222e50503301fc83d34c90001fb6ee0fee3bc05f66e47d657977395769e54efa0fb74ba35f34429cc0dac5c3
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod 151 BLAKE2B 260f1bb3e48b0bf9870ea3b725b13f84d2f18a12c6ca1275afcc2897bef547fcc1e893bd6b1efd46330bc1de66a00e3ef133a4418a50a075302aa3141abed8e5 SHA512 b6d7911148c590b3ce2a14a158cfbb94dd56dd402b3a4a2399adcd0421604f85d904244ddf5f8dba65326f04a7817d5652b30a306c65f44fd248ed269485a21c
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod 151 BLAKE2B efe8a8f8394f082a813ed4983158ada7bcd20f92f9f8b9b0d0e61e8dbb968b3c825432ae05d69c9b61a04ad57533c1e60438d9a1964312d4c9168f86864ba2d3 SHA512 2df7aaf6cb36a18165dc458a7b3f4158e2bce3bf10165418de401dd43e06d44378511dd4fea6530cb668a8ebb17b4c3f294ba35f5018e6aeb1b7b9082aac8a84
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod 154 BLAKE2B 8645404d124dde54c3e9c284b1243b1faf2124f2b7d6c5e6566ca600d3c965f7787f09f6825840f5e3ea6d36c016ef2c7fef10e8e12dce354593f7a8a3210a33 SHA512 4c9416c4777123a39b23b49ecf6265295fc3432de083a04dbefc87264b8c69f0d9e342ebb7e8e488f30c3efdc02951fd7dec23dfd1fef0802c8f0250f96612a8
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod 124 BLAKE2B 4c032e7f2e1c8765cdd720690c1067c7c0ba1005bbfae01cd928bc60d96bd82321052fdb18a4ae12119144e34865cf910e306c5116e4f4f56cc5f70f5d52004e SHA512 acbd5afd399b3798d4b24529479b18523ae4009e21acde15a3893d2af75f9a6e65fcbd5a237423849003eb8903718eaa0b1aed9177c390972ab9490f3acc0d1f
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod 124 BLAKE2B 9e60030e0014cbc67c0bc7064eef3b127dec57dfe25bbf7f0d0e2b9c8c77e28477066daf073a6793428116419900e7c9f6dea6e8841a5f61812cf11ff77e7009 SHA512 14a0f1fed404939fad835398d5889ad57621edeb0e183785b3094957183bb29a2026e2af939b94c7155f8496e966116c4a6a2497fab113a175a9aef3f7ec3f32
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip 206762 BLAKE2B 13c74350dfc3bf39540c37f6b7771f18930d6bfd6a5c83c27c723065da6458e0de544a6fa4d57c027e6c67eb528493c620228a56249b889f00d67a064218dbb0 SHA512 3d92469995664037149e3e11363db685b3175fff01f4ef3b578ada273853a16131b3c97899b497ab75ffbeb6191fe59a28f073779828f719681b8e15182b6211
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20170215233205-553a64147049.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.2.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.2.zip 79281 BLAKE2B 6b93c61a88217e741d528fec2b72b9ceef9ba4b46b7632e614dcbbd6ab2d9401dd9dc15452d2e241bdb0cf4f4727222a5de2364c6b4e612ebb98f37af8771551 SHA512 ab3279b64f02783ddba1b506a538eff97a97634bd8ae4ae61a508c98adc2accc9541d336508eb60d4bd6e8e18a5a335b384074378fd30c29ef6892ca242f9e8b
+DIST github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod 35 BLAKE2B d6addf74aa6a2ad97c1792946aea166c48bbcf35fbc582a9dfeabbdba68992106b7cc7b2515ccf002f44bc74c0f0655089e3110e39fc312a683b1c364318279a SHA512 33a68d466b4aee3c41e6d70766e90fc7b7b8e904acb360d1a5e15236832ca47e5f45393a7f5c486893f6a8ca04af4ca4ced27b064c15a5189217141a325972a8
+DIST github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.zip 9531 BLAKE2B 17f756f40c12b6ea29962938ef18520d5ca3fc99fe6804b0edc41b63dec17b63740df8d9f1abb028c00f6b5e74b2fb6dcf5c6a09e44ef0ee1a86f2fb2e740239 SHA512 27fc4b487a652c7960ec6e691b78e80adbc3dce7590da3f4e568fae95f583e207a887aa8626ed75da7346a40d47b2bece7c3aa5fda6bc7cd4188673706f616dc
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip 17644 BLAKE2B 2ab156c678ef5120adab042c415b287bfa6ebf901181837122bbf83867ff312900a16a24c0f375708f915628ae5bac93b42f659663cf827b81e5e6c4c6e47769 SHA512 b54c7f94aef24c769a0478aea5dedbf67309dc3f59a5d7cf52ea8b49e81783d87bf80e5bcfa36f1f95a65e64bdd8312d20ebf81cd73952af5481b2f1f3619eb9
+DIST github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.0.mod 37 BLAKE2B 9355e4909ed1e7ea43b9882cdfffdc9c986b9a8febd22659143b53f05b4c7a9b152e01848cacaef750ce4fd7660dbb62ea3e0fec4bc2abb47dfeb566248df33d SHA512 9d10e0f8380c49034398df4cf8c9500a0e1091001f08b9574da6933b861210dc4d518c7e353570618c4d4c432c0162e8fab4b4acd64a2d5360efe456fed4881c
+DIST github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.0.zip 1180341 BLAKE2B 390754756d725b5b898089e5375fb03452a168eaecbe5a6d7d596a781146d88ccdb822ee5daea0cee7f3c63040702d602d30a99a70def0880c9bbf60d337da94 SHA512 78d6138fd0a575d70d3813fa0dca70dd8ae3de591ea41d795462a82dcdbe73370fbf17717571e396bdeb1b67d61b0b8a34872b0e7110cfc9fd0fd3e3c6b985db
+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.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.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip 130974 BLAKE2B 6e4efb8abb584c3839c7b1ab80c8060c125b695bddddd44c57f72c0fbf9de85d40595ecff57f57ddb533e34dbe72a95e0e8043d91d462d68818699f194766e90 SHA512 9cff1690cb177e70b1d67ddd305e4317e3d1ef2825f5f3ed4639210f7f2ee6e89ff03970495757b922f16fade5fafae5cc14c8da2b95694faa3fa48c63f3313d
+DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod 35 BLAKE2B 87a5884f51a766419a5bfaca4d6b317f2e86680e7347d29dba287e4c2004db6b8a8afcb2b2b8145cc3f9a502b768105eab89ba0f3e99db44427fd3eab9d3ac8c SHA512 6d285a58dc91fb57f990b76b3c2634247bee990ec1bb3e0f11b19fe1edb3b9b1998030def12b20a6f05c574965ddcefda6883121f5aae70c695e031e72425178
+DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip 347066 BLAKE2B 5ef49f931c987f9a24880afbd3ca231093bb43f0c059df9110c38ffe3ad54c4de3851cc36cc9af15b49112462cc164b0812c8872d5fb2d61d0cf751040213762 SHA512 3a24fd40eec7d23c69143355338019544fcc935b01f63f604419a5d7b5f1222e89de7e28dc86454e57e262f9bee5e4333395f3b8d7392c6e87b7e8c442e05709
+DIST github.com%2Fgoogle%2Fgo-metrics-stackdriver%2F@v%2Fv0.2.0.mod 328 BLAKE2B d5275bb1944f38b4ba7578ede747e5cebc7e3bc3a716275d5c3d689074822ed2b7abba50ee7ba3741fca92dfc4e305455ff5d30e70339faefeeb1b5e7fa1f821 SHA512 7f4a8ec165c35d268d14d4ee9889f42af8296b6789b548cc1d6139653f8323eb9fba9feebaf91e32c9f619eb1b3f6557dc69c51410bac0f1240006784b5c0856
+DIST github.com%2Fgoogle%2Fgo-metrics-stackdriver%2F@v%2Fv0.2.0.zip 27762 BLAKE2B 248dfe000475fde4045d89292d4ebe7c41c4dd2ab051ff75f6350bec80f4ba3844b08b874ce2b74ac32af0ec8ca3f3f9c106329d655b5f5613f8e3d04076be09 SHA512 a38029f50b2527228b139e491388a56e1f3e3f1b1482baad31384d580d91426ab03dfeb0947460c53fc60ab4c27f4e7686a19a88bebfe6f570cf4584ff653004
+DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
+DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
+DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip 9151 BLAKE2B 853a982f1c3b2b60fb44e3da969f7cdbeb6e5214c549e47dee57329a9c93c8786bcb2af6e3aab5f7aacf0bf0c70beb26f95c42b796cc2cff5b9b825040cf5a11 SHA512 e13c7622fe1c4ba73fe147255c02d6828f5d5deaea74ee14a97dd689819547b913caef4721838a68490991c710156307cf0487866d200021cf9d774a4600e52e
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod 32 BLAKE2B 11dbff4f4352c70c63b410ec8fb7986235dbaedd97ed64d665ab465898df351f2ec3eb9758c165812d5f97bd7b409e90f2db6ee41d73ac9d13fb96c638b42c38 SHA512 8720691f3968ccec689b3c777eeb9b5dd2932f16f77760db3e51fc0315405f7d96711fe0683d6bea810c8ec4e5b320fbd16e228f5f407b12ac5ff896cb263372
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip 16936 BLAKE2B 04270e67b679a158d5675c41f8b92803ec49d9d29f4e8725345c307d7cfc97a4876b30f6518eadff651a38af46440e184294ea48757dcf53ace35f44d36801f4 SHA512 c94aacb755ae942dc487c9e8f79f01016cc31fb118f6f340a58eb4f458de5735b2533af6ec513cb4512a05e270cca73faf46c5f3f621a0b76a79d0606000d3bc
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip 259222 BLAKE2B a40b65755786c83fc0cc40de98de0c7f734b54c0441617f0274890f823175b4e44e721d4ca3c46a7551bddb5487c7d992459c928ff4abc435acb5bba5a302a96 SHA512 26ffdf319d3c952533c25c487e027bf219be3f7ec7345f9d155a480e1e5f3006fe335ba790cbfed00487e23a8506a8208ed7223a514da11b7a4bb069337573ef
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+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.2.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip 21638 BLAKE2B 63e755faff06cc528386a19bdc3396a6deccf4872ca8d20484291c279b7c93bec50af19c31d6b41e37ff9144085af7e267ff63490bca1f2524c52a52e28c645f SHA512 b4c3f39d7ef5d42eb89e78e7924cc6edcb682062bb0a96295742359089fddf2806557877bb8ad609ee9c53ecf9d0fce15d0c8366d193ae89a979f834bec64ed1
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip 596836 BLAKE2B 09db31490155fba99fa74f0aa3198dc94c113a3c8478fb366426b61922d74eecda5648fbe5172a315d450238f8f3b92873eaddfdb05b4f6d391bc6fd8ca13374 SHA512 c27b14bc8afb6cba3d835aa91a011747849800a2716722f6f4b9a1fefd03aa34da2cd098fb9bac60901af9dfcb1d344db5bf066372afc2b5d07cdf40e3843ef3
+DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod 201 BLAKE2B bc1972ace31333e12a0462701bcd8aa135ebda6f8619d3f98e4db0bd037ab854873c68c2503812fad3773f1bb1937aba7ca4b2af50e8eb2c13cea5aaefa7f573 SHA512 a1e237b3f47807afcbe3eed728821d15da81c78e20562ded5a8cdad18d498a670cc4e1c10821374fef8661afb7ec7e41f27b4dab8db2912db7edbcdc642815cb
+DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip 1719536 BLAKE2B 0df6f7e2df2152bfe6ac0e7065a8c2a2638cc82ca532509cecf5f102e16c1463ad38ac75d324eb38f12106e4cd950d647805dd246860f05f1168ff7c92c1c1af SHA512 ef4d868f6c9f92cfcb5bf7d53e02ebe04e14fdc11ca22e7297d88652b660f6667d491035da7a9a1dcb25654add04852e968f9b7633d5c363534c63db58dce8bd
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180628210949-0892b62f0d9f.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea
+DIST github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20180427100037-88b0669f7d75.mod 35 BLAKE2B 9a19672823c771aa5c58abd42d7f999170a7164a93a860913f421a85ddfa6dee8ff829fae42b4d671fa65292bb0a39821d172aa9e5f8337388171a1cdc0bdf2c SHA512 80892a032b773c9f6c71cbf2b565d4c29b63aed2bb5c730871319a95c829c07607a4f2b49f3d3566f70f9303b23217ebacf5aea161a61e618b302c0fe111e249
+DIST github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20180427100037-88b0669f7d75.zip 33888 BLAKE2B bda2e5f91a5c6b31740b71a2dae39fc6e3c7b7d6e520659fb6c8af21317e9e08c839e20ec4e69d3b401475e7ba5cca01a85f5a53a51a5fdad9fb0536420b0b88 SHA512 b5662e00379198284ccf85114bc059f43481569ffef4f1387f345df2cf839d6b2cce50ff6b0623bc6fc8538e80c248c8ac2cc57196111405b4322e62ce1d0622
+DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod 34 BLAKE2B 378e68460634c64da8779bea61bcf813ce4c5797c3ea541362d1409bff606626917c1bc4cbd030d98077819c5a8abf2ded047c047c2fc6b58977093e67e7b6ab SHA512 1db09f5968fde5c7877937c2ba476afb8a07832943f66c24cda7669ccde744ecc5ebd6e9efee9427b24e10fafba5f7acba7416f9c4e438c2ae2ab22c4483127b
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip 54002 BLAKE2B 8f6fc685cc85f850ecc0b7dfd63c37a23dfb6d0b43107ac749365b10f254f8d6cbb16462848e317d91410af8524bbb1c7856eac54c7e94ab6a92d813434b9c40 SHA512 8f82d0b2d7e881b7533e6755448c01a8e32db5bd117d61afd9456387ec87761b58ffad050c4b5051ec4853096c0f11fcc5b87be21c4062ddb3d365e23405123c
+DIST github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod 39 BLAKE2B 18dedfc007aad3087ef83c141ac6fc1835681c7f09af9a657f879e1f2bfce5e8d501113ca0e044435979b1dfb0ac5ad6954661f91118af7ff00b929076a39206 SHA512 f5596bc3919bf32ebdb9851ba6b8e5931eb88583e5129c277f6d5de4b339433ca8a180c40b1bfb44420c35cc8a01f53e4bf1cf6f0aef6f3b790590234bbebf61
+DIST github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.zip 74512 BLAKE2B d5f52e8fcecdd611a6dbf872a5420497e160a66afdcbe5285830cb8566bd32064e81173c971daab09f5ed8164ef571ec502a41ad49675b536ce597e49e6b90ef SHA512 60b35862bcce859368f01f47562308cfe0fd47932811375d1357a02aa21ebae6905c8aaa8533aa5f873005affd450c35f35f7b5e58b58ac46f92882c271509b6
+DIST github.com%2Fgorilla%2Fsessions%2F@v%2Fv1.2.0.mod 83 BLAKE2B 858965ca4337e7bef6fa686b6458cb82ec83ace6188fe32264c107eea982559333c77f6ebe1f8eba30d540ec2c11caadcc0f65468d9abcb249eb22eb29934e79 SHA512 b86dc7a38e59a926445af4df51cea8f318652480c467f3122613f900f3671080f5323dbab327e6df33d7902eb3bfb7e852254d362c0953f16cb4ffac8abd7e52
+DIST github.com%2Fgorilla%2Fsessions%2F@v%2Fv1.2.0.zip 20101 BLAKE2B 063d632e48f6c70479d12ef1d45c3a4b81cd8b83033710d0cc4a24a2d0bd61b31150202e0077638accc7e480b1dd17e417fd07b73f014934904d5a2616975a8b SHA512 5dab2ca153bf8e48035689c051bdafcfdf788fa7c0a22930af8abfb22e616419cb44048dacab022531362814460f63919acfd6b9fb1d4740382ac0dc6744d0cb
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip 79215 BLAKE2B 25312a1d971b0e214f92e88846586f3cb96a23a8df927d2fa73e37cca6eec4d55cd88c3757831f37661ed82a0681a9d0c3e1edb32e5182b1a0b8e349e28ebf79 SHA512 8de80f729d0538295606f5900e9f70a3f77c4b6ea7782c9bfa8520ec89c75b6a7ae08b42b6ad0dcc261f9e9a298bb58645fc97c4e5c2b51cbd6cbab62401a2ae
+DIST github.com%2Fgotestyourself%2Fgotestyourself%2F@v%2Fv2.2.0+incompatible.mod 48 BLAKE2B 1928fe4e63005bf9d678f5d275400bd3519d679207918c44b0d93e829e1171dd1dded06cb8d82109e1f0b06b5b8a3f5124f1596e736ed83c15b6831de57a271c SHA512 dc9bf8e49c8937007be31d97dac8bc58e0ff9e983b8f287c50944ba074281c1e2d20e643cb26fb207a936a1703680a2884ef10d07bb0b9fa0c545d5414dcdb91
+DIST github.com%2Fgotestyourself%2Fgotestyourself%2F@v%2Fv2.2.0+incompatible.zip 93535 BLAKE2B 5bf87f311a8e5467a6202c59609ea2620aedfcde525a1ff7e7ce2c6b436a4eb965ba7bfc2d19883ba467395629d9f0835e9b55f795e9456fc29974d37e6be12c SHA512 9e7aff78ddfa1ef1f98af32b05d6f8da72fcc49dd1cc3b9297d803cb5d6709e8135bf43aedab7ce5a55b29891964f15aa36029893c069b9088c65d225783d3ae
+DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip 138925 BLAKE2B 34895513786f190d7379e74e7256b9fc18fb82bcc985866dc94ab2110fe04c120fda46b2f2629b87d9d0380e21420a625f8206782c67ca5c0e71c6cc8309b9ea SHA512 39bb926ff817750578322805bcf412db6c09ca5b7dcd237fed9f64df51222de62b62eee275e6d37c7dafde7dd8fada499c344c62c3ef0a3bd8d27053057f4079
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip 35110 BLAKE2B 4ebd3cf0dc4580a53cbefe7a955cf05cb6d1d60a69951ea4e18eaaf108ce2cd5bfd0b2dc4bed62a12b48922f6f9dcdf1e598b77a946bfa0267314caea827286d SHA512 5c8e6beedefdf390a9eda76fd8d5042323e1c9a6306605ec7ca8b1612bc038a6cb0c02ca1093e0b6373a05ea64b7eb0c0bc62720a74b37d4ceb61564f4d46753
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.6.2.mod 46 BLAKE2B a909a61754bdc458c27211bf62b57f4ead8065bcb84511f4fc8c6fa77f56d78ca714e7e311035c1544d92f596de2fca56bcc767f9aa360d8d2cc36b7301fde21 SHA512 b1c1ceafb509b0b3c2b1c5fa0a28281880084a63a071a32f6ea4a04dcd2b2c455c9824414da7f767b1e039a079b6a40c0505a2e71991b9e737c1ba01947ea434
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip 429863 BLAKE2B 51d2d6558bb657231d7e7e9561e42018196902dd388a320726a5f5c93b1111c8ed0b8c6eccc62b2e6c49d4b09f084ad99a8b17ce3944963e990c75271ee6f8aa SHA512 3cf71984f9b4974a2967b5d0496bf9ee28f248f10133ed54017c02b7d2bb9e04dcc00cd3873f5a8b9fa4ae7d6cec619a4ee4e97e6dbfecd886df10de47017fda
+DIST github.com%2Fhailocab%2Fgo-hostpool%2F@v%2Fv0.0.0-20160125115350-e80d13ce29ed.mod 39 BLAKE2B c5448e753ad6977fcb533ce8a4cb69f2368a5de08335f39627f010f4efd5a7651b6f2292e508781e21618d16cbfcd1d21471c406f70271ea8da75fdf38deb9e5 SHA512 35c1d78a8870a8b6236254d3ddb28c571c3a04c13768f107da64f89e7759313c5959de2292770ffb01695abb0e1c5cf513ae5ce59adc4b943e2ba45d62b60d4e
+DIST github.com%2Fhailocab%2Fgo-hostpool%2F@v%2Fv0.0.0-20160125115350-e80d13ce29ed.zip 10501 BLAKE2B 872147c7196877fa0344fd3be0c925575044f284a0c5a33c95cf7d08907b5674b7dac356544791c6722c59f14da958e538610fe35bd28faadbaaeaa21b0fe22f SHA512 c9050d3959318f6aedda175a6b39a2d0c9d82074ca6c85cf7a6afba0e05b342997307e91fd65cb359db91bd8d6a9bbcb11886e690003f86520c2ad9c3962cd10
+DIST github.com%2Fhashicorp%2Fcap%2F@v%2Fv0.1.0.mod 1144 BLAKE2B 2b0f670ff61057c4e454b588653219d1f2a89c846f775a08a2c538e4c7f1bb8efa11441120cd26c8b382a17541fb1d0ae1cf0356ddf5bfccd0894ad239bf9fa7 SHA512 e22486d1b7f4ecee907fd9e10806cc63553eb815b42e4bdfa041d232470029ff07c2f2dcb9aaa19f90fea7be603c298235e4aeebac11c0ea5f5f626917dd8c80
+DIST github.com%2Fhashicorp%2Fcap%2F@v%2Fv0.1.0.zip 134034 BLAKE2B 07cb92ca5303995e57bb21adc344774e910f4d9747a3a47688c8c1739f4589388d490875ae79344d3578c71dab23da3ef4b3b2b5b71a6ec9b31724b1d7d8bd0d SHA512 056b27b74465e02bbdb99539fff08055c48ef907c43668fb4cabe6b475f1a54b94027deb0281ccc11a42082257284566650871d342a18cf672af7e24279db088
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod 449 BLAKE2B b4fd520f53e935f4e33630427d57ba97a516afc5c20d4b4c62d06cefa9f77c6f2a043afacf95c9e496e8ff573c8feaa638987ffe014d4432555725a9c9f920dd SHA512 ef9f64ec39004adc78f354ecd2c614f0c76cde23549fbbd778b458699f4aa104972fb2e5c270e7e223fff6354c309873c4c3611c8d746d2045f2a69dac861830
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.mod 424 BLAKE2B 8e4575e659f7b2829ef4462f2a94694ea22ba05b538e309c958414f9c8e99de359b007813f6dccaf7bbb0fe2f0ba1b69a878eca6edcb0d6fae10cb6e930f6b7f SHA512 a0d2ae55eca543e43aa4ff03c5a1b27f0fdd405c019a67f9d50a3218888c4c9ee44ab212babeff6f950c86e0c9c2ff98c3f68d973e515f977dca46920a5a9fc5
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.zip 144944 BLAKE2B 1846b3b50033b90f97245fce8165dd02af8c6ecb6db3aebb7e06cf88be0ab148afbb2e0bf4b0034d485462b765cfca6f092009cfec1bb5b50abe059ea2696375 SHA512 687e546896553b777d6b52c5150a3adcbc26668df2e937a0c7c20d4484b19b85d318544da4be5705437b2409b49886a8994f79d533ff903e752a8b07f972220d
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.0.mod 595 BLAKE2B 0feef849725bf5c462504df952e7f5ad79c2030ef3ee3dbb26d397cf2df6dfdd3329883a3dccaf661d2d0edfd2fb339c38d6901194bb782f2b016c6ef75e9cc8 SHA512 56bb4f1c943db405a3f669aec2300b644f9d7cc9bfc88ebbea37a0abbe7019e27e6edd3998c727d5701086056d180dfdb85b763f701f44e61804a6df7bb9cdee
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.1-0.20200910203702-bb2b5dd871ca.mod 595 BLAKE2B 0feef849725bf5c462504df952e7f5ad79c2030ef3ee3dbb26d397cf2df6dfdd3329883a3dccaf661d2d0edfd2fb339c38d6901194bb782f2b016c6ef75e9cc8 SHA512 56bb4f1c943db405a3f669aec2300b644f9d7cc9bfc88ebbea37a0abbe7019e27e6edd3998c727d5701086056d180dfdb85b763f701f44e61804a6df7bb9cdee
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.1-0.20200910203702-bb2b5dd871ca.zip 33992 BLAKE2B e9230de32ff7911cbab8cc56513fb08fb425de09b4503281fe8ff1a6d2924fdab4f467ed36bd49b447615551ce5700d32235f9b1f8f4f28af9c175fc5fb2da82 SHA512 4390f2b0e9f38605701a62249e60a18b0f629dba2e7066059928b4bb7732f3b890cb0065c8e3160ac9beaa745062ed3b2d9a348cf81df34405a1ed629549fd0f
+DIST github.com%2Fhashicorp%2Fconsul-template%2F@v%2Fv0.26.0.mod 2019 BLAKE2B 5ef85fb9d8619ed8cec91342bb81b2f4d4e9d71d9f4e87e776f792d854328b9df66e66e2188671b7beb35178ba74a4e54d4eb016fda9d0d802f984d28eb52b03 SHA512 4ace2f1f652d4df3b7e91e90d03be0d117a7e300d45ec4a5d563feaac21b6a5c756c2438dde9479f6aec01db64ed0b566fadd381a0827e49ace7aa06365d7603
+DIST github.com%2Fhashicorp%2Fconsul-template%2F@v%2Fv0.26.0.zip 292504 BLAKE2B 62afa46e704de10273c0d2a05899b4a6c1a2554d750ec7750fa08b54d5b9375cb92a8e11af075d8d5c84879e6cc574a15fd976f11e05b214efffe27b7b47fc48 SHA512 4b0824167f3131f7f038a769401b27a7eefee7cf44336b0d461fcf58387d0a015cce118eacb3dd448668d59eda79b17ed35dd5eb7e51ab11e5ca9bfbe56658a3
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.zip 9497 BLAKE2B 57ea3f82d59d1a6815a0f37a6175648f3be2bea0cd867c3cee1472f50e64097c9723462c4afb543b6eb7a64c687d2098cc1a1e03efece05d9bf89cd1a8174a60 SHA512 8065dc99eacbda55ab187ddcc5ff4792246c8b623b2c978df0bfbb2149c07966ca701dd6f36e7660074f47d082e1654eee0de01347fecd65bbd90f386346e110
+DIST github.com%2Fhashicorp%2Fgo-bindata%2F@v%2Fv3.0.8-0.20180209072458-bf7910af8997+incompatible.mod 39 BLAKE2B 98be05b4e4d4b9c9f1a28da6030f2d3e334a4bc9fae5cd8f26b711b033edf3d76deb796a799e894b072a09d9c2ef6cbb83276364ce7c006899b24185c711e488 SHA512 953410d3fa04671649fc15823e70549ca6f335f4722a76f2c2114347a893cbfd39e5558b1cd7e1b46a8683907c7e74592493ecfefb73c58b1822142bd854a38e
+DIST github.com%2Fhashicorp%2Fgo-bindata%2F@v%2Fv3.0.8-0.20180209072458-bf7910af8997+incompatible.zip 43499 BLAKE2B dbda15fe2b2c809ea08d02aa3e4ca3e41acd3ebbc20baab1c8b649782a5ea62a2a618df6124b6f745fa8bdc8936fb80ace8ec58cf4da5c1c7f35ee0a23ff4fb8 SHA512 d7b013a64a716481b6ec6e840b11678ca92726e8067ac4536274ec847655dc6668d8193e602dde07506224720b82f0e2fc7b812590745e18cf2c56a77c2ac8ce
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.2.mod 50 BLAKE2B fb92dcb4a1f00ab43c3be966a569dc51df9384244f7eb093f55e960c5acb59c394995fadc2ff72592e9026f7e6a068ad14217f7f71d3d6e6f83a98283785bcbb SHA512 ee698ecc8bfb568bef4b6ef077724f393d34e0fb2a36be48ad5e0db844a1dc54cfc26f5f377968214229ea7944dbd636e883a5f68567cb62beb827de1dfd07c5
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.2.zip 9586 BLAKE2B 41c33c234399eb60be7aab232e617424b95ca55d5c0779b7b87430978e0e28613b2547b4894e2cbfc4da54c161cc4db484c4f5d6e3c492c8194449fe19fc08cf SHA512 ba650d9cf967a21d4bf20c3db36d4f0560330ea3c3642f961e1bec4ae7472c3d07d9c31384bb1d64768cff8c34c9c9987a8725fdd920b6ee8f43d05ffaf13032
+DIST github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20201029210230-738cb3105cd0.mod 2075 BLAKE2B 130566ee8d39af68066611c1f1b681fe4cdab68a704e26eab07fe52b20bd9f436a0a07206f3d476fb329e4f1c8fe98d91d3127b4e951c008a828b2a64437f163 SHA512 f8f4d92cc7cbf247865742e7268d685c345c6a23467fbe254f4ca8fa852584e1f84052a3089d426f5355207b86ae1296a2c4f6d86f255249a30563558dc63c15
+DIST github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20201029210230-738cb3105cd0.zip 103261 BLAKE2B 0442f3431287439c0ffb6794e06c638eea04e90ef387731473d555dcde10a5f13d271a342d6a199158e812f6ce7fb8b77e2e3e1c43e4566573bf0db9f7568282 SHA512 f9b173eb91691882f9f16a1e17e46766f5c989cd6d0eec3bfb5a55b04f11c7aab46376bf064b6ad7b7c1af9924c8515091daa214db7d51961662914fc1809f0c
+DIST github.com%2Fhashicorp%2Fgo-gatedio%2F@v%2Fv0.5.0.mod 48 BLAKE2B a9aa353a1736234b52d79c42428cb1afdf4c39ae85351d9702cd810a26e4b272eecaad248706d9590778ca8109f17ceda47369cfa214a74f695927dbb532b7ef SHA512 fea15af175092af9694b0a9e304b34d1784a57ac9fb2f603edc39bb878dd42e537fa12057718e97b0c9e48937c7e3e885b4b9c3b16b81ef262429610a6e752b6
+DIST github.com%2Fhashicorp%2Fgo-gatedio%2F@v%2Fv0.5.0.zip 10242 BLAKE2B ad7f11783760bac17a84750ab2533d231c841cd95f718f8c815b992df97ac977ba67d2d18128a119758dd01e24cbfe2e541dea691ea40cb18b7f6863aa7f8fd5 SHA512 009a62e7b135c194ca0a5a5f1f29669632b0248d855d11c5126590ac92daaed0ea69641b71b3da22db0c205fa6a0c511c7ab99512d9a7d7eaa2c5a03b2fda6a0
+DIST github.com%2Fhashicorp%2Fgo-gcp-common%2F@v%2Fv0.5.0.mod 267 BLAKE2B 84f2f9d19e56f1da6e13f15df701b6705d120be498aa8059893d7125a96a59ee173d9b7b3372ccbe9ead450e713f33b9697f65520679bd71a77b084ab6da6244 SHA512 666c3b9dd1aa5f73fe3c3d3e49f2712160b029245780deda764072371e337fb6a126a06f0e80ff19bf2c86968a2a08ec30d1037d9162f67d7c3bfa84d7c6edce
+DIST github.com%2Fhashicorp%2Fgo-gcp-common%2F@v%2Fv0.7.0.mod 232 BLAKE2B 7b5ce42b846ecf39c6a6db00257ab7d1f2d257f3758c856373e71c92a31476f070c34dc913befc42c0cd77849256342d7f2815359384840152c4d3bcb383f022 SHA512 22f04d9d2c5819c0d27019c8a085fd24f5105d354cdeae578d6caefcb9e824a4d5dbd0436498bfeb2473ca859b56f3bae877e15d0b4bfdc2f4896e06000f5b74
+DIST github.com%2Fhashicorp%2Fgo-gcp-common%2F@v%2Fv0.7.0.zip 21841 BLAKE2B e275d1074f3be7fefe743d932c604457b5012f8580d9eebe2b56fc5ce07808d95996a10cbc241fcc0b80e4beae44c5c6f54c0b1ff08508b5854529bd2e0b1233 SHA512 69fdaf95d6b4f77706c6aafbc2fe75b40458871ebd7f313e5a9a04fa253fe96ecb635cfe33c4fc5e4a0a06c9a1eb0ef02985807e32a3532f9f152d409e941936
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod 37 BLAKE2B 3e6a6550c5fd7b237c484b2d7ff9d4fdcf02eeef8be89f18169d50c0ca7c58849c362d363428893035a5720d094cceb407c8565ed680ff248c305cd4acf886b2 SHA512 f2a0acca0b74daa85f1b49e2a56bf2d58c17570379d80c696428e31c028ace8436bd734b032996b2e3a52396d90cfaf3c0a99fd414c10fe1d67727a0da962ac0
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.15.0.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.16.1.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.16.1.zip 32582 BLAKE2B 2a85827de19748a87597fe7f7ecebf613969f5eb6bae2aa4f1053211110ed9e57623a1903e9106d727b050af93757813cf5edd1666152641004a62c8a2c58631 SHA512 d38361b1e9be344325b272ce81ae229da9d79569935460c224c9cde76c9d5f4fc5d7fbf44576a279d444a8ad8c2ddc97d5c04973fbde9452512dde296996ec13
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip 31729 BLAKE2B cc35c143559499bb19e8802039ee32f1ba2db84cd4b6e7209feb9b4a9a36f2a7b21e817c40c82d75abd94dc02f4e3e89b38692c93fbca987a1ac16f2a43676e4 SHA512 b7a8bde64b16c032ab4ed47c7ec11da6661293d231d7e100b4fdf9db88a1ed2fb9f48b95f7a6c44fd14e033a5a02244c894496cac57fcefe8bcddc73f4755508
+DIST github.com%2Fhashicorp%2Fgo-kms-wrapping%2F@v%2Fv0.5.16.mod 1409 BLAKE2B 3cef23218a9a2a3b4a5be1cb54449332ac6db34e492c71f988b50bf9def0e97e42097c094ddf5dea70b0aadf32a1869a884b6842e2c2eb5889b05ec403f18c71 SHA512 620f33238095b01e3d411b64df3fd2042f761c0917e672fbed0775aafeff2ba490fbed4aab0ddf6ebc499f7a3047df2382ab221333003f62065860693cff7654
+DIST github.com%2Fhashicorp%2Fgo-kms-wrapping%2F@v%2Fv0.5.16.zip 97614 BLAKE2B c70de304bbe85c4f27a2b138a59e673e2e31536c549ce55d7ec94095642163f02ee4cdf8e16e1fac02bbb71e0f66ed2dc3580853d71848bfa454297d89d3d503 SHA512 82f8b75cb94a1c22b21cf7f363afbb5700386bce539b62ec226fc4566bcc82a5a03f8f7821436a3fb7e15d8888164e02849e1f07430e765d9728a805920bf35b
+DIST github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod 61 BLAKE2B f43ec3c9c450f07eeb5c08107e6320e5d98cc68b0bd388df850fe5c61ddc18b871956a75df797984b3f63d24b4ac5612d322d577e5ea371d24cd05cb0b4eb91c SHA512 9d86ce1de4bd2d4b32f76f69d0ce1f01c7db8b1a2555ae8b789c24fa5391e9e477bdd1d82719003f37205b102a845bce0b65611fd10cf52df4d49b6471f7e39e
+DIST github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.zip 8113 BLAKE2B b38a1dc8c25554a4f56d7dd26d37036381532e355ab05e458489a2ff0c0436e9ae7de28c8bde941b3ccd1e00ecd4bd0bc33e64060f6db41e348ee66d0bf6a3dc SHA512 d90328e546ccc43766a304f4971e6036337caed53204bd687c736ec3a5c82c538b929921ddc9745eab6315ddba741817d70b41dae2177a6a88e5991cf8c43d14
+DIST github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.2.mod 102 BLAKE2B a406da5817f94ceca88556a1ae8ef772a12f868ceffd9fe1e758730b017919aa16e533c8fef194831b9225412ce38cdb7b578c5c95bc4f3f8418ef6e28628a19 SHA512 8e7ea5c9a297242229ea98835167536d3fa58765187d535d7f800e53819b5d5539a166566fe30d49a7c4d06b1eabd871574d8a3f2ad283818f68228eb766d749
+DIST github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.2.zip 38185 BLAKE2B 8a4db45fdb351965a5743f4d82066ee9b7e9b0493d1e30e3ce8c28ea749b0a95b5fa21c321bc281ff800f47c67f36ec3293cd9032d4efaba8eb23602ad7c8b6a SHA512 e846c4d8862097773548128303b93cff8276631bba07e02ea8e9ca47aee4b8f7bb2c50f2e5c68da242cb442d4e27a218db64f2f584bdf4cd96e706d3be6c8171
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv1.1.5.mod 111 BLAKE2B 4f800290bd148916692a372216504629ebdf62ae0c672be6506045d0fd0ebc3f170e11d0d97a5d209ad97306ace0209c2c89d199a004f800ca0b483eda61cde8 SHA512 d4922b778ab17f7ef41fe2f59bf40a7cfb3bdd466b595d4e06bdef60c3054db560797297721be61f39a0a20224ec410608f6de0043649e914e750036117bf36e
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv1.1.5.zip 408057 BLAKE2B e90f9126620d741149d908875364dc9b94a4eeb2392af6cd44c3fe2a63d13bfe904b399cb60d4c339e6149c68a409cadac5e0586282062cf1f606ae72b695c2e SHA512 6692bbec3d50611a212b3bf1cbbec779e721fabd740928c53817c0278ef16aacd10608370d97f4fa2bdfcd06c27bcfab7ee8b315e7ab641994772e767d385d32
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod 96 BLAKE2B ada026bc3e6104973cb7900d638acb7976ee8301e98cea55548fc800d8954997b666d0c605dcf1de0f639932c8834bd13e8f8512e74529a818d3de978f0163d4 SHA512 7276c308f91ed52579965e7e83e839351f2170cef2b58ef67887d5eb926dd21fd502f98ddc84ca8e6f16c81171490c1e2d9a131569b5d6d56a1e2ba28f227451
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.mod 96 BLAKE2B e834b9619a59e85905dfd9a50233e959874706f35026892af8ab385b2fb78a8f876aa47695fd896fe241c72db5c306da0d7c24f49e3bfcad887ac9e2fe5deae8 SHA512 d44bb68b322c8512c135ca9689bbc603643a4a924dd59c168519761878fff14a394f365fe5d88114f5552a9ed1791f6f9e3f7cc44be08b412f0b3a5eb3efd67c
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.zip 19419 BLAKE2B e8e9f8e23c550256e8f31341e2a575675c4dc0b720a701023898ba9bd09f1be375d21c9843ce26767fe5b7e7bf6dedbd4807f58807c3497efa1a1d19544e07ae SHA512 054679ee890bfb4f268a614870a100525b996f53bd48dc914200f2f18a4dec30cda59e26c16478259d1e80c35864df6090901595b59fb80a209f30d909e9e9d7
+DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod 770 BLAKE2B 22eef413edcfeb0337641d6567fdfb73d32f8ab2b3e624a3e5dafa15d31ca15c98c9740d4e9c8652adc5cd9f336153c029b086c260cf9ed8beda64b9c0c06028 SHA512 65489f1fe43c58303bd999f4c8d96b6bdb4d194b78e14d2ae9de9ce4fa877827f47d5d3c79e8417c88d1571b135678c069571e528b061238a9d59dfc8b472097
+DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.zip 105218 BLAKE2B f08840f6a06d88834cc537a458805b9589a3fd247ce94bea5ea99c39061ea6a710d9bbf7a5864ec2a3b136a72997bf5755e94685104aaec76352633c7334fe2a SHA512 d2487934034ddf55c95fc98c02de482c9182079960698c21e14e8b89016c9229853e835695aac7a21ad11abd263fab8464bc8014eb9fcff52bbc2ae1866a00a4
+DIST github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.3-0.20191002164813-7e9e8525653a.mod 306 BLAKE2B 32cea216d25c20e1d40e86ffa5f050e984b074fb6c04e6cefd906b2efbbe3c3c348dae7afa9d6d2c8f641c5bf969e0b2105ee2e0988d3d0d649d255764896b93 SHA512 ab81858d806bfcd3330b9bd58a6406ea9f53cb04872d96627be8c7d09be05d99f78371a929406ca18b7627ea9a550f4b7936c9a4b31c7831b7a594389e86fca6
+DIST github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.3-0.20191002164813-7e9e8525653a.zip 22080 BLAKE2B ec88434cd6ac9405070a6d615dc526ef51e7e97b7cb4de12a4a53c5192d06c9dc2f3c97fe246963728c028557aeb14a45ae99a6bf40d4fba0d4adc07d03bff53 SHA512 229d46628530534fcb61ea927b7e89e49dc6c5a172fc5ce4ce48582b0fa284f5d79924308f95c809829400a9ca8625eb61bb59800850c2d29ea5afc95f6304fc
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod 147 BLAKE2B a87a317948074210158c83c25aa1e287c613665f0008c6337a41cde6fb7e1a0758c38762d8467fa508e0178fee74781f1db49a05a388d46f8871700fa3c85c92 SHA512 7ff5a339ab0da7023d7548056aa96eaf1fa9a0a36f9deb098f99910a9a77fbab43137b6e305b35cfbc4ab9d50adabda10b53c279bc701ffdf97e928fd19c7888
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod 147 BLAKE2B a87a317948074210158c83c25aa1e287c613665f0008c6337a41cde6fb7e1a0758c38762d8467fa508e0178fee74781f1db49a05a388d46f8871700fa3c85c92 SHA512 7ff5a339ab0da7023d7548056aa96eaf1fa9a0a36f9deb098f99910a9a77fbab43137b6e305b35cfbc4ab9d50adabda10b53c279bc701ffdf97e928fd19c7888
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip 24036 BLAKE2B 30e48b301ee1aabd326394047f39d4ee2208aac617b2c3435d24c10735862c1fbd021aaa62f22e10ac07834e30e329d80aa5aa75267658b26c7a64112d0eed63 SHA512 4e72d97d59cb97db89cc6457b443ec4be7294e678d0edfefa0f76ee545c3663bafb223d9f7b2dc2e67c19429816e084e9da65e542788abcadea13657272ec8be
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod 89 BLAKE2B 9e53a988f41eb9425cc2fe3051c0bbe67c65208e6988ae1b455450183c225739b540edb0e59cdd8d010c34e89c4e4acb70687c2bcb861d379443a5c36e261458 SHA512 3446ae69871561766d2b70963eccaf443edafd9328f0f58a97630fde61fa746e59d26ee5d833548a92711555656aa9c1f44bb9e241aa87e21f4424a1f10fbe1a
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod 98 BLAKE2B d536f017d021aa2e43bdef41de97b002d8e08e2767ae5222ad7d05ae23af04c4920fa2663b553ee803d72751ae0772b4e8ab7dd5243aae1c35d53c0f6ed85d24 SHA512 97ad4c83d3c61a8b878871c886a1fcd6e3e954623b56e0775897160368b08a243d325991956d557b5d8741b0609d758b2da0277049e57163e18248594ce3cdb6
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod 98 BLAKE2B d536f017d021aa2e43bdef41de97b002d8e08e2767ae5222ad7d05ae23af04c4920fa2663b553ee803d72751ae0772b4e8ab7dd5243aae1c35d53c0f6ed85d24 SHA512 97ad4c83d3c61a8b878871c886a1fcd6e3e954623b56e0775897160368b08a243d325991956d557b5d8741b0609d758b2da0277049e57163e18248594ce3cdb6
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip 15463 BLAKE2B 88fb544a56eb6266a2ed75b3b6380f52d11d725e8711f2fbe321bd30494201d43db01398348fca95ef76ebb46ce26f3f523be67bc2d56f264f5c9fc3ac1cb8c1 SHA512 891f2adbadf938d7d070d80198f50a62e187a6aa6fa6b489e0055b98a9b2547b43cda11ee983815026b1e6f0f8864d695bf7e72d70290423ff53b4872d310735
+DIST github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.mod 45 BLAKE2B f929917e6591c425c0570baeba93a9f29783f8d76ddca583e7ef8741210d4798e6ae0373c19334a60d03417b11524eadf3af98fa452b4ee57f120838e61a6677 SHA512 ead2335e4739698a487b3defdf5f09fd5b43c7b39a7466b588d4057e4140061b38d2e23f4abdcbe1d26b4c2e300dc3a5bd6288e9285d36a8b0986c5020ba8e91
+DIST github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.zip 19131 BLAKE2B a54390bdac1be49b1d08b1d64289d29219edb64d3fa2ad867d3e992ca2ccf47813a0b5e7a17767ba7c6f8adea2ce1f179c67aebafea3e89ac41cdd4b489bd64f SHA512 5029bf828e02a226e417430bb848096d267c061d6c88d7dc465ccb5b508f2463a7ac070e9ff7e93b38f81acb2118ab7040db11e7ef71e8db2b62e5332ed77f9a
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod 215 BLAKE2B 1533dab2e1f588c3e362d82a22e8031674457b30822ec51d6130bab2d9bdf9412a86eef4d581ac50b2320ed39277386f6422e0ed26145cc5a415428ee77a927e SHA512 cd1d90707ef0309643612f59ed64ee94aa1ba686a4140ed84963e983dce5204788b10def7a0c949b15b215063f52269e7441c2e0230440b07d45d704580662d3
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip 132950 BLAKE2B 382fd8ab248997b4f364426ab0cd0a31085b5969b9ea9ed50046e8b7687b81eaf766e9e8e0bd15cfeee84319dd25b0c32b0ca2795066ed38f6979dabe654803f SHA512 43075467209b036a7634f6398af7147d209f685e2108f6190e51487905df4d0e5e0b66c40c8bc5a26ae6edf4652fe605fc2e84fb5421019c07d45710352c146d
+DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
+DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip 6210 BLAKE2B b5d3b234531523546445cfc48d9c4198fd0ffe8c91ad6d2b3349f28d5073a6d3cd76f0db36380d69ea5617357a8677a81ef8cebe04c0dbc4538bec1810f817ae SHA512 50519f8c8efb7b3494c857373cb119b924f2ace674f07bd0d0da5939a75f8c154b5cc8875fd35135228a9e8e221fccc174aa298d21bd490b89a0f2d9aeb38e09
+DIST github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.12.0.mod 465 BLAKE2B 28cabe73cb5c3fdb8239ba5dcc79642d2237ad579e14fb550e1ad7b95e92407619a678129dfb3d77d79dee08c3ead23155316262a31b272c57b4de35968a64a4 SHA512 8ad904644bba1555339418a141d401b76aec9e3434e1f386d9b2ca9076184909b37055b86ca5e15ecc38477fb37d9ac9862e26e3e3442c4f0166e8ef229d1f06
+DIST github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.12.0.zip 136178 BLAKE2B 2a91fbc41afaecdf3016d2f6c0b896b79d96bb3f48d919f8a80bd800ddad344ec5d8a81ac6ee779002f78e93fef6e162e1897b6080367c38e69a0ccd12bdae77 SHA512 f6a9232bf2359a88fc1c61e4e6f4d225027d217a05a00bf5e04865b66af34e75a6683d59b7fdce2f516a57e547d1fe06e0a5bc7aaa4fe89fd069f9aa34f02510
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip 8042 BLAKE2B 9ea2dd58a5d47047a84965e956e0d228e0c7f836c6b0111fca63ca2313c1721341ba31e7e741febc8f5b1053298116d69d6dc96f1497b59b343da59b57f7c3f9 SHA512 1afcd111ce5ec191a932e6f51f0aa9b05ffd3320793c022cc66766bf01431ee4b9cdd3e7a0544b6b1616fabeea262f54270660fb723de8ecebc8f919e7a94e34
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip 16706 BLAKE2B 3077f81adf72f995a24e9e8e0fd90e0457d5c210cba7b820dfed7a2cddb06eef4ad4747ff0da2e663419ba891df9fa7ff374e1bc73f2326faddcde17bd3e6bae SHA512 c44bca4c63fc38ebd97c2abb7b5bfa2af635548723697d9533590242b936f1b55b119d0f4a327f1b02c546d571cd0d085f727c00057634d8c2316d1c7249fecd
+DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+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.3.mod 48 BLAKE2B d49fb83b0e128d1d891c78fd7efc4d1f6c92ff9ba30943fcda9b89d752d468836df7c37d6f30d1b4e8eaa5cd966c4b2ec90efc087887f037cce94654761ac107 SHA512 a55d0882366adebd894e5ebf9de5f70ac8b5f8f945e52b7dac8e56b4efc03f40930d132ac03bacb51ca220bad114940b9e27bc0ecbb92dc739691674a8aa5e15
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod 48 BLAKE2B d49fb83b0e128d1d891c78fd7efc4d1f6c92ff9ba30943fcda9b89d752d468836df7c37d6f30d1b4e8eaa5cd966c4b2ec90efc087887f037cce94654761ac107 SHA512 a55d0882366adebd894e5ebf9de5f70ac8b5f8f945e52b7dac8e56b4efc03f40930d132ac03bacb51ca220bad114940b9e27bc0ecbb92dc739691674a8aa5e15
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip 20160 BLAKE2B 19b98d09d695d9d1d999e30896d7bc6b5f7266adebcf182ea18cf8bb379ded400d2200e22ec4151831d4e124c4cbfa0c6332678b20311134d5666eae24302f07 SHA512 f18b267cf4ebb61f56c726f2e6b7ebe33bf97d445d44648d41a5ba9734fd7ef7dcb034ef8881f476ff2ce843118703ecaa01f9925c2fec08bc642cdadab742b7
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.1-vault-3.mod 84 BLAKE2B 6864544f8e01bd702a9b7da2664f3d92fcff8872343938443a8c3caec1964fe14f042243d36ce2e9fbc46f5350a8fb17c9e3bfdb7954809bc2bd7fad056134d2 SHA512 c853d91d0a9794fdd0973cee3ae507438f944ac5fe2766bfe5b083685615fa525c218e3282f84facd73d9b3b7a27e2cf79686d04131ac1ae133f5612c19284e5
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.1-vault-3.zip 127799 BLAKE2B 4ae75f6d9fb17e0add5b8f23353c9e2ddef5a70c55cdb844bcbc6e003c7c07d36ace0f464cac08c9fd37a539d558d3356b8180e155ff27df8927fb7377b9734b SHA512 c2868f155575b0f508f26f755167a6b12b2050b7d757304af73921fdd550343c7be83bcc87a58bec398033016aa360763a7ac8004cde8aaa6caf5bf0571fec8a
+DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
+DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip 9174 BLAKE2B d972fd0c0a8b7135723ae51a6e57ce7b686c7d4b88313c2df73fc537874405595f82f58f5ca51da4036667f6d48f74022225209bcf148228e1d0deb0a6d3d709 SHA512 f2935ed7cc01bfb3aa7ff86dc4172edcf5fe20727c59a43676565d81c878de1dc6a0c49bd51076bf2e078ff71f72ad689802c0286d26e0bad26b2ded74d222d2
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod 328 BLAKE2B 5d3c1f5b839250a69efe71d633601e076be84d2adbf5f69067118851ec76b6044728cfe23644a8fba03502e476bc40ee79ef3e0c3385ab8ee2c3103321753deb SHA512 ed46a1036f3f7a7c2c5d55440ac93f468b5b4282fb5bee31a0c1a746b00426922544acd55ca6ca539d9d6927a23888e81aa360d2140036e84dc895b5a97c9b43
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip 14557 BLAKE2B 7b306a1151cda04a778b2606fbd7e5257a80da359ee6f02374bcf7199f16e3513be56c706d8af2fe2e683c46b80f9680e6831f0e022f3c8dbc5e0c16020d7a72 SHA512 96125081b3fe8233d3c2885c52cbd46c7091f4dbe7ff3e542f934c21c75f498b6bbb89200f9ed27dcc572b16dcb31bd400bb4d74b4e75e171c565ce7c1ecb3cd
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip 114585 BLAKE2B 846541b55472ef94a8d2606e9cccc82fc52d189e48bd94aef69871455088915595bcc21224ef7728750ac1ba8e3caef7c303446671416f71b74d03de647a3f23 SHA512 13275b8246248b1c3001acba9ea6178a10263fb8ff3cc205d2cccb86682eccad96695bac455a32f2407f7fbd9a4bc3b68cacab722bcc242c606248753efba3d1
+DIST github.com%2Fhashicorp%2Fnomad%2Fapi%2F@v%2Fv0.0.0-20191220223628-edc62acd919d.mod 395 BLAKE2B 4731cd7f1c79a4a631a6975128889315101e29c550f829a7ca31100305ca24471b07aa24dddab3aa0916aa7a08148e9568438ba0788ce53cb2d1f51f000bd317 SHA512 f5893c50f73345254d6ca49432b2c00d422eb56fcf618cd7d24b238f00fa0cb98bcff97728c0d711c799b995c4810bbd8d67dcac7ce5d3226462b2ccfab38474
+DIST github.com%2Fhashicorp%2Fnomad%2Fapi%2F@v%2Fv0.0.0-20191220223628-edc62acd919d.zip 108398 BLAKE2B d7f2de56b65147de89466460d683ae54dce3ac339b332bc4f743e1c6667ffbb6bc413ec1f76e02525cea4caa5c4f83ded6e039b30621f3f567e55dcf5b7bdb06 SHA512 5075a9faa38a0d82e6437a574fba7a35e6c67851958b5d58ca9c6bb2b94013b9e4025e38b361c275eb494c94f3f67efaa1d93926b7bad4052d276c19e97f19ce
+DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.0.1.mod 33 BLAKE2B 35e96bb8c7c32711adcc85ab52893ca256ec469e5d6ade107b678fee20637c84254c9289a755bb6629bf5be8e169082405941071187a6b6c18cefe677d68eadf SHA512 b37b1d587bf00af5c41f1ea57346a993e36b28f611a3c9ce7457fa384990233b055e104307928f0a9c5e7e6f7eae9ac2c72142db9c59c19e3cfb316d3d426ed2
+DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.0.mod 233 BLAKE2B 5a1324854b1f65cb37077cee6097e04e24f099eb48355d84f8df7b82f5bc8b0ecf01021c63591cb83363c1b8156455ce86a0a2599f9ba6ec2a94fafd107df1ad SHA512 a687048d5ba12f826081a5c4c39501e0dfe949b98e7c8b4b4bfa2b9be27fb650d6fe8ec31ca379ab0c13b79909a1edbe1f410500651f7226206bd4e0d21eb296
+DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2-0.20191002163536-9c6bd3e3eb17.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d
+DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d
+DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.0.mod 233 BLAKE2B 5a1324854b1f65cb37077cee6097e04e24f099eb48355d84f8df7b82f5bc8b0ecf01021c63591cb83363c1b8156455ce86a0a2599f9ba6ec2a94fafd107df1ad SHA512 a687048d5ba12f826081a5c4c39501e0dfe949b98e7c8b4b4bfa2b9be27fb650d6fe8ec31ca379ab0c13b79909a1edbe1f410500651f7226206bd4e0d21eb296
+DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.0.zip 145624 BLAKE2B a88de74be4b6d9c1e86adc1f76d706510b37a227091abcf6a0df542d01bc08288ac74ff8995e6d9186fb4489c03208404cc78f6d640f13a2d373d752c7259551 SHA512 8e4c7593b0d34edea3880756544ef17216adda25fec3b2da8f9281e0aab3bbe093bada50e5a9c4933805e025f13abce4bf2c764e73b1aa4a17c397f3ff954cf4
+DIST github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.3.mod 256 BLAKE2B 3011050c4c07a10c30d083c928a167fa6c7bcdad04d4591d23dd7f0e8e91d6c108e023da39c64664fa1c9edfd1cde9ee381fc136256e727cdb367e42b63d284c SHA512 5446adc8997410fdc10c3f8dbd8562a0d36e9033165e54b71fcd2cf844324e69f8c324a8e1016656224a552699e01054cb2a70d439578067d8fd64d7366dedc9
+DIST github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.3.zip 55829 BLAKE2B 11c82fe0abef6d1204b25ccc4bfb16ef4ec9a9dc8da3f3057465e56e1d5dd936ceaa0826508ac07819e52cd707e798eba22e9a1703c2570a6373e31feaa7adcc SHA512 f0f68a8e53d183835f903bd7c798ac94fbfb53e03d5d680e481310dba6d342dcbf2227b41b41ae4b6e6f1e356a8c45a16c2194b5389ac42e55aab748f2a7a27e
+DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod 40 BLAKE2B 77f35128903a84139dfc23055bf87c4fd8b4843953c764f0ec004a8a2b10599de19bd767a569080422179bd8ad66218d3639025cf1d83eb5cab22599b5da2c3a SHA512 76ce93f04caa8045ed49fccbbbfe76fc278bb7d94c973e408d0695e8c9c5e569b3dc9d4af8722f13c4718753aa72fea76a238dc8243aff34bbfd10d4b684e38a
+DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip 12245 BLAKE2B a83d39eea2c911303550703d23c6c6be3e71c47c008d9bfc947303b5efe87f60983ba00a5fa3d28359959940ccf299a82971cc4cea9ab0bc28e7214db83398df SHA512 6b88063dd61b36a5bce08e49fa630d2a59d9e3617c9f9b5b747993cc66029209597e296dcdb38c126559226139bacb57dacf451bda3e50d6e85c7b4953e4dc80
+DIST github.com%2Fhashicorp%2Fraft-boltdb%2Fv2%2F@v%2Fv2.0.0-20210421194847-a7e34179d62c.mod 164 BLAKE2B 55710d5e2103a92938858caee10918527934664fd8c48dcd020061f25637c09782674a111e37f69b0f8a0ab093165e90f73cbf0e4d88e087d2629ced99291ed0 SHA512 4f2835fbcc5725e69236890468a87f088cdfab692e5bf06e37ab79ce947d74ef6bcce50d2e8c46cbb6d4aed9285068de03843b25821886b5469533956e3d8588
+DIST github.com%2Fhashicorp%2Fraft-boltdb%2Fv2%2F@v%2Fv2.0.0-20210421194847-a7e34179d62c.zip 14279 BLAKE2B 9db5984d43399cdb94dba4e84a9de3036e6c6da13567fd6b34b551b2ed71cc60a1a6f6b3f4068881dca8e8b735b7ae3c9963864f75c77ab251b62f2c4a32bd23 SHA512 485a39c1663a20e593ec6aeb70d4c107f73e8464362157c5e87a1323f790ab302d854a9bfb0a427820ebc0ee939b4b6ba069e37a22f5f00f0ca0aae3ee464ad8
+DIST github.com%2Fhashicorp%2Fraft-snapshot%2F@v%2Fv1.0.3.mod 292 BLAKE2B a598bb88d4f3d7e56fea746b68305b61047943b8017fe3093c8b574c0b0a570c6d2836f3067dc2f51fbba28b240a12bfd94c47849672f51d9d571978992a4585 SHA512 c9255aeafa8239a48a195559586ab60f7ba575f820e4b2bd5524c0b6c6032d5d3596a190a349a20499884df6c3f50e8a1533c493b04ba565242102afe0ac7877
+DIST github.com%2Fhashicorp%2Fraft-snapshot%2F@v%2Fv1.0.3.zip 27168 BLAKE2B f7603c8f699086860036cb6791cc325c344a530d5727916083b27fe80ebf7215ad16472e15ec290a97b340c0bcee2190d9c9afa55621f59478ba43323ef2fd2b SHA512 a279c9e9fbfb1d1b0cb0866f92e16199b1948aa19f4bbf3903e977073d21c335b338dd067406048d86095e4f70dbf3e02f95a2524c5c00f32124277c8e75de72
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip 553094 BLAKE2B 87ad7b11fc8edf2edd2a619f1cc262f2caecab0ec3c626f30e809ad9c366476e49049e8f6adb7f55c9a719ec19505eebf2db55d93559ec134f42479e78cbe968 SHA512 0daaf5d99ee54e7ff0ea882e77a38ab344cb427a8833a5c7fa30936d401d4c9edd6ea603b48821c072b6dabb2d9f31d74ea38180e23cc0949756b8e828ea0070
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-alicloud%2F@v%2Fv0.9.0.mod 1155 BLAKE2B 44e5c205a27ed048cad37f34eec26501df47baa7580ba9c3c8c789efc964388f480b55465d7d0cb6e25ee6ff7f71071731d977b85805135012eb9efc981cb1d3 SHA512 2efb19170b57df8311ca4df7e0b570ec8ccd9db9e6166b2e47d170e9757f4300171e7780a77efb572a1fe9a4496ff8c192201dc0bed44a849253141a1408b7d4
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-alicloud%2F@v%2Fv0.9.0.zip 41086 BLAKE2B 66ffccbdadb0cfab2c19e14fb36ec36737b111f0d28a544fdf7d626a062df816d7f4417953aaadac5b69617e505a28ae5278c2ef8987e9142669745ed57d5dd6 SHA512 67f9e3273890cbfe57f4bfecb88c32c04bba99f4470af2ed34b9e60b2fc3b5b94c2e3d97c56e41101f6d2d71417ed4a3ae16ffcdf226dec423ec6f054525abec
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-azure%2F@v%2Fv0.8.0.mod 793 BLAKE2B f9e953256057f36b031c6e28f20c08e8a00c9f678c08e187bf2d1f260f345a48c555bfb4750db36aefdad5f31c6784e0134fb45003157f824bcb5031c1c7c768 SHA512 6490d533548c39d32ec63eda0246222fed301c8bfa74a8b4f6c751ff44e6c77a4d4099344ff19c2ded107374012d4a0fb2e5bd9feba2c65acbe36f87e947ee0a
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-azure%2F@v%2Fv0.8.0.zip 45201 BLAKE2B 2d4fafabafb2dcdfdbe7021c13a2fc2cfbd888841e4173804e389851945b4a0bcf936eb221309652a448673a8546a92b7bbf5dccd07ecd8b22c2d19e4d64629c SHA512 47849595e26d38563dc0999720fd6af681664f27d80c31b92e8eb59061bfa8f166acc0b8d1d5f3dc50bea9fb5c5d05b375a9efde2136920870c468e99ac1f0d2
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-centrify%2F@v%2Fv0.9.0.mod 588 BLAKE2B 03da7da07d35c2cc9ebcb35daf40c5db44fcc7349668b87a2e91e4ebe820400242933618f70558e46b73256edca89296aacbd4538bfab7d99bb954fe6b387306 SHA512 af4858aab8440f0f7eba305825861ab60f125eb519025b6fe68eaefe10849b17e1b388fe73523bd3f7d4d7b18f526c1e62ffda80759365e8c7623e78acf54671
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-centrify%2F@v%2Fv0.9.0.zip 30458 BLAKE2B 6e4ff3dd852a41204aa98ba75d0b5fa385b9850a3494443c863af699f4e82d4c269c90cb25d54a6897cb985303d9f8e61058e333942ea8a009fdc06bdb139f56 SHA512 937f7017cb66b83c9eed27a83c9ba1f34a2cb153ba771e61c17805ac7bf32867812074c92590cd25425ccfdae6d2922ff6cc6749d85737275f2fdec3f2c88238
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-cf%2F@v%2Fv0.9.0.mod 742 BLAKE2B f36960b66539807c4caab73d70ada5d9db8157e36499b1eacc9602b5ff1333b636cf3fdf5145640f57d6c8a16c026b75f57f91ca9d85b74b41abff34a7c456c6 SHA512 a804691ccee05b49c60c148925befe49a11deb9c45431aecbdf23199192e23b7006a79b730c1ec85b318421bf8032a238b4635ce8fd9463a0726ea4cfd6a1465
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-cf%2F@v%2Fv0.9.0.zip 92841 BLAKE2B 02ce3a18b4fede8b39cb09a219570a6ff8df6904db0bfa661ce57bd9c6395d4ff233b22924375640119d413a7ea0591ce109156e5a4af5cbc312e98bb01b4ca3 SHA512 07eae5b052d4112414dce8b636a0e1aecf6d0902d3c78ee5f57a53e4f0b2b7f34d6d748da2831b16e9cd6c9128448ad70155156e544b7e51da6f6a5fc966eea6
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-gcp%2F@v%2Fv0.10.0.mod 815 BLAKE2B bba4f7d92d71e9df29009a83070ac754a4f79823574a0c985947d939e8b5fca7d832f55ef17850240b4728265f58f4f4b1bd07f5f09176f751a0c5e024e1576a SHA512 bdc08fdc4644127de14706e0f9293e417ef9adb5b5bdceb9395b70e3974a4cfd446933ba9d0d024bb779eabf805883be6cb5038790adc44ec634467c11872577
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-gcp%2F@v%2Fv0.10.0.zip 75965 BLAKE2B e60815eb0d8b3fa9cb3a13a3cb4732abcdbf7f045518538a8c7f36b2167b4ae2a1441ce94ba3476a87c5aeab0cc01bbdf38887f2699ea0ea05cdddcaab571237 SHA512 c6a6fcd4f65b6a074a75174a960193edbe744971545c0850f2fa905f8f909e10bdb32254d802acbd631b31844b4490b3ef04fbd3976825899893a45edb60fdf0
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-gcp%2F@v%2Fv0.5.1.mod 467 BLAKE2B 94a92e11a38d7a0bae70058ff8aef560fc31955ad03e4087a2ce93eaff8142341d0d53e76711e0bc574792d8ee468e3aa8fbdba38459c454124b95f955a07e86 SHA512 7a2bd65156c556404b989af686130471211c04f3cacdbd8f07675cc3da29d6e7a4a955bfecf14b94ac39a8737935c94405da910a0dd7bb457020949424897aec
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-jwt%2F@v%2Fv0.10.1.mod 979 BLAKE2B 7a5cc830c163d1d87d60a8f9d0bf753c993497d3e0b9d150d6d8dfac868d17018562d2ff8332fb609c3edb1847632d44ac738edda1f7150c6d8ba638054da133 SHA512 3c11cef59d3790e14102be457ac7c9eaff45bec8a5760c348d9508f7f8cd414939740ae0c85ed8cfedda1668143be06be5c767967f44875caba44dac3b5afc72
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-jwt%2F@v%2Fv0.10.1.zip 103224 BLAKE2B dd365ab9b3ba5df7ab94ef92ed7b59486b1319d88d039849eb570554065ff3a8c0a5944bd630027e5653c11cafa32575d9aa7968ab736be60f86d61d7bdb04c5 SHA512 787b390900d264ba5237c0895eafc151ab2b6260d0b0affb9b4ae550dbb1e28246edabc3155da7845b86329193e42cc4edf83d88343fcc79a2e91b2dec4ec85d
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-kerberos%2F@v%2Fv0.4.0.mod 1650 BLAKE2B a8ccd3eea3ebbb6ccfd3e5a4adc4d5391be50c8282b75565c56ac22fdf34d88eb4dd466d65178570c298017f83592f2c281eb06cbbc734d7821e5eb9fda8ed45 SHA512 9f76b2f51832f4b1503ff3cd2929a0fc1def1909730a928715b38746c3f4194d648353b75ca44ce80689247f1b8bb3a59998f31a6f9271673565a7bc44674292
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-kerberos%2F@v%2Fv0.4.0.zip 50227 BLAKE2B 7bb3f4206cc80b88234a6ef86cb43204cae610576f863223d7c8c771d48e8dcfb0b48f0bece2482f8e9adfe85b4555bdecc2b83b57bc3fb5cb23aac3b15ec024 SHA512 e5e26401c0314125db0d4a6a78190d5f9b630e0b700f0c067ce0bbc8a8ccc15446141dc3beb1c6df5197d06d075c57848b6f505e980ea05feb8406362ec15542
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-kubernetes%2F@v%2Fv0.10.1.mod 941 BLAKE2B 78ecd71defd0e3afceba82b6f9dec4f7f4271c72c58f8afd87cac1d73a4dc8fabc246c3142190ff821fc43a3285a24c490b4a2c46c054772f8c437643877c964 SHA512 9a8f239a3596341b3f3a703f8638728e68903c262e4780bacb5d9b1208b92dc8853cb0a6b3c32416008219f807e2b2e59673daa5298a33786b269d12f2193999
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-kubernetes%2F@v%2Fv0.10.1.zip 54116 BLAKE2B 0cae9672360a54dccca6bae2945f12df2c47323fac3a8f1170727e7479baa9941bc609a8788b3a44c9f1fe773b8281c1b26ec54779fd6d16c18ceab683af3a75 SHA512 76c40dfa56275fae6516a6f8417a224c9a22b30eacad527076bee7f80fa3ad625807e91755b718023da65be71e455d1f365000028666c681c91f53759ae41e76
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-oci%2F@v%2Fv0.8.0.mod 1073 BLAKE2B 3c7c40470b1160de1199e5517dd720b58f44aa7dd32d096c222b32f6ba390f9a302f7af599a79398ad07fa153759e189f0bed93b41967884d8354b7fea168884 SHA512 532a95bef5f921b247f8db9ec3507852bc9d021d9c1aa68c5c4cdee2a3680c2cad74ed89cd76268d27a77c4d743b0807f663d48ce3c85ed89ac7309144aff77c
+DIST github.com%2Fhashicorp%2Fvault-plugin-auth-oci%2F@v%2Fv0.8.0.zip 45648 BLAKE2B ebf3e79402c2d9c367c91a0262f1f1ef529dc17b6ddde36a80c5dc98d66a1996955293bef48b610579aa908498812933cabb02aa394a46cadb4a33cbbb4c1ec9 SHA512 a7f328d7af69b6d84ab5ca03b4bdedfdb6f7d9f8d8ece81eac6a82a54fcb687eaa01c93e3e56041b7c03a1b633b114601130bd5f974bbdbd88bf61b3b2ddca63
+DIST github.com%2Fhashicorp%2Fvault-plugin-database-couchbase%2F@v%2Fv0.4.0.mod 866 BLAKE2B 63bb89a615200c5606912046bd5e2e8b45f75834f20423368338b498d83f32c077d4617fcfdae5d0d606a1246c389e8fea641948aabcf322a80fc84aa592f9c0 SHA512 6e085cb50f3852e75e394ed2eb49b25dbb21aa476f6812623643508c624f2fe10c726ad75baa7bc208ba45d3b51c56f8d3e57937bb02a9c1a3674736dce6b930
+DIST github.com%2Fhashicorp%2Fvault-plugin-database-couchbase%2F@v%2Fv0.4.0.zip 44724 BLAKE2B 3fe291964f6d7ead0415c2c39d50d508d88d901d3f5ba0f2a93c74b20477fc50149942717942efd07fad5feacb90d89c90508af17cb1893b03da6e45cf0ce659 SHA512 a60663ad5901b46707e994784d60888b812a2d8067e4edbac21a5a8c159174de89692d01970bef92ea28f1a6897a5236500f23708bc6cce4b4213ee1ef33e627
+DIST github.com%2Fhashicorp%2Fvault-plugin-database-elasticsearch%2F@v%2Fv0.8.0.mod 779 BLAKE2B a615e56c4f01ad5fd1162f1c3fe938ef72ccb19be16ffc053d174800dcf619e8161fadabbe9a4690e4e522e22ebcb6f52c5d389e58abd3e0a0f11ddf46f1fe44 SHA512 c1d1d21227be0ffecb3f4c8a26083396bb021ea6f211128ae34f22963f729b8433a9c8214ae286e49c669a0efc1d341b5c10d75392cdaa7996473060d349c89d
+DIST github.com%2Fhashicorp%2Fvault-plugin-database-elasticsearch%2F@v%2Fv0.8.0.zip 63580 BLAKE2B d490264496880d566226ebefff3b689bb5efec3de041460a62edf67f53a34bcc84bb30e2e66883cfb346e89dc27fec864d1e3228bd01b39b28393f9e45fd3ffb SHA512 fce69a01bb484e7d03d33c43765c8df36199ad3e84b10732c035a991cf2aa853f96f61b56bebbce83e5b2bc1963648cda18093cc5598658a7d9c24ff4585a500
+DIST github.com%2Fhashicorp%2Fvault-plugin-database-mongodbatlas%2F@v%2Fv0.4.0.mod 459 BLAKE2B 9566fd7c9d4c1930ac7874bc181e8bc01542506633cc418abe58dc46da285e7c0c4880e8fb287ed454daf03c63fafb939d6b973189872a04ee27972d29976845 SHA512 1af1f4614c87d4d86140e3cd1427593ca25676c2adf6dbc41da0e1356c563ae915ea3e3da073f0126789742bef647b41144895657da3db53ead3406101af700a
+DIST github.com%2Fhashicorp%2Fvault-plugin-database-mongodbatlas%2F@v%2Fv0.4.0.zip 46695 BLAKE2B 830d39f9ecd1601bbb48c3ab9b63fa821888bb13eba30ebe50bb88440718e01f438568913aece6f608a94610164bb868ecc04427c2edb3f695112f9af5f1ca37 SHA512 3c8a46ff18d9792edb2979e7565e13fc72d2afcebdf191c0690ec5271dadecf530e3f026f6b07c1b4a8fc046d1c49f86e77e46fa6d06897ab5d753e901198fe4
+DIST github.com%2Fhashicorp%2Fvault-plugin-database-snowflake%2F@v%2Fv0.2.0.mod 405 BLAKE2B 32d23998b72b7dcc84bda896997ac006c3ca6ea2e7cded714dddec8743b6bc9152c34bf7910421d31c02f25bf5ada5f3483160f7b701de5ad9b4f31c1b6e4b14 SHA512 acb8d1c22c5c9adddf543b707f9a1b68b9fa08433f6ed427e8a461dd756a0c5ac781c14b8818bd9031f5714d40ca0c5f27adbee7fd707f31284000e625ce2980
+DIST github.com%2Fhashicorp%2Fvault-plugin-database-snowflake%2F@v%2Fv0.2.0.zip 31425 BLAKE2B 87e9ac780eceb399ff948a3dddb19f79c8596cd5a38d17756dd75100665db0a080b3bc5f698021e6d7d70d98b941ae5240e54524e98af25c5500ac0e886bff7d SHA512 151bed1a746e7884850bbccc7b86071083ed82bbce9cc63f255d843c7fd13c4b4ec60039ec87d4d6e7862f61c754da10ba9dbe2dc0a37204f946135d64aaea30
+DIST github.com%2Fhashicorp%2Fvault-plugin-mock%2F@v%2Fv0.16.1.mod 55 BLAKE2B 98110bc16658ca86b0fff3885bc0bacfa84bf969818bf76c44df01d5bfe708836081d9407c36588726b16444cbab83a834bee97e8d34a896ddc0c435e6dd9568 SHA512 d9c24c3e257d6faa2c7d3fe6b1660aba346b6951aa7822195937dbfb96d8a013d7183141af9cdb258d29467be43d9833452eda14266fc3b41b96c07f8203baf5
+DIST github.com%2Fhashicorp%2Fvault-plugin-mock%2F@v%2Fv0.16.1.zip 6253 BLAKE2B 3462625d2c72451472273c497487a5aa2f49cb710b0a93e1be3ab5a5249301dc798f9f6605d91db60f5f43fe9bceb2eaac9f4c33a4f6d77a225af2cd617882fe SHA512 c37306a9aa9c61a9fa0392b97d87820b48af9eeb6eea03a4f599e6c261ae9579ec5181a221e81b84f7f6dc43e7323ff651c415b699d5877057ffbe63b8b060c2
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-ad%2F@v%2Fv0.10.0.mod 643 BLAKE2B 81493e8276a7b36f2e7fa4367cdd72cf8aa58e43f437c92208a6c4ffc3c3200061c9d8d8ed7cfdc0851a57b9d6f1c5073ece8de34a03de842cbb6f46fed90fba SHA512 453a508963d18a9298ff00235107d3e1ebc16cf47f6499075d83f7040f7df449b91444e904317dc25a52625c42334c15e08489ce019a4359526a3e5ba90dbfe0
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-ad%2F@v%2Fv0.10.0.zip 81714 BLAKE2B 0101f72d9ecfb5b564ea973881577b9ec484f8ec546e08f28377e669660331bf5ccd285f5937630f5ff059d8cb1d96cedfdb2e96cc00bd6181809172df95c10b SHA512 181eb1740f8c34bb490c8ed59fc09916f3aee6f0a77f81267d28c20ea7307e87976286cb8b0799730df83ce046e88cfaa308529a7eb70e380d778f180bb8bc8c
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-alicloud%2F@v%2Fv0.9.0.mod 729 BLAKE2B a150b2a69b58184a2a7a6aa2d1a8b78c503f32a4a4e42c0f6a15eeffa3996883fafa26610266698f9bccebc5a0845e75d8516bd0077d49ccc8a79437fcaf4439 SHA512 aa696ef853a9f4577305dc68236c52c337143327a877e28ce42350079d35b80483744c3c8d82b42b040a9d72406bfc089bb7221e9208233ec4ef7d97c11f2521
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-alicloud%2F@v%2Fv0.9.0.zip 46653 BLAKE2B 81ec8c3a27c68668d1e82ce0adf88723a0d7e2eecc738d0ea05d3588c151f826a30d11bb7a109ebd5d2a1bda0c23986db8d591ad175fb9e64c7db5e516522def SHA512 5e4c57b4a492fd044960548dede1687bc8aa7fa5bcf57863b48add55d8c783a9717ca0d903d4e0c7265f5999cc7aa7d648c55487c7872c568412821453219608
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-azure%2F@v%2Fv0.10.0.mod 1627 BLAKE2B d346a569842fb5b3fa09216d37e1ee818ca9f40fd71b8f649dbdb99b6c825696d13b437de793ee02b6d4168e6680c283d1c1327b7755193d5abaca640327ebc9 SHA512 7e91ee01eefdf66534f7d493d4883fea9632bbfb68ff82af057b40a1317a8c4d770d0c32222b53a6bd53edf519ec6639fb1d77f37da767096effab8071a6325d
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-azure%2F@v%2Fv0.10.0.zip 63496 BLAKE2B fa34954f9a4b47c20ac325ba2dde4d35950056d11a383ed080627ba25ad5de7265660f9da6442acb60b22a2128f68d6c986d0c9fe04f0f21216e81339d162b52 SHA512 2fa5f6ec952901908bcb08a2f62d59a9e0e2b9d6cf771db9e90db2939afa315db793dd5252fc1234e5e45a988802a72692e99a3aa6e5ba0d83dea782c8d168c5
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-gcp%2F@v%2Fv0.10.1.mod 881 BLAKE2B 5fc4e3555b871816cf627411e01e9feffec1d964c1b22b8f78d8f4dc1ac1b0043cb6baa30805cfaf21998ed37e0d48e282ca4ad6a0bb6f600cd545590feef34f SHA512 314c5dcccdcea0cf7e3ea1dd7d05e9412c60462971f36fdd793a3aeee2ddef8762aa68b3783ff86b5d43e4a0a9c2490dab204add1dccda88165291dedd055b15
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-gcp%2F@v%2Fv0.10.1.zip 119421 BLAKE2B 6143b6fbec6eccc6833ee7ecb4a3941ef56d32c5ed45bae95cbfa586d201e75dabf5c1956d4367d4d2099095bebfe168d0fd078e5bd8eebf939e19bf41c6f6d7 SHA512 c19a6a873506a77839f24ea46e1b36d2179743476e93af8fb4f3a764b7f381e729df9eb250489717b550bba767bcc7d3dadcfdcfd480b89f0a007cbd6af09b8f
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-gcpkms%2F@v%2Fv0.9.0.mod 1301 BLAKE2B 16a55c78f0eae5bc4bc9090aab436158eeb767c51cb925332664f9866f34708edd1cf625bc95f4d53123a0606007a797f429e7908c58e76ac99d8f595b73ac45 SHA512 15ee50314db3aa0e55f9280bfc586f77d0529f50b77eb09612c46bffb2648e95786c83ff339d0c0b7eebcf9c4d03d5bd1d161f6a63eeb3e3f0864a6c128cc850
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-gcpkms%2F@v%2Fv0.9.0.zip 81659 BLAKE2B 8ba4e7c5d7780fce663095c6c65c70e4779bed82ac80d51dd673702fd03c8a894afc6e1d22009edcf8a235da2751c7687fefe6c12b216a5d309fb3866bd4dc49 SHA512 2624efbf0ff664cc21486acf6aa54d278946684915b67e56f79fc8fa24f32e89388891091c302672b6c22a6bb2363a4c37a096df27156ae7195fa0ae0599c123
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-kv%2F@v%2Fv0.9.0.mod 547 BLAKE2B aac1b7da0c1bf8f3c2d7f80f592444dc3990612c184f682b0095fc2dcac379a6135e6caa6d28681396664f26930779b18f7b25cacda7ddc00b06dfa2725efcde SHA512 aefd0ce943619bcae6a32808691da0ff7ce0834ff1d3baa0903260c7d5d944d72ef078733e63efeaa2930e28c6acf55ccc1490b0080441fbd6a7b5b3ddd0e3aa
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-kv%2F@v%2Fv0.9.0.zip 60417 BLAKE2B 2c2d338f38c9c459e97520cf981249cb673fab232c19a10d29aa4fa85d49694fb5d2f02a6a3fbd14d9de90ecbf103c94b42528df002a9e3477169e2c4d43c77b SHA512 c7f4baf8ca172bf89ce7c480edcebcee849b4562e64b759deef524f61eea441e47d9906071bbe620f089dbdacdd145a3fc851e3c8041be470710e759ebc235a0
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-mongodbatlas%2F@v%2Fv0.4.0.mod 897 BLAKE2B 62c09a2e517cd69ef1ecdea0e9fa81501e9254602fd0cfdd5f66ef9d37ad412ac90b37893ed948cca203881eae81355be9c244c2ea3593b74865a2bdcaf258f2 SHA512 aac484b5067e37c21411b61dba5f80755d6c74a4d526ccae4bef440936d7e9a1d759850a52f8b9113c67480c9815253996de2d86a58d04d57871f2755f79ffc3
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-mongodbatlas%2F@v%2Fv0.4.0.zip 44497 BLAKE2B 5aa70e4f68346c12f87677bf98b54c3a5bd5ecc2520d1f3e616f943fb2e2a16ea7e79ec82c6f4dd753baee577aebb2660cabaa381b625396756fe7b5872c4395 SHA512 c1d971eeacff84a5f3d0f203222c34483b1db575bbe61f0991565dc1471ac5c8df1eb6f5252faafa2d2473d2781ccaca6e38d3de86833b05a3e2557ee91b6e90
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.1.mod 654 BLAKE2B 65d973ef48076c9b11dd7a9057efeccaa7851cf1d42273b9fc722577844861694bab90e578a47ae144c3b568a381ea3c5501a951bdb7936ff247cc2c177e48ea SHA512 8ee81d2dfdbcffb4615add255cbee4cc8f369a035b865c0fc74ec9126418e6265518afd0223fdf09da3957ab325ce6c29d81b539be704815e64dfd821bafafae
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.1.zip 87114 BLAKE2B 76bce3b85179d005480590256a54cf5b2e6e69151775b86bf2668016ac80adf096c2196d33c2b35e211e31f0106b80fcdbcc338ef437d28004d017789d74c16f SHA512 99a6b117ca1900782c6bf06ddc63fb17778113ec8aaf0637a6b3530d0df5d5bd43b3ab8a6117551f0581fb04a49362bf7e67f3a17e9c600c4b98675c2f5b718e
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-terraform%2F@v%2Fv0.2.0.mod 407 BLAKE2B 3381c3a22697e706463c781960e46457b346cee86a0b087205f24cf12804abb21e99acca67889cab9cfbf71da3fb642e96528fbc09526c1a294a00f591aef437 SHA512 858e53248937d9cae085e23e61a4b76a9c2acc1e955efb36110b53bb9e4a19ff7d4c3cb6693c5bd340402b5cedba132147d93295910126a90c7842c4e972ac0b
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-terraform%2F@v%2Fv0.2.0.zip 50978 BLAKE2B 5963eead988acf705c34af624e98b6187369a3fb7c77490d07d06e016f0c848004ea9614fe5e6cf1bc6b451a2503a4ede2e3f57f061832cdd23c73e23a246e9b SHA512 d7dbb67211fbeba11607e9fc76346d74b53c35a648da61ee796c4be46f24b56e195f025e9ad641aa0ab1f45f8cb3223dc9f1eb756638420dcfed30105b4e82b0
+DIST github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod 32 BLAKE2B 40839230d4a1fd6d28597a39b0d98ac4aace76a96dcf2d222f073554b8df6de4fab48c0613b7bc2da1b4912e338ede282043a3f615a87c246bfd71488a671337 SHA512 614955fd74641e34555d843e335d5e35cf79dcc6e3b4d43bb0ba4fd6fed7d332365eb874d6bdb7c3b5be576dc3d09356c8206d1aa4d70378581001342f4f7310
+DIST github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip 24656835 BLAKE2B e4c0912be7d396374a372afbebe32d279f7585ed598f3c5e0edcc68e08cb91ba4e0c18df99eda33a2dbf2684c497e3a9e33010eb93039c0dd651ee4d1bb842f0 SHA512 671654641a1ed413628c14b6406cf68c6b6f95d6db9aaf4510b08b9c30042d478718e48077c1414e13d0c66e6a592731872ea7e4249d7fdae2068cad6588e551
+DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
+DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
+DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip 28730 BLAKE2B dac64266297648a7f3519e13bae1dbfb4d46f818d02cb1da520a1888b085ce31028e274e5085ea58d8786e9f39144880ece626ba46b50b68d37dc17d730ecdc4 SHA512 1949e95d8f3d259b27e0152824e25aea2ada28f33b56282a62bed9a6076a25dbcf664a945c5fc3015247c6d3f470192fd22273d60bbeb155288574bdac6e2e8a
+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%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.mod 43 BLAKE2B ea72fa407faa556d4164e25aac2a8093cfdd8efdff6f68f9ebb277ddca3aa7efe0df0f22546a36fe6858c22dc638869cadcde024e32d0a930e0cf12ef5b17c7b SHA512 f6d3531d393904144d7c84cb254becfa2dad42f8695ce32e3f44789abe89d60019f01543936a64ae1728f8d395dd96bace969282e3cd9f8a9eda8085d3d1475d
+DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.zip 25062 BLAKE2B 308b1487533954b46beaf1927237ef4dca5deb4e660d9be4ea483c69b36d0f669d36f286dc5dcbf42fcb040fea858cfa5ab7c3eabe860e2556db9e56dc298af4 SHA512 cecafdd3567293f0621d5b5fa7b2b6a15d77b3cbb8e6cf061cfa9b0e6ddf8ebf9dae95fcfdb77bfb8335e0c4922a4fae8d1a5d98ec27314c6a36ffdb9a37520e
+DIST github.com%2Fhuaweicloud%2Fgolangsdk%2F@v%2Fv0.0.0-20200304081349-45ec0797f2a4.mod 40 BLAKE2B 820085e42cc4a1def464f4bc12ee9e89c1970e7a55de3f6781598b56d4800a94764322f899bfcc95dcc585caa43112a3e0c904e17a9b99b9e10c976a8e4d2da6 SHA512 2a9754dce0546366b6c49f6f994d035e1c19b607fe117490dd78706b94fdec808e85cbe02c7108a96a834831faff3c0de892d4069fe598371f28cb964ae1935e
+DIST github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod 29 BLAKE2B 7cd37a0dd89dc331943531c8477a4773980f42e0c135a159bcee3ae6bd82aa8f15c4d67e7fa60878a35c7fcb69d647738095087775e18c540059fff6f4dc192a SHA512 28dafc16202503db863783e4701ab30b34c71b4435a4859329fa635c0915f0ca408dcd8c73217e0751f879400845d8136e171bde5d0cf6b7fa7ec4ae3ea97f69
+DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod 74 BLAKE2B 47557579d6c1e12c3b7dfdd9e5dd37291411cb87ff396973a0e17c97ffc79da1f6d81dec640d75cbc5e84ad9a8e17d729992c998dd614ef89a973d3cf5083b60 SHA512 2638750386491e91639a8d6e0fdd5dfe58ffca24a228d2810556b0f280839ca1489bcb47ea77adf287beb3b2d70ab2b1a664e0fd1b8b24cb3c88aea1265e47ab
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip 38997 BLAKE2B 792e9f0dee385ecc3a0d3ab507a8b73c5f08392e63964f84045200fe1b380f05ece7e61a6359f263ef8daf682aae30e5b28b53ec17d0e897c83fbbf0dfe60e56 SHA512 fe6e378cd4bb82cbda102710a11a2f183d5286651ad7c641c33c9c1f251387bc95f72a5e995e4fb12dee33c69e6d4a81321a9ea75b27135cf977cddded98ff2b
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
+DIST github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv0.0.0-20190411212539-d24b7ba8c4c4.mod 38 BLAKE2B 30b16c532180970779ac956aaa49124862f9c55e1493a6ecab8d03c5a719ac0ee4e747ffa56570c761ba660beb63ecf0a1a8eda0c4ce246ca2ac6949060038b9 SHA512 9840bb7405945d53cf1ad5fd29828c0546a57fca81fd0fb37fea26a92e977d1fc5f07987897476c5baecc7c030528f698bafb5b168c30dc59f3145b4c50c8479
+DIST github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv0.0.0-20190411212539-d24b7ba8c4c4.zip 12292766 BLAKE2B 051eff31c187cd15cc662badd58a3d6c8437c71ac5174f37c3e15a6b85e59b2133165e2802437bafab91ccb1950a1a004af7cff94855bcb11a8bf7aa933e107f SHA512 936384ec15636b0fc40a9bbc7d3bb8b0161256c2b13813660d1b014a9d1f05dbdd2162ba6ade960a349bc93933b9d1769cd33254483db01a10485671390d131c
+DIST github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod 46 BLAKE2B 825c65ce0e045d5c764d3ccae81a25c6224c44656bb8ceb93f39d06a0c8d766ce7562e5ea1ceed903a5d1ad4c035e27ee84b4311548d024e108a5cd6ca142508 SHA512 324450602d8234231b0cf40b07e8936948487354b8f6e92012f3e65ba3c646b0993e4722d3867a12d0bd3749c8dd6fca4a1118393e2ca682170e500b3d54e5fd
+DIST github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod 29 BLAKE2B 3d5b46c50c2c48a41de97e3fc038e4ea6b6cc84c3c518bd867ce8c8c1518c7b28886533e6e8a9e5e64b949348b0b15c193ef29bc236e7e81bbf46e6f79163ee9 SHA512 002762fc54b7db0152d59a6388108b028f089c21f024353ba85795e00db73b93c73377ecb728b1ab801e915c20d3d3482e32b467187cc05c37c8d163d53c5e5c
+DIST github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.zip 94860 BLAKE2B a648fe1ca6c4ced3f5419d04fa35b67bba768103bb448b722e355b653f858caae42194a22d17cae2541d0bc81d74963d3cdb40dfbddefbd90bc8719d270a53b9 SHA512 b0645f73224bfa22d2efd3f6acaf0cc940b8319378e06cfcd9cc407526fb988dbf23f75ad56ac8085152425b2561391e0342faddd276373e5228d7440038e877
+DIST github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod 28 BLAKE2B c6ec1d0b807ad4dd8c0a9ce726d1c1d93d964c07100d8c9684f59fe5f348a5a6b158feb2181d43ddfb0586a0d0a124605aa6baf4559b380b4e359e9c8dfbfe78 SHA512 76a383265779809a87851fce9a713884b6d9e2c69966153f3ab67c566eeddc149c6a21266e91d91fee790edf6654d1b80c197513aa4a8617e044f08e91c91f5c
+DIST github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.zip 365693 BLAKE2B 6c2a2a07fe30dad6bab53808602b2dd2682191753db8b63e1e7746b73c36665f4069e9dbc9107a8977c49d5f17574d044550782436f41b8ec73f77d2f7fa5572 SHA512 7f9ba60a34e87c31a8cb26596c73978d6b61f0b34f3b82edcb685c0f9d6af5b9f171ef7ffbdd34b0dabee81b4b5d04a0ef5c03509e163ed6b89a5a46e359f0a2
+DIST github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod 35 BLAKE2B b0fd4d6d2f41969285f2c34fc769a8dac3acf51272cea058c6f959e65625d1a6578daec881ef597dd4379ab5e70c81f87f4e3ff645208f8762c34842147bff0c SHA512 0789db4d0c5480041d58616e2b9ddea7cdd0dd377a3eac37d077b21e6b135740e068a0dffd790d3c4bf23f70c3359168d86fcbc78713a07397e41f61c298cabf
+DIST github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.4.mod 43 BLAKE2B 3d0d2a05e01b444fd374e5fb17a44bc8e5edfd9b6f3cfb4f11c5560b5cb7ff6fd6b17a71dc4f66b1b5bae36772c4f1b78f38c4d57e56781e7a8f49e20a119181 SHA512 7b584512981122677bbdb1c18358f1ecf72f7e97f61d80c9787f0887ea456e96c3f67155fc287a8cc7ce39584cf48696dd9c3a14c98e3c3f5b3a744cc6a4cd9f
+DIST github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.5.mod 43 BLAKE2B 3d0d2a05e01b444fd374e5fb17a44bc8e5edfd9b6f3cfb4f11c5560b5cb7ff6fd6b17a71dc4f66b1b5bae36772c4f1b78f38c4d57e56781e7a8f49e20a119181 SHA512 7b584512981122677bbdb1c18358f1ecf72f7e97f61d80c9787f0887ea456e96c3f67155fc287a8cc7ce39584cf48696dd9c3a14c98e3c3f5b3a744cc6a4cd9f
+DIST github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.5.zip 24697 BLAKE2B e935c44c7ef033ab6ac8398d175526dd4080fdbea604a970b50d6d1dbb7f0e6065b173f9286805f2203df1c5d2b59fefc15b06a403c0dac9b7ddb9eac83bb0a3 SHA512 6fee11a8c58c37565ee949792a58d8167d5866f73b07eb4c65b7d79e95b7563ff4cc99dc4ebcce04cefb47c9a2fb924bc7a4243969f86d69b56620a754cb703d
+DIST github.com%2Fjcmturner%2Faescts%2F@v%2Fv1.0.1.mod 35 BLAKE2B b63a989f57e8af41767ec0646985afa833d39e02a40ffb7d0b0dc28fb7f3500f840834d5dff3e8c8ca7f6c0d6708bf3a49c43d92657da7ef23ca6502f982008e SHA512 6bb0a8fc969776157eb9b7475000862398f26b8a51c28816160c5742dd235ed57841aa797de090f5d318adc8ef3ccca707238c00b23b5f0e182e8d919e1ea42d
+DIST github.com%2Fjcmturner%2Faescts%2F@v%2Fv1.0.1.zip 8128 BLAKE2B e6af8b8979e5fd20488452af79dc06bb2d850ef5469c5ec559e3676738c74ba9ea395af33812e5c4586f4f37f38b5859008e8063a2b0d05ad746dae444930c81 SHA512 8afd5bf45b3234d07a1d10bb51bbd93721d10ea8ff4b41b13d0b88a610f5a3fa78407aeb07ff9279ebf21d8979f05acadd234eaf9f0bf8905af5b9e523cdfa07
+DIST github.com%2Fjcmturner%2Fdnsutils%2F@v%2Fv1.0.1.mod 37 BLAKE2B cb311a0990048786c72a0745a7c7aa4713cc8f1935a141cd1575e2bbf049ff8d4cabf7966515325e60a0069620385f82b802b62d4aed32fd279a78a3ad979146 SHA512 afa8ec02cf4c208b7007d19ec079d1986d67323cb64043d9010565313fec99be6687d19cfff1f61cffb6aeaeac4897bfc63b152dbd6a1f8d4aee28e459ac2a48
+DIST github.com%2Fjcmturner%2Fdnsutils%2F@v%2Fv1.0.1.zip 7413 BLAKE2B 28c70cef1bfafe9282528480a28b2c3a8ca6be50081e31904b5245586150b33694cc7b82f47236ce822b08f9f03bc6adac1def93c04ac00aeb7e403be92924a1 SHA512 88e648cfd4d52fb8e60fafea18fcf2eecf2ab113d0eab469e8a4785c7a24a767dcbd3db3a7b854354ef3b8a0bb2cf987f41573ae5547b376df459e36a242ea60
+DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod 35 BLAKE2B 152ed61bf84dd1666421e11827c23eeee0c7c50edd35851a50ce21f4fefa13660a7a6cead25a0f9d8f1b748c2c4277d21639eb781c484359aef00e77921139e0 SHA512 5e94601c72f24a3d8a115759a8fd6fd3420b662995ce94d7dbcfe4f86437bdf81a42c77c82accf7fdb926b75a5898bb34706fff864e00b38d891cdd076fc89ec
+DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip 31175 BLAKE2B 17e0ba33bedb9809d12ffefe034baf727e7c2a66aa19adeb87de3e3659c085f176fa48951f1afff4e5fe132c73d4520ac7061deb0e24d86520936e6ed6b63845 SHA512 d1717086c3d429838c88ad276d3bebda858fb4afafff46a204cf252685d9c7f1e2b15916f3cf7f8c03fd54e68d2d1c3ecb64e9d73975ebe9ae188039f0aa4570
+DIST github.com%2Fjcmturner%2Fgoidentity%2Fv6%2F@v%2Fv6.0.1.mod 137 BLAKE2B 480f03ae84f50a8cdf6822f05a28ab65a6e12a3d278818fbb1804083f4f25f6262c9abb814695b6f0f23d972a16cd437a92dfb0ea160f47c246725d12e666b7b SHA512 d9308a6f62b713113186606432c1324fc99a46f2ba070171eb5ae704eb0968875c21a9fe4fb9d23c6d0335908a8240566650fbacf12a7d95e49570bbe6c9fea2
+DIST github.com%2Fjcmturner%2Fgoidentity%2Fv6%2F@v%2Fv6.0.1.zip 8102 BLAKE2B 34d800fce55264daba12d1cac94c29c39203d3cc84c2c97bef93382a52cf96b973eedd4e654116fe2b436ecb1ff2a7aa948cdb1367f4df9512c2191b7cae75bf SHA512 491cc822dcad78f1146d7fdce977b21dbf669cb57febd7f06b8e668c20a7b08edfcc28f027e6058a582288b2c9d71cc3c65b377d73e98a0ac39c3d0eeba2a249
+DIST github.com%2Fjcmturner%2Fgokrb5%2Fv8%2F@v%2Fv8.0.0.mod 414 BLAKE2B cae9136f5d95613a00479aa24a76fc76a52165c42131f5ad845160b10ca15726293083ed04fd4f3857237a31f0ad3708b1adcc1c47672168489efaf713811e39 SHA512 0295c44985c5c6bd84059f1dd298e74f993377e40602d6d5c5b251a78d6afea4e62395322d0fe6296d30d52d5a9ce4b96f711cdf33d855531643da606834bea2
+DIST github.com%2Fjcmturner%2Fgokrb5%2Fv8%2F@v%2Fv8.0.0.zip 60604311 BLAKE2B 089fbb687a8c1f2452c3c91f0424de0c88b944095eeeb937df4c83f52afea677425e11aadfc09cb0aef3a13880c0a4f35926ef1d90416f2f187aa794cad53b67 SHA512 5c60a8506711f7d0ebd63c2827fb62caf8043b0374699ab576d48f80b76e09831977c373f92d67985d3f407bb7a1bcb4a3e9950abccd0e17568b2c8be7a75393
+DIST github.com%2Fjcmturner%2Frpc%2Fv2%2F@v%2Fv2.0.2.mod 146 BLAKE2B 3803c900f25283f4a575da4aba657fbd5065f4903149383decaf7a277d0df00d734b8ecff7371f41df2458e199bcf284e8f6ff830a0ce128da9cd74b6926ae9d SHA512 74d97141907715ba778984a679975a7dbd54ae17c0b1aca2e649e3c8ba4f2e1a06923fa31b06b1fcbab3b23344d9548d09cd59f429bb0031a110402ed19adaab
+DIST github.com%2Fjcmturner%2Frpc%2Fv2%2F@v%2Fv2.0.2.zip 42837 BLAKE2B 3a26864a36a03cb2491d9bf65f5148f7d6dfc37c462c9ecf359744333dfab60ecc4a8356d65e3de8890bc17cf3d9d210df29400ebad9737b9ed68b69310aaa71 SHA512 049d50aac2851564d9be860608b82ca491dba65383c32778cf2ab105bdc2c7ad88ae7c267957d573a30146d101e7b82e53bc80e094da4ab3007662277a66e1d3
+DIST github.com%2Fjeffchao%2Fbackoff%2F@v%2Fv0.0.0-20140404060208-9d7fd7aa17f2.mod 35 BLAKE2B 7b4185b9c8fff49cb2b8bc9584d69b3b97ffc2fb1df658a2cad91be487a0a6bd4cc1e6178a7923a884b73e93418934ef28c2b75e6d62ff5239f4ab0fbc905ad4 SHA512 b02c98b02868c4593b6e074c460e6c733e20f3ba69cdde166a63807d051929699ab17b5e997bb26e9313bbb949a6702ee7110eda8cd546069e62c45ab031fafd
+DIST github.com%2Fjeffchao%2Fbackoff%2F@v%2Fv0.0.0-20140404060208-9d7fd7aa17f2.zip 11354 BLAKE2B 039016d6fb21319c48bea3eeea202e0cc3df87e3908502b09eb5e00ce015e5cb18d4fcc3b3491711d52b872826f535269b041e39c831c0e5b8a3f27efe3280da SHA512 f06c38253b53daadf7f9c803d46423b3c0490d506ccab8b3f1d5d1e1a6b597e734b110ff5f76f2b9310cbb224cfad71d6f496972681b265978896e0d38822b3e
+DIST github.com%2Fjefferai%2Fisbadcipher%2F@v%2Fv0.0.0-20190226160619-51d2077c035f.mod 39 BLAKE2B 11675d97478670080192ab1181ac3c08dad4142d56e29eca50b0e84be1fd723d49ce77b0fd8ab3814c5f58e7eaf5539aae52c10bda6656b1b8286aca55728d06 SHA512 d36b1cfb42ef004ce32666c5f7a0ad039be5eb8b02d902c68b238f2820a63545b0b5bd73626349d72af9ba82b152ef8c69aedfcec2c40b546bc06ef80e0d9818
+DIST github.com%2Fjefferai%2Fisbadcipher%2F@v%2Fv0.0.0-20190226160619-51d2077c035f.zip 8199 BLAKE2B 646e210146f30eb63ef532d4bc4470ac282461ea8012c82880c85e87367988cf2f923645dd4c976e745cf68859be027b51faae3850a8ae1242aa6f80e8108083 SHA512 ab39d55646c9f01aa990f9f247b0c842e9a76bf1ca85924eb2baa3843d0195e2f8f568f248dc1f95a60a01a2cee749b86055124006ecf2938834793eacd35dd0
+DIST github.com%2Fjefferai%2Fjsonx%2F@v%2Fv1.0.0.mod 73 BLAKE2B 0e69f38b73eb03a7a2f99b1a030f8829b72f8963cda7503f26b23fc4f90f18e8d91645d87de6a5a04d4cffeeaa80c7e51bc949f398e2b8a9a25376b2c8fa5c96 SHA512 b5529ee84570ad566283a4ea546d60050a0b23b51b859bcec743d00b2618793c733ff90fd1ff42446b3a52a60a723fa287ec43a438ea89495006d78a27ef208d
+DIST github.com%2Fjefferai%2Fjsonx%2F@v%2Fv1.0.0.zip 8991 BLAKE2B f073f3033aab9b4f189501bea23eb4a14317aaf59eb340643c0b6df7e80a73a87ea001a97bdd5b6eca8ed4cf7d601a5635771b7f2d215157841b59ff8f94ada4 SHA512 19fc50f854505d9cf365e09a06cc85d3de05f44ce7d55ce84c60963bc264effc5bf43e4ce19502a1809120379a53252e2ce601ab948e32b9234a4b9917b5f0a1
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod 92 BLAKE2B 8b5eebcb883871ea090297a64f2ac5171b87eb4881fab71e73fc737e2ca4c301d8fa3a14f184d5c468120ea4b3f22c89867c952795fedbea7abc9b7e618d14c1 SHA512 8361dae50e9bc2db7887bd94f516f817dfc1a3c509c776640b0f9380343236d52a3f43a5ca0093a49a4ab6b5474ec2ad24a4c8549d5949e4f5fed0b322b83c21
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod 113 BLAKE2B 7ea9e809aab218e2d044bdd2e5994eb3489fd36cf7709613b6cc98b4c1acd6882ecb35b27cfc214779ef3fbeefc930d5803999e12440458af7d1314ec0eb2998 SHA512 50c1339c7ab002f6ceb599f51ec49717e88cc2c5ae1193fccc9431440a531dea27d54e1d0a87b987825545d106a2bbf0dbdbcfb9883fd0e8decad70d88514d68
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip 195725 BLAKE2B d41015982c16856e2ec6710fc7f4c40e7bd11f5b5dc365e8bca6c45fe5055185395724ceff5e35147ab7d493f41db1e7a1dcf90d386444367c1c04dc75abeede SHA512 133747a475094107084d3d8fdf03db36e88eb4673e7781e8779fc9e99da77ecc95dd8c22ac87e80d62cd10c2b6228be449544d1f33d22afb6b978a061b953895
+DIST github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod 209 BLAKE2B 00b0c468a857190cd26890babb3e946e9ebbe5ebf0b94ae01519ba32a96f3d99b031140d6de003caee9ca076b33736c96fe4474fb715def44f6ea1eda3ef258c SHA512 8e54b9d01e16e47686cd7aa3b4b184b61a24b7d54fb83a37897c8b76621b3f4594fa86f05b8f08908f6999862e741309c49dcd90bcc928501be084b5667ddfbc
+DIST github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip 94054 BLAKE2B 33e25f87bb306decf63ba4d67e841b59b5fe1410ab5a75829f5f33f396b74335d28876bd0c3deba8edd37e7d5f938ec3fafc3982dea464958fd0d34f419bfafb SHA512 297e929f6acaed88fa197463d38b50725f8f3d953faf813da2c1aba2e179191cc1863e3b0910159d419c842eb319268985aaba4ed4486d5ef9b9c4173e02fcb6
+DIST github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod 32 BLAKE2B 108af2b21e180487fb535381cee881222cd34895f1b3d78561bee6bdfee40e7b9681c74345d10881fbe519fc496181b85eb880b5ec411e13b24926a39ae8a512 SHA512 5b3e66c42da78c7df031089cc05aabe56671eeda4617683a1e9857677108cd0dec00332f5b05f29923b1314fa1d1c88e57fac1b653808cadf5a3cde93daab03e
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip 8857 BLAKE2B 2887917f30fc4cba4c028ce8d42262b007ecd785df9f4ba1dd74f9ddf68376a6c3af924449684c8ff8ca530b249445a7ac0ea36a63fdb18d767ed3649a63f7e0 SHA512 999ed7f22551e55d6b4b59af2ff2692ddddb251de4c61a835ccbb9f8386ae426ef8df6c3434b8e8e143faacf82ab64e022350f9d57ec51544a27042465cf920f
+DIST github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod 35 BLAKE2B 58f9081333c4d484056fc9fbc8be7f41cd1f059a20c2786635176a283c47a1d526fe2b5718fc03832a4879c70b9523c9cc3fa6a3d75081778621911e7123af0c SHA512 cb340ca055291eefd8e3f05764d45dc8f11fc25486e8ecc7f4510ef925d0d6a1b81f29c23aebed0e03beb6bd3bbab45ab9ee9344e9d4cf3f4407c2a7031e2ebd
+DIST github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod 1251 BLAKE2B e874cab57ba23b565a34a866bb77560917cdbd4b5fc70e5e2092c39f5e29c37647ec2eb7c135ef6db5c23320ebc44be93c0978788c702528a66ff81cef77968f SHA512 172cf8fba2401f921243d281f008de4af0f6c4e3c174f5337740d78c12fc0f12e252a2c1a71bdd39e385ca424d3961b1e15446665269a8baed2b92cae0658c0c
+DIST github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip 259634 BLAKE2B 962e78ce6ee1825bb61ca1f450a00466ba338db6515e74764871a6ef809f224a609b04448ecd2756c573fe679f82f1764b5bd0f7e7aaf7fb8aefb66b5d9dbdbd SHA512 3972a6ff9a2780ee2da5768c9422ddf4766502bf9242d4d1b0f9d30a2afbff31faebd214f704703375cf0c83dce413cdf0be2ce404a86cedb60c2029053d009f
+DIST github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod 44 BLAKE2B eb9ba00998f4a45590f7ab28d94adcda4e2b511ae7078f5583bfdcc792d34b6eded81b8c0f71ced35b782cd1bf344542673677915b44b9eb31873e9c5d69e133 SHA512 4d591cc0f2d11ba450f294361950972fe0dd71bdff5bb0c3e72b673cad6ea990335680bf7650093e1f9978bc8556a0ef9329ae2e8a14c10b7de668aead7afe33
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180701071628-ab8a2e0c74be.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip 138645 BLAKE2B 90b085fefbded221903d24f63cf0fe9f2dc95c215b5ec2f9738c384c9118642425d810ca405bfae689fa1985f4d6a8a44c832f79300ef82fd28419138dbe5630 SHA512 1e1e5ed05000dce783b69b47af8ed0d59b11bb0b1739eb9620b576f67b98976cba9e9227519fe247a1aa3ac9c8c423b4896d1dfd9af6877e5eeaa6514761ba7c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod 51 BLAKE2B 4cf5f813ed021b04c810da33b332dbf44f45594e3657779687cd24391d2a93770f2a0e8999fa5a8b6564da5e08ed9fea1e52394907d518ea14a9568adf263e67 SHA512 c5761bc45d554ee6639c4ca23fefa5fc5c8a7c818f8f18d0b43aaab26c8114615543a1be207f5aedaef53c2dda623edeb7d3ae1c5ce6b72ea42605a1d5c31667
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip 42083 BLAKE2B 5f9cc715c99fa4058551abcdabb96e2294cd50c79f49e8acd42b0e37cc990599a1eab827121b259b47d7af6fc62f1b75791c4916feafe6be08e2df3932e49fba SHA512 9f5d126347316b497910b30fa2905e6b6c119fa975adc6bd4f17f5a346cbe110c10f33a7df6ecc63e086c082f61ce493e4ca5efefbf2eb8d024f2a07cd80e093
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 9901 BLAKE2B 0c8cf7ad0809f65d91b9ad5b27759cfedc5efc25194f19effd4b19c35c940461a48a57636ef3c707b27ac614b693ea05830bdef6943f11993bf561ef558cb99d SHA512 08b7201a9aa3294a3fc59bec78fee09f0d1bc7507b50b1d1cb1fa29a523c6870d00b633ea9679c9c86df9841739f46e9d5d9bbf0e3ec15b8ad08e57db67eedc0
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod 51 BLAKE2B 2e102c58874af58833146011d2b9d64950522530e5bb51d643b06f98b258d7cb52efa2caa36a1fd4d39d4307a37712de7f22d45990ebab7a755b7cacedcc861f SHA512 e208321653fa4f40d2af68b6db37a368134e27463a45691a1642bfbe67186efa2a6fa41cddb3e443e465c7425d8d44cee8364953b39e1b08fc16b447431cecb3
+DIST github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.10.3.mod 45 BLAKE2B db48945fed4cb850f178e9dcdd0247e47c4cd349b17102d16ec289d353494c44015166cc7ad977b33367a8eca2bf9ab10728523364b31bec8f766e4a5e6948c7 SHA512 2ed2271c324cc5d92b021d64084d5113ac4e3a1723ee74dd28e478d180d4a341f53ee7b0435e53b5ad95b45c0a79e3417f042722deb0b56f492589bb6631c763
+DIST github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.8.0.mod 36 BLAKE2B 473d06ea15a3992475608d6b784ae45908e77494d007d63599aafebf49b54abe9068bc58b581bf1be6a686c679048ef5c9ac127b4c00aefe9b65328dcce8b3b3 SHA512 0e4f2430ce02a71bce1b8ac38df95b86332db955a8e7d9d59d59c094c5003adf8af5a3073e350fdd06ac06ae9d8a1a30b4d8b2c8f84e2a5c5e9c720bd0727fd4
+DIST github.com%2Fkelseyhightower%2Fenvconfig%2F@v%2Fv1.3.0.mod 44 BLAKE2B f627e32ba8d14e9b9f62e05cc2da37db2abfebc57e10b294553d86c6d9a99ff739620d3e0b9c1118ca0afeb88834b3b3fe635c2eff242a01cefceaf4104c2431 SHA512 c2559074805902626ad5d60b717fc7a70e1b30df6f198214d1411fd1d854afb0caff575abaa2fc275dccf0b6d04a7bee2323caeaa015543722504b67429210e9
+DIST github.com%2Fkelseyhightower%2Fenvconfig%2F@v%2Fv1.4.0.mod 44 BLAKE2B f627e32ba8d14e9b9f62e05cc2da37db2abfebc57e10b294553d86c6d9a99ff739620d3e0b9c1118ca0afeb88834b3b3fe635c2eff242a01cefceaf4104c2431 SHA512 c2559074805902626ad5d60b717fc7a70e1b30df6f198214d1411fd1d854afb0caff575abaa2fc275dccf0b6d04a7bee2323caeaa015543722504b67429210e9
+DIST github.com%2Fkelseyhightower%2Fenvconfig%2F@v%2Fv1.4.0.zip 20038 BLAKE2B 57fbdd307be6fecd9b1c81d8b233716aee308076cd4387a365ec31c115a84ce7cca9333be89ced568d592222a53f847271aa63a969ed69e47352da93df77e7b8 SHA512 7ec990ab775ce63fa064127501afff8dea80e22af36a1ae8455d6d7f60e26706dcebacbb72bf3b8ccab64f00f6ee21cfdb23b0a0f1b963cea4e4e86041256734
+DIST github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20190403132359-d65b6b94177f.mod 36 BLAKE2B 47002df6c177371a992c98e6e821e8ee94926bd256b81470e1d06fcbb48ab7ed843e76e4ef1e23ca40e4238d2a3844b5890649c52ae1cf79e8275e58b52c17c6 SHA512 f634e17321bd57c29ef906f01294b53f3af7a8b4e191c87c61c10520800bdcbc43f57e21bc445008c49f41adaa3dabb0ba61461e416907a2ce6ea5cd78b01bd0
+DIST github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20190403132359-d65b6b94177f.zip 1501689 BLAKE2B e83c069a8f4f5d6c841f77113a168cc3ba450a2a72a0e7d85386b8839de32feb6eb88389604e722fd732bcfa2ab184ecde4fa935d844bd880509f2021bb1abec SHA512 a65c494a387ef64b24c0e79588fde116db9647f9b17f094a004e426d791c0f3ef1c603e40bc6766f6834a7fdf30f532a724fbe68a86f9ee57e922e62f9d7b1d0
+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%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.5.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.5.zip 15270135 BLAKE2B 0b76100ab34f213c6230bb1ad5d60b27ce8b3e23a717f836ac8bb31b4c7aa3adce609442ceb3c02c7a8068afecb4d8478cccb2a87f185bace78831b2af6c61c3 SHA512 d14995c478916c5031162b75cbb6adea1c7a859cbcfad5160a47347cc9244b351419b14e77f0a273416ebcc9d7de456025a0f92a288981a4de0991153661ac97
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
+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.2.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+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%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip 11508 BLAKE2B 609b34f41f3c1579ae15bbdd5f9632dd58e9082917acce355ffc5402c33ea45bb0bda32d009a0a58c6cd60327aa87008453e0c4c36ed2a1be41c4f5337de72d9 SHA512 0f792e6f960b0cb8f9a30c25d3a3f30e7c459a05d7f03f68c98cb581967fc48b377314cb83b990c9509cde5680389bee0ce2b0b1efedbceb5592f38a9ae6a3ec
+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.2.0.mod 68 BLAKE2B 91222794e2d517a33cb43bb9430e2e7b497ace820ab8c47dcde253226e54f08b922404df7ba7a2dc74555a059e95b81471dc36fc5b63b55e385004fd9a16d61f SHA512 9fbff125d97ce2c4b9b301021a987edbeb686b37927504df4e5c2f0ddbebc8ed28ee5152de7db2eceb0a0fc5728579823dc4145f36df9ba1961b9c2da1ac4461
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570cc11a3d3c3b6f9c4d097ffadb161280ac4dda90e7b74fe3784dbd31a74be243a2a0d6f3f3273f24a0dcb07523c7db8975171327de25d5 SHA512 5fbe5884d311244c5250d4a1b249749a84fc6a50d4d5d6b3967a4bccb317ebb807917fe540f13fea788abd863d7d2f2537a40b57cf156a3f920b15cd8b365ac0
+DIST github.com%2Flestrrat-go%2Fjwx%2F@v%2Fv0.9.0.mod 34 BLAKE2B 3d7eabace16abee8de4575a058588468e11ef91e3fecd49221b3daeac365695765ab16d4596ac0a6b3ba03c8a9a364e1a66ff6b85dbba8fa320d864e9fc0e7c7 SHA512 18c22c965b123460911646245a10cb5f5c249ef635331d38720d47bfd3ec9e2f8a39e024632d7a11ec1dee16ae5116b8150ad8b210ef25502f9d0d26a431dcbd
+DIST github.com%2Flib%2Fpq%2F@v%2Fv0.0.0-20180327071824-d34b9ff171c2.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod 34 BLAKE2B 1f70e2e8670ecb572e36b3697429bbe82bb3372aa977eb116270674c689b66d2195dff69887c8555bd886a67a07bf1bf5d43c2eeca0bbc51b6613183378eabef SHA512 f0f38407ddaf1cddb83a07d7435e78dc4bd789761325b68d689a6e571e8d28ae352717a7aebabf4b63918fac9fb792f6b7ecb0db4898b563706e1fad9c30e13a
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip 118447 BLAKE2B 35bf2178c21f6b65693863db7160f4e2392b3525ca9d51db07c64eb026e736cc346009cf8b9b9a0415386c7792833ffe3715ce9658a2e0bdcff8162b7ace7829 SHA512 d01f415ee9e59e1e9b9d8d55a4f79b508aa871ea1106686defab608b6f2c76223e0b85bf7aef3b098b12cf66de89be5767180789691c1abe17680defedf408f4
+DIST github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod 267 BLAKE2B d2298b42ba1b8aed99658a846dd1ff5cadf5403411766efaa880ecd043a56703ac1089ea5edb04b391d710d99f9b1a1471628043be868fededf189130bf852e4 SHA512 76b19a140339b43774f3df87d1de97dd4bbdbf5939f523fe39faca051dd2a4b9e719dc147a0a2f931fd30871c30eb6a628d58bded12271e04f6de5d9dbab497d
+DIST github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod 414 BLAKE2B c0bcdf3e0a6f510eb3649030349e26c3d78608af9ea46150e891c17463491da92c544562b60cfaf35b8e6e11cba5b43bcfe0a8bbc3e3cf7832ba6114ba8cd9ae SHA512 1ca2109c477bea717b8f66a2d57c35373adea2fcaf4223d85770be21833824334e4f9010c1257db95e345d1fcab540c96a40e9abd7bb51cd993559c224e79500
+DIST github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod 34 BLAKE2B 4217c6bd7b66d286e9ff72af7851bc7fc833e894887789e6610645e36bb72c66995d1c308170b54e21035195ff96ec6af8811b835f75995af0fc93be45d6b9d7 SHA512 5a5f833d51cc196adf1bc58ab4804951c2475b229c1a3c707c79b45e59e8ce98e9ba52d2624eb73617491c28bdcdb834038c4c5c75982559865d3d2b110994b8
+DIST github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip 333347 BLAKE2B 6aaa8e120b76c9b831a1531377d249ad3c8e857035e1a9b23ad7c7237f4a4124d5031771df03da60fed4ac7433f9959bf25ba6fe2024385d355eeb41ea3c01c3 SHA512 08cb3b6745ce23e422e0e0d8d5c68bf9c7aa9e2ffbb44813b66c29ee10d457eab613bd6d609ac0522c18b763d0dbc53d8a33c8dda8cf0a9651ca1cfef946f9d5
+DIST github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod 43 BLAKE2B f49107f68b9d73c573cfe976efad9dfb5b4555aecc4b15eb4b1592d1ced4cd1cd09f1d2483e7476f8732dd1404a07d9d9a35df84c944cbe21b46409dc5802265 SHA512 f4286a907eaf928904461716aaec3d5e58a826f2f50c6568f70aacd2f14c9d226bb633ebf9fbc8e492961ca23f459be0c49b1ddc644fadcb7e90e99818fb03bd
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmarkbates%2Foncer%2F@v%2Fv0.0.0-20181203154359-bf2de49a0be2.mod 180 BLAKE2B d2cb50ad2f7d1b54d60824d1dca3adc50969d91c448e932608554c1102ac3ba968aae92ee1f621c71548d2788be579b8296d5e1813879e52d7a3cd7c3dc382e4 SHA512 8799f1a1a2bbe0548bbb0777e40ce85367fb538385b0c9abae42890c7cc3275b84c58ca461f0dfe6ef58b04b2fc18e573de75903372b81e01ed4b90eb89f97f1
+DIST github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.mod 179 BLAKE2B de910385e475042370cba96867c04c984420d69427c8d0b8e3784e9263869e463decd856ca914dcfdd85c2977570da2ed59bf5f17c41b6320a4dc5e878388db5 SHA512 4700d6bf62086de6dc5b257b855d20770779aa3b6de37f237e608b3b130e588ac08c035c00636876e38bdcf2637fc84f2547ec9eb9a9de1168781c6225dedc37
+DIST github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.mod 41 BLAKE2B 5b60f89d548875788ba9d28d5b570a44f14babbd6219613b338521c4ad200ac31c0a0292ae9d589cc79a424a39afab9f2fd590a9a64bb4dd68c67a13ed9e0b22 SHA512 fe7f14ea20575f82045ba640612e1ae728e05607849aff5905369cc0361186e879b6f056cc89c6c96a9ef6e8e4eaa2cd34aed843ca23870a735d17298f186fe8
+DIST github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.zip 11765 BLAKE2B 8fa0bc6987b422048df7e051e8ce2de530f2c70533f45f7a2c8cef7cb0c729cc9fcd39faa8061e2fb9177c6845574a3e827df6af01e68881b10acffa596b876c SHA512 6b1d2245c85cedbf2b2363ba07ec82dfd3d31c5d313605ae28ef4d6191f4903cb1e109c02464456f169415a6c7dae24a6e54f7c8fae1126ff7517712627bda07
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip 13690 BLAKE2B cc3568a99c03ce4ef19e52a8429b485e774eabddc3ab24315a58b149e8168c448bb1fdbaabb8e3eaea918de96cb7411caa000be4585f851edcb26cb0be9f0a7a SHA512 c39ebb2cc99a555054d55ffcefd5680292c66eed23b1ba8a3595259dc24cd42d432b558014066554308f14fc452b7a830f8b10e635d317b5f14ac0e0b24b1528
+DIST github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.mod 201 BLAKE2B e7d70655a2b746b1ebac46650c7539e492dd2b40c44d7fcaa397167be74f2bdd8a3997d4e31fb30739dc562eb883b82df5f7b95125ee6569e598517b13452d02 SHA512 65713ddcb3bf3c4b8352e7f07ebaa48ea539170b9bfa1026e7ec95084dc0ad4ae9217fcad5793ce9b01582c5cf225fbbadb0d79380df07f48703373b2e7f5237
+DIST github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.zip 15873 BLAKE2B 3da4b067d6eeb81a3a4b4c93c955b2fd63443f589c322735a9f2397b5ce21b7eb8da4ce201001fdaecec2857a971f2baa8a094b86e866bd43a5ba2f0159acc3e SHA512 ceac4faa43badb809362d1ee92623f1cbc1d17bb9ce067e8f7cb4e5f3e27126a7001aef2b536894611066792f3fd25572b562242fa7153cdc24daa95d358c848
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod 104 BLAKE2B ee5067e0e89fe2d374ea852dac828c094db84c3a3d2d8a991abeaf40385431015577eeb6b11a66033e8da599e808f9385a84843fd8f87dea487bd3bc9ba233da SHA512 f144089cc85271c7d91b9a6faf169018bb12177dd770db0092dfd0b4c71846e5cc6dea385c0158a974cfe86971e5642858a6d633c64d3b598f1ab254fd47db28
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.12.mod 47 BLAKE2B 4a848f4f2e5cc615dfc3fc62a9523eb7b3d79244393ce8203978051a34f981b0219f13f10bbae5169e03d919404f0ed6502b39c536218f8c8c8a5492561c1112 SHA512 c1a6d910b914ceef7ffea53c61f2225ebffeba2fc87c290aebdb739bf520494e35fef046eb9ced4fc9a3767523efefcce41ef5026fe11bad97c005b8e55d96f8
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.12.zip 9134 BLAKE2B 337ad087c21153a61991839405f3d83daa7b8805da32d3a2a2f58b33716b87716f24de1b4fe4a58aded4373af3de742f669b9ad6563819d7a7cb3582dd74d335 SHA512 9ad6072ad5f2034e9f2c96870a58eb41ab50c563f7d9cbb952e989e7d6e2479100f39606e09ccad66d826b3f52a39d330a06f4f1ec995dcc5acbcd5809733e8f
+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%2Fmholt%2Farchiver%2F@v%2Fv3.1.1+incompatible.mod 33 BLAKE2B c73b0d8e5f9af8150c62bc122e0b922e97dc8b5f8993ae6f912ba0ef961b53c29e0adb1ef41bddb4cd5983fee29609aa848ad3e2851e926ba27c5e6b843c54aa SHA512 11edd5885994fbf94cdfade07c7556c229da61ce64c8697a67f7a1d3ebf1127da0db78438720998b053971bc225777741450794471b02f0e684aedd5e23b3ffe
+DIST github.com%2Fmholt%2Farchiver%2F@v%2Fv3.1.1+incompatible.zip 58857 BLAKE2B 0d72b7791c86146161c803db8f5b1a34fe3ca45afae25e175884555eef16b0a7c9f23d53f74c8c882c6af095e5c6bcf95f1797959f98524d304a0f8dc0f82fb8 SHA512 fbb80df70abdaf86c4ab4abac4b97eac11bff082215ef8160cd845a7f64e4d73c7a6132787748f22ed7007dd4d5c8741484de951161d86b64b4ed9619d24061a
+DIST github.com%2Fmichaelklishin%2Frabbit-hole%2F@v%2Fv0.0.0-20191008194146-93d9988f0cd5.mod 742 BLAKE2B 23efbde8f097dff1f3eb3c3df4a5469c24064d1afaf51b161156d1b6efc8e3e7081f7dd20ac9fec1bd225b27a85e579aa44aef0f8213b9c20b0e954d9b51914f SHA512 03ef7039859b7fad0d6d19d08c642d6f2fcd69637007b75c890f8edc40ceb5ef002e106592aac804089305d2bcae334d5d79c7fc3044abfdedd987748ea39c6b
+DIST github.com%2Fmichaelklishin%2Frabbit-hole%2F@v%2Fv0.0.0-20191008194146-93d9988f0cd5.zip 47756 BLAKE2B 06e36bffa8da3f41789b9e6b867ea2a4f7f2f66915c59c3717e46ffccb73886126312cfdb79f1fedf07b5435cfe63bf9112abb07745b9a4edcc751e8699999c8 SHA512 b108e79c95cf62eae00e192ba1c6b0ef664de077fed4abc7c0ecaabfcc7a5cd3bab9369cf487c71d697e56ae13d37c52e028d37f8795c8f69aa90e17480ad76e
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod 371 BLAKE2B 3ff3ff24a8fa567c715a8698c5a636f3eb2b1bf95263dc71a57d506a8fdf9e25cd741b8d0564ba95c04c696ba536ba44149da16572e13c1b5134c24dd0edddec SHA512 5a25ee9f24cf52fccb76de4ca0d1ee7bf309044e6700d48273bc1ceba948831320a51a7013584f60496df642284a4a282b2ed44e7d6290e96927927a220619d6
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.40.mod 333 BLAKE2B 8d0eee290f65ec90aa77494795ca379d6e0dc3c1a3e040b045309e1ddcac7623330a140fccbf829cbd32cd6788195f3446d340144d5757340734804504203f86 SHA512 838358c8d40bce54c7010bf6c141e2022f2036ba91129166dbf27e2fbf355b8c32392fe8fd6edece94934c460c1b9bc73c496627b4b7efd63341d7086fd0b114
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.40.zip 235830 BLAKE2B 1bd5b0703c9f63b69b1738b63848abe8e698003ebdf784b1ff7d357e19efac38f0f1fd97cb437e0500ddc8068b759d27432df1a5b6712f9b376267a76b87d73d SHA512 69350579be009a82bf338943e7f9863cf270dfbc570fe24191cad820ec857a049f0252dfefcc342f005ec61fdef2f5106984506eb781b1c7e61b4deb58b05a7a
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod 425 BLAKE2B 8e9c5ee0d4795def5f031ec58ce255227d2d17c80e0ebe028218e3022bb7c5b2cb831981a3247279a5405f36a061e7f0ec717f7d71ae96f33b56d20d0dbea520 SHA512 743b2f950677b8d24423a2491cfd67edcfb45d032e6995a743ebb1f3d6ec6f407f2e4d1d56b2bd14cbe4c519523ee83470f3e594f2da6e0b3fe7c2dfbad9c961
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.2.mod 819 BLAKE2B b5dcb129e4d15bbdf3f04e5b8f7192046a155bb8e5bbe0ce78474d62cf92174f14a68e417dd04e36c99f2c84a85b747816ee5c88a4bd243bfb336ee12419da09 SHA512 b83768d460b9a37ccfbdddc6d780f956e9e292866040195e8cd792dcde614d7531d0b86db9069c39d199fbe4a80e68f9ddb6ed7d818be6712e847516a675cb9c
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.2.zip 32403 BLAKE2B 4a940e550fa50f3bdbc37e9a69506ba3a328189aae0553e611d33ebe2a3e6b38f24a213e598d84e9b7aa4bfb6bab88ae54ca77b8390449b590d30a96d18a2f45 SHA512 38d2aeb9a7e2f84a1929adc87f2f5fe181b07070413e19ffa8f5805f9374d726748efd28491e5262183560ea552c5f2f0ef1c9496bf94777b8885a0df02bdaf9
+DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod 91 BLAKE2B 22854387f9c0bc85c6f4b7b9c5ce8a774c10c6be0c43ec6d188b6ff2f2e394ffdedcdd1bc0b8ba0e31fa3c418cc9339a78a798beeb355032a0724b284573c38a SHA512 8858ec62f3bcef65224ee7d66bbc16c080b2ed16609c46c5c6b6d983b9f7eef9e020a2ae78a16d0226c0f02c609ec5da92565861c02a81494cd6060dd56d005b
+DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip 11210 BLAKE2B a469026ecf6a1ee2f2d56091fd90f00857cf5e57164ead9e53c15af03d10a8b737a1d2b2fc336e3e972af014dacf8f1321ee1fa1cc9dab93790fb6d03ae195ed SHA512 30b1a531823403a911d9f877352218890bbea15d82390b4561ebaa4bab09f493d49181ea5c34078c18df31b1896165e80c4862b450ef5858ed8af55b2a0c42eb
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod 58 BLAKE2B 2333737b61035e619ec57fca1e42fed937df5b9fcc706b0969ecc1fb50c3219ee8ced339c50642a40e34325ff8d06210793c5903e20bbc3032b589c40f0721b6 SHA512 3c179a55d85399100f631854ca36958ad6acc897f34c527c429b58e10a3a5fc3289c304b5d3268928bf9689b5ecbfc6790eff9a3293d9e3e7e7af7a4c90df95a
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip 3839 BLAKE2B def4bb0b04892d37faadaec991c88b8ec4d6e0818dca363a918f6a78c38b67e5644bef045187c10eeec0278af3ce00b8b90ed4de9cc7fbd983d62141e27fd6f1 SHA512 60f66de1251f9b249676408f2df84bb121e5229e0d649e806800f0196aead7dae8d12172beac0d631159c303c1ec526e01f6582bc346392cbf7940db4d17e063
+DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod 40 BLAKE2B 089a3d8f85648feb04c692c4e108e1e843217ef67fb3d5c00ffec847c06eeae55a9432c206753cb220595441da76b635f33a9812ca92f04959b4e7dd08644abb SHA512 e8e4f318e3cc6d203ccc62c0b47af2aebee3fb99680cd6bd24af023442154ffa9c3d4bcf9064af5220f01d3cee71e7c600e465e3651ae0d7d15e2abee1caed27
+DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip 3587 BLAKE2B afcc45c660601467eb2d23942c845c71f5e61277308f9ed56fd86794f2577f9c61f0fe00b6d04d348e16e94616484cc4156ca2cd017eb25dcb5e985958a47cad SHA512 d08d8446d425286a94cdef1eaf227eb61d942e95499c5d4b5dc83b5e0b7a9a50eab2734016a8f57414acb8db8ca159b55900159f6c6ca67a51bee10c3a2d4356
+DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod 32 BLAKE2B d511476a16a86c50db84dbacb40afb4b30ac3f72c4fd5a8b20fdd8bc6de1c46592bd16b24f77bd037dcb23ba86cd217fa740b59a784c6fff0fea1720d2045695 SHA512 451fbf9129c151784d97cfe6af29d27a277b6821411cfa5b23e6730ba0f5d5a830054eb6ed660dd2192c16abd54d5999be5b80e39bbac3499c3198311d01ec1f
+DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod 121 BLAKE2B 1bcc532c14adaa320767f5d35d1493bfc9a6cf1404bb1ad7c5f5c7fc940b529ec6afa0effdc757aa20640b601b11fffd9f0ca07e1b3ca2cd5128717b9fabb5ce SHA512 a0cc03f0157608eb5e9a26c6496d60446de5493c66d81b2fb7c20c6c029db2e4a9026d22c77c2906e1995d4ed2abf3b353c7bdf34cefd4e57d94499fe159efe3
+DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip 23850 BLAKE2B 4cba89eb304fabbe0fb2e5108f0385b28b32e9a18daf7b766f1446a051948abaa4412bf9a17a7d6ca44d9315c47fb5c509856eaa0675263b916dd0b2accdf694 SHA512 6fb395119184b78061f3517739e05a3ecd98d8dae3f790a1e52563a3e10f9aecaa6a65dcf2fb52a8aae6ad27ad8939d2446a47ee66a866bf72a866f8eead6436
+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%2Fiochan%2F@v%2Fv1.0.0.mod 35 BLAKE2B 0b603da65c4738d257fb759b8aa3971011ee721c1fc783663e1b26175335c6c90ad56eab45ddb6422e39dc0c6603e13ea64756f8a97bbfcc5e77845248b16a74 SHA512 2249854bef533dc77479041f9dc5610e14c549be1aac292a39b8b74b36c9fc42c04d211d8d5b71082c05971cc26a94a57751c3e61895050d41909270ee5123f3
+DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip 2536 BLAKE2B 5f26ee7bc9146338a1bea319bd563161f921017bb208967b7745a06e7482232f00f7c32f23cd526efb44211e9275d0fd27556f77ad3fbb033677b12e79d520ea SHA512 c27fae2305ad9b3dabd7bf99214b86540ad21a6b2bc746c67251813769da9d49aea1cfe473fb4effa9ab7ed9e1397c36c9906445a68e84be1215ed2b3148ab9c
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.2.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip 31024 BLAKE2B 0764e170ebb5ee0b3c4a827b6df9eb62d6804202375a3c37b115879f7c716c026f80aa08118b6bb7ac1a1572070efe8acb235e1ae2e1a4f154a5cff4f4a4bc80 SHA512 e61765ecbb25ee639710d666f5523cbdca9ac5792782926d5ae7e0b13545e0bc5d0aa5d090bfb5e2b6ea218b55fa3fe4ceb8a51e5ac432f7d6e5c9eb86aa043c
+DIST github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod 104 BLAKE2B 22fb94f808eec8235c32993a7348c9ccaaaadb1d425ed711b42b30c4f72c214ded4b00f09a0801a07132944675da4b5150c76992b38e3c09c6b33ea9dda995b3 SHA512 bd4fe6712436e85787eea6bcbfa7eb9d4b63e06fa1bcfe357778fdce536d8cd5080b00a41f98f1634b26c1e1e0f2444255fcfab11d0a168678bac405532de5b9
+DIST github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip 14397 BLAKE2B 9e44364de4d4fc682832d57a60475d3cbc44f1bd64de899dd6857d2bb576d6a64b918cfd6d0bd950f45a30b49715de3d498fc7533279cb0260a4be1abe6d725c SHA512 4482a9382f9a95f747c1f895874bbc317296f0e5c0f34c74f7dad4c6a1cbf70a491d0edb0267523f8bce6e4f519f18f5961ab6206861631575df59f49ac9c701
+DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod 40 BLAKE2B 82487f50b9cfb3e87f2500b992a68361ad1971106763efb2ae4833e3a0505d6131b87aad4f994d203123b8fde60d5799afe67704ae72d36b3b4e85240ace49a6 SHA512 e7ba1cdb05cc6f30a57cdbfd08d55766cdad89875e4db393c304c5004d8907d07952b9b7f542bdec1c8b2f722fbc5d2283a8ff9cae53b6da0f3b075b8d05f60f
+DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod 40 BLAKE2B 82487f50b9cfb3e87f2500b992a68361ad1971106763efb2ae4833e3a0505d6131b87aad4f994d203123b8fde60d5799afe67704ae72d36b3b4e85240ace49a6 SHA512 e7ba1cdb05cc6f30a57cdbfd08d55766cdad89875e4db393c304c5004d8907d07952b9b7f542bdec1c8b2f722fbc5d2283a8ff9cae53b6da0f3b075b8d05f60f
+DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip 8002 BLAKE2B 0a8b00c6fa6fb7ee0edbd7c64c09d542cb3b5f3171663982d5391161855f908c91d938dd38d13c66f638fd37c6729f96f195ae75ca7e4dc9baad3f15cefcf619 SHA512 39e87a715707ec9243a382b6e9a3d951234a73e6a50be0f3e15825ebfc9d9a0cdc52e9584909e2f09c852525c1de0f2c5214f6786d3352ca9a9ead579f9d35c7
+DIST github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200915141129-7f0af18e79f2.mod 297 BLAKE2B 4cf44a80256685db07920024b37194a45c584bb37c74a73328c53779851a75c8239d2e841b8afd277e3a13fdd091fd1c09d8f3255c7328f8d7b6a309f0101c4e SHA512 b3a7a594f3ab4822c8f2082541f3ab5dbc62f3694d890fd29ca2767d3a960af27888e54acd3d3955991259f5802941e6094f967de29e33d90bb9d5c15b5dda4b
+DIST github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200915141129-7f0af18e79f2.zip 22567 BLAKE2B a87ca529421e1b858a9b904c18a5de255aa1f77064fb95079e2e31ccdafef8be447b977a1889e59a1df669c2203a1fd61739cd1ec89aae3530172b6fef8879ab SHA512 29843a879636bc0f4ef2d414e313a63eda05f6e449480810b3434644bc2346910f8c06569b1d29f74cbf9ab72c91378c02a4a2d003c840896475d1db3dcc447f
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip 10936 BLAKE2B b045256d37d4973e88d0d9c6dbad7397160ddd7b3102ea8420f92be2e8c3ebf6362f350eff10b52fc7fb447d98b00f07c2bc1da3f6e442ebdb8e90103492c8c5 SHA512 e7986e7dfb362e346309cf77ee3969c2881056959e34db07d2dfa0e505106844b7424270d8f17f1a89d335071688e98b992ac81e8ffe0c98c8a0e3d145144d4c
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 25694 BLAKE2B 59d0a645e3fc29e94a04fbed5329cfaf2162f5779f1c13bfe96c9d979c7acd1b356587b6e30760568607ea15d2088a76bb58e4504e17abf360f2702eb6e8c3c8 SHA512 8fb62179a48e212b74f0e8af79ee1c20479b1725c089c75a12b43bf4936caaf87d42b35f2b7a7de87c60e793347bb185486beb8061e588b8085ac354a3ef8562
+DIST github.com%2Fmongodb%2Fgo-client-mongodb-atlas%2F@v%2Fv0.1.2.mod 180 BLAKE2B a5d1fdd97c43d701534919511e52e33fed20c7b30a27c314c84a29b321866bec29be0a7902b8f94ed8545703404e359685a6203a62ead6af7fa3031a7f284d14 SHA512 be158201cfec40ddeede018511da99427bccf8d8ebc45aae6bdfa79b38371352f582fc7680e84e42ae1d640d526e2b71c9b400a61ef9e13253d20d215b6db63e
+DIST github.com%2Fmongodb%2Fgo-client-mongodb-atlas%2F@v%2Fv0.1.2.zip 81671 BLAKE2B 575637f9a54697326adb1789c12581c8bd19be51710600344758706f9f6a9996bfe63464ff4f6d5efdf7e6b0de9797561674576545445bef879dfdc92f4006fd SHA512 69f00246ee64aeed97e038db0d5d9c001837365a853a98ef71830e179d4965ed02b53b5f37f84471854d5ad3269116a7c1d38055c5cf0e0cbd55cac38c3fe170
+DIST github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.0.0-20171201202039-1bf9dbcd8cbe.mod 37 BLAKE2B 19d1ea7d880f811795d06af263c6f11c05c45b65e95a035b0a46bc132f456c41a5ec726fd934672b88129ce172ddbf5d584f524939f494cf3f6ae66671d6ea31 SHA512 b624ab08a47139a1fa45e00136e8199f27fb2d82b9589ea9227a323a7d7f3e0f58114876c0af82281ff3300eba8b1241ba804d73e63370768f58881bf45fabf7
+DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod 31 BLAKE2B 5b5d97cb4685ef921770276b81b0bab6f0acc362b49544e23c228fa4e26c3ff712b58e61815616fafc19233d3cfac47b05e9d55d926b2559137ad4e7d734e113 SHA512 f868673a9af26c1735e257c840e1f9f5de035ebdf3814f8568af504af6f3d94284e050f49e96670a5643804760db2ee8e50d396f6d6c1d17c94258695ef41748
+DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip 56868 BLAKE2B 7795586966a72a5107b680b7e5b051a516cc0aa60cd1519bf0dffaf264ca5fcc768544438aa1bff2a2c5a3a5bdd92507f921357d80e4033590afda4ebaf536ed SHA512 22d3534c0e6d6507671e02f1da00eaeb7245497b4ff626ae7967d6b2dd4c9675ec16ebd20d4eb16ce98aaf831e93d207bd7a3331e8ed7411e9ffc71c574dfe67
+DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod 36 BLAKE2B 636b2a1011ff647b1597c535916bdde712e45585b9be3e90191d474e88e293df5b30e2e15adbd2f6d631a57ac81b59b02055b439390664fbc8a8e224cfc51e39 SHA512 7873fe200c30b46285fa8a001345428db580c67cf634c1b1e4aef6a4a82d7b975545b827d00b1a3dad86b2f3f7681df739915f95144d4d3a3553f055fa70781a
+DIST github.com%2Fmwielbut%2Fpointy%2F@v%2Fv1.1.0.mod 180 BLAKE2B db4ca886a6331f3372553f90938ac09ffc31ea89d30ba9d57d8e20d3402a9ec93aa3d8d2c29e3461babc06f7e31c12d86bac5e757739cbbd8edbbfee7ecc2043 SHA512 966b60ce185ce5c40af53b57b5cae0d9c0490da820d3f4ce3c82136d86a19ca360e5b35de66d5754a9923106c0df9f77bef02370f07b3d165f0ee2888c1bce73
+DIST github.com%2Fmwielbut%2Fpointy%2F@v%2Fv1.1.0.zip 5556 BLAKE2B f5c1420c4b88de50991272a2d5d7a9011691a3a0094cbd8f1db1af9bfc01addc45caebc6dbfcd2206583658b418260535c1e04f53b1bc1beb604a30a20932a42 SHA512 0b718a45160bbb16e6bb38a099da684c3487cba8775e5b653b0dbf4d4486a7154bda2850e307aca13dc0b2d03607f97c775f3b33625e8208a78eee2ca2661597
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod 34 BLAKE2B 315fe4d5620c1d1c92df3fd382560ac2cf164aa17a741c1a74fc25807819de811705467227923fee7f804c6b6e96606c87b4adb11a6b722f367b543c2792cda0 SHA512 b1c163d7a6a139eeee1457fa07933f01eaf6d2ff24d10385e75f87b443a95fe1b08e9e144d3c18eb6a77d34e8521cc6dbd486fefe908e60452c5a80f654c551a
+DIST github.com%2Fnatefinch%2Fatomic%2F@v%2Fv0.0.0-20150920032501-a62ce929ffcc.mod 35 BLAKE2B e2ffe76b2965215f66a49623985b2e2355990f5c53a30b685c24f1641ef09e95e1f0146bdfd6424db681a05dcbf39676319cf5d4451377a3901267d5636d13a3 SHA512 9dc389a90f041df77b0ea496d22b301eda1efeb390684d47f8dc54a6eac357a513e650d6e0bd442cddb5a596a79d381bcb9f2cf3ccacb78d5a351e0fdbf649e2
+DIST github.com%2Fnatefinch%2Fatomic%2F@v%2Fv0.0.0-20150920032501-a62ce929ffcc.zip 5053 BLAKE2B 7bbf363c2ac7291738d6b8f2a629e749060efb706d0424e11c82cf7461ad620ea8250866c04d2aa9d4ef36ec980433284753cdfb49f7fa09cf2ede432403ba83 SHA512 20d73fcb9406e20fe9b9a70e5d7fc0c75ecb3393dee332893b97d3c72afe9c2d3105f65d49a28e1fa9f227c620babee6f3529c171a2cde98b943e7166653ea4e
+DIST github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod 71 BLAKE2B 01b34bcadbbfc83fd26f11a51b23b66f59212c6c9f9f669ddff2d19c7d563df24839933473705b86c235cc143732398d11f0ce2af1979cebc7594a742e325019 SHA512 8df11664ca01688c0fb0648e6943c13fe0c892ddd94cdf88da039470449726ecec8b0eaf69f0e41f277e9248502325093e698a8f949a7fb2ed9b59fa28bfa4a0
+DIST github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod 71 BLAKE2B 329c114697ca9dc1dc69c4fcffbf488631b0a9648533db756495778f7ceb6de109798fc9c7e473c3cdfec6a049d6e21acb10ba6b1e2ec11cc2c2a99c03f7da81 SHA512 8745b75071b79f3dea777d3eec1e0f74cdefe5b202c8075994f7e68ba8e9bb87afb70d494fbf55944b12182d480da1c1f45c9f057c789b82ec2da81eff6079a2
+DIST github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod 341 BLAKE2B 96093120c73925e7a1705fee52cb06904bdb530d8f730f6ca7832ab0646a7762e012019020ba01d3781765cd3ec849bcfac3b6e903f2dcd53104c87bf845ba73 SHA512 b555bd66ca72fd51b16a45f9e21cea01a748c44c5dca1ff248efdb5dcd36b61a7a5527f3afa9d50415f6cac56d998aa8590f65e7c0a7f90888fb174fde83067e
+DIST github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod 143 BLAKE2B 946454f6ede7f2a46621597850fa560fdfa9b6a08a53c0aa95652fc08178dcfea523a57fc8030e5fa101128d697794f5a3bac20a3d92fd436f960975c3b18d63 SHA512 9937550a5df4b906c0e3af1777b64d119f6adc98f73738c2a8d376d665baa7bd4d0e97da7d93f0622325d80f84c3fa374d72e706bd945e50006b10f8ccce6a4e
+DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod 96 BLAKE2B 071f4237c2606c161d8fc6160c818259807572f1e41dec9b753653b9dfcf4bab8c2c7d201f35d803ed876b99da693d15c1f5ac4075b556bfcf78e9fbec4d2dae SHA512 eb91e385e6161b3bc7e3e2e337519c1435a368fd98a26880cb37f3d52bdaaf23d7b07e1c7430592d0c960050a08c3f94e0a18576da214e50fe7047f2324b0ea0
+DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod 96 BLAKE2B 071f4237c2606c161d8fc6160c818259807572f1e41dec9b753653b9dfcf4bab8c2c7d201f35d803ed876b99da693d15c1f5ac4075b556bfcf78e9fbec4d2dae SHA512 eb91e385e6161b3bc7e3e2e337519c1435a368fd98a26880cb37f3d52bdaaf23d7b07e1c7430592d0c960050a08c3f94e0a18576da214e50fe7047f2324b0ea0
+DIST github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod 31 BLAKE2B 294aaa7492b6b42b366e5130e12ca72a84223fe02b4f01281ccbe3ba68dc5b515428ce95a9b575219b4688a42aaeb1a5e0dfa3bc06a1db47b8afdda282cbb991 SHA512 918b829894cfd626c011f7ff13934a2c1c12c3482ed61652ec2c59f5b94a0e8c8510e3bef4f5cbfae977df177f8eb9a123738d7382a6a6e2f8cc582d50eb10c9
+DIST github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod 28 BLAKE2B 57fb6c274af3e1f296bbb2c4b81cf52ecd31af71afac9be2f77ca58c67831ecac4eb2f4f8819c510f3e2982d9a5ffdfbb5f384db878b37b531e59e06e0093a31 SHA512 2f4794d0c8dfff16f1fa252eb5e3396e2cc5479c96b5e4af9ec01931387790e51273d4a308fb2813a699a54a3cbf6b3adb5e92d831d3032120cb5f19698bfd19
+DIST github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.zip 73514 BLAKE2B 58f1fe84a299e27737d84e9b6dbfefb2e3798e63e06053af74f04178da17a8ef4258d18acb816c629cfbcf0e7c8dc4dd5e1909816f23a5fe0817fff3af0542c9 SHA512 d4ea97ffdf059e50b2f8cdc0580da4df6335044791566700b26677166d1b30d0389e939f31682030ec4b0a6a5bc8e0f719d32e73ad227a7fb2cfcc69e4967c3a
+DIST github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod 41 BLAKE2B c0ae8bfbe1cba24ea72ee152799087e23fd36f61e7e75fe4e0f9ec1e45ceea6c29783a8927aa05dc630c5c75c2413aaad96d7592d397ea055794ca6419176b59 SHA512 30746c685ae63769ee178c2edffbe0a7bd8e9c9fe59c1eb7e04c16c00f282ee4d085e853b6aa6751b3ce53b9b8a10f8dfe5f7554c2873731469ea3faa92e9289
+DIST github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip 26003 BLAKE2B 25263739206a1a1bc788c80db6f3e4c98b3d79b09666b7e74e0bfa8d270c25daf37096e715981d76db76c395ddfd7ab39fb523297d41fc3c2241744788ff38fa SHA512 7f7b5e08c4dafb1873cd55f838163afc65d3f945a7607d424595f4e0ed599b05fa2c7e29894c0e6abadd2c1e4c9a5c709e5e2d8206dca27d8c9f9e9ebbd65c16
+DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod 78 BLAKE2B 7cde27fce0ec4a1c5c2e5205fb962352037c873d6183a6c1d8a9d385fe6a3bc8c9b66590401f8a715960858576d100626889e02361860bde65f8b66074d93837 SHA512 ee531fe5de94a4f4fc57592864a42beaf57be600d3fc11205ff79b44615429ccf46922cc3d80ab8df77b2db31a85bf40248ce0b1e1079d6861f317828b3305ea
+DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip 13281 BLAKE2B eb14a393cfba4230af192cd76a63a20568fe80ff650113640eb63d880c276307e792b0bc3339ea37f1387f78ee5e9f15a8ff66d0c4b8c8cfb09fddb1e73288fc SHA512 96747fb5890efdf10e0793afc08df1ced6dc8c71462397a0e4149f32f77470f1af6bf8fb2637693497d33a2a7483c4609380ee89ee0a85ce21102a32b7a1000e
+DIST github.com%2Fnwaples%2Frardecode%2F@v%2Fv1.1.0.mod 36 BLAKE2B 95e7eefa116cbe98c2f2f8889f07ddddd72ed4c279c12309467d951f07d623b23bef341943b06656ff522f363bef7ebabbcdb75d1485e918245fcdeba9914052 SHA512 349c415bb3798e8a9e023a34ecc362a0522fa46c62c1ecffa3332fc48a2fc338e25ff568ec88570d7cad235997d1dade730620855c1f6222c782674ad5ece690
+DIST github.com%2Fnwaples%2Frardecode%2F@v%2Fv1.1.0.zip 42623 BLAKE2B 16bc408795c252ad4b4d7e163e4affe86e53ba6ede0a19ac4d4142007327b1ffe11a7fa20edc632c056f306f7f82dafc5057b569a97eb0707a23f84220ff7dd1 SHA512 e4adedeb9d7f60e70b63fd972babaf2cfaf2627214763bbb8f238147e3e3160168923535b7d078f39f8e0cb7f28c477f0be65163ad8c66902e0d7fcc29c31368
+DIST github.com%2Foklog%2Foklog%2F@v%2Fv0.3.2.mod 30 BLAKE2B cccdd5811f1be90eb22900329526d699cb97bd2bca45cf30d8b2eb7fa1f2539f107b3f5ac4a93b4c38c44abf88d2957fb3e625d93544d9e726ed4b2f7a01a9fe SHA512 cc0a9caf1e57dcd87dc0757fb61c2b503e72195e089d758278323ceb46d06871dfc15508669ac95a470386987c6410cf72d0729140d36d9a445a038ea79155a9
+DIST github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod 28 BLAKE2B d1f2187d0457fbf3087b388af0e41fa8c7a6c1d54c9f22fb631a144f42adf679bd372b5fc45f8d6f33d7e3cfbd57c1b7da2c4e969ae32185281390db58e9acbd SHA512 41e5c366b775318a4162bea00a6fa4e3d5a23c2ddb5c2707e4a4fb77c42855ce407429a7cf9c8e506bc79493ad5c56423c70dab081187ea6c94fbdaa0d5040d7
+DIST github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.zip 8493 BLAKE2B 0f00762e52e47e39e2c76907ef393dae846d9a49422e066c82ebba3e769ceab17df6fe1cb473ba490cb3b2c5c5aeb1616cfdb42b617c4685ee2066f7fe9612f8 SHA512 08341ab41505c3a098ec989ff43d8e460ec2b449b9a4cce6cb6240e33f8580f75071c2a7e7c8269f6cfa3fc2a5e33a3315af0fd2ae80bcc0901cc6ae9118804c
+DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
+DIST github.com%2Fokta%2Fokta-sdk-golang%2F@v%2Fv1.1.0.mod 767 BLAKE2B e37969d80d1be36c8340909589671a27f7a511924f8d2226126cb2ebe5af383a1e960a552dcd28e6646f9b99ec044fd9225b006945b7a206b26ca85d23f1ee90 SHA512 2c23dddd8ab8ac50bcec09d7ad9b754eb05b12c45bb7fef6282ff58c4d2200d5c83afdd4c38c25610e1439ad81dc893f42a135baa57edc2b51aa4aea9d7b2964
+DIST github.com%2Fokta%2Fokta-sdk-golang%2F@v%2Fv1.1.0.zip 282396 BLAKE2B c19489f2dceb43b2d081a42f8914ff21e0dbc3e469acf2fc59ae0ea7b4a12e43a86d213e5703fff714556bc12e861414a416ed12f5990947eb6a1432a9092001 SHA512 e7feba6d4db61632f89b68a8249c9b214b964dced7936788b83c060675438f670c85cbeb64a15bbc1aa7869db488553ab192951b8cd33cbc6ed45fc6553e2aa1
+DIST github.com%2Fokta%2Fokta-sdk-golang%2Fv2%2F@v%2Fv2.0.0.mod 480 BLAKE2B 81de3984c2da541166253f8ca29602f18d5fd9760f4935f36fcdf3f1766e3db1519bb549f8ff4db385464118373a4def5521b90d1b2b2109fb2d20c4fda2109b SHA512 2bf579a812c2367e2b5b69e6dca100920ea00f71a732e76e60cc306e3376dc8f6d0453caa32bb520b33f4c55dd012e1a2723cee5df8d4f860ad9d4614042d3c9
+DIST github.com%2Fokta%2Fokta-sdk-golang%2Fv2%2F@v%2Fv2.0.0.zip 455916 BLAKE2B f1c5f20e6a70bd8ad0a32e85cde84731900d84cad06a7cbc275bf81fa45fe0edf5fe1f34562da9d708a62c62f5bff843b808b6561d8ac2727a310faf8c869b9b SHA512 26c20a64d48f6edc5f7efee04b9bd42f7e96c1ce841297f304551b6df1ca3ff9d8fe34f57bb00194d85d3d6d2a5a7c54080bf324ed1c2054c6db06c0599b50fc
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip 245650 BLAKE2B f917c3c8b6076add4a4cb59fcb1561b21785e9c7cd910c96f7decaeaf4f2c988566ef656925cf91842cb4218142d13f0487721c23dfd85bbdce1f847e12f1551 SHA512 bad04a31aa648777f437f3a7516549992962ef1c660694c02aee62508540c553a2ea36370b917d29a8e4510cc171d94590721c447e8878b562f55a7b0ca78f23
+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%2Fginkgo%2F@v%2Fv1.8.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20190113212917-5533ce8a0da3.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.5.0.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.0.zip 157659 BLAKE2B 2e4a53ddeea8a6076af3dbc356f34d898c0189871a6328f00f0690479ca34d2efdb670a3c0a67c19a4d34684f25145d4bda7ea9a9cee1e26cc6d941a274ecbb9 SHA512 279292e468d786f0f94b627b00b7eda5049dfa9be7423ed5c26e80fc2c020787f5feceb7571654d903787089c0fba05f49539eed958f97238065924d6eccc003
+DIST github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod 32 BLAKE2B 0037f79655226dae67faa11b27847001c422534de854283b8124640e72f9209ddda65f4fd601cd35399c0d6705b65131b94c8bf8dd8a15c2bdbaa0c4404b58fb SHA512 76f6ad85ef60c0972b9193af3395e586b8da352614049125ea6b39ebddaed94fe3b6a5deccb8a4d33890f292795d2c44a3563fc420106bf24589a1d838f35649
+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%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-rc9.mod 38 BLAKE2B 3b83f93aa086dfd3028fedf54552dacb3d904867e62704526f679f2f0da0df8cbc73ffaa4e0164718c850d638d4a4d3d9d036be176be94b430d13da25e19217c SHA512 9aa2622003271b0763bcf11c8c7e39d5a5259deb17b7463451ceb13a9fd46a8786ea9a31936e22919ac8b871458952224687fef8dc87286ea25294945371c9f6
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip 388333 BLAKE2B f6c8bea9173a292f6c208b1591e4c311659518af5f8f6a3d7e9e48f7ea4fb319f019f33a43ac31834be6272581940faba02d0a8f03059abc3a3a4be528a7438e SHA512 45d58982c1a6d99da0e9422185081ad33067b0b53aec2538f3d25a980623087cc9b89dbd99690fca8330055b161a1529e6a00f4aec6201696ee483b17786b22e
+DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
+DIST github.com%2Fopenlyinc%2Fpointy%2F@v%2Fv1.1.2.mod 181 BLAKE2B 4f0ec7f260a81531fce76b34d079921840fadc9e9b1ee09a1bf12377fbdbffb2881546a8b4632bbe0ce10676508b57c1ef2920f895fe42eb2480590cd3193376 SHA512 00681288d059288cae068fd67e94ad38ba00f614979db622063de33347d2face61536d174142ba142336e38ed846cb64f0ca4d47150263b68cdb66c1fadf8e7f
+DIST github.com%2Fopenlyinc%2Fpointy%2F@v%2Fv1.1.2.zip 5570 BLAKE2B 1b7bcdbf45a89d1d3bccff3d9975f1953906e8a19ad8e37abcf64d98e62f24912895a9764418b0cd925e74b7b2fdb0eab02a0daed2abd4c34d5f1c149f209409 SHA512 2ef06d45840c2bf226a93afe813d3288eee3a55aeb0eec5cef288865dfcd74889e3ce8655896b9d38f22ed9cc569035a1f5acf5e1614dd5c1d8a049664479d8a
+DIST github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod 45 BLAKE2B 4a11e9a4a24eb8e0603b2e708591792b76e8523cfe113df480a67bbe95169d1b1e30ff8267ed6530684369a445f2d15f433f258a7c36b7b03381154ca90e1ae0 SHA512 33ab2af09dda0c6ad1d7b3f85dee520f18971c9c0e161d260f04b08ff3cce9b0633fd09b90c46aa5770a783ab7fe6871e6f8a5a0ed90bf56d555bf325beaf46f
+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.1.0.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
+DIST github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod 50 BLAKE2B 45544c1be596ddeb8fa01c80e7d96799912343c885784b18c114716ffdcbeaa05a772d819b9a762b7f155045be1ab3409d423c173356c6fb61b9dbf810c606e9 SHA512 edf1afd7200a64b2feecdcb8f1007e58444ab9737bc0e9d4cea67cf286116fb0ebd4d9b9ae10786bf71265d9b813b175f78deb0b416346736c9a7e39d741b6c8
+DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.3.mod 39 BLAKE2B f2a29cf2ce5b2862bfb3d894f36035e27c8cbb4ac1a1fe78cb4a0bacb1e3fc20e82d38b9b6c5d8793229cdf5d5a21975c936de50e6e3d395296d7e116a346d23 SHA512 b4a425d5f19203f3808000050e56a197965f4f26b8828ffc5837b7ee2fec2813f7c38dc242614a7a2d97b5fbfe63986c0115bce38b5a02eec6c60ec7a4568114
+DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod 1010 BLAKE2B 6bef0142218537a9452ead65865ba25d9bd2c9773cd87e199a72ec57c7de0143088044bb79e23c2d7a29d4275713efaeab457d8fe2b519006883b0c15f11e24d SHA512 10181677125b9bccfca933fa3ccc84c81381548b0bcbbf1c7423822f13902eca3907e06d9cff462126b4795b8ecba9fd0525e4dd9f90962697829b99dbc20bc7
+DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.1.mod 1033 BLAKE2B a6a88217fc248fb358f71cea9af2fe5a4346d51927e75317792cda9e00896e20f70ac060618bb1a648a05c5d214482a2cdd4a4ed5c5685ba583fb17b7d7d9a10 SHA512 44a8be7c11b9055ee26d0386c31f27d24d7d82b5be2594842a5338007f9d7a0d2bf835a5a2ed20c3dd78a0f8188f7e1d2d2b072acae0346d170612d38df4e761
+DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.mod 1033 BLAKE2B a6a88217fc248fb358f71cea9af2fe5a4346d51927e75317792cda9e00896e20f70ac060618bb1a648a05c5d214482a2cdd4a4ed5c5685ba583fb17b7d7d9a10 SHA512 44a8be7c11b9055ee26d0386c31f27d24d7d82b5be2594842a5338007f9d7a0d2bf835a5a2ed20c3dd78a0f8188f7e1d2d2b072acae0346d170612d38df4e761
+DIST github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod 369 BLAKE2B 96cb4a6ca9813f733a4a86753a406716bdffb636c0df7a43227c6eb5f950cf9fc8d1510a02a6ac9f75198609e377a6f4c3af16650527345d9a2d369ff6792d39 SHA512 cee2d00b0b1b1c3d09c27566af4f47243360366597b3b101656cbeb4293ee3e36c38ed046d193bc28dedfc86d36a9d24343c2b0e4f231aa74b7528e1c302617a
+DIST github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv12.5.0+incompatible.mod 36 BLAKE2B aa3c0143ce0099e48e07d3282bb4bb680612890e5011c4eb5e49c131d71447598bf13e93e6938b6982ba0450c668c2ea949b53f2ecc0848744512de232bff39a SHA512 cd96f5afd87e43290e6e74bf2828ae1636d4f905e1ffe068888bc30d1313a9e4ec752dc2dede29c75f4f1dd8e695c43acbb01c116c2b8fb62a21d123594a6b2a
+DIST github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv12.5.0+incompatible.zip 3130892 BLAKE2B 9e9b6c8945f5b2e1e104eb2e404678575a59a6b5f409c39b74fb6959733b88226b9ee9f2c0756c2d9f8cd752d7921e40561c567cb832de7c63168888c376cbd5 SHA512 eded990bd80e5bf9beb7ba907c50ec315e8ddc18842e81dabb8e701bc2831901779ae87506192e6ce892b0eebcca3bd108b1b75fc3e9d3bb2c8b7e97d4e8c96e
+DIST github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv7.0.0+incompatible.mod 36 BLAKE2B aa3c0143ce0099e48e07d3282bb4bb680612890e5011c4eb5e49c131d71447598bf13e93e6938b6982ba0450c668c2ea949b53f2ecc0848744512de232bff39a SHA512 cd96f5afd87e43290e6e74bf2828ae1636d4f905e1ffe068888bc30d1313a9e4ec752dc2dede29c75f4f1dd8e695c43acbb01c116c2b8fb62a21d123594a6b2a
+DIST github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.4+incompatible.mod 33 BLAKE2B 641436802108b1bf3a64ba7f059e3c047f91c99fc091d47a33213e3f00006fe03787a36fa349e9b4d0669ecf911a0510da7c6b2f4663867b8261cd5ae987f5d4 SHA512 be5a940ffb5cba71c75b24fb97c2738e073b4a87b1e9a326f885c8cc175eb60f28160e35dd8b3c31f70a137f570314422564e85f1400311525fc0d75c7d0163e
+DIST github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.5+incompatible.mod 33 BLAKE2B 641436802108b1bf3a64ba7f059e3c047f91c99fc091d47a33213e3f00006fe03787a36fa349e9b4d0669ecf911a0510da7c6b2f4663867b8261cd5ae987f5d4 SHA512 be5a940ffb5cba71c75b24fb97c2738e073b4a87b1e9a326f885c8cc175eb60f28160e35dd8b3c31f70a137f570314422564e85f1400311525fc0d75c7d0163e
+DIST github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.5+incompatible.zip 324293 BLAKE2B 8b5f29e8c1a0be72432c900ed109970c50afb112c951ef0d41953f55c5b83c7e7f8cef379cd3a072d33278b3a5cafe58f177b617b0bc626611b4091f326d5ec4 SHA512 c22798d044733461936ce7aa9df693b8f8b7022f519f0bcf9707570b985cb7baeb884a66cf0d76810307baafef04d77d57200dd93d3a9d3be523fdda0495f0b5
+DIST github.com%2Fory%2Fdockertest%2Fv3%2F@v%2Fv3.6.2.mod 1004 BLAKE2B a981e91b7948ed540871f84ceaa2c80379ad67340f7310ebad813ed2085aea41f7115a331bc5afed685d4f9fa1d0e10ee633fcfa59721283208f909afae00cae SHA512 f99d4d6aad45ced25dc1d93ddd9866ec4e3f55ed02383a46de52014a8ed7a7a8730ebc212c7fa255944ef7d2dd0587490fe9cc9acaacd4be7e273a0f5f1c3353
+DIST github.com%2Fory%2Fdockertest%2Fv3%2F@v%2Fv3.6.2.zip 321068 BLAKE2B 077232891bf55952672ca77d49b6a0f4dba0a1990a34fbee13643ed6f031b0c0507ef90953a56ea4d961cf139f438aa36e9190534e3b70590244aeecb544f2fa SHA512 f667f42d06f1a0465525a102bb97513e9ef14c9b1fbb34b06e3c90f97c3437b312416d8842dc2eb7d1d93dffb824a6220f69b743a041c15ea445083640e49f47
+DIST github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod 34 BLAKE2B 24e5a5c0bd31053b54c98d3a593c6c82cc8a0136234a90981004ca7f40e1eeca392b56d80ede7407a49f8c666cfffa4407d0ba0d7c09a42dbe8a9773f1613d0c SHA512 a0744e73669284e544d60a9b3c9449ce074cae579583410ff0879571e0cc57a7784e30938a8dc56c08b8f5b87fb0c0df3ad477b0c3543f3bd221b6f3a2f282b9
+DIST github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip 10165 BLAKE2B 7208b851d5b38607aaf215d3076130dda5208b8c54a7ae8ceb8232011b2c802e8d3034ace2d91c2e5f1e085068ad8dcbe53eb653674255d3a727dca92cd14dd8 SHA512 0fe3bcb22a1a3485e64df4bb6fcfe619a8544bd1e245ca755a0a4b1db2fbaa39411f4fc2e5d3373538b66eec805a3df208103ef813ebd94494dabde52d5683da
+DIST github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod 37 BLAKE2B ed6f4a483b165555bd8e0483e5ea03f2b46f9aaa60d0c0275877d1ca107561627e1c8b894bbc3d0054f3229e05f828f9aedf9de9ea8c58879dc2cf8543aee8c0 SHA512 73d11fe4f2a7a420d84b2a749f589bb586d9280ec3f4864825d4d2a557aa5f0e1c2a8acc2dc2661cb06425a35d9cd94d06617ca11aa0a92af786dd25f9911466
+DIST github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip 44333 BLAKE2B 0c915c31d64606ea905b35d962953770fc868ed63c1408d7ce61d96165f3995371bd865defbfa120ceeb7cd0a394cf34364727229129b53f44d50a5208b675ef SHA512 915840cde63a7b85eba397ebd26cc4d61b65df9327ff1f190ac68fc1acd2c044e5dd3b5d0630322177df6d62a8120a1ffe8f7c45c7e66036b848e3af432ab95c
+DIST github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod 42 BLAKE2B 96c6dbda3f5479e2687e4dd71f0bda96d8f25d2edf4665e5e4b742c942fea4db9d879cb039442672cd9aea2d1667091355d745156911bdc21a3344fae5e52752 SHA512 64c2746a75d99c6637221fd8244cc1a07c805f055f4a1f3c1408e3b6c96471343caf438ae1b797c424d59660777011201f47f262ac7210aa81d37c6c3f28bcdd
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip 24373 BLAKE2B 48d3d48ea7431eba6946ec134f22d789b1e71d5ed5d421214f7c8b1803e0c44988375f1464206209a30cd20ab22da83d34ac27a3efeac55869ec24219fd835d0 SHA512 540d0f75e2fc27aeada7b736a896555732d8f4940462003fa574921d4479523ec1d7cf08697dae09a9bc1aba37b06557639ffdd8458c73346a114fa445dcc9e0
+DIST github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv0.0.0-20180815053127-5633e0862627.mod 37 BLAKE2B 0e37253242e439c5d26f3782ec2a3790b799c1014089101fe2a3b6996ce12b001495e11efdc1de203059231cc4d759445a43fc5e9617e56864082337383d0c41 SHA512 5a7842b9804240c1cbf50e2812f26821a0ccd68d5dbffdc3e761e0e60014dda69de842246c45569c7b09c8129bcdbcf9ddbff1071ae14b7be875a9351ed46f0a
+DIST github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod 37 BLAKE2B 0e37253242e439c5d26f3782ec2a3790b799c1014089101fe2a3b6996ce12b001495e11efdc1de203059231cc4d759445a43fc5e9617e56864082337383d0c41 SHA512 5a7842b9804240c1cbf50e2812f26821a0ccd68d5dbffdc3e761e0e60014dda69de842246c45569c7b09c8129bcdbcf9ddbff1071ae14b7be875a9351ed46f0a
+DIST github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip 15715 BLAKE2B fecf95052bf2bf9ca21e6fdab3c9ee60a01afe8de700050877f1ce4af0c6f05ca044ea9be9228280e6dd2682616f14cfedf678a92c66c00936b8fde0fe336082 SHA512 0bd072a733e99c2af2cd83792a13a0c0f625e63ef71fa9ecf1a50c9d93c2879c5965bc5457655617ff4f23cdb854718958d9657557ab09730ed0404a252f8749
+DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod 70 BLAKE2B a94864739ead6676f2defd1020645bb86b8b77600037227aee95fe3e82070c31814fd055dad1fa16ce1a00f64f32be96a97968259ef43f70f20e8a55cb9943eb SHA512 aa2a52cf55149c10f76a8e535dc75ff9bc18b4f2515a31e8720a26a5f501459c736dc73548d2e37f348f27b78974bf0a3b18080df972eec26222fd8afbbcfabd
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.7.0.mod 153 BLAKE2B fa07893d430b69f49991bed1bccdca11e9bc2d2c92303570601a05dec04155b52ea9a74ab58af54944f158a837aba650fb48a131845001e44035adea7122fcc7 SHA512 9e36fa7f42a0d5660cad8949f47b31a3b0361a40cde7f531fc26438de521ff64f9a7a3b0b77215ec1a4a93a7f6f283c28f9b16ed9ff1b8a049efd66c2a1a6e9c
+DIST github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod 43 BLAKE2B 22517b91de93a0e72290dc3599ff8b4fd4fe2807e175e3778c0cb6977db6c02857b9a331e2e07b21851fbf35eefaadb2e05f36c2bda3c2381f22e23d4f24b89e SHA512 b2a58daf4ac906cb34db04bd3815766a74ff25c40c4f4b70edbefac0d3368f1a26ccbff3a5ea910c399ecad0213a2eecca174827caeabe3027e0c99fce53bb23
+DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B a52c6a0304ea7026657d40ff685f37799d37cf3b05a87b15336eb05eb8a12d8749cd73d8cc3228ba2a80ce1e489a3029617ecf301dbd51c7f5dc7630dc114801 SHA512 df531789f1495979faa830433a34e38996cd919757f0191b31b862a9e9dd48be68179e291416876cb31083dec78337abf6bee92c68cff38630aaa456cd3cf052
+DIST github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.mod 35 BLAKE2B 02b7783baf4e91e1d27eecd00775026d0871b01c7c8d447f74db2fbf8f1fecafe8d25aedc503762ce9a96f9299efc3305d8382a7e87336de8197d332e51ebf03 SHA512 884e2bf0081cbf0158921c92db1bab1af99d32a30494e632457e59cc31a692eb510f93e800dd606f8b8c4cda68be8df08d571b5957816e2cc98caa1ec19ff3f4
+DIST github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.zip 16924 BLAKE2B 6de4e697381061b4c409057d566cb8d53ae77a4e511bdabf9d65d8c07ab8d4dd1b8fcd20595c99b9fbbb4473cd0aa970a2c040011191511fa847aff46fd08ccc SHA512 3a6d9765d02b91787c599fc39e5f1dfb144ad4a9326716fca562c60f9a62e55e8d3efd5bb2e50077ef180731ea2b89d09aeed14f3999e9cd4cfa4da3ef9194d5
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod 69 BLAKE2B e3c2bc67965f266f7449c37a9cb421a8a5464cb18b54ec9c81223c81b3e19890e4b628e3d14a7904a6de4e8a83b53a21c01ae32f774fb583a8739eabd00daaeb SHA512 7b303db4973d7804f48fc036bd427a8258d34aac8a8ec95252e6602c7053be4428b5e15642263913686c3207cda00316132ec668bbaeb2748e093b1f359a1620
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip 20573582 BLAKE2B 4c5dd3e4f8ff6edabbd14b78486d6213064a8ee351a45efae43bab610899148060dba9143998f37667d8170a90a70187558b9eba9db36ef6cec5e18df020c466 SHA512 fda30f0b48b9561870599645cb9dc0a788d0f1fb8217e813ecbcf9a36d29d2185a53670bf81e21709484b22b851c0b46ae99265327f4af4c78eb5e95821d8264
+DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.mod 30 BLAKE2B 3addf97309c342e8d5bcf397c7c22cdf02eaa571e0632595f9268678a2ca0ef9818cad13ccb3444547d001994d137325cb2cae16fed3c080aa6e62f206a3f059 SHA512 c084d8b2c486f343a891b3b2d21200f80161f2ba1303ae17f7a482949b1c10562e7f87ca44b4258d32a1743b0eb66f842bc184d80fe349e9deb965215ab98b2c
+DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.zip 5869 BLAKE2B 5aa5d1f38eae51f3728c284ac81ff9de00b0ccdc17d78a73e006ba384b204192aaef056aa872504ed5887496a817f99c6d8f88414b44ebe8eba0db960d94387c SHA512 a6b0274e65e084f59bd33088dd3fb6658e0824ab9d8249c2417a2f9396d4461ad9dd7e3a1d5ff5008bc0edf7f835bd426f1447c1bbb8fb81cade200d0c891579
+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.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%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
+DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod 136 BLAKE2B 3708d63176898e5b9b06ad69d2ca1b4bc3bc62c5dabc6df3d77f476ea9b588f27efc18ce5f098b50ac0fdd7c71b36f76175e2cc3cee878c3f4815303b17071e8 SHA512 9138e434a2810bd96269cda05a0cb03bc7e6f28949f6d6379468567e40938846c85f581b4bc3549a53605dd9436e25662f27f216a60a4bdd816b038d6af570c0
+DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip 33879 BLAKE2B 2941a11911a8b9857e5dafc63c6477a1fa80dbc7118720302735277d9d10d292b0da58575da6a3a961a517912079a7c55d7101fd1e401297b189e06623c15299 SHA512 e88934a079336ceec1566612c97e0e5b0fd38fdf91377917d92208f39415c0ef2503fb3ac8923af4dfc43e146a71b5e28d4ad810efed32ffd9831e1e2aedf495
+DIST github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20201205024021-ac21108117ac.mod 92 BLAKE2B be55d917618cc12e5de0c8f6ed3a7452d79a908a966f4b6445c15adaf01827dd476b2d88a2e659a58a057b880a96d291c35ea8e045f341fbf56fcbf8b476ec69 SHA512 1b58b06c157eaf1240d9cc17f82f0c77451a6ccca2e066dcc80196be60f80651f94a59dc9cc518ddb4ae7403efb6eae23cb5d60cf2efb47b419834da18efb1eb
+DIST github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20201205024021-ac21108117ac.zip 30109 BLAKE2B c4adf7b5767559a629d8d94c49604240856dfbc3815f868396db0d85826c8ba0f07aa2192a1cf6b9f56fb77eee11b5b63dc4faa1f4661f342c73b6b57de6ac7b SHA512 d5c696a8d3c572cf4aab9d1b76bff26868b370d79bf25ed849d4b1b9bab7d007356e278299b53efc7ef173fe9d139b2cfeedbaaa233e778bf8be2d7374a9013b
+DIST github.com%2Fpquerna%2Fotp%2F@v%2Fv1.2.1-0.20191009055518-468c2dd2b58d.mod 155 BLAKE2B 4e2a5664777c0bdc0a6d9d2d393adeabc98e5966c1066d7d4bcb2c5540327479f9a2d7ad3e0b6957fcf2c583ecbf74f34e9703bfcfb1b86d6e3d098d8ecb2bb1 SHA512 c5afe35fb3535cb648fb6d574de9364d71e1e829d38aee37d49e62d49d72f0adbab950323f6f0a3ead161b83a59a30da30a2f5af4e50d9f23a900339f3e79f52
+DIST github.com%2Fpquerna%2Fotp%2F@v%2Fv1.2.1-0.20191009055518-468c2dd2b58d.zip 21773 BLAKE2B 08e96ddc3762bd6d27afde3f6529ec730d62f22119a2ba13cbcfa334b1eadd68a89939a42c49c546995bc3d400e6eaaf6499bf84474fac904b2f51c1b72b4f8a SHA512 ed99ae39dfe40ffce5ce5d4b941cf893e41970af532537f50366081e10c6ca01d342ffa521d0fba133c865e1f5b93bfdbf2918193a19e4547a8e09d549f2dbe9
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod 540 BLAKE2B 4d43a0901fa46da74e62fa22f61dfebdf6468f2766bd43dfd487d7a5434f961d181ecf26015ff9134e8d3f9c2dc03da6abbcd0030348facda3a499af9a04665d SHA512 9add81238044589ae2cf38042b963953d507e40945118fd62ac1cbf41bde1b001a69423c50b7045b721488b3d53489b4ce3c544b68f6c4e31e340d2581f7c8a6
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod 443 BLAKE2B 2bc1a0ca986dd17787cbf528312efc6e721d3d9a46126b90537b7cae6681192e74afc83f3b64f8835314a0608a3f146e3fb74afc3339bb7b009d16ba04208cbe SHA512 e45c711b58e0453c63b899faabfb662fe743085dbc82782ef730ef6797fd8d372208d4fa887168ac920d6b1d15f7f65fc9a3fbff25a4474915d858411a7adee8
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod 375 BLAKE2B fdacadbb6c23350ffa04e625324420df9b523d9fe5bccd8bd1d8f6d592d7ef5a2b4620c1d16c78bbbbbba2716f3edd015cc16ae5b0c3c31e5959ed12143ff3b2 SHA512 e98ebe9ff7f5f5c893ce7a54c12b3d5b86ae1f99a5117875bfb78aa2b59d9e9a95bd54e45e1a16e8bdfa79f38192626f49366a0ea4e36a25681e7448b544b144
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod 612 BLAKE2B e77946b5137a632121f113e6d7b390d25891d1fdf214b7c07ee0307aa4e78f5d19e96d1f4bf01aa1d62a2b0918727db1e128fdca6b6f1daeb08632b940a3084e SHA512 46eb82a74b845f5eda8cd01e8ae182e5dec7867306b31a40cb5c6bb9df2045c3259070b57388cc7826f54ee7b9fddaf980436f74ed500ab88748a13f12b30ff8
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod 569 BLAKE2B 0c975c1c48f40792b02fd8756be3b6bc044ca05725ae179445a858baed4861011ba76051aa25fb10be23c6cf14738cb9cab928418be49d8ad85211d398089ec8 SHA512 6fe81bf3c591058f2ff968b3c6656766d9d3fd74c8577b3e7cfac17e463392eed3268248237d252c98751b2f97bc7c48a8db15bfc3fbcd4afbbaca0e2970819b
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip 226158 BLAKE2B 899457f410f559d70cac7131e9c6057bfd749964b8b133943635b0ee78a12485d933718569d085f51dd34f831114c2f74986818536cf21ad642dac793b00390a SHA512 5c4d5e70be8984c9eea4211e06e1f9478fea4ee4cc227167b9a99d87fa773e060e42aa4866eaed39e58a251821840643d5117b12006a6809902daa08cca14b2b
+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-20190115171406-56726106282f.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+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.1.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip 13785 BLAKE2B 2cd44410ea7af88683792807b0f2c31b0943d8664a4be050f2e422095ef3674e6d42f4b9b6a76083e13bc9f44be1578cb06a7389b4a4b201b5a88e756b40193c SHA512 db2396362357b6d5e99b21bd4aa8d8dc193dd2676a8f437c62eafae849a56a53875bce7411d58ad78e4fe36445b72ee1a34360b174a23ca84de911f5df189354
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod 817 BLAKE2B b4cabfb93633359c6ac6dcd400484e6162bc6b609bf0edfc4a82a2cc0137edef114d0d3e9c55bc47d1abd906d9ac00f9d84f07ee7072452c570ba9f98118f4b2 SHA512 7e1b17c424c8ec889d0efb0f5a171043ac0fffb48725144836d8ac635c036e877e65f34f75055359747142051afd00374cec9e39911175adddca2c50fde4c893
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.11.1.mod 739 BLAKE2B 6a475498d76be0ec42814e1d5a932c707711b9538e8507afaa36a3ee6d26b78392f750e9553f960cd9768f3ba6a88b3d8c338b102ba48260c91b0f5b48e1cb06 SHA512 5d321367c7b93f913cb524c688dc515dfe28a0cd712665b61ac12dfebac8a67fd19ba578f8a3666b557b41670eb9f3cc718fb93ca413851552efd695859b7c4f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.11.1.zip 178866 BLAKE2B b752361261938342f00404b6c05cf25120a2a368846e15e855c4e0f58bfb24f2ae4c4244f967a23bf74d2fc296568b74fbc7e2249ab8efba669dd6a615946c43 SHA512 3a5cdb33a7891df7cf568337aec67d363de9206b3a6325e176efb9541d1bd5c5a2834b309ddf46c6eb90ab7dfecf5222e58ec745a138a8a7be6e231a2ce59a91
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod 857 BLAKE2B 4c4486d3772ba9c4ecb347940a8e6c84d650847e5e1d9f2a0165569bf062c2a2060cd01c8325221a0c59da8864881c35bcc1532acb0b52f617a02a28f4ebcce9 SHA512 17deca5d2ce10cfeaa0f8e0b1d83317023f4c9841149f9b989cedbc9ea2cdd2d05b2dec1a6323f6202290c7920a68d35da1d4b064892072fb056ba3a767129d2
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod 829 BLAKE2B 14a7c9b3754cce16715135e33ee294058d999f343d74281b9fd111a9c0a5632b90b6594d1ed220165b58614a695b2b2aae27b2ed9aa35ba1acc768ad12e46ea3 SHA512 4cb3dba50a3b47b9db735de9df4bd7b35d02464065919502bb1e17236c2f6b1bf1e74f312a8d0127d2d570344c30d58063d62031d3439f52a6dd8f47b29b9996
+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-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.zip 262428 BLAKE2B 6334337329e564dfddb576464864b53d4da3cd7c0988cb6b0eeefd3ea9141f36429f09c1f75d11560dc12e23751fe5c52a4c7d46cec0ed3454fd3684562bad72 SHA512 8dc2a0f05fea67aa9a64d2e91807cd9fc111be3ad4fcde2b8f53757ed38a478467f5edf68f990d124e1019cdcfef133cbd0278600df8abdc1c0971808d729956
+DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
+DIST github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod 85 BLAKE2B b5702bb668542b4c88cc63201fedb0fa72a00f6134ac660f5fd392e425a61e4b94a1fca8df1917242f2d6b83b8f810b20f3524a870d1ae1d67fc04ba718abd2b SHA512 0649a85ce1922565fdb4f3eea0c095560bbeb655a382ef6603cfc0fbf1ea4053050a17672c30e91e62ae7816cf178fdcb00e7ef395cfdc2245dad5b63f835184
+DIST github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip 6533 BLAKE2B 087713f137203900b2118c96d7cbaa0a0279095d236ef3050cf4accdfbdec03711917e898da4363851b01c7e0b4144f0848cb1fa5599bdd126504f415699b860 SHA512 8e0ea31f6ba2b89da5c78033796d351279bd981437df2ad40d1c426fdedb07b006ed90318a6429030cae2ce0bea4d0cc7228c22887f4d137768527baa7f8598f
+DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
+DIST github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod 32 BLAKE2B 4148c4c08d4c5062bccbad5db4c68a75a3ed1de631b32999a78bd16336a1fe6c753a7bb3e54b99483506e49454184bceec726f99b8e31d59ce08fe9282dcbe16 SHA512 51a5ef03eef2165adeef916aabe1277815cf25b930b52c52ff4eb959504734dc14bd3f37e61ec61b03c75f27ede85035c401bc7e294569246ffffe332520f76f
+DIST github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip 16827 BLAKE2B c742a9187a1f70ad64305fa5b115313c2578bdc81f9e7ca860048b4e573decda1073975c111c76fb2e9ff9af3c84b278bb679fa69ef53c16b7ff1169a8f79b9f SHA512 d7247d7c28a0eda048a8ff9ef6ae8a1c136e185cd94bb756f83f4fed8b459101c168175ada72ba31a2ce7481647040421468ca920f2987389884173b2ae4be98
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.2.2.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.mod 82 BLAKE2B 3b7ef0a383ee9e7e64ba74f92d717687cacdcb0e7a57f76872cfbe77ec1c526ab97a8695a2819cf986c51a4561794391e5d532cc591f6ddc2141b5559d3cec9c SHA512 d08f8ca2d93c0d97d5947ed3d221fff67e774e810d7fc9c93bd25bdc446190fc5590776a3e6b159fde2b97c3355921235fb6c8b8623b7f2090102a7f1ca1a6bc
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.zip 196384 BLAKE2B 938f3486294fcdb95056c8434ff787c1e16aec8ee030cbb6edf9e897b1c5c97bb747c94a07fd952728cbd89d7c84592e98f582068678fd66e55d9b22fd14330e SHA512 9a77af402afa843f83d5d98296524e49d30e35a79e20f3fd58427a7284f42f7ac826b1ecb7c963772de8950b78d331775aa537936bf9abed2779eaf8e2d23bbc
+DIST github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod 29 BLAKE2B 2ea3c35fc2c4329d91f1e51488b118dad13de2b395a1485922f1522c0f510773109caa149ce2e1082e117fed475302995623c26bd1a24e700e445a6d71979b26 SHA512 ba2bf79bee3aaf1c22f0f53a12a30b7fd4a8f344f768ff6e4edc84c237ec8fd4aedbd1442f5a9e6d81d2bfafb6366e844067d4862eaadae49331a155bc7dbe13
+DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
+DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
+DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip 4810 BLAKE2B e42236b0da77d785a299eb5ba0aebe74c6c4211f7a363bf1f654cb37551e1357cbc0798166641bf691f024b3b1b4328491d04db104a7c48fe3bf7e8adae06cd8 SHA512 094dc845fc470cbe5261646fd3a9eb313c5a41d456dd6e0522656d47f41622092e5f86776ac4855c1dd9b6f145178497c31a621dcad51e224d8294e6947449f1
+DIST github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod 35 BLAKE2B 68028ffeebb96ddadff1a781e7f0d7267d9ee0255b2b00958d9e36b6870e27630f7cfb1f6a1c90d81fa6303465d50936c66567c4b562a8b2711d459ee4e093b4 SHA512 1cf1bb0f786ca726b882a958d719c3b762ac146c01b5f57fa246dabd3fc1462b47cb71f7fa0c6b146873113a609b5a94aee724d2d624fec9651947b78d39cf73
+DIST github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip 3875 BLAKE2B 9055960e0a721a3227bf7b758ac3113aa868ddac5d5eee9f39a836f6d5289a6f01e4f97347be504bc8ec385deb5d1687df71f29b3ea8825b894cc1957531490e SHA512 1014d9b9b3d05c2ffeedf92ea2280477a9403614b6ad84631e634db98f14e28eda22fa32092d618ca2b10c13993cd82a064420c7cec5860726d80a78a1e52804
+DIST github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod 38 BLAKE2B ce3c91e2fcd6c3748acf0e0f6355a0af01db3c7b36a793fc07b94b1072133f7f25f4c49473bb27007ba2de7233454a3728f24eacecda76388570810e62a5d161 SHA512 54235e8bcd2f98cfbfdfe187ee4b2cc7d0efe155710474100709b1a8c2e55cc2e24a16559857fb9edf484a0b76debbcef69d5c182efe52594c9858a37b6b10f0
+DIST github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.zip 51276 BLAKE2B aec8c75acaeaf4e826d754a0e07445b296e5e833004c895790dc49ce98bf56f71b6fd133c90abe45d72d7a1314b08cd46755ce02baea187aaec546b9401fedce SHA512 2eff2ca0756a376fb3f5999b731d9e3a5c381b512ff640e62f0693d30e3964554c1a8aaec0d36180f103dd2572dc9205ad1ab2b5da6ccb4cf254d2ed3e373452
+DIST github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.2.0.mod 38 BLAKE2B 5cc410e639162c75afc0c4f5250fca06c04008d7454b89aa31b75339f06351aebc404c5d27904cbd6b9e0e064d35decd5b822899f05e8d8ca110307a96323fd8 SHA512 68b0901d5689850fac6d4f5ec7122a8f6763e1f4e4ddeae0979d9bf0ca9618f0aa4dd50c8f77c725ef3536f0077cb230939eba617f162235e4e7f0349eaf1a2b
+DIST github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.2.0.zip 11409 BLAKE2B 028e4324c22f827d6b6cebe4950218d65e724391e331888bddc4f0c26f8a67ab6ec45db716cf3c4bdd9aca7cd27f2f69500d037d25ec2bbbb472bdeab6690865 SHA512 adcbbdf8724de99cc7aff2db495260c9ce257cf3cac7fe7dc5c61ba941e35686729bdd50ab394303e3fec8ed94283c5fd6c8b8b590089cc34aef6fd4ebf533fc
+DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45
+DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip 16598 BLAKE2B a24ac9b6c7787b9593508fb394cfba29c5dcce040cbf7f78891ff521f00773bbcb189c12cd24500510ed6b89a4c906ae7eb6dd0361a3a7c0c964a6819d8aaf27 SHA512 a694940f17372097d987b0585df417a71a5ce9883aed9f5fc1222dfac32d08f804ecae1001a9241ccabe2a4c5bfeea588cedac078afd6ac3188bd4e907376db5
+DIST github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod 35 BLAKE2B 71029363efb060324896192363d41d20c9cab843dfe45d26fdbc54482cc944816b8e3e036efb3c9004356eb0fd99419b14af49d27303cdd310d194fa401bf015 SHA512 274faf6f3088e44d5ef67ed2811536dd105442f920dfda66083489afc9676e510d1b149252e33655ae8f77286d546cb52da07c3d522c56229f65b8827847f353
+DIST github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod 30 BLAKE2B 77431281d4cec52a254453afe8c7438154b0ecae0116ba085401536adc1f71f6a7eea8b0e2181893b004d805e3ff8b3a7f212ac82e41877cd08c2cf0fc47af05 SHA512 5101454134688f96467dbbdf475b1d9bd9e446c29eb2cd04b85430ea0130c09dcbd8141d5ca0d63e63b74349c3dbf59d978ef2115a03c920ff2abfad10fe9a62
+DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
+DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip 4415 BLAKE2B f50a9fd1f74506625ae9460c6071bbbd1dd3ad3d83264fb7def028c757e8ad8f865fc7255db6e9b5cdb7a1744ac1f741bc6184f064eee7108f6fc0facc81f639 SHA512 acd19ece301ac146ae50dd784e3dc1c2cbc0c00a562fc5d2759b7b8a4acf0b5bf83d5bcd54122130877a1568a13709c28ab7e1cc7ba269ec91aa1b1a86c2065a
+DIST github.com%2Fsethvargo%2Fgo-limiter%2F@v%2Fv0.3.0.mod 48 BLAKE2B 33ddfe8d645092d307c8b8acd8b1c0c8c0c91224a6b0eb3bac20d707be49acc3d437cf00d341d4d37857a9ac4b5303d1df717d2a46ce717941ab7eedbfd133bd SHA512 4266c966fbdba482455fdd13f37891847cff194d1a6d169be35167b729c6e36e9517d72c5a5fda048d8465ada31927b0f3d00fe455e5339c554829e7fb914d2a
+DIST github.com%2Fsethvargo%2Fgo-limiter%2F@v%2Fv0.3.0.zip 32198 BLAKE2B d779ed09d9e00d6ff18be20b48068a1877d623070d2f74bebb6816d3a139b311276caf8f3f3099a6b6940e8d5ddaaae07719fb86f117f9ec987483b1573561d5 SHA512 35f0ae21b2af7e125e4c18a36a0c6695b024f9f53facf6f025c71237cd12658cd507d05b6d8e8249c53477b56ed7c8e0a960232715e7243da2a3f00d6dcdcd68
+DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.21.5+incompatible.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
+DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.21.5+incompatible.zip 257791 BLAKE2B d0c44078120582d20e3c3eb60d0ecfc2c8547323ea68eddaffee5614243b4410518eabaf0c17b24351cd269d85bfc5f32151bcb56680793682a17b61e8881204 SHA512 c2d405ad66b1e3d6860ef21dacb6b7f0a5daef57267c32773cb26ea9983ba75df39e6b3ab5bc97c4c0eb133e17eb587a565da30d89139982fd90102765d27ca9
+DIST github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod 37 BLAKE2B 9945435440e0d3be57cdb12cab697382fe91c56329289bbde332bbd1fd15928a5101d7fcadd89064ecbd103130514a1cad383db097d02d596138fad0348c15d0 SHA512 7f46d39bc8f24a5c5c1ff513c0f0018d5341a008526a49bf0b3694008c272b3080b0386a44ba6c27f2894bef19dfbec5095c9189ed222ed5a55797788668315e
+DIST github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.zip 39452 BLAKE2B 8dd14db80a538517820b8894f46a3b879b4a0b4434fb33cf2c9ee479d464101226567bc88b6727d5ecc0e2362c5d6287965b9e5fae78a718b52ea5f640bec6b8 SHA512 62985be9142938aaafc2d6470604763b7a1fd83fb8c3656959f0fa9666d683022b41e5778ba6640575cb2a81db537154e7a8abc4ac0c52502f15d66386074937
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
+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.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
+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.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-20180725160413-e900ae048470.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 81760 BLAKE2B a5767557b0e96fa3bbbace46e08d6a2167be2c203a44ffaadcf14079a23e906ee9197c8028fb29bdfc596d4f39e7bdd29993a1a520c36c8b08c5c5b6bd6bd2cc SHA512 e204307d5a06550292a4fb6e44912260aa5a7f9fcce0883d8abb324a53673512218982b1893e7d563eb7d6313ac98a8638072aaf7b5d66d359e82832f2a8bb2f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod 41 BLAKE2B aeccb766735cab34f6559537127886e3227273ec40f78cb289b852430e5cb967e2b3b8a798dd20ab0d1c8481c62d25976a76831092bc114cc6c04214ce7ab081 SHA512 8ce1457d8f4e3cd2d997306844a157198039ae5feb9132f22d5768c1de32800469f682d33a8c3c455f7728332136f376858c23bf00da180a53f9d32d4e4ef291
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip 1521758 BLAKE2B 653e697d76d392b18c09e5c1c96734a737071667345b9d6ff9c9589bbe74e1c50849dcd7fc00b660adc1aaa30366aa9ca93a94d5eb4e605f7897d9714119f926 SHA512 3bdd2bbeaf755618d9fa7f324814497308361cb0f3f93a7ac84b9fc01b79ab346353ff0a022d3d85e74aef57b3773e03ea9279d0a60de317a1c57d5eca2d1507
+DIST github.com%2Fsnowflakedb%2Fglog%2F@v%2Fv0.0.0-20180824191149-f5055e6f21ce.mod 35 BLAKE2B 504e3741e565a744f2d7fd2564be54dd07ec9f1541130d1925ebbc13c0fa3f5ff0e3307920f152bbeb70be17fc0afd5fbab9b102ab4aa140d0a1cd5f372c6f4a SHA512 47b5d310b7b5bcab7883e2886218096805d0a922831a5e473dcb9c6bb960f85a184659eff746914f1e4170f8611cb37b6abdefe0d49790d6aeda14615d806082
+DIST github.com%2Fsnowflakedb%2Fglog%2F@v%2Fv0.0.0-20180824191149-f5055e6f21ce.zip 22504 BLAKE2B 1d4b79e57b439a63afb6e76b5bffc3a0e55bf8c7766ff8214106fb91693fe5e153c58d00bd8644fa7b78baa2e2eec36e93cd2c8aa15a7465d5961bac89824e86 SHA512 893d8d5eada291cb8532ab40b4f6e19687b697256d9d5e09f94b1b82bba2dc5ab340377a125c6aff46976a3c340491d1ed31b51d5b0e1a54c38c855d46174570
+DIST github.com%2Fsnowflakedb%2Fgosnowflake%2F@v%2Fv1.3.11.mod 391 BLAKE2B c506f843c4e0e8b011391d63bf26ee3cf9f911378e7922d1d3416f6066bef9b4d4f929387b52c9130365184d503cb41a7f0c869906ac4ff4ba78ecf702988724 SHA512 ce313773b3a2db7297c352e733e071e330c6ab2c48f7bd78185cd15fb4263bb5da96514bbfcac3647e1f1b0ab3b7f8acbf0845f2468af6a3f935408e7bef2e3a
+DIST github.com%2Fsnowflakedb%2Fgosnowflake%2F@v%2Fv1.3.11.zip 521227 BLAKE2B c890ba62b550eb4f1b308a827dbf9c5e8b1dda288781a86b070973060d18c2dde47760939652f5b856c7584e5169da2f1f8912e2501ca380fa804aa441b5539e SHA512 abfc033a3a45bad1d5f4fd8e8e0ba9802956ed12c961e47dffb58490a2598b12dc1fad6f7981be827df0b37c80aca3d4cf0a82b1f706d61145d68cd268170ddb
+DIST github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod 41 BLAKE2B 5d4d27e0f2c2a03d5ea5a22e208ac33d9a4eba122ac4ca95618d2c3681e63540907800a6e6e28bab54c720e88a4454440a23c0911e1c86855f67b67128f5e011 SHA512 a887a2c822f38592ebd66fdcb2c13a3c2f3a7c3de53eba3c0cff66106dd287332c2d0287ffa4c1b386f1fc008047152e79820bd56d64864a7941d10a91bb4019
+DIST github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip 711899 BLAKE2B 59e7ab12479e515512a2d7a9f20cdbe0b490f6bff444d0856d4d3432698762ef0537933461c88de17a3a844702e5b63cbad7493ac9f58af30f968b008b38ed35 SHA512 906a0e32262d50a20ff827163fa91ebad2b4a1af3ae90625532630fe66c6ddfefc6dfefb2a399be3f511db8da305280e65d6d0cc901483ca1448724150d20964
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip 26744 BLAKE2B dbc7578fcac5c616d1cb5dd7cae959ee8df0496532db36d78d617ff265f213e4e5a336d33b795e793100c1b8e604919ca6fabb1736bcea0c02bdd0f8f0cc931a SHA512 dc990fd4f640acaa66baed26f2e82e0a6c46e293b016bd1573e72600e1256146f1b8abf746ebd96771bad4f3d95dded70c9f884908580ffffc4162efa0450735
+DIST github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod 86 BLAKE2B 93d8710c720a6abfda7ce2f81229f4ba96088d4563b163f02fbe05c962e698f1ab1771ddc8a0296e8eab22a1e65f64258a5b3ad459f53de0d662e1ef3ca9edf9 SHA512 de0d160e304d1e1341fb3d3769ad300b61879ef491b3a293ebd1874ca259dc3fe95a3bd3f41b04e382cac8391174a54175e08b8422f243563e845208cac15070
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
+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%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+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.1.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.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod 2018 BLAKE2B 516407d1afeaeb665c558a4babcaa35aff28dd9b41298d04b904378159f1978a924323195e4c160cb9cb992c264558c7ae4f07ec157dd8c65fb98853a3cdc53f SHA512 fda6d22c26332038895ea2f2c62458baebededb0df883728dc9a127c10102b9bfd3e8128dfee194d909d645ea652f3ccd5ef737a8cb7ceadab71864b21de117b
+DIST github.com%2Fsquare%2Fgo-jose%2F@v%2Fv2.4.1+incompatible.mod 33 BLAKE2B 989a11a0049e913113279c220789a7cc980e84c90a4e23f26ff2f134da0729503b7442361936dcab3e718e1bdad29e2729e87ac58124d5ee16cd7403e08392a7 SHA512 eb3d29e8f0ae2d97f144376a2ac40caee978d353e76e677fbed8cf6fa59aad0eec7a5e73c2d96571f6176d0d5f53b7f4961b9b8a82608e879c05820ff2cb2780
+DIST github.com%2Fsquare%2Fgo-jose%2Fv3%2F@v%2Fv3.0.0-20200225220504-708a9fe87ddc.mod 150 BLAKE2B 5b995460d964eb9c882daa38f6bafbdd05c78257de4a25bc01bf0f26f9dfe84390c4dc17f8ef86f83c9ba53816a6442b9a3e5e2b8fdcf835abd8111f08fff1df SHA512 c012dcb5dd2c555e8e859843af4b002d4957b4d457ca356f26f70041045957a94bca279ae8a7bcdfadf7024a95657755bb9a18315e31b9a17f9d5132b8fcf33d
+DIST github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod 42 BLAKE2B 528d17f9ad90612c6004aa88eb138daac467c3cd82e8f9a990e64ec956a9e50ebface9db66bb7800f74e7923a647999a9332d871f08d78a7eb09883e0fc6c811 SHA512 c5b104556b88e433f61bc94d0b61fabaa86fc25f3089a03f1360fe61b2b3487a5f2c6c3086eb08298d48cc05860652b58075c51d2767c2c4f2a698069b7dcbdb
+DIST github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod 42 BLAKE2B 528d17f9ad90612c6004aa88eb138daac467c3cd82e8f9a990e64ec956a9e50ebface9db66bb7800f74e7923a647999a9332d871f08d78a7eb09883e0fc6c811 SHA512 c5b104556b88e433f61bc94d0b61fabaa86fc25f3089a03f1360fe61b2b3487a5f2c6c3086eb08298d48cc05860652b58075c51d2767c2c4f2a698069b7dcbdb
+DIST github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.zip 107319 BLAKE2B ec834ff8774815d1476a67eb8628a402676a563d73c2ed8209253db092f9af0318019a228d258cd5dc248eefcd610d6d0397143de02647257b47256ffd2276f0 SHA512 3687321d4ecdeadcdde218ba9ed2e7bd4c65a1688c0744fe570d06e38fb7b5b8272b3fc96a02cae86e3aadfd8827096b41845e97aebbdbcbcea94c69158ce383
+DIST github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.mod 34 BLAKE2B 8362ffab206b4889b3d3c3842042d4504d5e040313b40a66022477a6edb32b377f4756a8c783c1950f1ea60e4ed0f9b616408908e44e571fa340c75639f50e5b SHA512 20d2c6658f5ad6e033e9532ddf6944e168fd2296acf434999967932ada1f80b6ef2e4f433dc033f745168be3e77c07931d9ae95c7f48c9a01eea2f6c2a7a9855
+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.2.0.mod 137 BLAKE2B 47195334e42f0997d96b50b8364764426301d31cc7fbc289b89b173b877d54cc67133b07d4a21e6ecdfa2e4404a9cff32f06b53cfa9493e075ee2ff2cc46e605 SHA512 02d0b2b1df84750ad3d15f4b86b3f7989a22007e27b28e7b3a4d34b26ec7ccbaa5d48ac0032ad692bf7db150e101cabdc050b0aa1697cfb20f922c88b9f086b8
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip 42547 BLAKE2B af3f81b3947f0802a6542c60db0248aebac9521d75d0d991f76b5783f4eeb42f7902250cd22da1b8fcfc2f150342ffff53260276b7a6903c092febbe66f40ace SHA512 b21cdcb8683760280e515ae487e17b65b324b51dbdb36c6380ec0b272699297d388a34b1a6aac281b1aa149d85ca81640850e1fa0d84bf63f3dc67b794baa249
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.0.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.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip 105564 BLAKE2B 7b082ff11190ff27ce4a3de68896fffbbbf80ebdead7612aa3b06981171974ad2935bee7d5d71cb9ea29b110a82b3e04447248e7b9376e84c8f3f53d5001ae4b SHA512 be80972112f0a3907bde960637cb2c08d6ba4256ca27cfa07de5a0a8e523d0dfbd8e90ae593e5302d7351b7dbddecf69dc3985a9d19b96087732dd886eff371f
+DIST github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.mod 39 BLAKE2B c3f72de1e0ea9f1bbe083bb8d97a4ba1af19d043aa6509d2d76c4250b9cd595273581e708b09bbc7495618cdb7498071feab530fc5c763a7f1eecb85693d7d21 SHA512 2b5bd6b760b9284457b198c3c0f162a326e75cb3a2937fa0305a9ac3243ed03e65d537795f22a4235265016dc8d4c83138bbd511e4aeafb0f1aaa75cf69020da
+DIST github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.zip 38488 BLAKE2B 7532c35cd0c74d7afdeb9bf6eba1732c671ac5ec8886d7a4df5f713ceb774f94dab7b203a3d5ff315cfc8ce2cdeaeb12f30e8b5032c016b5bf24d5c2b43be5d6 SHA512 32a14268df16b80f3675222486365449295f31c321713ed86153e061f6182d39d43b970978a820a95ace1cd6cf074a421b5931a8aa7c73ebb81b7c4f601bd264
+DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.171+incompatible.mod 51 BLAKE2B 08863dd989e6100eeb94aea780331caed21f93fa1ccc6dcb4c77050afe0b8ede362f40e0a8271668e2ca0e328a3594dfb6481640ff3d5f1d1ad3e6b4e7747e11 SHA512 dcbae023694dbb97fa3e1cd6bc20ab7eee364117c45a45912e6d782744a54e0b2292936cce6e807af0dff179a495993e19ff86360b27d3a79c90a1f81b6e22b6
+DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.171+incompatible.zip 1859180 BLAKE2B 3f0397dd309f2b8c051d949c626c269c9d3a87c948af50f9bffc1f11ab8067f6cd2371fe0db767c49f2a3bf3ab64fc2e35944db1a7b9b2226b179c4b0dd551c6 SHA512 52ba0238d28206e903b8319e2fd4a766429e9eb209ea0ef618c53fcfed2f35a26ceae6aca1ca6a0a68693cfd9e5776d2a06237a16bc7c47a44bda398907e7e15
+DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod 51 BLAKE2B 08863dd989e6100eeb94aea780331caed21f93fa1ccc6dcb4c77050afe0b8ede362f40e0a8271668e2ca0e328a3594dfb6481640ff3d5f1d1ad3e6b4e7747e11 SHA512 dcbae023694dbb97fa3e1cd6bc20ab7eee364117c45a45912e6d782744a54e0b2292936cce6e807af0dff179a495993e19ff86360b27d3a79c90a1f81b6e22b6
+DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod 33 BLAKE2B 2f2161156210fb855e4efe08126e21b4fed0ff111b4f03679aa26051e23ac71f9d269c26088262a3ebeb6364fa60cb9e85c1850d8fd1674ab488c6583d6034ac SHA512 39a892eb40bdbf1398cde6fe8575bf4fea604e3bb21473de5b2316ea182130b92c9dd2467e2807c0421a35cddd0096fa99134a9f9de02fe79bb59d82e2762937
+DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.mod 33 BLAKE2B 2f2161156210fb855e4efe08126e21b4fed0ff111b4f03679aa26051e23ac71f9d269c26088262a3ebeb6364fa60cb9e85c1850d8fd1674ab488c6583d6034ac SHA512 39a892eb40bdbf1398cde6fe8575bf4fea604e3bb21473de5b2316ea182130b92c9dd2467e2807c0421a35cddd0096fa99134a9f9de02fe79bb59d82e2762937
+DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.zip 9822 BLAKE2B 5690d7f66d1c403be95de8677b72c3fffe536d47fc113f49665037cb01afbb2abd3fb65fb391b7dad50e7a35a4686f6da5c8a7c9aea13a82e23671af6356fb36 SHA512 45f24b719e0104e2c2630ef77807093a37e96e26099391ddf001086e36cdf9e5c34540c79d5a01254e8431cee72d3db87dcfbf9cc7f2171506b509436ebb11a3
+DIST github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.6.mod 149 BLAKE2B 7c42d8f0f0684856ade786a0dfe7b85099ce7e36f3b80abb7a21a0d3a529c41d0c071bd749c84410cfe7679d15b182cc7ccc92ea678ca3bb9c587d9eadac36ed SHA512 0e76daa2f4674c017b915e188c40c2937c962052c799bb24fea16a51cf124b735ae5a3a79281a65179940c1f49e5d43b40a55222a8221d9b9758f9af114262a8
+DIST github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.6.zip 87413 BLAKE2B cdb9735355ea9d103e43613a3ebbcf6fae61b514dbe4268056a0b3e10ccfe3632e96fe822f50bb844f13188a445f9fad34bbbf5a8a8d8aacd1ee3cfd7642bf43 SHA512 9bd86354070e72e5e30248c72e7d234c2d0aff65e56b22e23a10eac7b0deab3a1f18dfbd2f180a20b65df47517031ffeca5ad623061be1c98f4a2bea6a834379
+DIST github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.2.2.mod 105 BLAKE2B a1702a9728f665a94ba087c894e193f7fd899a4ec6119c1bd51d67d35869fddcdb2f62fa161e4303c5a016b8885ddf2bdf0bb93cc63b9a0dee12cde02a377cd5 SHA512 ccab3b3835e3f7d86b257eaf9e392f7f901be61541b6ce405390b9945065512017c99277bafb0ac0b2a781d11c9d15bc174078a31a22fee94c39d5c8fcddabd7
+DIST github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.2.2.zip 14907 BLAKE2B e84118648f62126a0dc1ca350e4dd6a610ba34f3ed750728783f214ca33b3531d7c7b4bdde9edf7ce5e8c0f37cce4218c453db7f71ad30362de55fde00f01275 SHA512 a12af5573f6c9fa870510fd5d0db115bdd566332c5d5bc49c64c99370c4b41c1dc0c3a5695e0001406e1ec909df1b7bdb6e6a112a384cd7c0ab2d7d1d24b26a0
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip 13644 BLAKE2B 484e5ae252f421994b2a23fe3e278992a11d79948509e202366a1b496c8f82e7289eabec3f5d2e0489da66bffe73c4c8c58224993ac621a1bd65a11abeb28a76 SHA512 8d7a4d0cf4d179438a0c8ecdf887169d45b3bdc5746f2e11a07c9621dae098c69b3b6a54ebae249efe9aa78669e81db9bf384919204b3d0af866808915eaa6f1
+DIST github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod 32 BLAKE2B c5bd918ed79f8ad33509bee3028b85da9941f721e12735da810f7cf4238ddf83d3c5b7634c01944ebbe9d0c77fea36d5480d945d2dad9d9126cdb5ceb1cc1d11 SHA512 4168487b908d7fbec0813e5ac4d1cc854216d2355fd2843c2856ce81ee7bc399d9fc2b0811b5fbf1f0f1f26e92d327aab3d54b30809ffed621aff37a706e3417
+DIST github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip 3224 BLAKE2B 408f2daf471af61b729a0dc22ae744fc338c93b375bdedcd76dbc0a27d1c01693c414d3e1e968289177fe1e0a0437fd2ede5177e9582bfce726eb7b63d25f9a4 SHA512 73e006b0818fff13479165491eac667deca291b656e4e4d4b834eca553f40844d4b3ddd943848882a1995752344c0be3c41ed8ccea373bb895df8630c1bb99f7
+DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
+DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
+DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod 31 BLAKE2B f8ed4b103891625af3043d86905f693014b245198a180911efb7e33480d81b93babd35912c5768df62cd26199e3a742f94365a82de619a97385d7407baa22424 SHA512 33639405743ddf22f19ca03d348c47d9cf963aa151fdab9e7303679ccd5cec373ceebce456eb96ef52dcf933f96e4ef7d4a8099822dfc183996d8cd4f09cba2e
+DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.mod 40 BLAKE2B cda2535ba0a3160edbe7d8908e254248e06311ace58d75f6e0b2c75fe1e68f534f68ddaf77a0eef2844b87c2b0234323d8b36a04ce39910cd5e3c0701073f350 SHA512 fc06f111ad8fe91b6233781e300d3abe760140633f45c51fc7b93c744b870f66727d12132e692b5d59526fddd1f728d7a18976e392052d9fe362d3a39149cbb1
+DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.zip 511010 BLAKE2B dc975316f194a0506e6348b2ba26d78389124ae784955c29ce838a359bfbe36dcef0989905f2e860ed3d42abc7fdb6db1b189d92f69e816ebd2720af88375f2f SHA512 091e7dd86885201dd8e9fffd0c9d9233f07b835ee7efb31125c1f03a035e7274e49ea77cece524f3e51dea2af9a0f581cc9bff20a2d9a7a1f8afc5b7f1f0acc3
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
+DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod 33 BLAKE2B cd0b56c3105d5a303d3e19c1b7fe5231ea3d9454e9b1f67047cbaaae6b5689f2d48fd6ef31c58bbf1453d995045709eacc57b6e9adf1a3c9613b0512dad62868 SHA512 483d88e041bc73a30a83559b427d454381c2774acf67edba69d8dff8034992b6f2435c472e32391f6b6c7c1f0c52715fb554c01890e9da1c173f481df51f51f2
+DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip 1438412 BLAKE2B 6f7e05eebdc4f364300d20eae130ed0fa9cc26ce2827bcd6d28b79329126b21dd1007401f05341f9c0d1139efe5d58aff826ad2e48176aeaf9ff18f7233d68f0 SHA512 f9bb8f16b0c4b19d4fbee534281dbcbf74782f9bdd3ea06f9be9b967c6f5e4629e42453394ea7fb58624f45db44dd80b19360c68074c763c00d73d52226726c3
+DIST github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod 28 BLAKE2B 87b79aaa3dda433afe275fbb69b3abfaf808a8a992f37846b51a3cb9069b1a0e5506ce6166d5186eef8656b451c3f6fad5bdfb58a213a9dbab2e7820e9062c81 SHA512 2303a64b0acb96f5f73dc64468a81d6aa6fd9a08240a04d5025884d6076cf90eeb5b132979488431d6f885138702a22a606419cfc0aecd05798deeb3acc4fa1e
+DIST github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip 33880 BLAKE2B 4b0decc2808a3f38cf272cdc053d1ed933e5023985543ae1643f0ad18dd9de98287403ec3c44ae753c001c25355591d000c996efc23f6bdf4a571cd1ad805833 SHA512 12666c80cb033c49832f33435b6a38d1e0e562965e84485efc5da6243f9fc959de19d05a70628a3bcdd02e7167a69a1a4731f6e6e3960e754f90fb38e7343f9e
+DIST github.com%2Fxdg%2Fstringprep%2F@v%2Fv0.0.0-20180714160509-73f8eece6fdc.mod 33 BLAKE2B 602b301b7da6b66bdb3a5c9c88d4a74f776ea535fe1c4b1085840eaaea4ea5d9a05fc2f088b92fb85152d22025e89801eb476cdc26e031f8e3adb68fbb62542e SHA512 9c89175c24f82cba599f754d2efb8dec6def64b32735f9733b883b20a0758a6769afc527322ec5059ce275df6e034bc631a32c0a392a66e96c9d4d4a1087c4c8
+DIST github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod 33 BLAKE2B 602b301b7da6b66bdb3a5c9c88d4a74f776ea535fe1c4b1085840eaaea4ea5d9a05fc2f088b92fb85152d22025e89801eb476cdc26e031f8e3adb68fbb62542e SHA512 9c89175c24f82cba599f754d2efb8dec6def64b32735f9733b883b20a0758a6769afc527322ec5059ce275df6e034bc631a32c0a392a66e96c9d4d4a1087c4c8
+DIST github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip 33696 BLAKE2B 698e18104a389eb6f9493ad19546a7b61e28b6e1ec138eba1b9f231a5bfca222057520861f3e5f466ec14a6908705b1cd5d0fa9339c5349d95f536e7162431a2 SHA512 b5cd794572b339f1b7ffea9443fdb5f2512b55f2d2ccbb39ddd4d4163eb3396576cb85d99c72b16d4ff564bf2a5062ea54c6d313126cf1c3e4d81a0663643d3b
+DIST github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod 25 BLAKE2B 21e5b310a30482f79ce878f1649fa49b3d1b34db022063882a89a83e18e58db00042a2dc35005a715f1d75a3cb8fe72dc3637a91649946f2205582aad092a1fe SHA512 5b8492ae7974c4282c5302607f891aeb4f49dbc4c04bc492f99edd9e9cf89e4f6a37f52a0897ec28440cd2aa1c91ebd8e10075eae4156ea574f7ff4363845e74
+DIST github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.zip 1160500 BLAKE2B 46b1750b12455d7b557967ed61108117728992b2183cbf853c4a2c7ac9c2b844eea78892e0be4c455a99b03249991abab963434736e6b10714c871257ffb3c6b SHA512 05477018a6c6150018f99bc7688127f6420ba679c2fdf0d18025c9a43489975721ca9a10b1d99bc7e8f85c304c682acdb6856330c976523eb83c27b723510019
+DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
+DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip 5264 BLAKE2B f6d986c7f5fbb1960fa1b62a5722d426c3ab79d865cb179bb9bca5a213bb2008a3cf4edb59dba1a336928cb0bd05d31f7083f394cec09270e66b55cd4a045b37 SHA512 2a8e1f10d10e4479568374b9e51b1b8dbbf1077d8af413d7dcd254ba1dc1cd38ee19e75a4661a4e237d3662e51cbcf96a08bc69a2e5beaf34a2559fcfb9d653c
+DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
+DIST github.com%2Fyandex-cloud%2Fgo-genproto%2F@v%2Fv0.0.0-20200722140432-762fe965ce77.mod 43 BLAKE2B 2a4b8b9e30cfd3c88a92205e3e9c1e2335095683ea964f1587e15a41339e7942bccb2939da84f5bee5239676bc175a8c73b970e71f8cdfe198e81eb3674fe8e2 SHA512 91f2a05654a107fdd60df2284ea03c17bc1690c60137931f13e531580ef22e876fcb8c2d1a170b268cc14e08d19a19a3a7d6d22e28e6ab352a18116b1a03960b
+DIST github.com%2Fyandex-cloud%2Fgo-sdk%2F@v%2Fv0.0.0-20200722140627-2194e5077f13.mod 686 BLAKE2B 974916ac55e0b89354fc49b2471ae7b765aa6bdc41318dbe510598fc0b42c5baa4205debce8023bdba3480abfd8f55b540ca3fb05d3d928f92c987e021104e46 SHA512 10fdcf64d58f48193f14a3bb7ad2fe50782ccc05fbca893fbe34ffc843210fd45030abf1fc659647b4133cb792168cabcaff2f731691ba5ebf26508aeab6fdc5
+DIST github.com%2Fyhat%2Fscrape%2F@v%2Fv0.0.0-20161128144610-24b7890b0945.mod 30 BLAKE2B de32ca230521792df7fb20e8d98ca1abcd893d8699cf8fb441825e6ca25bdaab89c716ebf078bf2d44136becefa9a237c42f967bf1702837f3babcf5c3b71cda SHA512 412a5c0975834cada01e0731750141b900bc972f44827fbb11f986d3a51612a11f9c1e518a83f699bfe73be1b93a074ef1bce61f325284dc6f7e0eeaf3e592b3
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20200816102855-ee81675732da.mod 300 BLAKE2B f278e49fe41814932f1e698f2b021e943c1e6ddc6cc374efd678acb31eb453e3adfe25dd22ed1771bbd13fcae487b76bf47cbb5826ad349e9fca1007e1461139 SHA512 4a8753f9380b9a60ba8d6339a6c3e7ee22fa5810d4d502d8af101f188ca53cc91edb069d2f7a701dc03a288dc5df87a03f61a47d7abc24eb5c2897214f82d0a3
+DIST github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20200816102855-ee81675732da.zip 196664 BLAKE2B c9e7512fad8b57252029698165afc46bff47a221ff23de0f1d380383683195f24fe27ce1694151b1e08ec3a13c5a2a9402ecde589e53a789a9b95769996f469f SHA512 9b61653f5773f8cb426aea7c6d6feed37c50c1ca3e243b727e4bfbd0af8d422a4f642c630473b21caabe5058e5ecbc5aa789808ab2229c1a13842d5ae59eb0e1
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+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.4.mod 94 BLAKE2B 5014c2a8459f1f01661c7cac0a7d2ad7de372b3e2916d56d721fd454e459fc75d5b4f6249a73dc54b46b91df00b1ef5c3d47d099fa28429a6967427ec7bfb36a SHA512 d3cfb7a75e321d2a6fc145b727dea76002189ae2caa8dd3162e5e6903a1acbe5bd55be81d7f112c71b47e61351534ff991be30993632be9c9d7443111600fe39
+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.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod 2182 BLAKE2B 024744c8c4b0f296f32ce1af2407eae0eb760a443d43e2a1824254c9b2aace62966a2f0f5b5dbfb0cdaf66f2f00740ab653a2b429cc9aadeb3e48421dd6e180b SHA512 904249febd483a4504d49a1b769ded804042c34acd6b7f76503af9f43c76c53063888a7d0e15ee457107cf688108d2bff057330d9d44548b2a30979336370f09
+DIST go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200425165423-262c93980547.mod 2012 BLAKE2B b9955220aef889bbc06f0e8252b823e2056c9cda6b0328678c4261f1ff217cfadfe160cadd99ea3004102266686eceb3da2fc65d0785fc0f27c539d996c4e047 SHA512 6bbee4ea0d5ae26845a238848d9e08e06ff1e79b8089da12dfa5632c9f15fcc9e64e7bd9ccb0872058f633cb7d8232722c99a96672bcffb28096d8307920adad
+DIST go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200425165423-262c93980547.zip 7137327 BLAKE2B fd83fa9c027d730ab812a634a820f4afb272f81c43ad4ac6f4fdc156ce040a0ddc8b49f304ae78ca90efcb7972814aadbb18acd70cb5aea0ad4077dbdeb1d7bc SHA512 481655483b904407bcd4c7d1258b98f3f2a4ab2a49e1e9466ad438f2f4075a46dab8d1dc7fdb5e1751576886c4fb9fa85f336182a50f0361277b78637b36dc36
+DIST go.mongodb.org%2Fatlas%2F@v%2Fv0.7.1.mod 159 BLAKE2B 5fa289b33f86220b231642eabfddb0568a6c7be3282196a621ee03354412a588452aa1c4986feeaddf02e0ab91ab1820e5bc7668e226b30b89428b42add76f55 SHA512 4ec076fc0ba900cb411d9b3184a7b37a1c1d4fe697ec3a548ea6d356c5e47e4c923186973f20fae86f2e4620369e8fdcb54cf06f4d19e2d334c9370d5ca92350
+DIST go.mongodb.org%2Fatlas%2F@v%2Fv0.7.1.zip 230045 BLAKE2B 038b537aa68d96cad54c5802edf6482f4673db2f7ac9e292cf0970ed7e8f0b4993b15f929c7df7c967a61f1f4b19b76b033ce47e546d66fe500ca815c807ab75 SHA512 dcd4c70d5683e71540f3d2d80f5b81820cc6a4eb660d560361b4f3cfe6738f4b99262cad7725684d34521dd53fff6fc7aad0879eb57e8373858d360246e8517b
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.2.mod 1079 BLAKE2B 857001d7f0c6bbf3518c4dd788a8cf00632920151b8353c44f6672a1ae4c8757374ca4142d324799a92cd2a453f61573e8b22012cdba410cc5b084f2d5c23b4f SHA512 8e292fa425ca61ef179127e45d7d81fd6b75f55844bb3a14eafd4af95026b78d84b31d699a5bc74e5c591b6253436c23f3edea18f04ae02def4a8b5db2e8d542
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.6.mod 1079 BLAKE2B 857001d7f0c6bbf3518c4dd788a8cf00632920151b8353c44f6672a1ae4c8757374ca4142d324799a92cd2a453f61573e8b22012cdba410cc5b084f2d5c23b4f SHA512 8e292fa425ca61ef179127e45d7d81fd6b75f55844bb3a14eafd4af95026b78d84b31d699a5bc74e5c591b6253436c23f3edea18f04ae02def4a8b5db2e8d542
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.6.zip 4423319 BLAKE2B 9debb98b22b35416140e0b5fd24185df6d7f6954cff4ed9b143fd7adcb95102bd417d63dafd1a75ce9c63ff20dce003a6928a9de0cb56271ec2d10aa633afc3f SHA512 3aa265c5bc1560329c63d34ebcbe8b83f0a4c934cf11fd5aa433814a1f60117965f54f3b18693a89923ea87d305683d03dfb6bd8296d99852da16bc46c40bf70
+DIST go.opencensus.io%2F@v%2Fv0.19.1.mod 1355 BLAKE2B a8c09f9731c6c36ff6320ce54aa4880b4ef31243e4ef5c0f817cb7b2862c6a40b63b32473965e1cabf5d092e5a4eb84e3797b488a38bd376708c25ba99a1cdce SHA512 e2f5d2caee695f3ae4b65d63a1946007d1a68a67534e4937367718f5a8f84613f7521f3793e88fe8cfbea6c6db016dcbbbf889b0df3c32ccc7dea5254755c1cc
+DIST go.opencensus.io%2F@v%2Fv0.19.2.mod 408 BLAKE2B 9c65f35d079b8bd07f6d2ff614e8acc8a7db620e6980ddbf0547f741f857dc77ff9f7149188946451ecdd18074c22f62be714a9e34af8e03d382c4080df4106b SHA512 59b71203c6a8723de5bdf43d8c3c11a0a175747250ef76493c9cbe6d7a23a1f705a4c03bda54a845a6fc326aa299696806c3dff278f14d046e8a8421a7669ed6
+DIST go.opencensus.io%2F@v%2Fv0.20.1.mod 408 BLAKE2B 01a022e76e1605416e74ffa8aafc0868304c7810d9e9de804bd611a2eb7417adf113cf10ecf607d89d1ef18f1e17fdbd1efc35f889854210114fb8a4e8db1d6f SHA512 2bfbe633ffde1f91834ca77f19d0b32cc4c9480b8a59e101199cf3e8ab0285c16fb45a00326353f02a7dbe06c1562c4695ce7d98767c4149ed2321acd527bebd
+DIST go.opencensus.io%2F@v%2Fv0.20.2.mod 408 BLAKE2B 01a022e76e1605416e74ffa8aafc0868304c7810d9e9de804bd611a2eb7417adf113cf10ecf607d89d1ef18f1e17fdbd1efc35f889854210114fb8a4e8db1d6f SHA512 2bfbe633ffde1f91834ca77f19d0b32cc4c9480b8a59e101199cf3e8ab0285c16fb45a00326353f02a7dbe06c1562c4695ce7d98767c4149ed2321acd527bebd
+DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
+DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
+DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
+DIST go.opencensus.io%2F@v%2Fv0.22.3.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
+DIST go.opencensus.io%2F@v%2Fv0.22.3.zip 299798 BLAKE2B 6adc76c28569e177bf40cd2d4c7de912e92bb679c29ce669bda7e001d33f8e758d3f2a413857b2b74efc676d4d0cf239e9c7acefd2cb7cc502121f07b31d640a SHA512 99fe389fbe5fed1db31068ce5c4ebf597ac5b39203e3c5f13b0f92c3e66ed0b1ee9f6f3ec0d953a7f5d02d2db46969b8d3cb642703acf43cc0df5cda61c3e355
+DIST go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.mod 1800 BLAKE2B e2005eaddd67d04b79f8295f1bf4d0018106f36cfe8a697a23ee1ac6767faad43b48a87b8fd0412c813139977f7188db008bd0c278fcfc0aa1000d5260487ae0 SHA512 0c44b58671f37f097def825346d69f0f0288e81926075b4fdb970e74757e333d22a8f552657ecbb152145e27277aeeaeeb2d09122de5fb1d1e284b1e93e68bed
+DIST go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.zip 171776 BLAKE2B b1540b229942993a2d5848fc72023c3b6ca7be44258674d82ea427dfe40b9495afddfc70e4c3a2d062565d921a086438aedc35c42bec9185f29680e5cd355155 SHA512 95680313994d81ea8d92fb6e5b087aa136234fe2fa9c483ff9f382a34eb94498c5092fc49661e7212be7339d077ea9753f07c5e6cffca0c7a9f3b65516372de4
+DIST go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.mod 1775 BLAKE2B 1d218c7e1adf5e04b19fe3447d1dd7da1da15cc71b3e9294d7a51e0397265b64857ca8d32c6ebc3b61d82a0614ad371bd46d812569dd378508b9a1a61363981f SHA512 34f8d2fc9d8032e6548ca24f7680e8dcb0d528ee183cce383cfc23d4f1b643f52ca4ef624e34dd04cfd37cc9d7fb784a36e09bcc171cdfdc13aa5208951a9350
+DIST go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.zip 35718 BLAKE2B 351b3220ee70c388e75cc861141d0241c6f62820c922d4804d35d251319750b82681c021963b5da54198c4400fdc61514f1b30c4c08f3cfa7b3b11f99246a824 SHA512 d6ea1e3ac0fbbce6dca5ef7f4347d4e425cc8697ca280811004b80b933b124d11f32a754ea1539bae36b04e3ac206b263ed5a0fa9df04ea7cbda6d7625875049
+DIST go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.mod 1744 BLAKE2B f053ca414f157096060ae3a07ac0d7f4723b716db892692152036f397d113dff46d43ca2b39679337bb47d48ffcfd6fbe3a49a8c63774383ce3518cba5854057 SHA512 cd84eadbecf933ea3f0785d4a604e5724d95deff0a152fb66a48ec38203f640da45780fdc86cb61d2cb8b996c9596e20fab92d6f54acb4f7fd22bad2354b0c41
+DIST go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.zip 27684 BLAKE2B 6c08e07d96e8d817eabc719c26b3d610a653284f5d8919ea81f73121fdd5eccdfaae5d5736a5e266e16297b5731b6c05c89fa970ec9bb9dcde89e5930bc92898 SHA512 0213e9fd8f5141e3a2d0d8dd58e299050724bc1ef7623d62e7a92f2ada2d34738c8169289ecd03351f743d3de7aaba7ad1280a2d9d12e2f4fb952319d2857357
+DIST go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.mod 1805 BLAKE2B ea3d75f8a92ae83eb39ed4230255d84c1897ba1c4658cbd603886aa9ff817279f6f79b336de3ab0dc4901add3bc256dc477d3c11a323e27c36e7e11aa7522dc5 SHA512 33568d8d5f47cb528f78f141f4f4970a3099ee9a1a651c1172c117a67dda0977372b9b052bc7ed258677ce7aeab7d22e33b0ce4a54deecbe50f2a744bed4f199
+DIST go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.zip 85289 BLAKE2B 7bf28721a0f3640fab40f7edb59e73f072c1a2bbf03182a6c437bad90c74192edd1080ed39238fa58d780c6f890b1e53625c32126c38c0c972b5b8ce002ab1c4 SHA512 7b3afba37331efd61fa640c5287e864df3a868bff6cb2862d7ce1933c1228374c25bfa301fafe8fe4c9a2778aa1f8df5341a42a600a1b71e4590f30e03b17ef8
+DIST go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.mod 1732 BLAKE2B 63cbf98b7152adbb31a47908f91f994355df404ae5010388ac4a99ec19594ced0ab7947f11edca423e7539c0796df908876f6c4370dc6e0fb4316b07d50e125d SHA512 262d653a0e1d1ec20d5dc2fbb3df55f84100bfa803184ddb1bcaf86eeb055d927cf090f5909795558698ff0104703cda2b1826bef34660fda3b2154667461f1f
+DIST go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.zip 26199 BLAKE2B abbec25b57ce85d471f9298a26bc3c1cd0227bc79be1643f1b323e4d469449a333ab7337990312a2b1384055e143e2be00bea9e28d67f2911ab7af4d51c59ded SHA512 789659153f297a0dd12cf7c4cec8ddcd4dd114a262fe288c802c1183feebc52805a1fe55733f622913e8f33974de1f898ed866d6b934f8a75fa0fc7bb7847da9
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.6.0.zip 19110 BLAKE2B 749dab9cbf012066f0d8eb694b6592fd4d1819dd3b27052a76940502d65900b39820091e683c1c8561f4b65262dade55db6be331b1ba8517c22ef7aa39ade990 SHA512 21b8036b73a07887db6ffb620557794241c085e01be44e45c93ffdb2aa6b47783151f37fc4023bf847e091e1150466e84a67394070d945cc4a35a771d278f61f
+DIST go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod 312 BLAKE2B 16bf4900b2afadc331814e16a34fa8cae0cfdc78c7ea9704312f121e166c93b7811db3604f6c167fc526faefdd1eb0ffca1dd09581094bfea4847fe0f62ecd91 SHA512 8814a6b8138027c366f3ebeea9033a71019990faf1cb613d75a25498a3a74d61fa2ba662302254150370a49a2a6f56da5c54889d4465117cf8afed4ec6cd9f63
+DIST go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip 24823 BLAKE2B 25394ce97a80093bcc7113c651d95fc383863a5efbb47825d053890ee2946f04ba4b9c4bb708458183b91f195133d22fb4bde840a25b6150c1c6a756ef417fd5 SHA512 cad58d0a0f37a7ba9ce7fc5d4598d511eda4bc675689f968b1d02c4b2e95d15976b6aae9d4b8655d2aa85e255308414e474fa6d42e4f49b31092e2b943648b36
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod 324 BLAKE2B 48b4bfac55f83ef9b78680d5354431cb8fa66139bb3e2f81dfb2861c8c2bd0731572372178c8499f8de7f3e7bd8d34f23f5b51935214eb008d52cda1e80953ce SHA512 9060d8bf8fd7a14d2a32656b1e086de1b3ec5658041ea0127fb2f68570c01059854137ce213d5ed648673c6f1843ae467facf647a4c7cd6ff44165eab575d30d
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod 324 BLAKE2B 46301f4e5db74421da813b0c2d3d178417435ede42a1857da3d3af84b5ba353f10cad25fd48b777325dc33edd05f0a17b019a9f37c4e13f28e7ca5ee833c0d5a SHA512 aa82aeb1b0559b9c9b2585b8d584d9be60b6d6aa48e9613cec7ca440e267b93b2eaf67e3e88fc2faca68062792f3f6c9b03d080b6f13dc7f967e1b403521a909
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.zip 20218 BLAKE2B 35528c5c70a5f9fc80cee48c0d983b0fa9b23ce5e8273742db3a5678b9d0a56bfb93cc904c0a8678114d114af5cbde5e818240751904873bdca4d7ac87cade58 SHA512 4a52ab2241ca171cce47c0ab5dbcb8f57d6cb0355c5d372d75822ee866536c4943538543fd7926846085d4a91b5d154e54865f32e9c3a8ac485b41edf217bdde
+DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod 25 BLAKE2B 233f108e33b587684ea189f873a869f028f02d9fee0eea04183b8d5baa445c5f76bbe2b497f5cae24dbe1745d8b26d35f302b23d8b11b95bb7c62f54416548ad SHA512 0ee649ad9b6a2d478469ece9e6ad9b51fa00f002f7a4966068892cdae278680403637897d83a0a423effcb8bddce1d2f9316774cb5890609f6085b906394909f
+DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip 27032 BLAKE2B 58b337663e7a5625521925deadcd0d686ccbaa7d04925852bee0ff1cf3ada22c078e9715930dd20858b16bf51632a4e4d7e76986b0092107bc07ad46d132840c SHA512 b0f1b10667e0e600a4ebca7b4cd9983a27c3ec5f2c54cd46eb055cc0a07504642bea7ccfd0e0f6e3d007422633506efe863817b7c7bc9d18eec3642c84b28f8c
+DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
+DIST go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod 221 BLAKE2B 586c82887d6cf6582837fb495a46030e1c582b58305fc70c7b88a29e570610e693a298fa7d4eac80bc86231c7fe6f6e27d3fdb5afe084363eb918692a1ccbc59 SHA512 2a7413f6f83e66456c340536502d855772e6de433ca4be1a9cd1572caf5fba7cafc7d377ef529324b5bd8af97830c9eae75768f7c45d4676b455e3959acc82c1
+DIST go.uber.org%2Fzap%2F@v%2Fv1.14.1.mod 257 BLAKE2B 2e5fab0b1a188fb7fffa1c9ca0799fa286f74732ceb0f45a904a3620f636af45d8b30d199cbb54ca46114aaffeeaf66bfa04715abe02711d6af46bbdba9bd6dd SHA512 4922fb6e20d2f5d2fa00888b8d644c51e1b558edb69b9f7d70a883314c3e971b6f8fc707b072aa0602d4c451ca0f20983796b65edcb737e5090dda1ffed0c757
+DIST go.uber.org%2Fzap%2F@v%2Fv1.14.1.zip 223907 BLAKE2B 753367cf4cb824f280cdadb38d53e80fe64909f167e443941d573ea57791f9608a47bcf0cc9d4f24cf83fd78d9ba9ddd1ae99ea3074950e29de260998d01484c SHA512 94a725d0169b78ce842b6a9f69e178fc651ce8d10a3eb54e905ce13131420cf1d6af79e32ecbcefda166ea7a50ce51fe02c929ed8c008fc33c04b1088759f7d2
+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-20181029021203-45a5f77698d3.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-20190211182817-74369b46fc67.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-20190325154230-a5d413f7728c.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod 88 BLAKE2B 22568b660b7e13eed0dd423bfb6b033adf659a2c2b59c6ab12d707aca9f6f7317b7b438640caf6233dea4d9840aec4eb997eff5fcccbcdb193ba81db52d814d7 SHA512 fcfc8d63d333065f1193e9c27efe32a1fab270e450fbe1db533156e00427a13c75691163cd1bc7e9aa26b84d4142625c9fbd755535c575f83d63d82d7a276066
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190422162423-af44ce270edf.mod 88 BLAKE2B 22568b660b7e13eed0dd423bfb6b033adf659a2c2b59c6ab12d707aca9f6f7317b7b438640caf6233dea4d9840aec4eb997eff5fcccbcdb193ba81db52d814d7 SHA512 fcfc8d63d333065f1193e9c27efe32a1fab270e450fbe1db533156e00427a13c75691163cd1bc7e9aa26b84d4142625c9fbd755535c575f83d63d82d7a276066
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod 146 BLAKE2B be8899d39fa75a36aa5a09db22d890466433efdd5310fbe61e7672f3c008a9aa34d038f844ca92450e9b8dde8c7d4d3649984f5edcb02abc34c71f46ce584c76 SHA512 173aab1e733ef5c18c3d259720c9fd7e46681d525ec934b4dc29a56beb91a362216768c28b50891b6230be003bb8e38636974e941d4fe6270a016798675fddea
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200117160349-530e935923ad.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.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-20200510223506-06a226fb4e37.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod 247 BLAKE2B 66c7bddf0c6300cb14884379a13eacf7ce4cbd1e86cdd94fbef5f67bbb27e263ecd4cc2c936b7f95751b7afadee561629014be9d997159c742be2e5ce7bf099d SHA512 36d6474a79deda7b8749681b46e682e0440d07b3e8930279c66a45c0d42a6f2c6dd75b7bc7c3cc1ef50cdeff988442630af904ff0f58bb2def5f49040ade16cc
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip 1874670 BLAKE2B 15ddedd5ae7c1f4f279502fc220fed70155caf23a21b9a79c2bae6eafded5ef966b07b2c4e2748735017fa1e312062052c291ac2862adf5e1b7f9b110f9b6508 SHA512 6494794aff8498860f5af522d4a4921278c6aed6e7ce6bef3c8cfeabfb78810e932b66d47746a2bd416c538d5a277ccb82cab45a479b37fd0484dbe44cc78825
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod 352 BLAKE2B 5e146ef1d6b71ec65511cb06d8392eddb9a126b6194213f3b2ac6b675977dcdc77cbb3e46fc936189269583df4d0d80d2e393523c3ba4c55f1e8f9294e0dcaa1 SHA512 8ea874c371c0a582410e682cf475628b4fe6a0c0f57b05566a03343999da063250dcb987d9a863b96a8e1ee913612f323de296b4ddbcfecb166884bee06a8af9
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod 475 BLAKE2B 3be94804cb1c692471ca7f2af890586ef57ed45a306a50fd6d6eaec9c7a161e2e4945ed11640ed30ab6f0e48ca644ec06b6b12e232b0990d4e9a08347c27491a SHA512 4b495d303e08e9bb4b43ff0c82665107a6e0a9cdd33a6d14aea491e634901fedb6341fe9e47c45fca1f89688ea3548f57ac8d62b79ef4ccb596ef4eb2e809241
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod 515 BLAKE2B b37d0d779f058e58ca3e350248cceaac958c4e406d70872fc3682f49b862391dc75d0a17a9ecac8a5dde4339552a222ce2f36b99d8daa3ad01fa5d8632351b3e SHA512 c5f79afe4531059fbc6acf58b7ec7f1e9558df83c4936c830dcb138cbfd7dbc4bab6c0acce6e0c588cc742ec3984d4116ad3e03be815c4f64af32f7ea5024053
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod 572 BLAKE2B fe37c4263fa4f07a01e65941f859f6abd92e26911622e8b06464ca1e4b65efa46b43eb1c475d6888a67d21b6104aca3c227f42210f0ea8e6709a497f13e1b45f SHA512 a773e3b5c26e95dd24414b9f2aa88225a330581cd9ed0c1ca83a3a6712dd3639e1526abe7c0ea47f9ca701828eb39e1df2144edd6ab261caf584a058f092f0fb
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6
+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-20181217174547-8f45f776aaf1.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-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod 97 BLAKE2B ec2dbdd2dad833a979dc53c8d170b4d0f5d336f4c52f36e3116cba2f3549e42fc3191fa56b81d3b9378a52322b86cf5eb0e947e6002dc1d1bee12f7a6bc2eb36 SHA512 23082eb3c6f3e4330e88178c7511b83a06288b678e517cf8ad5062943d0a0fdcea16973425a8dc01cfeacc32ec05b2dba8edb1adfba2e0bcb2d81cb5060c6085
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip 46076 BLAKE2B a3611608a1963ae2e1e326da29671c30a1d44c7afd2698f85081aed84ae5699c16362af284e299bd4ed721d20052801a79886f0b1305f91b17a2bc5a091a3f27 SHA512 b35cfd6b7640a526780db3c3bc62a89ec731793e350a49894c1de278b8033c4105b5534b09c1ffbfedc8e020fce2f42757808550e98e0ef5d493891f971bf247
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod 97 BLAKE2B 54b5bbd5b0908619326ca8bcebebf13f45b2838737d22008f20d3f40ae52fb4f8fdb8c73cbd98b57873aefc8b37c7328aab2bf02ad82a7d5f83e0d75a9283e81 SHA512 4e955424df3c1cce0b716fc518eed10196feb34ec718c1fe537350ce99efd0676276c2000feca6faaa6f3db8ce626e2d330f700fa43a10c73120dd13f5f1a764
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.zip 139506 BLAKE2B 9860ea996cb981d2bdeb4954d72e66609f125002bc356e027e49634136bfc20c7039351e7a7199d76e84caca11fdc000c455542f7e069f12c1adbe5cfd8d0b25 SHA512 bc26de861771474bcb7f4b19131c90f7e5de723ec4a9101ae904ac275b88e2acd651c9b22a26e3f35ffc4b2346a87086635db7b335d02d29a2b3986056c1a543
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+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-20181023162649-9b4f9f5ad519.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+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-20190125091013-d26f9f9a57f3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190206173232-65e2d4e15006.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-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191003171128-d98b1b443823.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-20191112182307-2180aed22343.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.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-20200301022130-244492dfa37a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200320220750-118fecf932d8.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200505041828-1ed23360d12c.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201002202402-0a1ea396d57c.mod 181 BLAKE2B e3907d056d6b40484c28d766a8d6bd09127497c5ba1f04ad9ac287344960ab74c50dce08ee38d567d0de5d2ab4750b64340fcb8119b3b3b0f260f0fc0f25ee1f SHA512 7945ad77f2fa062ec18d926c61829a5b61f1f97bd5a6cd82909487e8d8f4d1cfdb0195f3269173ac25386d6837e4af808fc49dfafc0867bea30a9bad4bfd6196
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.zip 1565631 BLAKE2B 80fee98ed18592b39375d95aa4ca99752d13c55ef618414c8983dba3faf1faa8baf8c47b1e1f7350dcc4d2b90093990f2738f3c4638d5cba2a7ec11c7685d3cb SHA512 8b376daeb6c9dbe8ede34b94dd4efd02419151d9a50d92891a8d199393c304b0cba5921e6d990a8f141ed58ec1f1395f0281d3b0ac1fee0c42f84ce2458ac801
+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-20181203162652-d668ce993890.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190130055435-99b60b757ec1.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190319182350-c85d3e98c914.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip 84373 BLAKE2B 39bd0256afae566a53bb0b7b95adf0416653fd003bf5312c7a316a2d7c3e5d1fa25fd08bdbcdf75df45a56116fea54dcb1bf9b68b07d15d3a909e072f8f9fa06 SHA512 10a924e5fb556c2726795462c91fe7086472d6baab511ac21c1fb3c137e5a3e0db55f9ce8fe1952566d887225e3528ec8b747136f8984163acf71e869a0d8c58
+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-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-20190412183630-56d357773e84.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-20200317015054-43a5402ce75a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip 28693 BLAKE2B 3d6a34fa6da642f5ca71c930bd69a41439013f20ee60dde5d4dfab4bf688f1edb150a0477cb006670424c6c59e90d4bac9e5eb34f9fb4c518d903dfd26fb6cb7 SHA512 48b983589bd682ff9275c47733ec73637ebb5e58e1bca0c7744101229237d5cb34170efab63db0061aec857052cce9ef03c3497702b90a86287e6be88e1b33aa
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+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-20181026203630-95b1ffbd15a5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.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-20181218192612-074acd46bca6.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190204203706-41f3e6584952.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.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-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+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-20190419153524-e8e3143a4f4a.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-20190515120540-06a5c4944438.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190531175056-4c3a928424d2.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190712062909-fae7ac547cb7.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.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-20190922100055-0a153f010e69.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.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-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.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-20200122134326-e047566fdf82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.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-20200212091648-12a6c2dcc1e4.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-20200302150141-5c8b2ff67527.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200409092240-59c9f1ba88fa.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200828194041-157a740278f4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200831180312-196b9ba8737a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210316164454-77fc1eacc6aa.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.zip 1635348 BLAKE2B c4c3c22921fc17c195e3f50d35bf11cec02d102e2f5fd93ab92f3da1cb052ec4edb74a4fe62fcf048af600ed0bfec3264b8102dc0c017f0f96bd4ae1e1995e01 SHA512 57821ca04b380fe5fb0de3701fe47227e11a6459bf39b773dad257bf1d0755491f10b85daabe6e99a0cbbfa06afe5d7954a26d49c5ca4a10657a9cfd8fcebb49
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip 23281 BLAKE2B b2fedb31c347f2b5b8bc3c0311f5078ab84359736379206227bd7ad4378cffb67f39cf078707a7095ecfac3c243bbac54b64cf41375a4261fbc9af9887d134de SHA512 267fab133c0ae306a1f484d17a9c3bc7bafb1ae77df3412ea4047de34a940b6425524a93b7b41d010cbf32160482fa3a370f93654e4ff73b6d11e45463bc185a
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+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.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
+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.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip 8610726 BLAKE2B 78870544de29f5cd9216befa8822c2387654c3987e09994dccf55d210ad7c517edb93bddcc68bd981f2c083a4ec5e012d558b0164901e2d74f6f447e75edfadf SHA512 494d58f2bc02819ec24d8e55f668a06694568e63bc4b41064a7e44aefcb2778c74983fc9126b50277845da8e6739e83fc1334aed989981e8e53b869878803d17
+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-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+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-20200416051211-89c76fbcd5d1.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip 12009 BLAKE2B 62af63a123635afd495a0e621ed365f31b284aba1f891d09f4334d63d46a5dc0387aa055901e6e74bf358e1757ae91ed8515d3e2c9b9388f7f356841eb6543ab SHA512 a1727535cbe56fd9c94619ef7821c06d1b2f2cc386a839451aec9b1d101118b0f1e64ee78e7aaa72660f9a780e1c74e0fed3f07bc8f8b4dae9f7bcab4323ea01
+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-20181011042414-1f849cf54d09.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-20181219222714-6e267b5cc78e.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-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.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-20190329151228-23e29df326fe.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190416151739-9c9e1878f421.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190420181800-aa740d480789.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190424220101-1e8e1cfdf96b.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+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-20190531172133-b3315ee88b7d.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190718200317-82a3ea8a504c.mod 155 BLAKE2B 23d2d8015cce612ac3719373303a968d64840c82a2c4442c1c287baf2d7f30e5422fdbf0eb451912f2d38d23a4c36e7730f2c60d5aa1edb55e0b63c0b6359aea SHA512 99b2e19040279bbf7ccafe1de879eaed0dc22c49d60cc3a0e267b533ca04523ca12f35bbbb3b4b85033f1025b036acf9ee3e526d45ff6fa1ecf30d67a3ffedd9
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod 271 BLAKE2B daceb2d4e388208a2619f2476085e0daa6b6546122a32355a3e005e6ac51ce72069c959a72c76078dedf82201fb217941091d3cc2b1bf4be8c77949b78ef6cd5 SHA512 c2c79e2a50a05d79909d58a13703e35f9cc9cf209be9593546c84883ac272e4e31a8ec9b2247d750b7cb42b088ad90214279c04b83a48173388fa13a71b6572d
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200409170454-77362c5149f0.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200416214402-fc959738d646.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200521155704-91d71f6c2f04.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210101214203-2dba1e4ea05c.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210101214203-2dba1e4ea05c.zip 3351474 BLAKE2B b89b692d85cce825584e5e1d0242e1c2a6ba7927990c1dcf8c1f082035942ab080792e288c80eb8e643b7e8d9ec23de81b49e498b856a34569b54f4de03ca047 SHA512 1f8b41b3a5b16f19230a0eb6867fae06988172ec7e3c3c056e5e2ccc54ed95569db5102794db68152350e4ceb0ef74440eb88f01a3020b29e4543c96bee7c542
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip 22295 BLAKE2B 310f892b8ce32810a1afef53335428d73bc23e749e52d00d7624afea2d10422b1b73507026daf23efd2384b81262c4c7862c22da23f6fb43c1b5f79a51170d5e SHA512 34044424d303f5032d4fd302bbf1aca390d45e876583cc223fddf0d685a6eec2bde0a4c1b82c4e471eb5be97fc8aea9b14695b07940d1ecde806636a85d12051
+DIST google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181220000619-583d854617af.mod 29 BLAKE2B 411ad882e1d61d9e7a02f83256abf55c6a9557a980b89d7fd1a8981cd44f81182c17659e2fec1f4a587163a16556076418f166e90118a04041a8c488f9bb69dd SHA512 f2367919f017863362525d492f3c7f9e36aa311a55f96533ad6a2db1dcbdc9628f516ca435a43cd63a09c677c3528c2fe386907fda1da7dcb69ac2f6c95bfdc1
+DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.2.0.mod 515 BLAKE2B c94040404819bdc509b1cb13063c58b9658ab88930421a87c8736de7dd92da8ab578cd4e8af77cc7f3748f25cac560e59c61cb39494e1fbecc68c7c5d3f28d7a SHA512 c1af7c2d85145681404db21c534910cf012b5d5c28054ba7e1eb64183ddf002b584431c14e67826d4f379ba3e6e9002ba2c70ce0b253ad667089476316a1885d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.21.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod 618 BLAKE2B 2b9706e395117be1f6fb728c055c6ba3dc9c2931589ac4fa66554a1a69a13961044f8d227cd5ca0643c8be742ab719af4866bf7f7cd2c60d7a9286458fda163a SHA512 ef0fe8dab48d31a477dfd1037229f12a47f6c1953ceafedb813facba73fcb6d880952151c50ed0a05279d7d93f288f8ad0381841ba263bfcb559b83d23b65c67
+DIST google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod 582 BLAKE2B cc82a660be4095a67922226ab37e8331301128d10332fe60fab27f17e1556b90031bf0c11dd53401fb0805632711296b561c1a7526d93545eaccb92c3ca5506a SHA512 930fb5295538f738db5258811eb8cb03e35f916a882cf271ef5175f0ea0d8fe905d040f5974b34cc9594b008f03fa7f4653ef7bcf5160d8498e18af0bc54d9af
+DIST google.golang.org%2Fapi%2F@v%2Fv0.29.0.zip 16562503 BLAKE2B a2720a006dc613b3bc657a15b4de63192250e89860fe07bbc9a93736cfad7e90d9c7f8cfeb1986596129aad5133be76cb1ab385178a0dc2ea7336bcf48152151 SHA512 8893411de1f75607bacea524d263f5de88b328479fedc0d82fec12a56ae38ce5887b291a423af9c319c6857b7a0dae7082a186217fa6bf6d7cd885edcdd59ffe
+DIST google.golang.org%2Fapi%2F@v%2Fv0.3.0.mod 506 BLAKE2B c2110624e0117392f6d49cfed14865592044cf8f961209f5d2ec69cce505fcc73065687c0cb5a5b591bf181f3f225995aef2af88e20c684faba5931f89279f5e SHA512 bb196878ab6cf76284198e9823d9cc1fa246f1d4d1a970690ebfdad7f5a5c0fb338d2b8f9185220874ebe1f43c62c8e41da80921cb1f1a5b4dba0c5890c1dabf
+DIST google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod 506 BLAKE2B 106ba1eae2f79ddc10b69e21988215a1be000c5b32a4bd8315d473748780be8785e89ce269f1560dc23a8afcb199c8a0428aefdf8035991051021443c17fd206 SHA512 37d49dd9c576465cc9dec58fab5cd9c0fa84ab472d46c961e64f34fcda27f88c45925da72368268f857db22bc9cd1378c6595933ee33ed5a6253f62c221ca6ef
+DIST google.golang.org%2Fapi%2F@v%2Fv0.3.2.mod 506 BLAKE2B 106ba1eae2f79ddc10b69e21988215a1be000c5b32a4bd8315d473748780be8785e89ce269f1560dc23a8afcb199c8a0428aefdf8035991051021443c17fd206 SHA512 37d49dd9c576465cc9dec58fab5cd9c0fa84ab472d46c961e64f34fcda27f88c45925da72368268f857db22bc9cd1378c6595933ee33ed5a6253f62c221ca6ef
+DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
+DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip 417678 BLAKE2B cdb4e693ed5fb2bb77ed1ce0e0b1b25dbc3648c00554ade874ce28fffd5824f487fac744f9f2cb0920aad2c94a82024e1d233d1663887f0681790488a3af6f3c SHA512 1ffe3894d8fd004f6c28916e06d8e64708c20321ff914e82d05c50ce4c62b76bcd93e74e45871f7adc779791240ef8e25df08fdaaf2abdce20a3640d8964bb28
+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-20181219182458-5a97ab628bfb.mod 167 BLAKE2B 986a022473dc24178c99e6f660397dbee93b9680a5bd2ee1de8ce1e6d7b3b71bd9a79a70230daefd5f579c65669511a0bf89289889db3d6234583bd0b03ecf45 SHA512 bf0f5825495820d6f0416598bba137d80131ff8fea005163afca3f2984f57bd24c9005fab4ba0408bd09dfcb2f9ab1cd845e1cc3d0d9dfed1bedf0507567f570
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+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-20190508193815-b515fa19cec8.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190513181449-d00d292a067c.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+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-20190911173649-1774047e7e51.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod 340 BLAKE2B 70822d80e0c64a18bea901e30359c66d790629dfcfd7b4512b215b2c29bcfcc862bb68f9480357118c7adbe6a1b42754ef7703bb28e608abef8f8cdcbf6d2396 SHA512 461bf9e9c747d61500f3884c67f82cdf9394b186b512f6ff7537620a8f7a8de7a5c30af81c9a1303c0babfbc748c80460313e6b8e440e1f553fd4e1e8e12321c
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200323114720-3f67cca34472.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200409111301-baae70f3302d.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200416231807-8751e049a2a0.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod 353 BLAKE2B 7e159067adb934153bc2a45c1a091ea85083c9e52927db8aba3e7ef9e13f984dd738aaf3890e85f7daf86afdab8e5717775250715285c0edc05625a544664cd2 SHA512 17266a643d974e2fae18e7055986002b9705bd2a7fb1e3cd3664fe6dbefbc7a04aef6900146c1e1c3ed84bea8b4d1bda4d6c355af2cda013c01f19eed57568d5
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.zip 13763150 BLAKE2B 461f4a0d169af83c296b39d3810d5f5ab0eec4d685c5eac8eda9514dc7ae30863a7cf56e3ae928787a17a702bf5fa07effb8e3c30cac707a110192eed8c32491 SHA512 68ded4c09531d5f0c11cf58f0bd54746fb122922363b7c4c31e29d5912de0156805084878d0d32cd69df95b337f3fad45f6409b09bcd9bd8ebefb60ab2d91d4c
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod 903 BLAKE2B dd9ff44489e2a944c07f3e58c3246534b472b407eb15780bfcf9a30370eea7353a8ec12601a6c3e0e39edad1de6651df1c959f86a528a0cb53ff7d2e8514d1e6 SHA512 1e7c2190023d06747cf81e4d6f25aa284a250912ac304e3d590e1b85f5ca3ad3d9963a0ff7106e5dc55f82f58eea953c72f131f4baa6618b46017a575669742b
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod 832 BLAKE2B 9de27394e05cf42e762a8b7ed42b6715244ea1086acd7c44f71b04bc0dc23c31ab236e6474fea423953eb3001dcaa357938daad1d54debfb5d52bdecc1de6bda SHA512 ac90f3fc374cc1ac7706146efaa8488a59634a209c30bf87453fa150bf8849870db2ec04e854438d59911ea35930a5dd8f40f5d5954786d0e0565907fc42f711
+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.0.mod 979 BLAKE2B cac1528e7af91a98ad2e1fcaee0892547eac67d1d6ce29473c1114eb2c373acebad87008124924adc3f1a98cc4a2911c1679cd7f24f025ffe0d4902d123a6639 SHA512 558a4f5d7910813809d7edead3f7e2300936a262e289905dc1e33ba293d89d9bb590ae0f8b00bedc1e30288257ac66d7edc2d3f3f657d2d31ffaef7ff0e24f92
+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.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.22.1.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+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.25.1.mod 532 BLAKE2B 4c46c03905fc660d54c7acdb5cd614db9429b0e1add087fa5068f41a72d04b2f776e8326d1181e63ce29078f075d2312f9b0baeaeb048ea3d73f2fdba111e35d SHA512 0171fadf89079d7c0f18b1401aedfd886888d0a4ec4e107aec191c3875c640990532e1f57a3f5306a2e5705ddcf7e09ab2ce4953710347c09deb1d9d5f2d3c1f
+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.28.0.mod 532 BLAKE2B ebe5fc28123fed2d7c497a7e237039a4a90f6eeb389b61650cede1d3bb850a1cd09c1574ee57fe65b6f4d338bb440a67ff802a28805b044bcc78b39ce2acd5b6 SHA512 85a0f6a03de8c151aacca3944a75738ac01ba368be98d6e4756a772976fccfd0faac55df170feb51ac86a10241a613b2ce1ac7d7c5cbef41ee2ed8eb93416801
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.28.1.mod 532 BLAKE2B ebe5fc28123fed2d7c497a7e237039a4a90f6eeb389b61650cede1d3bb850a1cd09c1574ee57fe65b6f4d338bb440a67ff802a28805b044bcc78b39ce2acd5b6 SHA512 85a0f6a03de8c151aacca3944a75738ac01ba368be98d6e4756a772976fccfd0faac55df170feb51ac86a10241a613b2ce1ac7d7c5cbef41ee2ed8eb93416801
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod 542 BLAKE2B d2411d4096489755e1a83388e3b3271930614b11b5d677af4a7ce0ee9c5d4618bda9ccf29c9dce7a2d0254676dfea8bd54c88ec857473f4beaee92d61da9c209 SHA512 a8ff8c888452392a2026849edd07ad5aa36691f7cb30357c33aee3457e03cac9daf48195b90c2ea62b71337c37bcea23d7a5996eaddc4330749487789dd70fb3
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.zip 1214793 BLAKE2B f2cdd928056e84499260c6ddd44594679f8c41bcda2630238d9281060998a6d76d1f63a5c72eff4dd30a44f2a8461f3fc85778699088bd54aa9e79c31c615420 SHA512 132d92c90c8ea502c3169966e717f56d1a437018190fbbf3f750aabe87276563265e30529a87e41be0a8192cac09547e231340e6dfefd657436cd5fea07bf7b3
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod 128 BLAKE2B e36e105129abbd7729a6d509724246766c16df526ce22637e92ca8f29bf854b66622a0afc5afe8e4ad29c9efc498c488a87020fad5969e044757d49ed4bd6399 SHA512 802c0df5ed11f0bb2e221c01152c6339d3634068f89aac760654411884e6b936b031cbfabad57c5add340f9d504edfcd683c77cb0ba7d753e06bc604095257ce
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod 158 BLAKE2B 46e19153fe487751cddafb86818a962b621b10c109e513ef22e7f5c93b44dd94c6a1636e6c03d0db6e5099536901821549859bcf84f06c00483637d5d4284c43 SHA512 4797f4305d5b0159aba0825c0432cc5678cb74e55cd95eb5c42e9879a62db5aefa76c6286a436aee9a31b096193e8a3bc2e67175f0296c9d5eca3d03e98ab2d9
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod 186 BLAKE2B ac72ab4b58c29ea036b52ea6972dba93b3ff95ceea9b476355b14bc335bfb99ac350101e70ec678bfb6656157679f3dd42a200a1531b982ad9c995c5063ad541 SHA512 d9197910537264ba24d95110f470ce2b057b795e7244bcae423ea922a8eb4f2c89df3b6dceb58e71cc7ba1f68ccaa3dfa78d7c26d63f5949d4014b8df336512c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip 1543881 BLAKE2B 2f556bdf8ed16bde9e6ecc8fc7339578c719ed0ec73ee426caa75b672ff5fcc442ea7dfed7f737900c98d5a5afc014b9e44b1b7f0f8147edb4627f3b390814c2 SHA512 29073698d91f0bd9d37cba38102b19e6223ea362f6eb331bb186670a0549391eaf856855d2978f70861e775af0a1f678a7669754862c9247edb0a682992debc7
+DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod 36 BLAKE2B 33002a8288351a233f5e8236743a91df1f630355380a4ae8df10c32abc03470955eac6c15c95655caec990eb17ef2661985570e49293cb146517828090d95635 SHA512 8482c3135335a3a69611529f0d50bd19257b0fe8a8de2d4f2d6441ccde5f1e7a57d487cedc375575c5fe16094e5fc1c7f7f1a6bf04acc8a9d4f92701db279002
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
+DIST gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod 28 BLAKE2B 0fbbe5d1e239fce8fc245a0a54a09a57ba1a669a6ed93aabefe8fd333549b3309ad9e6eb15cff2f0a853d3830e6b5cd60961835b14e2dd13aad5812cca6ee04c SHA512 00151108bdaa29a2097ab78c99c93bf0ec27af203696a11bc7ba55e36d7115ad13279110c245bd3a2cc84b63bb2a8840964e3b2e1334a0d085ac1e8ec5239bad
+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-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip 41484 BLAKE2B 34fbdc1525bbea7fc6b7f74e74ab407ed03d3b58e25e9b3b79ec35945acce36b7c4be54388c1244d508c7cf67ac6e4f1ff7c9eb5245f01ff27dec82cfe87bdb8 SHA512 713c79551d48a99cc9feed3bcf71b7f1fe95270701787dfb114237bd358ad104d18ce7ca412f65d1ce6b7f94ffb6c01afe28c9b821e1a5378b05c93340aa8a49
+DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
+DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
+DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.zip 15087 BLAKE2B 14023bf31885491762c00236992ef2c36894ab2d0c4838c24726a4de3b40a467b20b3eb41cfb1cff4dc5daf5a54d1d65c9a86837bf4f9875387d8cf57f002f61 SHA512 7fbe6eda590414d8c4f6da89d904308acb31b043054fc07d0443f788a405d8545944246842caec4cd9e19b6116359a65617726fb9cb56cd153c916855c32a6ee
+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%2Fgcfg.v1%2F@v%2Fv1.2.3.mod 24 BLAKE2B 2e460175791185a1eeaec63e12c62c4151b0dd57c9f1e21a2849d834d762c928c843b59a0ec9a2000e8bcf6e86a4c3cea4895c40b99451148e9e4ccd95ffa815 SHA512 cb839ecb3ad2ea4ac9f449a9a0a71dddd03b6988321ccd655cad1d66e042fe2618c635a8ce5ee6a96c5944a12053ef658fc13e54aeb69a5649523f5cd0252252
+DIST gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod 50 BLAKE2B c715a977e733670d4047cc0f62fd485ce2af214d87e799cdea97015f64ee66488e1f68f4aec8e8ab139cd70574a0dd5f54b7bcedad09b8890ad098bcb01d7f5f SHA512 2d48fa45b7183412ac358a60c0af0b3c2f77d5c461f6bf4ba5d7a162195d49076870e739ac6c59e95d41dae2002370f52faf183fd6ca7999d60374866fa3ebdc
+DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.mod 23 BLAKE2B 7e865218970f4a4fa06035c7474ea6a854843051fafd593b393007eb606d813e7817d2444697c68a3c63ce44d57b2f7bd47348ae6e4481bd11f43ed6ace64e5a SHA512 cb350a878f5cb581d62859e605c732ff92a0b92295c28eb17f17768845feef85c1838bda755ff952a8c939f6a46e9cbf5dd77b6e278adf8197a418111e2f98dc
+DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod 23 BLAKE2B 7e865218970f4a4fa06035c7474ea6a854843051fafd593b393007eb606d813e7817d2444697c68a3c63ce44d57b2f7bd47348ae6e4481bd11f43ed6ace64e5a SHA512 cb350a878f5cb581d62859e605c732ff92a0b92295c28eb17f17768845feef85c1838bda755ff952a8c939f6a46e9cbf5dd77b6e278adf8197a418111e2f98dc
+DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip 15882 BLAKE2B 00d4a14f02231cee71bf55946b52e491df36745bffbc58affd61d73e0266bf259bd19595364c094dda028f84838442c65be69e240f8a23aa5d83f4eb7b3d3d84 SHA512 bfd1d29d3514659d778c1ef699b23bd6b5980620992d9aba56f62bc3870cf438a7f179e9b7bfc02f398cf1ffaf13652fd9b8d1c90c0fbf2ab315bf0b02a97c2b
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip 48918 BLAKE2B aca803aaefb327d186b7f703ca85ce70caabd200938d8fdaae4a0c8fb41e73adc0a3a9fafc15483a2e6f13d5854a79a2753b8a67a3e33b39a351016856297bd4 SHA512 653c33136dadca777b3c9863cf7fd3f71d6fd51346cd1b812f30c901298728aeeceb03b48a87becca5eb3e980ca2b26ca374cb713d92d017e4d8e8873f3a6c98
+DIST gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod 40 BLAKE2B 3e77c43f0108e2eb7585bd5558385a198b301e2adc7f813cce7981d0979567808d015e60cfd7ac7c6a17e9c0a5d616642c4b9bec919cd5de8d2fd6f86dd00845 SHA512 c498fb321f358d43c35d98913d17242517c415fc3c26d497fd821f30e6c656ca9ba3ce3a73657c43c677d35eab70c90065a7f93dab73214502e604efbc44a180
+DIST gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip 7069 BLAKE2B db430bd56c95cb5a40e95368be1f8b23ffa067e4f491ba6a641c12f78855bbd691268f60b4d57307aeede99671a23c437171a446a47ca6ebc1eeaf9defb0755d SHA512 4972724984d58b174b50c1ea81842bc5baa1fca3d74ea5163b6339c2f4a9fee1731eae3dd19f8cb67bca9465a762e44f856537bdc907bbf37394dfc656b2edbc
+DIST gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.mod 23 BLAKE2B 43e4570f039747c5b2ecef5c736a4316d8517a202a587de55165960ba41b79431b8f1d3544b02581c224c5cffaf13e2ddefca0b67e14b9227ab136f285a183d0 SHA512 28d79dd9430ce03c7f67d3c798b1dff21019fb5fe588cffa5003fcad5fc1fe5d7c19c8bd7fd4f132acd59f6c24df7aefd4f1b72eb5b7cd45f2d11302f1560c36
+DIST gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.zip 443061 BLAKE2B 941f1f0624e07b437d116670d78d191e3dbb40d6cbb06fc82154bf443f45d08f25df9ba07d47d3e18421d3ad35869c632ac2a574ce2a0dd329966c30e4748905 SHA512 28be6fa763c30ccf1b347fddc11057943667554c3a69ded8a8e5c58c02db49d14a5d54bd240b7dccbaac4d4c8ef74ebd372cf67c5ee3212565be54ad6a3f5d27
+DIST gopkg.in%2Fory-am%2Fdockertest.v3%2F@v%2Fv3.3.4.mod 37 BLAKE2B fe1d96fc5014472e473a376409d23a1df4c0b53bc9c47609d65126077e2cff871af2f46ae61a2c0e787db0bedbd1f8861b87360656c4cfaed3e0407d790f1600 SHA512 5ed40ced97aa2927232cfc5890f2b4ba6eb2cf7179ae288ee326911b8eb2f0b378b46b29198195e4e8f2428902c840bc6811446d6343f0ad6a91ce2672e55193
+DIST gopkg.in%2Fory-am%2Fdockertest.v3%2F@v%2Fv3.3.4.zip 290090 BLAKE2B a02c45ef4b890a0e3d742150ed34eb35e24dd631cc4fe51c2d772ae4a2860a81ae46f1b80d09bb7e0c63448e4f0c66371e67afbad30f74fedb976b7129421a16 SHA512 d91ead3ce7491cc7c8bbc2c0e23acdc613befe480c0d9e9e1b31fa069b817f5aa5d7bcb42d2e10de37bc95b75a41ea0759adfc9165dcd2d6234c66c205fadcca
+DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
+DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip 2645616 BLAKE2B e128dd04ef8a6855c7c0a5dadcfec1e24402799efeb868d894f783c5554a44214fe69781652887a3d496aa1bb58766d33cdf74d106cd0004ec5e018ea078455e SHA512 4b72a2b0ad43f1b1fe1c60e0dc51d39ff04b5bf2b9a761fce22c65904961267f4c61d598b2035137cdb1e1dcce9420cb36fe8882f7cade6dbb7adb3e5795f8a9
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.0.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip 353844 BLAKE2B e4d24ee5a99951c19c32328d6eef3fd6c886338bc7189eec9e60c99fe89e5728b3f00824d0f321bbc921738a40900d8d90ab4d9879e8efee529ed4273df0c2a1 SHA512 7ec385824affaaa72aca2b5af052dc7e941a24b1712e0e1945fe6276df3b02ca9eaaf79fdc0888e398aaf10ce3b261f0d23b2c6485184e6a6587e1d04f1c8742
+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%2Fwarnings.v0%2F@v%2Fv0.1.2.mod 28 BLAKE2B 39555ca91c4818bcc1955c20438d83965ad6f1b2058c6d8590f4c30688eab2ac08dfa1655d4de34bd68006afea1788a89fb0240d60b048be9616c8e44d8a801f SHA512 6fe714c089847582c8c01e055e4bd6b991e8fddc6e420aa03a40efb35fc4ecc5e87a60c44aa82fe004899eab427d4b82262cfebb3331b7443a2c7a68718f8f75
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
+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.5.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip 80765 BLAKE2B d6d8bfba5082aabb1a247add43b21ffa058b58fef60e8efbf973b724273cda2496ef0c9b226ad14bfea17f141f077d3bd98dfe3dbcf3c2938fd64570abd662b2 SHA512 2a89b2bce856cc11f3b71edec9e538048acf07f6aabbe27236b663b284c086c5862f086734e58727e9db8912a113fea51f72dad1a45a9e85860764f9c27b19d2
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip 105245 BLAKE2B f0bcfd9d097905364d9c2b032b92a8aad64b63e0942eb864759b156eb97ac58769fbc035acf4ba57bd55db1b6596499ddc6d36e6d2e5cc584c2a465256ca3a73 SHA512 f9c0400f1f5590d7185ae3fdac7adf1787a5f5198e52ebd02841b7df5113c5e34de6a66fa01b2f5735be4b21190dffb46e9d8b084ad5c00ebd99599a39ff73db
+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-20180920025451-e3ad64cb4ed3.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-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.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 honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.zip 559809 BLAKE2B 55392e0d6cdb68f21348ef9c86b46797aedc94f8a47d7d7611be4fe489c1fca867ac184d1382480ce4a873cd5c435cf21825418bb3153420bd6f38157c332ae1 SHA512 64e810b40c1f64117074791cdab1dea4f282fb0a47df1cf82c6e26eae38bb893c9241119024d004b00dcb05d485bd5536f6ca90aee13200631c09da5c819c1c3
+DIST k8s.io%2Fapi%2F@v%2Fv0.0.0-20190409092523-d687e77c8ae9.mod 2940 BLAKE2B 46bacd70692f93f2f4bc15b4f1e09aa502f02a2e4e00e8123d6b9970e7c9cb69ca93573e267cf67db1460842899d931f36553fcb7c076bbeff12521396e3b830 SHA512 e628a0965e48b301ef8cdad3668746fcde80bbe22c4f3ef66124d8f12bc5656b8b3fb67efa3e2e40e7c28187f4ad8736c734738168d11505fee27997a6ee7450
+DIST k8s.io%2Fapi%2F@v%2Fv0.18.2.mod 475 BLAKE2B 53e898621cf26565e2d9f3cf4ea4c04a962d3c3521f771496b0da55aa8e7efc142748b8c218cd0828f196716901fe80aec97780cc016607b7fd555af51c004c6 SHA512 1938d9b9c29f782286c54620434f3ea95773d9ecba8b6bae5472ba7ebac744e69afaf8e681414a394c3fda1ba38b4b0db65a83805b4d8c8a2dfef679eb843107
+DIST k8s.io%2Fapi%2F@v%2Fv0.18.2.zip 3442467 BLAKE2B a4cf569a2d07035862e73837c42fae41cd8bc901f95f09d5193af1dd7342b502c9cd2a569c79093af072842a795735f53ef78a39bcfe00b6ed0930d12aa0db9b SHA512 b4b27577bdd5d7ff3bd2c95b0e2f3dbe9528d219da4e142ac189aea660895f29b28cde389f16bf9cf6f790fb8c787880a378f1b5f4b8f415769019407c39b8e2
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190409092423-760d1845f48b.mod 4168 BLAKE2B 7df1044ad1084822e65b307174a9e729b13dbe7c79bbc29455e027c8fa217a3e0d52c1d8d7a76dce42428870d1dfdbfada264be3f82840227718cb06002e62ac SHA512 17d86016ee15c639dfb85495f1401afe174c743c689e2e251e04dcb2bdeff7fa799dba20a46145dfda3e9835e39df6521e6dbe750cf63ccc258a12c635d15c82
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.2.mod 1605 BLAKE2B 7863e328cd5985db939aedbc154aa73c9fabbaa3554d21e6cce2bf02c6c07251f0fdc7c330cd9cc0b7470c6646145ad2f50ecb229b774f56ca6161a11a865fbc SHA512 7bf3281763e6aea61c2b1e83e97c74b3cb20151bb35ec5b6061a3de2a12025c488abd560e68ad90b8bb6a238a493973ea0caf016c24bff5b2ca739faed9ef0fe
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.2.zip 782310 BLAKE2B d8c52798f72eed2ec584ac963c77b2e37e4a30586cfb44fddda7231a384b04b08517b8a900cf9ad33109e3b29606971626fff6a91e9937879396351223ae8839 SHA512 591cb092d7d5862ccfa3c48d22ae7b0f1a08951aed579a4a78899547f2904d1dc5986ab45537fd1368e07c0f72c41fb2084289dc9bac105e738f029851b15c37
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.2.mod 1591 BLAKE2B 5c0f15086184ac14519810c86ac60a236c8ca3b002476f9c03da278fc2a46035f017bf23daa3cabcc7684a9c5e26fb0b7abcf3899fdf02492e2d639dcb7e3965 SHA512 974fe4d845ae6b2bc373d3bdc6280607a4617151ec05df10bef666e9e376b6b4275eda48a0a227875190ccf72a5254e86b47dfc4bc5d7f310414edfbaea408d2
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.2.zip 2145651 BLAKE2B 650c8c7251cd0470d2f3aaa65246af8eb312a6951b28f0152f93a8c02e282aa4e1640dc7adeb6db065760da79473f2f4751a264fa6b9c73385e1a6414a9c9702 SHA512 77b5da68eb55fc49ac01e4519481e0ef51766d9b06c5892bef4459d67098a3af1710b2dd46ae323638758fd475eee8f618b41fb808aea6853048d4335bc63af7
+DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
+DIST k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf
+DIST k8s.io%2Fklog%2F@v%2Fv0.0.0-20190306015804-8e90cee79f82.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf
+DIST k8s.io%2Fklog%2F@v%2Fv0.3.0.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf
+DIST k8s.io%2Fklog%2F@v%2Fv1.0.0.mod 68 BLAKE2B f745a62a974a42d1692705de032c8c651477ec71f32b0515adc02360e5a3de6c7d65f5d97960e78da06e99b0843c312a09701c08c6a5c112af832e3cd2e43649 SHA512 cfee3f10c26fafe7cbc510ff8cba479dfacedf1d95b4e25b75978656862067524b4b9f5e889455f2d74eacf07df7895fe266415a05b9502a759baf2e4bd3884a
+DIST k8s.io%2Fklog%2F@v%2Fv1.0.0.zip 39827 BLAKE2B 441907426e07ed46aeeb6314c615fceedd43bf1b21b07a31960b23e1cf31dc400f1d7f0304cd5c13db8c2d54aaec47d05425798508978cb25c7d05aa3fcf2fa4 SHA512 b28b559a8a6e46b206ac005497d2e061645a81a3dc4b4f2c2a9f84065aae024dfbe7c64e9a446f72f7f88b5dea31d0ee725b273fb79877e24fb27906e1500c2b
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190228160746-b3a7cee44a30.mod 27 BLAKE2B 9c24d9586f1fdfa479ef27be1f45780be8e756931657d77cc78236332838e6f792d3c8be027ad96528ac819933444eebaa1b2a84d7f7fe63f3f4529c2543d259 SHA512 cfddbdd6ebaa638a046c7f20a87048946521ce1320a615bdd77ec639dcc3994fc8cdf3375c1dc523691af6eb4c87cc4b2119c228d222df7f449c03271670fd5a
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.mod 1743 BLAKE2B 1f2f1c417b102908c388ebdabbe4686f756287951943eac396b07d8be7fa905a6d362442a2f99d5411aa19b27df038e699ec1264648e9c948126835df0f1a767 SHA512 6444514b3858974b4517ef18bbf82366363e2032e53a8a88db6bf2cda4105271ed672a49cac0d01aefe7f006cb69a8e8deebc077a91063571dd1b20fdf09b21c
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip 147166 BLAKE2B a9d5897231997c8184aba7c58d6b31fa8413d7c94e48f52fb59f171f537d0e9a047055a5e717e411c7f0dbc63bf1794c2a425c278724eeb73de59e7bbd8d2ee0 SHA512 49641d1a253a5469d9dec1e104b5ecbd7033e28f8ab08c351edea432687fb1bf902d9fbf3ea2ef217b82ab06ca3f2453a1dccf03468d38281c847e19477641df
+DIST layeh.com%2Fradius%2F@v%2Fv0.0.0-20190322222518-890bc1058917.mod 24 BLAKE2B a9c7ec29917df4eabfe87aa5ead3a73156f5b71d96ab569d04c5533328fea0bd1c498ef6ab93b1e5009e6408c77bdbe18d7068e5c61e1fbcee2bd3195266dc94 SHA512 3d17df8dd6bde6647a230a3efbaafe0bfd840d8f11304a2aecef2f7d1098f0fc348bae2044c7a4223089ee4ca1833a792bb5a7f4647b13fb8fd4b6df68dd6785
+DIST layeh.com%2Fradius%2F@v%2Fv0.0.0-20190322222518-890bc1058917.zip 109107 BLAKE2B f95c72bc7dc8061651d1e216d4ac85565bea7d799912b001a2e9d6a9142f2f00eb72e798616db9fc8738adad2334863a71f14590a3a13da82d7c436315d8e10c SHA512 dde4561283d283963322aab401a493927daf38dfba27d62ea05220ff452e3aef0ce7a8928949a1edf764c83f9d52f0b4adc9d686bfb7327f43eb759d81c81047
+DIST mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.1.mod 265 BLAKE2B 4232ab3ecc78532cc067fa124745e08caa46b0e645bdd40f9001e895a0521b2741c0e36811fb69356124514a494a4545807d7a1cadecceb10fc373656557a943 SHA512 e27aff713fba5d9157eb7f201e72d23f89ad65c18cfa7205f1e5e456772e7fba975ea54fad8841229370bf21fad6a2a2baec6b2d377c23bd0a6c4b5b48e1e3e3
+DIST mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.1.zip 173668 BLAKE2B 086fd07f1dd1930c30e7b20a21b4c708240f33f410d641224c3024b4576fa8ec51a68bfae39df685f396b52f4a4d1db4d69f2f598f4563d3239846f32e600d12 SHA512 ae6aa55fd322bd3f871026feec818e55aaa1d935d129d28ebab3bfd308d564cdfc086a95ea041b1a861e583e0d3238319e4a5ab837727cd181a03d36e8dab6cc
+DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
+DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
+DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
+DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod 298 BLAKE2B c8069652ef0558d03282ef0f8444222d09708f1dcdc1ab19ed698d7acfb8d3421d9d9c9d053f3060848673d3dd30befd94c09b075ced36f79bef28940e7b351b SHA512 d153dd32bc1485e17771bad3142f576d967e0986702050431a656eb990af3bbfe809542745ac7752c0d72e6beee78bf3c285a4b41b37b8ebef50ecd7b3f53f8d
+DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod 298 BLAKE2B c8069652ef0558d03282ef0f8444222d09708f1dcdc1ab19ed698d7acfb8d3421d9d9c9d053f3060848673d3dd30befd94c09b075ced36f79bef28940e7b351b SHA512 d153dd32bc1485e17771bad3142f576d967e0986702050431a656eb990af3bbfe809542745ac7752c0d72e6beee78bf3c285a4b41b37b8ebef50ecd7b3f53f8d
+DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip 215199 BLAKE2B 10e6de70852ce1a49e1091f10305e217d873bf92d727ef5c773376eb5bd4fe7ed09f4bba82b59b8fddb7bb67709428f0ff02068bd025df35c196b29abf9d57ff SHA512 f61f3d2c31c00c2c016ebbf48f051920cb461429c8d0e46b2995efa18e5b03cbfaee429c2b545979546ac82cb3439274133f4e898d0d3f2c9e3636d673818f6c
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
+DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 DIST vault-1.5.9-webui.tar.xz 1244124 BLAKE2B bdd56f3ffc3c1733f9ba3c76be2e6969039dfbf03ba3ced1f9fa69b2622b51d09e18c5a2c1127a5056db54a2a034549d40e3edbba23849276ce15360e3859afb SHA512 5abac5ccaf0c3010327eb79e78b3fe37de89202e998c19457d8782d138e826e2c6e319dca221419977ecc6dbe7477e7778c9d5011ecef5eaa49e53a4485f586e
 DIST vault-1.5.9.tar.gz 35127251 BLAKE2B 7b2c24f797f0c54672b49a28989e0e465d9a0054f26cfcaf22d030a9f3b25d79b496044bb65a6d4c363b7478a3ca6d8dac1520169d6c347fe75bac3ff6001df6 SHA512 de5dfa9cb0ca41514fa5652d2cd3dacc312b1a6d9f2311823a1634dadb6bc4430d8124ac9089dd93f7277ff44f3fee37354b3ae48f8ece839ba859c89655510b
 DIST vault-1.6.5-webui.tar.xz 1273364 BLAKE2B 3fd23a322f435cc1151c7c7321bd48ddbf5a06e260e77cb51353e5df940a7e7932b7043e914da149664d20e7a10b24771c6c3f1cad0cae035b654f4e206212aa SHA512 cbc433bf101996ff1f800b023664f1a6b9e3473fb2220986724f2019801cbe758a0889f1e9ab8a4fbcda3a6d75e453251a24f1c81228616f6a377100c4e7ae7a
 DIST vault-1.6.5.tar.gz 39136426 BLAKE2B ed977f7035b37b801c785c0f63c7338e6ad829de27d50fcc2078bbc008f9cdb0fb399786af62b16d9e85fab57d8a6c22417581b84e902fc3829144548cb41634 SHA512 0f5640d376f21d57bf25db0865b4509ef819dd82e950f8c9192188ab3ef1c2477c369049b69a5194e27051b5d8dc523b9760b01eda6568f7348bb782cf6f97c6
 DIST vault-1.7.3-webui.tar.xz 1331416 BLAKE2B 81a3e70086ef4aa1a4761188d8d8b294593cf26ffe8e697d556a3bc27319c0ea149ba3f652ff3fc9f552252354a86e7923ecd87a81ecc2b9d29d6ff25180e50e SHA512 a9f2aa9ed9e4303054a8c7c97a49daab8e2c6142ddff18ec0f38fd68383af10a644e47c02b3ef6e2d4f74e68a6a9d3324f58c7b7725b990c7c290649134f90d3
 DIST vault-1.7.3.tar.gz 39626087 BLAKE2B 54e777c0703c2b3ae32012507579079a97c19aee9b8488af71b863ab2f0b536417470441c68c5ace40069559485c9f2fa108d3f2e3cbbd9a44e1baffd812ed13 SHA512 06929599eb03373489da87bc63577b10b92080212fd090d5f95e29007a03c7e70c40148219415f252ac2acc7a8c46afe03fb5d034812fe379c79b7dd01d172e5
+DIST vault-1.8.1-webui.tar.xz 1390864 BLAKE2B e8f707c80358ed1d987fffd1bf579c9949b996d8022a63837f4c7872cc2092e06b76e459e68e93233854e516f039833098fb4adbf5e9a7bc4bc603dfff688352 SHA512 5266ccc45a7707111a71a4a0efde09eaf16c02d7b338936fb04fbc21c34c6a5fa9b6fbecc6c8a9deefad7f293bfc7aeaddf1de3dc481840bbeb404e695566e0b
+DIST vault-1.8.1.tar.gz 20941105 BLAKE2B dc9da6de438abdb8ebfc841c55574bc036f4dbf98f16ac2549bb35d60debafa77936ef726529701d7dd0c731980f72699d464b20a30ad404ef76b5188dc1946a SHA512 f6edb2e38f622c19e4b2839979f8f743a8148ede9226204c3463389cc4a85ce31f1bcd3ea473cf84ded76c528fe5fc5fd0d1a9e2f60a9a6be08e1885a39d8d36
 EBUILD vault-1.5.9.ebuild 1879 BLAKE2B 5bddff9571265a85ae83006d0c5443ec74127d486db55e96a1121cec364ff280c8c5c34645794769d7a5997774ccfb6bac37b60b50e343f6959b1671214dfe59 SHA512 e637af281634f65377b14168fd037c24380f696830c5b520847991b5c66ef98e6011b37a073a8f1c24abe91b06b206ac140618b151e2f3ef30a9cf3f48e51481
 EBUILD vault-1.6.5.ebuild 1880 BLAKE2B 9f7e8579490d1cd24afc040ac6af21d435e5199084ddb392000292f529c355a16d6fb9451c348003d2e71679b2a5c9062be6fd38cf1b5ee81900f45538014190 SHA512 e1956379e8f151dd471e03bbdb4bb816d7d92519a38b79355b99a6f3391556c01e40f268af59d5875bed878000fe0ea30f35e05455c9114b6db4080c364a4143
 EBUILD vault-1.7.3.ebuild 1880 BLAKE2B 9f7e8579490d1cd24afc040ac6af21d435e5199084ddb392000292f529c355a16d6fb9451c348003d2e71679b2a5c9062be6fd38cf1b5ee81900f45538014190 SHA512 e1956379e8f151dd471e03bbdb4bb816d7d92519a38b79355b99a6f3391556c01e40f268af59d5875bed878000fe0ea30f35e05455c9114b6db4080c364a4143
+EBUILD vault-1.8.1.ebuild 94776 BLAKE2B eb59b02df1e9de718f20ab55d682ddfb8f756908ac59ccd86c597b5b5f0d3434ec7bf3274c8a9b6b02f5cef80520bbe918ca95c51c6aefbef21e970a7d2cec76 SHA512 fcbea2105133b629e277f8c280004a06063ed72fcc10751424532cce9b71ee2ce0882ff97a4a22c224029253baa341bdc01f82a76e5b0a266bac98f47762be27
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.8.1.ebuild b/app-admin/vault/vault-1.8.1.ebuild
new file mode 100644
index 000000000000..7699be83768d
--- /dev/null
+++ b/app-admin/vault/vault-1.8.1.ebuild
@@ -0,0 +1,1809 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+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"
+"cloud.google.com/go v0.38.0/go.mod"
+"cloud.google.com/go v0.39.0/go.mod"
+"cloud.google.com/go v0.44.1/go.mod"
+"cloud.google.com/go v0.44.2/go.mod"
+"cloud.google.com/go v0.45.1/go.mod"
+"cloud.google.com/go v0.46.3/go.mod"
+"cloud.google.com/go v0.50.0/go.mod"
+"cloud.google.com/go v0.52.0/go.mod"
+"cloud.google.com/go v0.53.0/go.mod"
+"cloud.google.com/go v0.54.0/go.mod"
+"cloud.google.com/go v0.56.0"
+"cloud.google.com/go v0.56.0/go.mod"
+"cloud.google.com/go/bigquery v1.0.1/go.mod"
+"cloud.google.com/go/bigquery v1.3.0/go.mod"
+"cloud.google.com/go/bigquery v1.4.0/go.mod"
+"cloud.google.com/go/bigquery v1.5.0/go.mod"
+"cloud.google.com/go/bigquery v1.6.0"
+"cloud.google.com/go/bigquery v1.6.0/go.mod"
+"cloud.google.com/go/datastore v1.0.0/go.mod"
+"cloud.google.com/go/datastore v1.1.0"
+"cloud.google.com/go/datastore v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.0.1/go.mod"
+"cloud.google.com/go/pubsub v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.2.0/go.mod"
+"cloud.google.com/go/pubsub v1.3.1"
+"cloud.google.com/go/pubsub v1.3.1/go.mod"
+"cloud.google.com/go/spanner v1.5.1"
+"cloud.google.com/go/spanner v1.5.1/go.mod"
+"cloud.google.com/go/storage v1.0.0/go.mod"
+"cloud.google.com/go/storage v1.5.0/go.mod"
+"cloud.google.com/go/storage v1.6.0"
+"cloud.google.com/go/storage v1.6.0/go.mod"
+"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f"
+"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod"
+"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+"git.apache.org/thrift.git v0.12.0/go.mod"
+"github.com/Azure/azure-pipeline-go v0.2.3"
+"github.com/Azure/azure-pipeline-go v0.2.3/go.mod"
+"github.com/Azure/azure-sdk-for-go v36.2.0+incompatible/go.mod"
+"github.com/Azure/azure-sdk-for-go v44.0.0+incompatible/go.mod"
+"github.com/Azure/azure-sdk-for-go v51.1.0+incompatible"
+"github.com/Azure/azure-sdk-for-go v51.1.0+incompatible/go.mod"
+"github.com/Azure/azure-storage-blob-go v0.11.0"
+"github.com/Azure/azure-storage-blob-go v0.11.0/go.mod"
+"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+"github.com/Azure/go-autorest v14.2.0+incompatible"
+"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.2/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+"github.com/Azure/go-autorest/autorest v0.10.1/go.mod"
+"github.com/Azure/go-autorest/autorest v0.11.0/go.mod"
+"github.com/Azure/go-autorest/autorest v0.11.17"
+"github.com/Azure/go-autorest/autorest v0.11.17/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.6.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.7.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.9.2/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.9.11"
+"github.com/Azure/go-autorest/autorest/adal v0.9.11/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.4.0/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.5.0/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.5.7"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.5.7/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.4.2"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.3.0"
+"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
+"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
+"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/to v0.4.0"
+"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.3.1"
+"github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod"
+"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+"github.com/Azure/go-autorest/logger v0.2.0"
+"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
+"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+"github.com/Azure/go-autorest/tracing v0.6.0"
+"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
+"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
+"github.com/BurntSushi/toml v0.3.1"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+"github.com/DataDog/datadog-go v3.2.0+incompatible"
+"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+"github.com/Jeffail/gabs v1.1.1"
+"github.com/Jeffail/gabs v1.1.1/go.mod"
+"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod"
+"github.com/Masterminds/goutils v1.1.0"
+"github.com/Masterminds/goutils v1.1.0/go.mod"
+"github.com/Masterminds/semver v1.4.2/go.mod"
+"github.com/Masterminds/semver v1.5.0"
+"github.com/Masterminds/semver v1.5.0/go.mod"
+"github.com/Masterminds/sprig v2.22.0+incompatible"
+"github.com/Masterminds/sprig v2.22.0+incompatible/go.mod"
+"github.com/Microsoft/go-winio v0.4.13/go.mod"
+"github.com/Microsoft/go-winio v0.4.14/go.mod"
+"github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331"
+"github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod"
+"github.com/Microsoft/hcsshim v0.8.14"
+"github.com/Microsoft/hcsshim v0.8.14/go.mod"
+"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+"github.com/NYTimes/gziphandler v1.1.1"
+"github.com/NYTimes/gziphandler v1.1.1/go.mod"
+"github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5"
+"github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod"
+"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+"github.com/SAP/go-hdb v0.14.1"
+"github.com/SAP/go-hdb v0.14.1/go.mod"
+"github.com/Sectorbob/mlab-ns2 v0.0.0-20171030222938-d3aa0c295a8a"
+"github.com/Sectorbob/mlab-ns2 v0.0.0-20171030222938-d3aa0c295a8a/go.mod"
+"github.com/Shopify/sarama v1.19.0/go.mod"
+"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
+"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
+"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
+"github.com/VividCortex/gohistogram v1.0.0/go.mod"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+"github.com/aerospike/aerospike-client-go v3.1.1+incompatible"
+"github.com/aerospike/aerospike-client-go v3.1.1+incompatible/go.mod"
+"github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
+"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190412020505-60e2075261b6/go.mod"
+"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190620160927-9418d7b0cd0f"
+"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190620160927-9418d7b0cd0f/go.mod"
+"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5"
+"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5/go.mod"
+"github.com/apache/arrow/go/arrow v0.0.0-20200601151325-b2287a20f230"
+"github.com/apache/arrow/go/arrow v0.0.0-20200601151325-b2287a20f230/go.mod"
+"github.com/apache/thrift v0.12.0/go.mod"
+"github.com/apache/thrift v0.13.0/go.mod"
+"github.com/apple/foundationdb/bindings/go v0.0.0-20190411004307-cd5c9d91fad2"
+"github.com/apple/foundationdb/bindings/go v0.0.0-20190411004307-cd5c9d91fad2/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+"github.com/armon/go-metrics v0.3.0/go.mod"
+"github.com/armon/go-metrics v0.3.3/go.mod"
+"github.com/armon/go-metrics v0.3.4/go.mod"
+"github.com/armon/go-metrics v0.3.7"
+"github.com/armon/go-metrics v0.3.7/go.mod"
+"github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a"
+"github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/armon/go-radix v1.0.0"
+"github.com/armon/go-radix v1.0.0/go.mod"
+"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod"
+"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf"
+"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
+"github.com/aws/aws-lambda-go v1.13.3/go.mod"
+"github.com/aws/aws-sdk-go v1.25.41/go.mod"
+"github.com/aws/aws-sdk-go v1.27.0/go.mod"
+"github.com/aws/aws-sdk-go v1.30.27/go.mod"
+"github.com/aws/aws-sdk-go v1.34.28/go.mod"
+"github.com/aws/aws-sdk-go v1.37.19"
+"github.com/aws/aws-sdk-go v1.37.19/go.mod"
+"github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod"
+"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
+"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod"
+"github.com/bitly/go-hostpool v0.1.0"
+"github.com/bitly/go-hostpool v0.1.0/go.mod"
+"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869"
+"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
+"github.com/boltdb/bolt v1.3.1/go.mod"
+"github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc"
+"github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod"
+"github.com/briankassouf/jose v0.9.2-0.20180619214549-d2569464773f"
+"github.com/briankassouf/jose v0.9.2-0.20180619214549-d2569464773f/go.mod"
+"github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee/go.mod"
+"github.com/casbin/casbin/v2 v2.1.2/go.mod"
+"github.com/cenkalti/backoff v2.2.1+incompatible"
+"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
+"github.com/cenkalti/backoff/v3 v3.0.0"
+"github.com/cenkalti/backoff/v3 v3.0.0/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/centrify/cloud-golang-sdk v0.0.0-20190214225812-119110094d0f"
+"github.com/centrify/cloud-golang-sdk v0.0.0-20190214225812-119110094d0f/go.mod"
+"github.com/cespare/xxhash v1.1.0"
+"github.com/cespare/xxhash v1.1.0/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/chrismalek/oktasdk-go v0.0.0-20181212195951-3430665dfaa0"
+"github.com/chrismalek/oktasdk-go v0.0.0-20181212195951-3430665dfaa0/go.mod"
+"github.com/chzyer/logex v1.1.10/go.mod"
+"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+"github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+"github.com/circonus-labs/circonusllhist v0.1.3"
+"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+"github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
+"github.com/client9/misspell v0.3.4"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190201205600-f136f9222381"
+"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190201205600-f136f9222381/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+"github.com/cockroachdb/apd v1.1.0"
+"github.com/cockroachdb/apd v1.1.0/go.mod"
+"github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c"
+"github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c/go.mod"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
+"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0"
+"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod"
+"github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod"
+"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
+"github.com/containerd/containerd v1.3.2/go.mod"
+"github.com/containerd/containerd v1.4.3"
+"github.com/containerd/containerd v1.4.3/go.mod"
+"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
+"github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod"
+"github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe"
+"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/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
+"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
+"github.com/coreos/bbolt v1.3.2/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-oidc v2.2.1+incompatible"
+"github.com/coreos/go-oidc v2.2.1+incompatible/go.mod"
+"github.com/coreos/go-oidc/v3 v3.0.0"
+"github.com/coreos/go-oidc/v3 v3.0.0/go.mod"
+"github.com/coreos/go-semver v0.2.0"
+"github.com/coreos/go-semver v0.2.0/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf"
+"github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod"
+"github.com/coreos/go-systemd/v22 v22.0.0"
+"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
+"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+"github.com/couchbase/gocb/v2 v2.1.4"
+"github.com/couchbase/gocb/v2 v2.1.4/go.mod"
+"github.com/couchbase/gocbcore/v9 v9.0.4"
+"github.com/couchbase/gocbcore/v9 v9.0.4/go.mod"
+"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/go.mod"
+"github.com/creack/pty v1.1.7/go.mod"
+"github.com/creack/pty v1.1.9"
+"github.com/creack/pty v1.1.9/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc"
+"github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1"
+"github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1/go.mod"
+"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+"github.com/digitalocean/godo v1.7.5"
+"github.com/digitalocean/godo v1.7.5/go.mod"
+"github.com/dimchansky/utfbom v1.1.0/go.mod"
+"github.com/dimchansky/utfbom v1.1.1"
+"github.com/dimchansky/utfbom v1.1.1/go.mod"
+"github.com/dnaeon/go-vcr v1.0.1"
+"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+"github.com/docker/distribution v2.7.1+incompatible"
+"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+"github.com/docker/docker v1.4.2-0.20200319182547-c7ad2b866182/go.mod"
+"github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible"
+"github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible/go.mod"
+"github.com/docker/go-connections v0.4.0"
+"github.com/docker/go-connections v0.4.0/go.mod"
+"github.com/docker/go-units v0.3.3/go.mod"
+"github.com/docker/go-units v0.4.0"
+"github.com/docker/go-units v0.4.0/go.mod"
+"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+"github.com/dsnet/compress v0.0.1"
+"github.com/dsnet/compress v0.0.1/go.mod"
+"github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod"
+"github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74"
+"github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74/go.mod"
+"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+"github.com/dustin/go-humanize v1.0.0"
+"github.com/dustin/go-humanize v1.0.0/go.mod"
+"github.com/eapache/go-resiliency v1.1.0/go.mod"
+"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+"github.com/eapache/queue v1.1.0/go.mod"
+"github.com/edsrzf/mmap-go v1.0.0/go.mod"
+"github.com/elazarl/go-bindata-assetfs v1.0.1-0.20200509193318-234c15e7648f"
+"github.com/elazarl/go-bindata-assetfs v1.0.1-0.20200509193318-234c15e7648f/go.mod"
+"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+"github.com/envoyproxy/go-control-plane v0.6.9/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
+"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.9.0/go.mod"
+"github.com/fatih/color v1.11.0"
+"github.com/fatih/color v1.11.0/go.mod"
+"github.com/fatih/structs v1.1.0"
+"github.com/fatih/structs v1.1.0/go.mod"
+"github.com/form3tech-oss/jwt-go v3.2.2+incompatible"
+"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
+"github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
+"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
+"github.com/frankban/quicktest v1.4.0/go.mod"
+"github.com/frankban/quicktest v1.4.1/go.mod"
+"github.com/frankban/quicktest v1.10.0/go.mod"
+"github.com/frankban/quicktest v1.13.0"
+"github.com/frankban/quicktest v1.13.0/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa"
+"github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod"
+"github.com/gammazero/deque v0.0.0-20190130191400-2afb3858e9c7"
+"github.com/gammazero/deque v0.0.0-20190130191400-2afb3858e9c7/go.mod"
+"github.com/gammazero/workerpool v0.0.0-20190406235159-88d534f22b56"
+"github.com/gammazero/workerpool v0.0.0-20190406235159-88d534f22b56/go.mod"
+"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32"
+"github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod"
+"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod"
+"github.com/go-asn1-ber/asn1-ber v1.4.1/go.mod"
+"github.com/go-asn1-ber/asn1-ber v1.5.1"
+"github.com/go-asn1-ber/asn1-ber v1.5.1/go.mod"
+"github.com/go-errors/errors v1.0.1"
+"github.com/go-errors/errors v1.0.1/go.mod"
+"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-kit/kit v0.10.0/go.mod"
+"github.com/go-ldap/ldap/v3 v3.1.3/go.mod"
+"github.com/go-ldap/ldap/v3 v3.1.7/go.mod"
+"github.com/go-ldap/ldap/v3 v3.1.10/go.mod"
+"github.com/go-ldap/ldap/v3 v3.2.4"
+"github.com/go-ldap/ldap/v3 v3.2.4/go.mod"
+"github.com/go-ldap/ldif v0.0.0-20200320164324-fd88d9b715b3"
+"github.com/go-ldap/ldif v0.0.0-20200320164324-fd88d9b715b3/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-logfmt/logfmt v0.5.0/go.mod"
+"github.com/go-logr/logr v0.1.0/go.mod"
+"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab"
+"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod"
+"github.com/go-ole/go-ole v1.2.4"
+"github.com/go-ole/go-ole v1.2.4/go.mod"
+"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+"github.com/go-sql-driver/mysql v1.4.0/go.mod"
+"github.com/go-sql-driver/mysql v1.5.0"
+"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+"github.com/go-stack/stack v1.8.0"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/go-test/deep v1.0.1/go.mod"
+"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
+"github.com/go-test/deep v1.0.2/go.mod"
+"github.com/go-test/deep v1.0.7"
+"github.com/go-test/deep v1.0.7/go.mod"
+"github.com/go-yaml/yaml v2.1.0+incompatible"
+"github.com/go-yaml/yaml v2.1.0+incompatible/go.mod"
+"github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod"
+"github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod"
+"github.com/gobuffalo/depgen v0.1.0/go.mod"
+"github.com/gobuffalo/envy v1.6.15/go.mod"
+"github.com/gobuffalo/envy v1.7.0/go.mod"
+"github.com/gobuffalo/flect v0.1.0/go.mod"
+"github.com/gobuffalo/flect v0.1.1/go.mod"
+"github.com/gobuffalo/flect v0.1.3/go.mod"
+"github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod"
+"github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod"
+"github.com/gobuffalo/genny v0.1.0/go.mod"
+"github.com/gobuffalo/genny v0.1.1/go.mod"
+"github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod"
+"github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod"
+"github.com/gobuffalo/gogen v0.1.0/go.mod"
+"github.com/gobuffalo/gogen v0.1.1/go.mod"
+"github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod"
+"github.com/gobuffalo/mapi v1.0.1/go.mod"
+"github.com/gobuffalo/mapi v1.0.2/go.mod"
+"github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod"
+"github.com/gobuffalo/packd v0.1.0/go.mod"
+"github.com/gobuffalo/packr/v2 v2.0.9/go.mod"
+"github.com/gobuffalo/packr/v2 v2.2.0/go.mod"
+"github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod"
+"github.com/gocql/gocql v0.0.0-20210401103645-80ab1e13e309"
+"github.com/gocql/gocql v0.0.0-20210401103645-80ab1e13e309/go.mod"
+"github.com/godbus/dbus/v5 v5.0.3/go.mod"
+"github.com/gogo/googleapis v1.1.0/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.0/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/gogo/protobuf v1.3.1"
+"github.com/gogo/protobuf v1.3.1/go.mod"
+"github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod"
+"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe"
+"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
+"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/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/mock v1.2.0/go.mod"
+"github.com/golang/mock v1.3.1/go.mod"
+"github.com/golang/mock v1.4.0/go.mod"
+"github.com/golang/mock v1.4.1/go.mod"
+"github.com/golang/mock v1.4.3"
+"github.com/golang/mock v1.4.3/go.mod"
+"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+"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/go.mod"
+"github.com/golang/protobuf v1.3.4/go.mod"
+"github.com/golang/protobuf v1.3.5/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+"github.com/golang/protobuf v1.4.0/go.mod"
+"github.com/golang/protobuf v1.4.1/go.mod"
+"github.com/golang/protobuf v1.4.2"
+"github.com/golang/protobuf v1.4.2/go.mod"
+"github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod"
+"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
+"github.com/golang/snappy v0.0.1/go.mod"
+"github.com/golang/snappy v0.0.2"
+"github.com/golang/snappy v0.0.2/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/flatbuffers v1.11.0"
+"github.com/google/flatbuffers v1.11.0/go.mod"
+"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/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.5.0/go.mod"
+"github.com/google/go-cmp v0.5.2/go.mod"
+"github.com/google/go-cmp v0.5.4/go.mod"
+"github.com/google/go-cmp v0.5.5"
+"github.com/google/go-cmp v0.5.5/go.mod"
+"github.com/google/go-github v17.0.0+incompatible"
+"github.com/google/go-github v17.0.0+incompatible/go.mod"
+"github.com/google/go-metrics-stackdriver v0.2.0"
+"github.com/google/go-metrics-stackdriver v0.2.0/go.mod"
+"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
+"github.com/google/go-querystring v1.0.0"
+"github.com/google/go-querystring v1.0.0/go.mod"
+"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/gofuzz v1.1.0"
+"github.com/google/gofuzz v1.1.0/go.mod"
+"github.com/google/martian v2.1.0+incompatible"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+"github.com/google/renameio v0.1.0/go.mod"
+"github.com/google/uuid v1.0.0/go.mod"
+"github.com/google/uuid v1.1.1/go.mod"
+"github.com/google/uuid v1.1.2"
+"github.com/google/uuid v1.1.2/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.5"
+"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+"github.com/googleapis/gnostic v0.1.0/go.mod"
+"github.com/googleapis/gnostic v0.2.0"
+"github.com/googleapis/gnostic v0.2.0/go.mod"
+"github.com/gophercloud/gophercloud v0.1.0"
+"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+"github.com/gopherjs/gopherjs v0.0.0-20180628210949-0892b62f0d9f/go.mod"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+"github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75"
+"github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod"
+"github.com/gorilla/context v1.1.1/go.mod"
+"github.com/gorilla/mux v1.6.2/go.mod"
+"github.com/gorilla/mux v1.7.3"
+"github.com/gorilla/mux v1.7.3/go.mod"
+"github.com/gorilla/securecookie v1.1.1"
+"github.com/gorilla/securecookie v1.1.1/go.mod"
+"github.com/gorilla/sessions v1.2.0"
+"github.com/gorilla/sessions v1.2.0/go.mod"
+"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+"github.com/gorilla/websocket v1.4.0/go.mod"
+"github.com/gorilla/websocket v1.4.1"
+"github.com/gorilla/websocket v1.4.1/go.mod"
+"github.com/gotestyourself/gotestyourself v2.2.0+incompatible"
+"github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.6.2/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.5"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+"github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed"
+"github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod"
+"github.com/hashicorp/cap v0.1.0"
+"github.com/hashicorp/cap v0.1.0/go.mod"
+"github.com/hashicorp/consul-template v0.26.0"
+"github.com/hashicorp/consul-template v0.26.0/go.mod"
+"github.com/hashicorp/consul/api v1.3.0/go.mod"
+"github.com/hashicorp/consul/api v1.4.0"
+"github.com/hashicorp/consul/api v1.4.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.4.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.4.1-0.20200910203702-bb2b5dd871ca"
+"github.com/hashicorp/consul/sdk v0.4.1-0.20200910203702-bb2b5dd871ca/go.mod"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/errwrap v1.1.0"
+"github.com/hashicorp/errwrap v1.1.0/go.mod"
+"github.com/hashicorp/go-bindata v3.0.8-0.20180209072458-bf7910af8997+incompatible"
+"github.com/hashicorp/go-bindata v3.0.8-0.20180209072458-bf7910af8997+incompatible/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.2"
+"github.com/hashicorp/go-cleanhttp v0.5.2/go.mod"
+"github.com/hashicorp/go-discover v0.0.0-20201029210230-738cb3105cd0"
+"github.com/hashicorp/go-discover v0.0.0-20201029210230-738cb3105cd0/go.mod"
+"github.com/hashicorp/go-gatedio v0.5.0"
+"github.com/hashicorp/go-gatedio v0.5.0/go.mod"
+"github.com/hashicorp/go-gcp-common v0.5.0/go.mod"
+"github.com/hashicorp/go-gcp-common v0.7.0"
+"github.com/hashicorp/go-gcp-common v0.7.0/go.mod"
+"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+"github.com/hashicorp/go-hclog v0.8.0/go.mod"
+"github.com/hashicorp/go-hclog v0.9.1/go.mod"
+"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+"github.com/hashicorp/go-hclog v0.14.1/go.mod"
+"github.com/hashicorp/go-hclog v0.15.0/go.mod"
+"github.com/hashicorp/go-hclog v0.16.1"
+"github.com/hashicorp/go-hclog v0.16.1/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.3.0"
+"github.com/hashicorp/go-immutable-radix v1.3.0/go.mod"
+"github.com/hashicorp/go-kms-wrapping v0.5.16"
+"github.com/hashicorp/go-kms-wrapping v0.5.16/go.mod"
+"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0"
+"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod"
+"github.com/hashicorp/go-memdb v1.0.2"
+"github.com/hashicorp/go-memdb v1.0.2/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+"github.com/hashicorp/go-msgpack v1.1.5"
+"github.com/hashicorp/go-msgpack v1.1.5/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+"github.com/hashicorp/go-multierror v1.1.1"
+"github.com/hashicorp/go-multierror v1.1.1/go.mod"
+"github.com/hashicorp/go-plugin v1.0.1"
+"github.com/hashicorp/go-plugin v1.0.1/go.mod"
+"github.com/hashicorp/go-raftchunking v0.6.3-0.20191002164813-7e9e8525653a"
+"github.com/hashicorp/go-raftchunking v0.6.3-0.20191002164813-7e9e8525653a/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.7"
+"github.com/hashicorp/go-retryablehttp v0.6.7/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.2"
+"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+"github.com/hashicorp/go-slug v0.4.1"
+"github.com/hashicorp/go-slug v0.4.1/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.2"
+"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-tfe v0.12.0"
+"github.com/hashicorp/go-tfe v0.12.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go-uuid v1.0.2"
+"github.com/hashicorp/go-uuid v1.0.2/go.mod"
+"github.com/hashicorp/go-version v1.0.0/go.mod"
+"github.com/hashicorp/go-version v1.2.0/go.mod"
+"github.com/hashicorp/go-version v1.2.1"
+"github.com/hashicorp/go-version v1.2.1/go.mod"
+"github.com/hashicorp/go.net v0.0.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.3/go.mod"
+"github.com/hashicorp/golang-lru v0.5.4"
+"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/hashicorp/hcl v1.0.1-vault-3"
+"github.com/hashicorp/hcl v1.0.1-vault-3/go.mod"
+"github.com/hashicorp/logutils v1.0.0"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.1"
+"github.com/hashicorp/mdns v1.0.1/go.mod"
+"github.com/hashicorp/memberlist v0.1.3/go.mod"
+"github.com/hashicorp/memberlist v0.2.2"
+"github.com/hashicorp/memberlist v0.2.2/go.mod"
+"github.com/hashicorp/nomad/api v0.0.0-20191220223628-edc62acd919d"
+"github.com/hashicorp/nomad/api v0.0.0-20191220223628-edc62acd919d/go.mod"
+"github.com/hashicorp/raft v1.0.1/go.mod"
+"github.com/hashicorp/raft v1.1.0/go.mod"
+"github.com/hashicorp/raft v1.1.2-0.20191002163536-9c6bd3e3eb17/go.mod"
+"github.com/hashicorp/raft v1.2.0/go.mod"
+"github.com/hashicorp/raft v1.3.0"
+"github.com/hashicorp/raft v1.3.0/go.mod"
+"github.com/hashicorp/raft-autopilot v0.1.3"
+"github.com/hashicorp/raft-autopilot v0.1.3/go.mod"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
+"github.com/hashicorp/raft-boltdb/v2 v2.0.0-20210421194847-a7e34179d62c"
+"github.com/hashicorp/raft-boltdb/v2 v2.0.0-20210421194847-a7e34179d62c/go.mod"
+"github.com/hashicorp/raft-snapshot v1.0.3"
+"github.com/hashicorp/raft-snapshot v1.0.3/go.mod"
+"github.com/hashicorp/serf v0.8.2/go.mod"
+"github.com/hashicorp/serf v0.9.4/go.mod"
+"github.com/hashicorp/serf v0.9.5"
+"github.com/hashicorp/serf v0.9.5/go.mod"
+"github.com/hashicorp/vault-plugin-auth-alicloud v0.9.0"
+"github.com/hashicorp/vault-plugin-auth-alicloud v0.9.0/go.mod"
+"github.com/hashicorp/vault-plugin-auth-azure v0.8.0"
+"github.com/hashicorp/vault-plugin-auth-azure v0.8.0/go.mod"
+"github.com/hashicorp/vault-plugin-auth-centrify v0.9.0"
+"github.com/hashicorp/vault-plugin-auth-centrify v0.9.0/go.mod"
+"github.com/hashicorp/vault-plugin-auth-cf v0.9.0"
+"github.com/hashicorp/vault-plugin-auth-cf v0.9.0/go.mod"
+"github.com/hashicorp/vault-plugin-auth-gcp v0.5.1/go.mod"
+"github.com/hashicorp/vault-plugin-auth-gcp v0.10.0"
+"github.com/hashicorp/vault-plugin-auth-gcp v0.10.0/go.mod"
+"github.com/hashicorp/vault-plugin-auth-jwt v0.10.1"
+"github.com/hashicorp/vault-plugin-auth-jwt v0.10.1/go.mod"
+"github.com/hashicorp/vault-plugin-auth-kerberos v0.4.0"
+"github.com/hashicorp/vault-plugin-auth-kerberos v0.4.0/go.mod"
+"github.com/hashicorp/vault-plugin-auth-kubernetes v0.10.1"
+"github.com/hashicorp/vault-plugin-auth-kubernetes v0.10.1/go.mod"
+"github.com/hashicorp/vault-plugin-auth-oci v0.8.0"
+"github.com/hashicorp/vault-plugin-auth-oci v0.8.0/go.mod"
+"github.com/hashicorp/vault-plugin-database-couchbase v0.4.0"
+"github.com/hashicorp/vault-plugin-database-couchbase v0.4.0/go.mod"
+"github.com/hashicorp/vault-plugin-database-elasticsearch v0.8.0"
+"github.com/hashicorp/vault-plugin-database-elasticsearch v0.8.0/go.mod"
+"github.com/hashicorp/vault-plugin-database-mongodbatlas v0.4.0"
+"github.com/hashicorp/vault-plugin-database-mongodbatlas v0.4.0/go.mod"
+"github.com/hashicorp/vault-plugin-database-snowflake v0.2.0"
+"github.com/hashicorp/vault-plugin-database-snowflake v0.2.0/go.mod"
+"github.com/hashicorp/vault-plugin-mock v0.16.1"
+"github.com/hashicorp/vault-plugin-mock v0.16.1/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-ad v0.10.0"
+"github.com/hashicorp/vault-plugin-secrets-ad v0.10.0/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-alicloud v0.9.0"
+"github.com/hashicorp/vault-plugin-secrets-alicloud v0.9.0/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-azure v0.10.0"
+"github.com/hashicorp/vault-plugin-secrets-azure v0.10.0/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-gcp v0.10.1"
+"github.com/hashicorp/vault-plugin-secrets-gcp v0.10.1/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-gcpkms v0.9.0"
+"github.com/hashicorp/vault-plugin-secrets-gcpkms v0.9.0/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-kv v0.9.0"
+"github.com/hashicorp/vault-plugin-secrets-kv v0.9.0/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.4.0"
+"github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.4.0/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-openldap v0.5.1"
+"github.com/hashicorp/vault-plugin-secrets-openldap v0.5.1/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-terraform v0.2.0"
+"github.com/hashicorp/vault-plugin-secrets-terraform v0.2.0/go.mod"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
+"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+"github.com/hpcloud/tail v1.0.0"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/huandu/xstrings v1.3.2"
+"github.com/huandu/xstrings v1.3.2/go.mod"
+"github.com/huaweicloud/golangsdk v0.0.0-20200304081349-45ec0797f2a4/go.mod"
+"github.com/hudl/fargo v1.3.0/go.mod"
+"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+"github.com/imdario/mergo v0.3.5/go.mod"
+"github.com/imdario/mergo v0.3.6/go.mod"
+"github.com/imdario/mergo v0.3.11"
+"github.com/imdario/mergo v0.3.11/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/influxdata/influxdb v0.0.0-20190411212539-d24b7ba8c4c4"
+"github.com/influxdata/influxdb v0.0.0-20190411212539-d24b7ba8c4c4/go.mod"
+"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
+"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733"
+"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
+"github.com/jackc/pgx v3.3.0+incompatible"
+"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
+"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
+"github.com/jarcoal/httpmock v1.0.4/go.mod"
+"github.com/jarcoal/httpmock v1.0.5"
+"github.com/jarcoal/httpmock v1.0.5/go.mod"
+"github.com/jcmturner/aescts v1.0.1"
+"github.com/jcmturner/aescts v1.0.1/go.mod"
+"github.com/jcmturner/dnsutils v1.0.1"
+"github.com/jcmturner/dnsutils v1.0.1/go.mod"
+"github.com/jcmturner/gofork v1.0.0"
+"github.com/jcmturner/gofork v1.0.0/go.mod"
+"github.com/jcmturner/goidentity/v6 v6.0.1"
+"github.com/jcmturner/goidentity/v6 v6.0.1/go.mod"
+"github.com/jcmturner/gokrb5/v8 v8.0.0"
+"github.com/jcmturner/gokrb5/v8 v8.0.0/go.mod"
+"github.com/jcmturner/rpc/v2 v2.0.2"
+"github.com/jcmturner/rpc/v2 v2.0.2/go.mod"
+"github.com/jeffchao/backoff v0.0.0-20140404060208-9d7fd7aa17f2"
+"github.com/jeffchao/backoff v0.0.0-20140404060208-9d7fd7aa17f2/go.mod"
+"github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f"
+"github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f/go.mod"
+"github.com/jefferai/jsonx v1.0.0"
+"github.com/jefferai/jsonx v1.0.0/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+"github.com/jmespath/go-jmespath v0.4.0"
+"github.com/jmespath/go-jmespath v0.4.0/go.mod"
+"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
+"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
+"github.com/joho/godotenv v1.3.0/go.mod"
+"github.com/jonboulle/clockwork v0.1.0"
+"github.com/jonboulle/clockwork v0.1.0/go.mod"
+"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
+"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
+"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
+"github.com/jpillora/backoff v1.0.0/go.mod"
+"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
+"github.com/json-iterator/go v1.1.5/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.7/go.mod"
+"github.com/json-iterator/go v1.1.8/go.mod"
+"github.com/json-iterator/go v1.1.9/go.mod"
+"github.com/json-iterator/go v1.1.10"
+"github.com/json-iterator/go v1.1.10/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/jstemmer/go-junit-report v0.9.1"
+"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
+"github.com/jtolds/gls v4.20.0+incompatible"
+"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/julienschmidt/httprouter v1.3.0/go.mod"
+"github.com/karrick/godirwalk v1.8.0/go.mod"
+"github.com/karrick/godirwalk v1.10.3/go.mod"
+"github.com/kelseyhightower/envconfig v1.3.0/go.mod"
+"github.com/kelseyhightower/envconfig v1.4.0"
+"github.com/kelseyhightower/envconfig v1.4.0/go.mod"
+"github.com/keybase/go-crypto v0.0.0-20190403132359-d65b6b94177f"
+"github.com/keybase/go-crypto v0.0.0-20190403132359-d65b6b94177f/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/klauspost/compress v1.4.1/go.mod"
+"github.com/klauspost/compress v1.9.5"
+"github.com/klauspost/compress v1.9.5/go.mod"
+"github.com/klauspost/cpuid v1.2.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.3"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pretty v0.2.0/go.mod"
+"github.com/kr/pretty v0.2.1"
+"github.com/kr/pretty v0.2.1/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/kr/text v0.2.0"
+"github.com/kr/text v0.2.0/go.mod"
+"github.com/lestrrat-go/jwx v0.9.0/go.mod"
+"github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod"
+"github.com/lib/pq v1.1.1/go.mod"
+"github.com/lib/pq v1.2.0/go.mod"
+"github.com/lib/pq v1.8.0"
+"github.com/lib/pq v1.8.0/go.mod"
+"github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
+"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
+"github.com/linode/linodego v0.7.1"
+"github.com/linode/linodego v0.7.1/go.mod"
+"github.com/lyft/protoc-gen-validate v0.0.13/go.mod"
+"github.com/magiconair/properties v1.8.0/go.mod"
+"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+"github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod"
+"github.com/markbates/safe v1.0.1/go.mod"
+"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11"
+"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-colorable v0.1.6/go.mod"
+"github.com/mattn/go-colorable v0.1.7/go.mod"
+"github.com/mattn/go-colorable v0.1.8"
+"github.com/mattn/go-colorable v0.1.8/go.mod"
+"github.com/mattn/go-ieproxy v0.0.1"
+"github.com/mattn/go-ieproxy v0.0.1/go.mod"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/mattn/go-isatty v0.0.4/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.10/go.mod"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-isatty v0.0.12"
+"github.com/mattn/go-isatty v0.0.12/go.mod"
+"github.com/mattn/go-runewidth v0.0.2/go.mod"
+"github.com/mattn/go-runewidth v0.0.3/go.mod"
+"github.com/mattn/go-shellwords v1.0.12"
+"github.com/mattn/go-shellwords v1.0.12/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/mholt/archiver v3.1.1+incompatible"
+"github.com/mholt/archiver v3.1.1+incompatible/go.mod"
+"github.com/michaelklishin/rabbit-hole v0.0.0-20191008194146-93d9988f0cd5"
+"github.com/michaelklishin/rabbit-hole v0.0.0-20191008194146-93d9988f0cd5/go.mod"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/miekg/dns v1.1.26/go.mod"
+"github.com/miekg/dns v1.1.40"
+"github.com/miekg/dns v1.1.40/go.mod"
+"github.com/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/cli v1.1.0/go.mod"
+"github.com/mitchellh/cli v1.1.2"
+"github.com/mitchellh/cli v1.1.2/go.mod"
+"github.com/mitchellh/copystructure v1.0.0"
+"github.com/mitchellh/copystructure v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/go-testing-interface v1.14.0"
+"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
+"github.com/mitchellh/go-wordwrap v1.0.0"
+"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+"github.com/mitchellh/gox v0.4.0/go.mod"
+"github.com/mitchellh/gox v1.0.1"
+"github.com/mitchellh/gox v1.0.1/go.mod"
+"github.com/mitchellh/hashstructure v1.0.0"
+"github.com/mitchellh/hashstructure v1.0.0/go.mod"
+"github.com/mitchellh/iochan v1.0.0"
+"github.com/mitchellh/iochan v1.0.0/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/mitchellh/mapstructure v1.2.2/go.mod"
+"github.com/mitchellh/mapstructure v1.3.2/go.mod"
+"github.com/mitchellh/mapstructure v1.3.3"
+"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+"github.com/mitchellh/pointerstructure v1.0.0"
+"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.1"
+"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
+"github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2"
+"github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/mongodb/go-client-mongodb-atlas v0.1.2"
+"github.com/mongodb/go-client-mongodb-atlas v0.1.2/go.mod"
+"github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod"
+"github.com/morikuni/aec v1.0.0"
+"github.com/morikuni/aec v1.0.0/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+"github.com/mwielbut/pointy v1.1.0"
+"github.com/mwielbut/pointy v1.1.0/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
+"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+"github.com/natefinch/atomic v0.0.0-20150920032501-a62ce929ffcc"
+"github.com/natefinch/atomic v0.0.0-20150920032501-a62ce929ffcc/go.mod"
+"github.com/nats-io/jwt v0.3.0/go.mod"
+"github.com/nats-io/jwt v0.3.2/go.mod"
+"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
+"github.com/nats-io/nats.go v1.9.1/go.mod"
+"github.com/nats-io/nkeys v0.1.0/go.mod"
+"github.com/nats-io/nkeys v0.1.3/go.mod"
+"github.com/nats-io/nuid v1.0.1/go.mod"
+"github.com/ncw/swift v1.0.47"
+"github.com/ncw/swift v1.0.47/go.mod"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
+"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+"github.com/nwaples/rardecode v1.1.0"
+"github.com/nwaples/rardecode v1.1.0/go.mod"
+"github.com/oklog/oklog v0.3.2/go.mod"
+"github.com/oklog/run v1.0.0"
+"github.com/oklog/run v1.0.0/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/okta/okta-sdk-golang v1.1.0"
+"github.com/okta/okta-sdk-golang v1.1.0/go.mod"
+"github.com/okta/okta-sdk-golang/v2 v2.0.0"
+"github.com/okta/okta-sdk-golang/v2 v2.0.0/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/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.8.0/go.mod"
+"github.com/onsi/ginkgo v1.10.1/go.mod"
+"github.com/onsi/ginkgo v1.11.0"
+"github.com/onsi/ginkgo v1.11.0/go.mod"
+"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
+"github.com/onsi/gomega v1.4.3/go.mod"
+"github.com/onsi/gomega v1.5.0/go.mod"
+"github.com/onsi/gomega v1.7.0"
+"github.com/onsi/gomega v1.7.0/go.mod"
+"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
+"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
+"github.com/opencontainers/go-digest v1.0.0-rc1"
+"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+"github.com/opencontainers/image-spec v1.0.1"
+"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-rc9"
+"github.com/opencontainers/runc v1.0.0-rc9/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.2/go.mod"
+"github.com/openlyinc/pointy v1.1.2"
+"github.com/openlyinc/pointy v1.1.2/go.mod"
+"github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
+"github.com/opentracing/basictracer-go v1.0.0/go.mod"
+"github.com/opentracing/opentracing-go v1.0.2/go.mod"
+"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
+"github.com/openzipkin/zipkin-go v0.1.3/go.mod"
+"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
+"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
+"github.com/openzipkin/zipkin-go v0.2.2/go.mod"
+"github.com/oracle/oci-go-sdk v7.0.0+incompatible/go.mod"
+"github.com/oracle/oci-go-sdk v12.5.0+incompatible"
+"github.com/oracle/oci-go-sdk v12.5.0+incompatible/go.mod"
+"github.com/ory/dockertest v3.3.4+incompatible/go.mod"
+"github.com/ory/dockertest v3.3.5+incompatible"
+"github.com/ory/dockertest v3.3.5+incompatible/go.mod"
+"github.com/ory/dockertest/v3 v3.6.2"
+"github.com/ory/dockertest/v3 v3.6.2/go.mod"
+"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2"
+"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
+"github.com/pact-foundation/pact-go v1.0.4/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pascaldekloe/goe v0.1.0"
+"github.com/pascaldekloe/goe v0.1.0/go.mod"
+"github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627/go.mod"
+"github.com/patrickmn/go-cache v2.1.0+incompatible"
+"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
+"github.com/pborman/uuid v1.2.0/go.mod"
+"github.com/pelletier/go-toml v1.2.0/go.mod"
+"github.com/pelletier/go-toml v1.7.0/go.mod"
+"github.com/performancecopilot/speed v3.0.0+incompatible/go.mod"
+"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5"
+"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod"
+"github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod"
+"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.2.6+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.5.2+incompatible"
+"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
+"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4"
+"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/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/go.mod"
+"github.com/pkg/errors v0.9.1"
+"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"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/posener/complete v1.1.1/go.mod"
+"github.com/posener/complete v1.2.3"
+"github.com/posener/complete v1.2.3/go.mod"
+"github.com/pquerna/cachecontrol v0.0.0-20201205024021-ac21108117ac"
+"github.com/pquerna/cachecontrol v0.0.0-20201205024021-ac21108117ac/go.mod"
+"github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d"
+"github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.2/go.mod"
+"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
+"github.com/prometheus/client_golang v0.9.3/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.3.0/go.mod"
+"github.com/prometheus/client_golang v1.4.0/go.mod"
+"github.com/prometheus/client_golang v1.7.1"
+"github.com/prometheus/client_golang v1.7.1/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.1.0/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+"github.com/prometheus/common v0.2.0/go.mod"
+"github.com/prometheus/common v0.4.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.7.0/go.mod"
+"github.com/prometheus/common v0.9.1/go.mod"
+"github.com/prometheus/common v0.10.0/go.mod"
+"github.com/prometheus/common v0.11.1"
+"github.com/prometheus/common v0.11.1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.8/go.mod"
+"github.com/prometheus/procfs v0.1.3"
+"github.com/prometheus/procfs v0.1.3/go.mod"
+"github.com/prometheus/tsdb v0.7.1/go.mod"
+"github.com/rboyer/safeio v0.2.1"
+"github.com/rboyer/safeio v0.2.1/go.mod"
+"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/rogpeppe/go-internal v1.1.0/go.mod"
+"github.com/rogpeppe/go-internal v1.2.2/go.mod"
+"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+"github.com/rogpeppe/go-internal v1.6.2"
+"github.com/rogpeppe/go-internal v1.6.2/go.mod"
+"github.com/rs/zerolog v1.4.0/go.mod"
+"github.com/russross/blackfriday v1.5.2/go.mod"
+"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/ryanuber/columnize v2.1.0+incompatible"
+"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+"github.com/ryanuber/go-glob v1.0.0"
+"github.com/ryanuber/go-glob v1.0.0/go.mod"
+"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da"
+"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
+"github.com/sasha-s/go-deadlock v0.2.0"
+"github.com/sasha-s/go-deadlock v0.2.0/go.mod"
+"github.com/satori/go.uuid v1.2.0"
+"github.com/satori/go.uuid v1.2.0/go.mod"
+"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
+"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/sethvargo/go-limiter v0.3.0"
+"github.com/sethvargo/go-limiter v0.3.0/go.mod"
+"github.com/shirou/gopsutil v3.21.5+incompatible"
+"github.com/shirou/gopsutil v3.21.5+incompatible/go.mod"
+"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24"
+"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0/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.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.0/go.mod"
+"github.com/sirupsen/logrus v1.4.1/go.mod"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/sirupsen/logrus v1.6.0"
+"github.com/sirupsen/logrus v1.6.0/go.mod"
+"github.com/smartystreets/assertions v0.0.0-20180725160413-e900ae048470/go.mod"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
+"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+"github.com/smartystreets/goconvey v1.6.4"
+"github.com/smartystreets/goconvey v1.6.4/go.mod"
+"github.com/snowflakedb/glog v0.0.0-20180824191149-f5055e6f21ce"
+"github.com/snowflakedb/glog v0.0.0-20180824191149-f5055e6f21ce/go.mod"
+"github.com/snowflakedb/gosnowflake v1.3.11"
+"github.com/snowflakedb/gosnowflake v1.3.11/go.mod"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
+"github.com/soheilhy/cmux v0.1.4"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/sony/gobreaker v0.4.1/go.mod"
+"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+"github.com/spf13/afero v1.1.2/go.mod"
+"github.com/spf13/afero v1.2.1/go.mod"
+"github.com/spf13/afero v1.2.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/go.mod"
+"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+"github.com/spf13/pflag v1.0.1/go.mod"
+"github.com/spf13/pflag v1.0.3/go.mod"
+"github.com/spf13/pflag v1.0.5"
+"github.com/spf13/pflag v1.0.5/go.mod"
+"github.com/spf13/viper v1.3.2/go.mod"
+"github.com/spf13/viper v1.4.0/go.mod"
+"github.com/square/go-jose v2.4.1+incompatible/go.mod"
+"github.com/square/go-jose/v3 v3.0.0-20200225220504-708a9fe87ddc/go.mod"
+"github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
+"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271"
+"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod"
+"github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/objx v0.2.0"
+"github.com/stretchr/objx v0.2.0/go.mod"
+"github.com/stretchr/testify v1.2.0/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/stretchr/testify v1.5.1/go.mod"
+"github.com/stretchr/testify v1.6.1/go.mod"
+"github.com/stretchr/testify v1.7.0"
+"github.com/stretchr/testify v1.7.0/go.mod"
+"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d"
+"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.171+incompatible"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.171+incompatible/go.mod"
+"github.com/tidwall/pretty v1.0.0/go.mod"
+"github.com/tidwall/pretty v1.0.1"
+"github.com/tidwall/pretty v1.0.1/go.mod"
+"github.com/tklauser/go-sysconf v0.3.6"
+"github.com/tklauser/go-sysconf v0.3.6/go.mod"
+"github.com/tklauser/numcpus v0.2.2"
+"github.com/tklauser/numcpus v0.2.2/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+"github.com/ugorji/go v1.1.4/go.mod"
+"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+"github.com/ulikunitz/xz v0.5.6/go.mod"
+"github.com/ulikunitz/xz v0.5.7"
+"github.com/ulikunitz/xz v0.5.7/go.mod"
+"github.com/urfave/cli v1.20.0/go.mod"
+"github.com/urfave/cli v1.22.1/go.mod"
+"github.com/urfave/cli v1.22.2/go.mod"
+"github.com/vmware/govmomi v0.18.0"
+"github.com/vmware/govmomi v0.18.0/go.mod"
+"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c"
+"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
+"github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod"
+"github.com/xdg/stringprep v1.0.0"
+"github.com/xdg/stringprep v1.0.0/go.mod"
+"github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8"
+"github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+"github.com/yandex-cloud/go-genproto v0.0.0-20200722140432-762fe965ce77/go.mod"
+"github.com/yandex-cloud/go-sdk v0.0.0-20200722140627-2194e5077f13/go.mod"
+"github.com/yhat/scrape v0.0.0-20161128144610-24b7890b0945/go.mod"
+"github.com/yuin/goldmark v1.1.25/go.mod"
+"github.com/yuin/goldmark v1.1.27/go.mod"
+"github.com/yuin/goldmark v1.2.1/go.mod"
+"github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da"
+"github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod"
+"go.etcd.io/bbolt v1.3.2/go.mod"
+"go.etcd.io/bbolt v1.3.3/go.mod"
+"go.etcd.io/bbolt v1.3.4/go.mod"
+"go.etcd.io/bbolt v1.3.5"
+"go.etcd.io/bbolt v1.3.5/go.mod"
+"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
+"go.etcd.io/etcd v0.5.0-alpha.5.0.20200425165423-262c93980547"
+"go.etcd.io/etcd v0.5.0-alpha.5.0.20200425165423-262c93980547/go.mod"
+"go.mongodb.org/atlas v0.7.1"
+"go.mongodb.org/atlas v0.7.1/go.mod"
+"go.mongodb.org/mongo-driver v1.4.2/go.mod"
+"go.mongodb.org/mongo-driver v1.4.6"
+"go.mongodb.org/mongo-driver v1.4.6/go.mod"
+"go.opencensus.io v0.19.1/go.mod"
+"go.opencensus.io v0.19.2/go.mod"
+"go.opencensus.io v0.20.1/go.mod"
+"go.opencensus.io v0.20.2/go.mod"
+"go.opencensus.io v0.21.0/go.mod"
+"go.opencensus.io v0.22.0/go.mod"
+"go.opencensus.io v0.22.2/go.mod"
+"go.opencensus.io v0.22.3"
+"go.opencensus.io v0.22.3/go.mod"
+"go.opentelemetry.io/otel v0.20.0"
+"go.opentelemetry.io/otel v0.20.0/go.mod"
+"go.opentelemetry.io/otel/metric v0.20.0"
+"go.opentelemetry.io/otel/metric v0.20.0/go.mod"
+"go.opentelemetry.io/otel/oteltest v0.20.0"
+"go.opentelemetry.io/otel/oteltest v0.20.0/go.mod"
+"go.opentelemetry.io/otel/sdk v0.20.0"
+"go.opentelemetry.io/otel/sdk v0.20.0/go.mod"
+"go.opentelemetry.io/otel/trace v0.20.0"
+"go.opentelemetry.io/otel/trace v0.20.0/go.mod"
+"go.uber.org/atomic v1.3.2/go.mod"
+"go.uber.org/atomic v1.4.0/go.mod"
+"go.uber.org/atomic v1.5.0/go.mod"
+"go.uber.org/atomic v1.6.0"
+"go.uber.org/atomic v1.6.0/go.mod"
+"go.uber.org/goleak v1.1.10"
+"go.uber.org/goleak v1.1.10/go.mod"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/multierr v1.3.0/go.mod"
+"go.uber.org/multierr v1.5.0"
+"go.uber.org/multierr v1.5.0/go.mod"
+"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
+"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+"go.uber.org/zap v1.10.0/go.mod"
+"go.uber.org/zap v1.13.0/go.mod"
+"go.uber.org/zap v1.14.1"
+"go.uber.org/zap v1.14.1/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-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
+"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
+"golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod"
+"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+"golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod"
+"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
+"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+"golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+"golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod"
+"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
+"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod"
+"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
+"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
+"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a"
+"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/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-20181217174547-8f45f776aaf1/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+"golang.org/x/lint v0.0.0-20200302205851-738671d3881b"
+"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+"golang.org/x/mod v0.1.0/go.mod"
+"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+"golang.org/x/mod v0.2.0/go.mod"
+"golang.org/x/mod v0.3.0/go.mod"
+"golang.org/x/mod v0.4.0"
+"golang.org/x/mod v0.4.0/go.mod"
+"golang.org/x/net v0.0.0-20170114055629-f2499483f923/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-20181023162649-9b4f9f5ad519/go.mod"
+"golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
+"golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/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-20190503192946-f4e77d36d62c/go.mod"
+"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+"golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod"
+"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+"golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod"
+"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+"golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod"
+"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+"golang.org/x/net v0.0.0-20200505041828-1ed23360d12c/go.mod"
+"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
+"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+"golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c/go.mod"
+"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+"golang.org/x/net v0.0.0-20210510120150-4163338589ed"
+"golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
+"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+"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-20190412183630-56d357773e84/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/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-20181026203630-95b1ffbd15a5/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod"
+"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+"golang.org/x/sys v0.0.0-20181218192612-074acd46bca6/go.mod"
+"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
+"golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod"
+"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/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-20190515120540-06a5c4944438/go.mod"
+"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
+"golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod"
+"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+"golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod"
+"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod"
+"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
+"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+"golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+"golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa/go.mod"
+"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod"
+"golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod"
+"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+"golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod"
+"golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod"
+"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+"golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod"
+"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+"golang.org/x/sys v0.0.0-20210514084401-e8d321eab015"
+"golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod"
+"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/text v0.3.6"
+"golang.org/x/text v0.3.6/go.mod"
+"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/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-20181011042414-1f849cf54d09/go.mod"
+"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+"golang.org/x/tools v0.0.0-20181219222714-6e267b5cc78e/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-20190312151545-0bb0c0a6e846/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+"golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod"
+"golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod"
+"golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod"
+"golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b/go.mod"
+"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod"
+"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
+"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+"golang.org/x/tools v0.0.0-20190718200317-82a3ea8a504c/go.mod"
+"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
+"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
+"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
+"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
+"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
+"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+"golang.org/x/tools v0.0.0-20200409170454-77362c5149f0/go.mod"
+"golang.org/x/tools v0.0.0-20200416214402-fc959738d646/go.mod"
+"golang.org/x/tools v0.0.0-20200521155704-91d71f6c2f04/go.mod"
+"golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c"
+"golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/go.mod"
+"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+"google.golang.org/api v0.0.0-20181220000619-583d854617af/go.mod"
+"google.golang.org/api v0.2.0/go.mod"
+"google.golang.org/api v0.3.0/go.mod"
+"google.golang.org/api v0.3.1/go.mod"
+"google.golang.org/api v0.3.2/go.mod"
+"google.golang.org/api v0.4.0/go.mod"
+"google.golang.org/api v0.5.0/go.mod"
+"google.golang.org/api v0.7.0/go.mod"
+"google.golang.org/api v0.8.0/go.mod"
+"google.golang.org/api v0.9.0/go.mod"
+"google.golang.org/api v0.13.0/go.mod"
+"google.golang.org/api v0.14.0/go.mod"
+"google.golang.org/api v0.15.0/go.mod"
+"google.golang.org/api v0.17.0/go.mod"
+"google.golang.org/api v0.18.0/go.mod"
+"google.golang.org/api v0.19.0/go.mod"
+"google.golang.org/api v0.20.0/go.mod"
+"google.golang.org/api v0.21.0/go.mod"
+"google.golang.org/api v0.24.0/go.mod"
+"google.golang.org/api v0.29.0"
+"google.golang.org/api v0.29.0/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.2.0/go.mod"
+"google.golang.org/appengine v1.3.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.5.0/go.mod"
+"google.golang.org/appengine v1.6.0/go.mod"
+"google.golang.org/appengine v1.6.1/go.mod"
+"google.golang.org/appengine v1.6.5"
+"google.golang.org/appengine v1.6.5/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20181219182458-5a97ab628bfb/go.mod"
+"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod"
+"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/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-20190508193815-b515fa19cec8/go.mod"
+"google.golang.org/genproto v0.0.0-20190513181449-d00d292a067c/go.mod"
+"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod"
+"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+"google.golang.org/genproto v0.0.0-20200323114720-3f67cca34472/go.mod"
+"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+"google.golang.org/genproto v0.0.0-20200409111301-baae70f3302d/go.mod"
+"google.golang.org/genproto v0.0.0-20200416231807-8751e049a2a0/go.mod"
+"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013"
+"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+"google.golang.org/grpc v1.14.0/go.mod"
+"google.golang.org/grpc v1.16.0/go.mod"
+"google.golang.org/grpc v1.17.0/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.20.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.21.1/go.mod"
+"google.golang.org/grpc v1.22.0/go.mod"
+"google.golang.org/grpc v1.22.1/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.25.1/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/go.mod"
+"google.golang.org/grpc v1.28.0/go.mod"
+"google.golang.org/grpc v1.28.1/go.mod"
+"google.golang.org/grpc v1.29.1"
+"google.golang.org/grpc v1.29.1/go.mod"
+"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+"google.golang.org/protobuf v1.21.0/go.mod"
+"google.golang.org/protobuf v1.22.0/go.mod"
+"google.golang.org/protobuf v1.23.0/go.mod"
+"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+"google.golang.org/protobuf v1.24.0/go.mod"
+"google.golang.org/protobuf v1.25.0"
+"google.golang.org/protobuf v1.25.0/go.mod"
+"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
+"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+"gopkg.in/errgo.v2 v2.1.0"
+"gopkg.in/errgo.v2 v2.1.0/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/gcfg.v1 v1.2.3/go.mod"
+"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+"gopkg.in/inf.v0 v0.9.0/go.mod"
+"gopkg.in/inf.v0 v0.9.1"
+"gopkg.in/inf.v0 v0.9.1/go.mod"
+"gopkg.in/ini.v1 v1.42.0"
+"gopkg.in/ini.v1 v1.42.0/go.mod"
+"gopkg.in/jcmturner/goidentity.v3 v3.0.0"
+"gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
+"gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce"
+"gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod"
+"gopkg.in/ory-am/dockertest.v3 v3.3.4"
+"gopkg.in/ory-am/dockertest.v3 v3.3.4/go.mod"
+"gopkg.in/resty.v1 v1.12.0"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.3.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
+"gopkg.in/square/go-jose.v2 v2.4.1/go.mod"
+"gopkg.in/square/go-jose.v2 v2.5.1"
+"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/warnings.v0 v0.1.2/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/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/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.2.7/go.mod"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"gopkg.in/yaml.v2 v2.3.0"
+"gopkg.in/yaml.v2 v2.3.0/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+"gotest.tools v2.2.0+incompatible"
+"gotest.tools v2.2.0+incompatible/go.mod"
+"gotest.tools/v3 v3.0.2"
+"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-20180920025451-e3ad64cb4ed3/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+"honnef.co/go/tools v0.0.1-2020.1.3"
+"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+"k8s.io/api v0.0.0-20190409092523-d687e77c8ae9/go.mod"
+"k8s.io/api v0.18.2"
+"k8s.io/api v0.18.2/go.mod"
+"k8s.io/apimachinery v0.0.0-20190409092423-760d1845f48b/go.mod"
+"k8s.io/apimachinery v0.18.2"
+"k8s.io/apimachinery v0.18.2/go.mod"
+"k8s.io/client-go v0.18.2"
+"k8s.io/client-go v0.18.2/go.mod"
+"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+"k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod"
+"k8s.io/klog v0.3.0/go.mod"
+"k8s.io/klog v1.0.0"
+"k8s.io/klog v1.0.0/go.mod"
+"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
+"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod"
+"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
+"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
+"layeh.com/radius v0.0.0-20190322222518-890bc1058917"
+"layeh.com/radius v0.0.0-20190322222518-890bc1058917/go.mod"
+"mvdan.cc/gofumpt v0.1.1"
+"mvdan.cc/gofumpt v0.1.1/go.mod"
+"rsc.io/binaryregexp v0.2.0/go.mod"
+"rsc.io/quote/v3 v3.1.0/go.mod"
+"rsc.io/sampler v1.3.0/go.mod"
+"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
+"sigs.k8s.io/structured-merge-diff/v3 v3.0.0"
+"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
+"sigs.k8s.io/yaml v1.1.0/go.mod"
+"sigs.k8s.io/yaml v1.2.0"
+"sigs.k8s.io/yaml v1.2.0/go.mod"
+"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
+)
+go-module_set_globals
+
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	webui? (
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+webui"
+
+BDEPEND="dev-go/gox
+	>=dev-lang/go-1.15.3"
+COMMON_DEPEND="acct-group/vault
+	acct-user/vault"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i scripts/build.sh || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-e "s/gofumpt/gofmt/g" \
+		-i Makefile || die
+	if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then
+		mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" ||
+			die "mv failed"
+	fi
+}
+
+src_compile() {
+	mkdir "${T}"/bin || die
+	BUILD_TAGS="$(usex webui ui '')" \
+	GOFLAGS="-mod=readonly" \
+	GOPATH="${T}" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	go-module_pkg_postinst
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 4fbfdd4cab31..6d67b331b68e 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 3f27a036a57f..0a7ace385afd 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1,7 +1,7 @@
 AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649de9bfe9cbf445216d4e9d6a6e34dc065008d0129892240c98bcb6e7beb5443d4c459a1bb77eff664f7245 SHA512 04d5505074e042eca46a8dfd9d9a3a2c9af901d9bf7d98c219e8e1f8c9b9071bccbddfa3e17e86800de2606a10b26dc05d69948cd84ddd3075d6c1c51991bcc2
 DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
 EBUILD brotli-1.0.9-r1.ebuild 1770 BLAKE2B 3e1589455d366aacf95ac7cf48c7fb76c844460b726ec041102335205b25097284b4ce4c204aefdaaadeaef57bb6e9fe6063338e31a5dbaedb13273a40e13ea1 SHA512 cd9d7cb565277e28c162856eeed8a2ab014cb195843e4ae29ceec8831a13fab8648f7042343bca9a5373677ebe81596243688da56464981e1a68c78be964bd08
-EBUILD brotli-1.0.9-r2.ebuild 1850 BLAKE2B 9cba3ae4a4e4cbea4b9354a62f233dd5ac74db8a5c2771cbab9c40efefc91ff14442791d4970e4267870866910785651098ed4ead03c6e1b8eca4dfbb234d63a SHA512 eec7e10851552abb5404716918b454cc5d6204703c694b354eacd9e68781444fab5c7e5dbfed0d47b12e3f48cdeb773f2b801c8a08690c5a242270793527184f
-EBUILD brotli-1.0.9-r3.ebuild 1839 BLAKE2B 001cd9b021aabdd878faa08bc69533855f883782f862a01d8ffdfbe29bbde155eae07306aabcaa4ebdd4d4a793a72f06b5be38f44e3a8ae120b860fce1330498 SHA512 d2a229b37783e1acb5a1f265b6bd9659b2df89b670a96c6428e4f080ed5c1e126d3a18c22375f54a55d03fd6daf50d3deb7a253e94a19f66d8409e9932b51f51
+EBUILD brotli-1.0.9-r2.ebuild 1856 BLAKE2B 56f37ad8638ef04d7f2bd28cc757801a534eafa2bcf4aa5d8b5ac54767c302d1455871c1348899fa81108ab61cb2ae39155f08a948d63c9dadfabb67fa182238 SHA512 72ecc2a919d1b7f2ceb4be62981b8a0df5acc9a90b5e43b7e0b309f48ade958059ae110d4bdff94dbf07751e46aa3bae2e6e6f8fad9fccc4a3b7ef93339bcdfb
+EBUILD brotli-1.0.9-r3.ebuild 1845 BLAKE2B e05de6c7bc5bd5e7d30e73fc9c060de82a74653dd6b7ae178a43a3bde7575035a094c59dd7103fe4b88987dd04d91fe4ec491d0da16bf3cf626ac9ff3530e8fe SHA512 5273bb2a88a812bb8fc1de81f946ffa219d49f4838ba42161e1e4271c825fb971e7fc594e12bb27cb82039ddff11d4ab5e52d1dd120b8eeda7967f6d51e2a28e
 EBUILD brotli-9999.ebuild 1719 BLAKE2B f507433812da5169b8e3464b60d626d8f1c632fce3166004d79e55e16af0aa71d33bb35c3fa42094166d4fa0f6b88b99225a2caa4b36db567d83c629f9ffbb4d SHA512 b30a75fe48c06310ecefa3e857d9278ea4a7a96ba69af19be330d8b8cd899c5ea1b78ccaaba49bfc9297fbba3aab83809bba9b2d176053f1613f38baebe48015
 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.9-r2.ebuild b/app-arch/brotli/brotli-1.0.9-r2.ebuild
index ccdea45cc777..73fbca2867f7 100644
--- a/app-arch/brotli/brotli-1.0.9-r2.ebuild
+++ b/app-arch/brotli/brotli-1.0.9-r2.ebuild
@@ -29,7 +29,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/brotli/brotli-1.0.9-r3.ebuild b/app-arch/brotli/brotli-1.0.9-r3.ebuild
index 5fbf7996e366..aecf41b5cb6d 100644
--- a/app-arch/brotli/brotli-1.0.9-r3.ebuild
+++ b/app-arch/brotli/brotli-1.0.9-r3.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 53ac9578b22f..4adbb7c1f3ad 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,4 +1,6 @@
 AUX libarchive-3.5.0-darwin-strnlen.patch 732 BLAKE2B d20ffd1d898acf1e69e2f275bec2beda0769569ac37e179604dc7d0a5eca8fda2a06aa5b3811e28f465fb34c2061d15aa8073110f703244aec02cfa35afd8087 SHA512 9f5b86b6dc483f17a1d909d88841e1f82f5835dbef0bdfc18ffb982cd5f649d87fdc22f490169eb827de654fbd469fda77a5ce1bc0748b48f3f46e77318e672c
 DIST libarchive-3.5.1.tar.gz 7008338 BLAKE2B 243dfda2bd4582bbc20679328b89aae0c530475c822dcf9ff25c65df2017b8f18bb616142d6ab016ccea4a5aa1b410d46b913c2ee0afefd2fdb1a41cf51585d9 SHA512 08ddd74bef4cef0981739da202879f36cf7ca33a8f6d438724588efe3ab8477f2f1d0cccf7b8ed0bedfc0c8d0cab16ee3ae5c0c6e83b6811bc650d7d7471a996
+DIST libarchive-3.5.2.tar.gz 7054934 BLAKE2B 1fc6ee0166573658dc5e0f170113c07ecdaa76b287cbf68bdee63ccd198dad615b3f2803a3fc1aed303cd1f7f32033e6d8e782ef6a8a991562cdc2a375894c9e SHA512 2003ec9b24086373451bd7317bdab86d81627f087c14a6f7df1a92e131a216749f9aa352504c3d04dc82b62078b59aeea5aad5543b7e6c1c21fcafa2955d3762
 EBUILD libarchive-3.5.1-r1.ebuild 3761 BLAKE2B 712b3e29fe3ade19f8bd24dcfc6005842743221a4b9bda3ca212b0e166829726ca71c1ea09fa1b7055e2734808725049c8d4737cae7411874a92a0b991a8e6a0 SHA512 d8258ddff7b030c6c3ea399db91825695fc7d5e5d5b9f92a3a78b63cc7057c695027a8a567e68b223ca545ec34d50c48787bae44c9a00d9d6b67445a2514307a
+EBUILD libarchive-3.5.2.ebuild 3705 BLAKE2B df1df2a49b65c25f0abaab042c09c6d198ce06cc857c70995c8a41e5345627fba59842f0d11b362cddc79c8dd76396ecd3c7eef210e26c7c8e5e574f14dd13bf SHA512 1723166f16fb40e97319ec77f0711cde80edc00c964067d430b54e6a666e3f944fd0fcc20293fbe8704a6cce3e6311a37d7c38dca78dc10412978db53dab4121
 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7
diff --git a/app-arch/libarchive/libarchive-3.5.2.ebuild b/app-arch/libarchive/libarchive-3.5.2.ebuild
new file mode 100644
index 000000000000..a4f72d7640c7
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.5.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="Multi-format archive and compression library"
+HOMEPAGE="https://www.libarchive.org/"
+SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux lz4 +lzma lzo nettle static-libs xattr +zlib zstd"
+
+RDEPEND="
+	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	kernel_linux? (
+		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	)
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] )
+	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	kernel_linux? (
+		virtual/os-headers
+		e2fsprogs? ( sys-fs/e2fsprogs )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5.0-darwin-strnlen.patch  # drop on next release
+)
+
+src_prepare() {
+	default
+	elibtoolize  # is required for Solaris sol2_ld linker fix
+}
+
+multilib_src_configure() {
+	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+	local myconf=(
+		$(use_enable acl)
+		$(use_enable static-libs static)
+		$(use_enable xattr)
+		$(use_with blake2 libb2)
+		$(use_with bzip2 bz2lib)
+		$(use_with expat)
+		$(use_with !expat xml2)
+		$(use_with iconv)
+		$(use_with lz4)
+		$(use_with lzma)
+		$(use_with lzo lzo2)
+		$(use_with nettle)
+		$(use_with zlib)
+		$(use_with zstd)
+
+		# Windows-specific
+		--without-cng
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
+			--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
+			--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
+		)
+	else
+		myconf+=(
+			--disable-bsdcat
+			--disable-bsdcpio
+			--disable-bsdtar
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		emake libarchive.la
+	fi
+}
+
+src_test() {
+	mkdir -p "${T}"/bin || die
+	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
+	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
+	local -x PATH=${T}/bin:${PATH}
+	multilib-minimal_src_test
+}
+
+multilib_src_test() {
+	# sandbox is breaking long symlink behavior
+	local -x SANDBOX_ON=0
+	local -x LD_PRELOAD=
+	# some locales trigger different output that breaks tests
+	local -x LC_ALL=C
+	emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		emake DESTDIR="${D}" install
+
+		# Create symlinks for FreeBSD
+		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
+			# Exclude cat for the time being #589876
+			for bin in cpio tar; do
+				dosym bsd${bin} /usr/bin/${bin}
+				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
+				doman "${T}"/${bin}.1
+			done
+		fi
+	else
+		local install_targets=(
+			install-includeHEADERS
+			install-libLTLIBRARIES
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${install_targets[@]}"
+	fi
+
+	# Libs.private: should be used from libarchive.pc instead
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/app-arch/makeself/Manifest b/app-arch/makeself/Manifest
index 337b29352de9..9a50b2caacb4 100644
--- a/app-arch/makeself/Manifest
+++ b/app-arch/makeself/Manifest
@@ -1,5 +1,5 @@
 DIST makeself-2.4.3.tar.gz 32613 BLAKE2B 2295b6d47a8105f2b495260abb0c9ae85875c821d0291a19b5af894c1cef669f338c4e10de8128fe38008e7e08079d1f29949884f202cab680c7fd62e2f00dd9 SHA512 d404c7920c7f69ae29c7168bcf76806b6e2aae2e8916bb7feed998d031ce8b2cd205b83ad960a90b01189c97f9242eb3ef574194ba3ee51c605fe99dafbd6c13
 DIST makeself-2.4.5.tar.gz 39012 BLAKE2B f79cf1c087e89c4fd09f328fb795a3f8a78ee38060dbbd1590e3dcdf22a346b0c12bf6837d1636efadb2a66f6a762308de7ee9dd2fc62a7c88d417d257c5f0f6 SHA512 1dae74586f6bd5afb526801b7ffa7fc7962ff74b0f190cdd51da93c21421864b72f5fe18090cb2ff6ad27f0907fbf3aeb5545f3f70e33dbc9e505a78505f5f90
 EBUILD makeself-2.4.3.ebuild 929 BLAKE2B cf5cf22da092ef5ed0b9e9f32c237d49529ebf0be2b7d998a8109ad19613237feb6d4c8f8f72bce28d0c5da43efed7e4473c8f03d56ece72a0fb34388ebf5f8d SHA512 1eb89f4e0f5b4eeedec4f538052f6dd1bf21f515cb90ea5561f7e7eaa9e2694fad6266f36687c19f9fa3464ef87ab849271de50182ca024a703c00330409f7ef
-EBUILD makeself-2.4.5.ebuild 1158 BLAKE2B 943cb467f061b207812394cacb456070c552c549092fa2a3ec93f32a6ea108915f40dd1990662ba766f67f7e3f02b10c9056fe482dbed8114b1ef3684ced305f SHA512 1f0454d64d30047c29454a294aa156a1da0d7b02ff94d1bcd8e5f2550cf4cf19e27ac9a28f98cec2014dc119c66695817f2e83865da4c9aa32b5ea4ec543186a
+EBUILD makeself-2.4.5.ebuild 1155 BLAKE2B 25578f47579ccd101e31428439449f9e55c509c1e3268c794b80035f5a40a1dc05bf1a8f7575ddf28155216522db114b1da7f5e12b92103c552f788861440f5d SHA512 d165630a20a4feb643d6fe780f1933202621f01f9f50523e1f67421df71d075d8ce07ed308c4996ca7938b1bfd633222803f405c224a42eb2b2b35c53b2b19f3
 MISC metadata.xml 513 BLAKE2B 25f348226db47085523f7e1f74b1b557982acf56ba2b33252e250cc45400137be2090e29dad3b009e7b11c2d2942e564e7c499c7566c857ad5b05849553014c0 SHA512 48b0f4efee7e7dd1dc3e5bc0b2585748a15e4e2e0e41eb764709b41b4eb45d6ef98b712fc5265c2892e70b6c99c00e15542430e854811961d3acb5a803c6d5c5
diff --git a/app-arch/makeself/makeself-2.4.5.ebuild b/app-arch/makeself/makeself-2.4.5.ebuild
index 6e66645515bd..57a66dd9848b 100644
--- a/app-arch/makeself/makeself-2.4.5.ebuild
+++ b/app-arch/makeself/makeself-2.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/megastep/makeself/archive/refs/tags/release-${PV}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
 
 # NB: The test framework requires bashunit (which isn't a big deal), but the
 # tests themselves are not of great quality.  You should avoid running them
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 97b568a38704..ba8141a86df9 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -3,6 +3,6 @@ AUX snappy-1.1.9_external_gtest.patch 1092 BLAKE2B 392ee98254749dbf65ae8317dd2c2
 AUX snappy-1.1.9_gcc_inline.patch 3166 BLAKE2B b4d05035647a97709ba43ee9673fbdaf1a160cc5859fd7401a8cdb67e04ba49bdfe98a9801257356841326b26759eff1022af3d5253628a87b0035af122a8fdd SHA512 5e8389e31a8d6e092843a3456f4a75d1f5f26af25d9d7ddfec283573a423522ce779b9ed4da5d2e3b6346153b5d137070611f88ebc907cfec64748afd29759f2
 DIST snappy-1.1.8.tar.gz 1096137 BLAKE2B e21f2ea23727f118920b7f67981354194f12d1d61eaa18eb1cb2f4285fabafdd221b88cf1e3b3261634f65469a714d3efe6b218c0b1e9d41639cdeb21097d75e SHA512 efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c
 DIST snappy-1.1.9.tar.gz 1102382 BLAKE2B 926d03156168e3d4800dc17144db3de2c182c6eb9970d87a00b94fb09b67e403479a64cbed75833b83fd03173c1bb8caaf248a55627e89fe2a34456f12ff3b42 SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024
-EBUILD snappy-1.1.8.ebuild 1825 BLAKE2B 4b19d78a843db8eda46fab568953a4f652dba370efa95f3fa8c8fec618b8a1dd35acf778fa1ca9fba4c5e49299218689feb7ef39a957d9bbd3c7d81afcee38aa SHA512 c1e57f6643737792ffc3ccfc11ad65e3255f8bed581b6ab2e41c2c2b7d7da916dad9d381bcedf9fb6e1587af6cd76386b8cf2516bcd378e2461fa0d5882c388c
+EBUILD snappy-1.1.8.ebuild 1832 BLAKE2B 7fb98c5cb96af2d0c928871ec1f53c1402e536d1b9063b137822d6229ac90f6ea397a81a92269a3c67bb3e5551b05158439e552b6ac4deb3905ed8e34ee92f8d SHA512 11813434621156c662bdbb1acce6b1279f8ad3e7ddf0eb446cac0961357334cd3b89fa9f640c01cb29e49d8c560253184287eee0cc763d1da7cb83840fa09f11
 EBUILD snappy-1.1.9.ebuild 1131 BLAKE2B 0c61bfe91d39ec064a79747cdcf525d562c0169c92d9a8625050f31ebe2f02197960be270a36a739b3a03876b0d844539d89f0db5c0ee4bb4364b0c210b88234 SHA512 7730eff003d49da217949413286ea5340d5894b5644aba08bbe479368df95bb6c18889f0182cb5798d885501524c8a27985af015ea4efd302b7c47e762ebe0d7
 MISC metadata.xml 743 BLAKE2B a2fd45ba06200b0dff520db28f0c6dfa1a2a0f5e367d146f66255ee3864570502d0f243feba65488033d0c3fc72913bcfc922bb8c711e972766fe0a9526c9d15 SHA512 f271ff6e36ae3a3701f71633561c1f1a6a5d49f87822f3a6c6337f200508625126c1783f40069ddcd06599d9013b436a9a67e2657e256a70edc0901c157e289e
diff --git a/app-arch/snappy/snappy-1.1.8.ebuild b/app-arch/snappy/snappy-1.1.8.ebuild
index 4a455d9b01b9..aeb144459747 100644
--- a/app-arch/snappy/snappy-1.1.8.ebuild
+++ b/app-arch/snappy/snappy-1.1.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 8c8d79fc596f..fe19a69a15a1 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/dolphin-plugins-mountiso/Manifest b/app-cdr/dolphin-plugins-mountiso/Manifest
index 586d3446d7d9..8a656746d89d 100644
--- a/app-cdr/dolphin-plugins-mountiso/Manifest
+++ b/app-cdr/dolphin-plugins-mountiso/Manifest
@@ -1,4 +1,3 @@
-AUX dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch 1626 BLAKE2B 0adc695494b95e300bc4b3539cdaf8c67ab8a6c60761977d93d375d1bb1c01ab5d8e65860de63f689b7a971a1f72fdae602e84620f54505ba7547067e6c3ba72 SHA512 402db0b683e71957ecba9d9280b3bf3f8911304ca06e4f767d3432376793d45e8c63ca8e16fea4cbf2f975ebcc467c6a9793ae64f15807ba88cd70b3b2d22d30
 DIST dolphin-plugins-21.04.3.tar.xz 253244 BLAKE2B c5c0e302dfc4eb82e2de1a635824bf8fd2c70bcac65c261253f0e52e7d9242fa339fe2dc619b927b0379477b2c80a22ec210080af8f2370e0a0182af3347df6a SHA512 e4beba0d596782951b149d42e930d76b12a36bea83f35eb0cff9e49b3e02d4b2aa55f4245d4b8708044a49770d477badc964752828eef4caeaefd4f16e5f9dad
 DIST dolphin-plugins-21.08.0.tar.xz 252708 BLAKE2B 7e6d4c72b0527302737a9e636a6e672699868325af4ef763a7595677e4f0ba3dc1e8cbcbcbe4db92becf481f9746ac61257e1d2c91fb145059724c9e70497f0a SHA512 46448d35e0d599c373f990a9cdc6bac91a6acb1bdd871e73ced298ae6be3c9187be12a3ffcc7734c9d87f8825adae472d5d923f46bf15d0b2c012b2d5b755a92
 EBUILD dolphin-plugins-mountiso-21.04.3.ebuild 1520 BLAKE2B 5b271edc47eda6710084f595628618facac6b1765e3c2cf005c1443c0de5d78cfb97b8234177904ff8841754cb5fd2761cb5a208621e20445f460b23ad2eef3a SHA512 0fab52acb8b629f9eaee2a589d64df96856c1689e0eef1cf5bec3f674587bc887cab02387c7e6319a15db7bed7de75c9f20f81b88fd15eba839788898b4ea313
diff --git a/app-cdr/dolphin-plugins-mountiso/files/dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch b/app-cdr/dolphin-plugins-mountiso/files/dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch
deleted file mode 100644
index fc59e1718503..000000000000
--- a/app-cdr/dolphin-plugins-mountiso/files/dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f136702d2adc8643ea12f1b6e3bf97925f1b33f0 Mon Sep 17 00:00:00 2001
-From: Kwon-Young Choi <kwon-young.choi@hotmail.fr>
-Date: Fri, 19 Mar 2021 17:10:31 +0100
-Subject: [PATCH] BackingFile property should be use with StorageVolume instead
- of StorageAccess
-
-BUG: 434617
-
-When mounting an iso with `udisksctl`, first a loop device is created
-`/dev/loop0` then a second device `/dev/loop0p1` is used to mount it on
-a filesystem location.
-
-Querying for StorageAccess devices sometimes only returns the `/dev/loop0p1`
-device without the `/dev/loop0` device and the BackingFile property does not
-work on `/dev/loop0p1`.
-
-Solution: query for StorageVolume instead which returns all loop devices:
-`/dev/loop0` and `/dev/loop1`.
-
-Warning: Because StorageVolume returns more devices, the function
-`getDeviceFromBackingFile` could be a little bit slower.
----
- mountiso/mountisoaction.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mountiso/mountisoaction.cpp b/mountiso/mountisoaction.cpp
-index e5575ae..d198a89 100644
---- a/mountiso/mountisoaction.cpp
-+++ b/mountiso/mountisoaction.cpp
-@@ -78,7 +78,7 @@ MountIsoAction::MountIsoAction(QObject *parent, const QVariantList &)
- const Solid::Device getDeviceFromBackingFile(const QString &backingFile)
- {
-     const QList<Solid::Device> blockDevices =
--        Solid::Device::listFromQuery("[ IS StorageAccess AND IS GenericInterface ]");
-+        Solid::Device::listFromQuery("[ IS StorageVolume AND IS GenericInterface ]");
- 
-     for (const Solid::Device &device : blockDevices) {
-         auto genericDevice = device.as<Solid::GenericInterface>();
--- 
-GitLab
-
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 2b64207ea944..0298129e1bdc 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 71c91c6e7feb..a9d9672487c3 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -5,9 +5,9 @@ DIST gnupg-2.2.16-scdaemon_shared-access.patch 2586 BLAKE2B 42fd5482c4e86751ce62
 DIST gnupg-2.2.27.tar.bz2 7191555 BLAKE2B d652aad382cf07cc458b29ff82718edd47457d8236dcbeee51f22d88503be141f009e9ea45b6dafe614115d9558fe371509579e58ce17a5f04540a31aa406ea3 SHA512 cf336962116c9c08ac80b1299654b94948033ef51d6d5e7f54c2f07bbf7d92c7b0bddb606ceee2cdd837063f519b8d59af5a82816b840a0fc47d90c07b0e95ab
 DIST gnupg-2.2.28.tar.bz2 7218833 BLAKE2B 61e90a39f4572f41da687c6a6983a897eec1784d60b6ff6579f895c07214d273ad2a25a1a5cb4c26210028afee32c58a8fb0752683a0ab9a5f8a73438492b80b SHA512 d79594fac93773639fc5b95cdfad1003829879e1bc9c415261bccfc64bd56cbeec5d8571d1468e4e3fd982c546e3b9cfc2161412d544717f48eabe3a360caae8
 DIST gnupg-2.2.29.tar.bz2 7215986 BLAKE2B 04b777730b8fcbe8d93dfc8985aadd6bc7385ac2ac9684e6248cb3ae6d008daae5aa976ffa3bae27fe9e89bc2c4c1d4ae81dcaa259fb08d13f894f00f12072e9 SHA512 12645e230fc6aa4811420ef33def6baa590e847ecdf7e5f8b96eb49122e6406cbdba4595d0b52fa26700d5d5def67acb4ed7dfe7f778e496d4d21ccbef3c476b
-DIST gnupg-2.3.1.tar.bz2 7570431 BLAKE2B f7c7d3246b0807798917ecd711c74ea7c52dd24530106765a1f4a6e9af098c9a99c5d0f44fc2c253d013b11f862fccf0b1630593d07b2e1950a91b3473c671c1 SHA512 d2cc82c1b47bbd79acd6ef787c01684fb084b1c5507bbca6cf7ca8834ed978ae7a44c01d652cc3afbd70e2906583c8701aebc8d9fd3fc5e0401769ad4cd46af1
+DIST gnupg-2.3.2.tar.bz2 7589445 BLAKE2B f7e35ed553ea89cdb073abb1432f67fa00bb625f6e686e534f96bca11d88f09ea272b3cb0d6706e4bce2c023f8c5b8d628742aa2f60752a2e605132cd32f62ed SHA512 2747cbe38546f500d165f024ebb2dc5be70fa68d20702af3f61e97db685eba94caf65307293137c76ea6cfcc189ed24aaee025c80cd33f26609e5fe512bdda73
 EBUILD gnupg-2.2.27.ebuild 5168 BLAKE2B cc9ad82a855cb56a630aa043537fe44fadbfece92cc09205996ba4cc3f3ca000534f7b11c29da543ec923b118d24bc23b490ce6ea29b09a799d17b36e387f855 SHA512 3f1377ad593d19580e953ef426dd23f23ae2fab65d8e6bcfee58c09605086fc0a2f2d2432b5d33ed70685ebb87561801a6b3dbf781d585aa59b6e8c9fc0dd81e
 EBUILD gnupg-2.2.28.ebuild 4764 BLAKE2B 672ee1a88193744ddc47f128b967a38a8ae94d3f0db2f40d2ff44b915c07a31200e9a57839cd891bf597f87f920a4dea927755f6c53937b86bb1b1cce2fa05f2 SHA512 ba0612752fca0877228ca3483173847b4e3419364c64b440edb48677916e8f6c39166cd63d8eceed0cac76343f6551b45e2b09226b634c414909cdb0d7d05aaf
 EBUILD gnupg-2.2.29.ebuild 4717 BLAKE2B cd39c581bf930c519e4f38fc0741d7c157ee44ebe6599253931e9a90f493cf28e06fac31a025a08b5958be04a0a92fa87bbc481153d746d4b8a194eb51d9377c SHA512 e3fe9d932a558b2e646b13fc98b429a6162d18f853481fe88218bde6b756a16eb8e24038860a2b8dd8922bb689e1c7b9df4855476315fd6fdf2249a169364a59
-EBUILD gnupg-2.3.1.ebuild 4831 BLAKE2B 093098049196bd759fdf6f5b40db207eb7e7e061fda3fff3faf76d204d45f04d3cf25f4268ce5edf58dfdc4ff116dd6bd89d5ef7e37f03c06e74193ba42b4938 SHA512 0d90cc64ae9d2ad09ae4732d1f617a3e7f178453c3c137dff6ad96efe0ac5dabd37e98e1fbd20ad602211088da7d0069faadb9a405655411555b704770a9e5a6
+EBUILD gnupg-2.3.2.ebuild 4831 BLAKE2B 508d29b5e00e9e10e9022667822be7e2469ff97bf26ccb392f63fdc96328d102833676cc9c0b44f07ce2dac6c81086d61b32635e3712afccf54a66e0fbdf6b54 SHA512 7a5371f1fd429ef09c8c49d8e233a4a9be2e65c0118baa199745686841221800bed51816dbaa6de423c8ecb07ecbb0a8e0f71f12fd424bb03b67c0ec7ebbfe73
 MISC metadata.xml 1379 BLAKE2B e51735e46f2b9ade13d8aa53c1354b1285904933c260efef8e0d6d66e7b8a36199f33ab48cc98006e75e566a21422883dc3694d91e1dcbf1e7c413ba7dab557f SHA512 cd71918f048d081e7a223b9b09b0089b3e015aef674ef233c2aff43e1325ac61a3bd2bfa828071dd157fea0f5ec76ee719ccd339cf94539e3702d48ba6ecd5d4
diff --git a/app-crypt/gnupg/gnupg-2.3.1.ebuild b/app-crypt/gnupg/gnupg-2.3.1.ebuild
deleted file mode 100644
index 3ca970d0c2d7..000000000000
--- a/app-crypt/gnupg/gnupg-2.3.1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard sqlite ssl tofu tools usb user-socket wks-server"
-
-# Existence of executables is checked during configuration.
-DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.9.1
-	>=dev-libs/libgpg-error-1.29
-	>=dev-libs/libksba-1.3.4
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	sqlite? ( >=dev-db/sqlite-3.27 )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="tofu? ( sqlite )"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-	"${FILESDIR}/${PN}-2.3.0-sqlite_check.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
-	# idea borrowed from libdbus, see
-	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
-	#
-	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
-	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
-	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bzip2)
-		$(use_enable nls)
-		$(use_enable smartcard scdaemon)
-		$(use_enable sqlite)
-		$(use_enable ssl gnutls)
-		$(use_enable tofu)
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
-		$(use_enable wks-server wks-tools)
-		$(use_with ldap)
-		$(use_with readline)
-		--with-mailprog=/usr/libexec/sendmail
-		--disable-ntbtls
-		--enable-all-tests
-		--enable-gpgsm
-		--enable-large-secmem
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	fi
-
-	#bug 663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	#Bug: 638574
-	use tofu && export TESTFLAGS=--parallel
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.3.2.ebuild b/app-crypt/gnupg/gnupg-2.3.2.ebuild
new file mode 100644
index 000000000000..3576669b399e
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.3.2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="https://gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard sqlite ssl tofu tools usb user-socket wks-server"
+
+# Existence of executables is checked during configuration.
+DEPEND=">=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.9.1
+	>=dev-libs/libgpg-error-1.29
+	>=dev-libs/libksba-1.3.4
+	>=dev-libs/npth-1.2
+	>=net-misc/curl-7.10
+	bzip2? ( app-arch/bzip2 )
+	ldap? ( net-nds/openldap )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:1 ) )
+	sqlite? ( >=dev-db/sqlite-3.27 )
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+"
+
+RDEPEND="${DEPEND}
+	app-crypt/pinentry
+	nls? ( virtual/libintl )
+	selinux? ( sec-policy/selinux-gpg )
+	wks-server? ( virtual/mta )"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( sys-apps/texinfo )
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="tofu? ( sqlite )"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+	"${FILESDIR}/${PN}-2.3.0-sqlite_check.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
+	# idea borrowed from libdbus, see
+	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
+	#
+	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
+	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
+	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
+		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable bzip2)
+		$(use_enable nls)
+		$(use_enable smartcard scdaemon)
+		$(use_enable sqlite)
+		$(use_enable ssl gnutls)
+		$(use_enable tofu)
+		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
+		$(use_enable wks-server wks-tools)
+		$(use_with ldap)
+		$(use_with readline)
+		--with-mailprog=/usr/libexec/sendmail
+		--disable-ntbtls
+		--enable-all-tests
+		--enable-gpgsm
+		--enable-large-secmem
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
+		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
+		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+
+	if use prefix && use usb; then
+		# bug #649598
+		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+	fi
+
+	#bug 663142
+	if use user-socket; then
+		myconf+=( --enable-run-gnupg-user-socket )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	[[ ${CC} == *clang ]] && \
+		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
+	# by wks-client & wks-server; and if it's autodetected but not not exist at
+	# build time, then then 'gpg-wks-client --send' functionality will not
+	# work. This has an unwanted side-effect in stage3 builds: there was a
+	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+	# the build where the install guide previously make the user chose the
+	# logger & mta early in the install.
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	#Bug: 638574
+	use tofu && export TESTFLAGS=--parallel
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 3725309e79c6..2e35742699ea 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,5 +1,5 @@
 DIST gpgme-1.15.1.tar.bz2 1699349 BLAKE2B d3a6ccaa35360ed3fc79364dfcc3f2fdcb70e5e41ac72ef011373a39d5def9be9ce1be45843ab65a87630d3fc570d29db5f40b9a273aa8e281464c9d1d3477de SHA512 1d75a848cce6389f7cb8896b57a28dfe1dc5a447bfb4f128b0994a43e04134343400a3be063e971f03dfd595474cfd558519741d5d56afb3e84853ad4f2a45c2
 DIST gpgme-1.16.0.tar.bz2 1718913 BLAKE2B da55e695b148e949a1c0770d0298d7a8c9f87d7a1f9e45d380f8c13c472bd44cb4266adb9a113e2b1dcc2596291744f48fdf998ff2de876059d89d184dc87f3a SHA512 69487be69612e9bf0221ff56ae687248bd13635db1b7087130e93c1670e38f3c810bbca17723555c04fe207976c35871bbc3da005179ce099504321cf33636e4
 EBUILD gpgme-1.15.1.ebuild 2671 BLAKE2B 259c3eebdcb359d6e6636dba2b9588f14f2bba426511b2d8b560192c31917dac28d85952443dbeed12e8a8ddbf61aa4eee3ec68add965503bfc8fc9e1a473c0b SHA512 ef99b8044daa6e1f3371f4958dd9acda2c1cbd9594970c9f06dcd70e45f6c83e78ec4792a3228d5c29f6689693b93c529fceded96f255df23539452c8b9bd105
-EBUILD gpgme-1.16.0.ebuild 2679 BLAKE2B a3305bfcea8a042705442d99c9068f1e3e0a4006f5ddeab18d99a688e5d5e9ec37bedebf057f7067306722fbe4da4529e3676e037ac8fcc9f407c477884cde3b SHA512 1f55f97a2714189bd608c116795cb76afff6cc79dbb5473e7dec837f5054f4e09e51331dcd48707d3f2dfe6ec3f5ceb54609e582d50e2978ed7c681d7a6da0d6
+EBUILD gpgme-1.16.0.ebuild 2685 BLAKE2B a6d145a9fa4614e4530fa5e98cbfea585f2301bd7e21b60628d0e37bb7437ab2e3fccce8d47168402c1558ec50887396dc4d591029dbf818fd281d19d8d54f3d SHA512 6ae5a93c381e1f4a4c3414c73fae4fb3386296673d29341dbac6ce7db9b240f7ebc2c09fc779ae7247540bda1a900661df6ee310219c89bf3c139da0cefb0734
 MISC metadata.xml 326 BLAKE2B 982fe6e2ae0b6ce81980b477a39341c363c867202d646ff4acc9fb361785026919cc0de914e0deee67b79441115cea8a8b36f095d4719442f527f1a0d3ba06b8 SHA512 1223f3cdd325623e524c5bf46bea592b6930bdcc2ba40f9ebf27e568c6a527f59c8315194e4ffd70c29b778d25a2e2b8f57282d5e788814d3fbbcb1de4cf6334
diff --git a/app-crypt/gpgme/gpgme-1.16.0.ebuild b/app-crypt/gpgme/gpgme-1.16.0.ebuild
index ed3dab0482a4..ed9a1cc7e57a 100644
--- a/app-crypt/gpgme/gpgme-1.16.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.16.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs +cxx python qt5"
 
 RDEPEND=">=app-crypt/gnupg-2
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index 6e24c9928992..6fe1cb30b5e0 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -1,6 +1,5 @@
 AUX libmd-1.0.3-out-of-source.patch 1147 BLAKE2B f255a1367f89912ba81c69e3e813acc48bcfea1406389ef40087308fa762dfbb524becf16138d4e243864991791b1f3601edb7d1fb6a51e7ad77cc768de5a213 SHA512 894413794c3e6523bb23bbc983d1489391b14e5bb08428d7dcd874060d5c64490d239b983eb8f291d8e98e76ed26548252cbd10ae74d28fa4cace82fb100290a
 DIST libmd-1.0.3.tar.xz 258584 BLAKE2B 35b732800a4b0a7b8d0a88eeff5e7e80fe55ab5ed05b7a7a1ffe866e156cc6dc6daca95f865a56297857b10b1bdfc9815b5bf0b198e8284f217498265c08fcc9 SHA512 f4b5a86bea7b9fac9f7f173032ee436d1e7141f760c1a114a785d31644edbf6802fe8193cc4cf3b5c66d38963be919c05055780bdf6bf5a47927690490ff5966
-EBUILD libmd-1.0.3-r2.ebuild 733 BLAKE2B 1977add95fa72b9a26878ba952b4a30a3e2210dc10e730700e83e9b4e2ac51c2818a4db11893546950d93f56304e050f4a9e8c2c8008f7f9e47401fabe403d56 SHA512 ba4cd58b9f866f0af341777aec7535a703e7517d09b985e2ac632b0c4a3e3db5f0a9888d8e86ef655237642a6d34d28247ae66a0b694f58c88a3976ab1732d7a
-EBUILD libmd-1.0.3.ebuild 569 BLAKE2B ef6a422b79c190f2978630ae8d881767b6588a87919488926c600a80ad8280b76195e2398b307258f7c83bb2b8b64d00df27faaa926fddb63a7de57d754ea35d SHA512 9d292bfcef77327e85d6a36038492f2d0c3a89c47d2640278d92557722bd74423a0a0c41223145640bca49db5c02e41e13a0a74c96ae440375da482b564d79fb
+EBUILD libmd-1.0.3-r2.ebuild 740 BLAKE2B cbd151eed80f8998e07a8cb8dcb55b9aedc0ad10e9863f6aa506441ac4087bbeae0be9a60182e2a99a092df09f941da082463fd71abf5de9b759c509cdd5c45d SHA512 729571dc53a192c7c20e6dd3248d8bf2cfd73a75cf4b7368e27e10407ce23b742bcafb03046aa59366f74be78f218d6637124af7ddf26191ba6c6808c1159e83
 EBUILD libmd-9999.ebuild 567 BLAKE2B c31c8d0780cd63516fae57497f80340712547fe78d17e16ad8d1c1f7320681ef914d0ffefc459593b2de6e0db054860296c72060bea33a4ef47de42dc3da8a14 SHA512 82345337a69a40c8f7199a3be295b18e530be415c712af1259b4e110f7cc80d50705559ad92ce0b7c001c8f6f95ad7d5fae3d09b3ec527a1b860e8577d078ed6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/libmd/libmd-1.0.3-r2.ebuild b/app-crypt/libmd/libmd-1.0.3-r2.ebuild
index 939ee06cb414..88ad43e9af55 100644
--- a/app-crypt/libmd/libmd-1.0.3-r2.ebuild
+++ b/app-crypt/libmd/libmd-1.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
 
 LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~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"
 
 PATCHES=( "${FILESDIR}"/${P}-out-of-source.patch )
 
diff --git a/app-crypt/libmd/libmd-1.0.3.ebuild b/app-crypt/libmd/libmd-1.0.3.ebuild
deleted file mode 100644
index d32fbc8f2771..000000000000
--- a/app-crypt/libmd/libmd-1.0.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Message Digest functions from BSD systems"
-HOMEPAGE="https://www.hadrons.org/software/libmd/"
-SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
-
-LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index a67b3174e3f8..f27b549941d0 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -4,5 +4,5 @@ AUX pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch 1606 BLAKE2B bebea2
 DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1bfe0458b973ed9d84479f8de9ee69ef309b518b40aa340434d64d37793cf97c94f78f99820bc5c71ecd2aac7a49 SHA512 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd
 DIST pinentry-1.1.1.tar.bz2 515723 BLAKE2B f257fe552852e6d1ff2c23aeb0c1127b43e3a60e44c78dfa764d569e659ccb78528ce3ee863114af273a4b6f6c24686cda2cb14bb04995eb8c41ccd4541a9fbd SHA512 d6ab5af8ac2f3c9c05e09703e95d8e2676f9b2b7ceb97f6a31d101d0e9da7a1e106a6d3eabe86cab1bb35a4b119a7cba1380ac64bf13c61af0b3c48803116c12
 EBUILD pinentry-1.1.0-r4.ebuild 2239 BLAKE2B f0bf43fd9a1d9d8bdcade2398e07ef5f960d13c20884965439cd90f5e08b0e8bc8d065f9d08d67bfaeff2759e62e99271fce5466f8cb60f19ef08d3e7a65fcf8 SHA512 da10a565ab8b921ab9a6097cd319183e0cdb278d56cb3c60d41eb4ee996e9f09fb6d9d1b80f14e8bff98e132a978df6df7c6e8ec1899bf73b6c647e35692b5da
-EBUILD pinentry-1.1.1-r1.ebuild 2309 BLAKE2B 80c40ab142e6c93c996646c53e7a7c8da31ea7f3a46d9c593109af47f2e97a13d9d1ee3c4aca260ae8e2016fb62c6799d07533fe7e50c1544785cfa40d921081 SHA512 1f2ebfcd055c5a16b5359f6bbdd2751741e842abc92fdd3e0ff60cacae53b0a4b4b715ef7cd91cadc4bbe774d91615db8aef487262d61940dc0f9513f32b63e4
+EBUILD pinentry-1.1.1-r1.ebuild 2315 BLAKE2B e9642855c880a02cf6ad6a5d659c6fe60001402748d8ae6d6c055a9a022cc0da362123bb12b108cd08d0175f6c8bd70d367c1c5cc76064e93651aecada249c3c SHA512 f684efd8e00f9b6c2fcb7010fc5a7d6812929f67e251e0a1218f2788f3f1bea2e2ebdd77d03a141fc2196710bcc50c0e973a45d1086e54b6875fbf0a0a6c1fad
 MISC metadata.xml 333 BLAKE2B a3d540cdc1fbb8efbe14ebfffb080cfd4ee3bc31e494874bfa9b8d042b409a830e6dc9a0ed22f28459d47f7c23f0906cb84a3b2d3cee28be1648e96d6eb13533 SHA512 1076092b801ac09bbbcbdb9af2300268ae60a5061deed026f98e80edebec3fabb15c26b16ef59af03248bd99a6334268f598de94372578d20dc37d10c8371729
diff --git a/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild b/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild
index d1e13dabd9bb..a5213875ce93 100644
--- a/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps efl emacs gnome-keyring gtk ncurses qt5"
 
 DEPEND="
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 5dbc7e28e180..3f3712b94432 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,4 +1,4 @@
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
 DIST qca-2.3.3.tar.xz 736456 BLAKE2B f0812fd33bd19293c8034e48bcf214d2d70dc1397860779c2c145fe841365384a8eb6bad9859520d32104010acb0cefb97e3a974b9852a37ca8039d52d9dbd03 SHA512 9a262350502daa1dd10802a7a24f0e4712d87d4ddcf752452a51caa8694a30835672f54f8e600aa8dc4afdac9ef073641deed52a24423e304d18ad2b83deeca6
-EBUILD qca-2.3.3.ebuild 1840 BLAKE2B 0db025caefd777c276cb84c99221bcd7776ba56ba89d3a4659c09cba0190ed08c9b44f5196c87974ad7f0a7b9af208d7c057d37f54f1a12a00f7cf5d6e9f02d8 SHA512 e7c8d0f0fa6d15ef7823be6297024481f50c19f71342dafb4eafb38a55f66fbe7c9ee22baf1791391be672e5faa6b951017315b6d4c3c683a3ad44e71162d473
+EBUILD qca-2.3.3.ebuild 1854 BLAKE2B 080d8e3610ce39fa9b8cda3108059b55fc2f6eae2e068b286b7281d21406b401b03dab0eed05db163f7dc11fdf4904f9968d2f8de5412f1005ec724f62d04eb8 SHA512 4afc045a2f21942c51e89efa0c459284d33460e06a09972bcd38e86608a57d28ac558a2c88fb8cc90b39d4eac3999ecc3b828b9858691aea090baa474d4b6767
 MISC metadata.xml 831 BLAKE2B f1e90c290a0d5a7e56e55973cef68b5266ac463022fd8d487ec1b3fadc1b5bf782cfff069e30dce92b37ec12251469c89a0be8b6dd0700c63d0fc05cbc783029 SHA512 b63fd70f71049e8009cb1d8f9af223bb2855578bf1797bcf10b9543ae7cafd4cf42dc68e0b1407db4368e2bcf9861f06f995c47c494f6f5d9a81bdabfe3601b6
diff --git a/app-crypt/qca/qca-2.3.3.ebuild b/app-crypt/qca/qca-2.3.3.ebuild
index e3cfcab697ec..128911e0db60 100644
--- a/app-crypt/qca/qca-2.3.3.ebuild
+++ b/app-crypt/qca/qca-2.3.3.ebuild
@@ -11,13 +11,13 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
 
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-qt/qtcore:5
+	>=dev-qt/qtcore-5.14:5
 	botan? ( dev-libs/botan:= )
 	gcrypt? ( dev-libs/libgcrypt:= )
 	gpg? ( app-crypt/gnupg )
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 0933f08af4b4..d5dba555f74e 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 26a750f84694..87cff76c5540 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -17,12 +17,12 @@ EBUILD emacs-18.59-r14.ebuild 4351 BLAKE2B 43b9d632623afd061f1259166faebd1c5329a
 EBUILD emacs-23.4-r21.ebuild 11065 BLAKE2B ec01f02640ccef8349bef30f81c23284652937e7635c853a34cf20116d2ebf651c629c7635a2b47072a025e645b344c0ad24f93b569341298856c42e8e096c07 SHA512 fdc01a8ca90039a86c06cac189b06d3370f218f5fe3cdc0cb614cde2fb9f4ec565264df1b96204613b7a767e5088550135899f1292737646152ab660c67d718c
 EBUILD emacs-24.5-r11.ebuild 10816 BLAKE2B 9968d323497774e9f864ff9f41e54b2cea4ed471836e9644ac675728cc83b955ddcf93d0a94af359beb722da5ec5d7c4e267a732fadc592fc00d740692ed65df SHA512 417cdbef740b8b6b122446547e87e527355208c3894fe88720114b9ec8ae22ce62cf44de5a571997601fa6cb17b208633c18a6017838386285302322ec3c8ea4
 EBUILD emacs-25.3-r10.ebuild 11127 BLAKE2B d337f00dadd09db93bfe37fa0bd69318cd92395bfbe1edb88a4c9319b69b50067d2f008f1a9196e03c8ce99d520f5d0d8c6771775082383741c3e4401a4b5700 SHA512 757d7b8c68613e9a2e3283e2369aa31c38455ccf7e65da760bbc34f97f2e514f476762cf2d217cfbc7a3c7602e0fba62ac4c3a0c127427178bd822d0f69cac1c
-EBUILD emacs-25.3-r11.ebuild 11133 BLAKE2B f943c9da7788ce40b7d341e74c6000ef5bff7a8a50b589093c35c38eccf4ce342cdb89c3e316b3994c3b2dc91a0433300f7cc8918401e1713e1665336cc32a7f SHA512 90fc889d351a9f2a07f7589b0b59efa119735d7dee7fc252fa38c040c0805f2e657b9c2ecf8c1959acf6cc0e50ae049746498c6c33b84d4fb5d47f7d1ecfaffa
+EBUILD emacs-25.3-r11.ebuild 11127 BLAKE2B 22d66c1f674b929fe6b325e499c65f7134c88a129d256c2e1e505a1ec47d00342262975c6f1005cb7141ae21068cc3136eaff208441ba93a0676afd1eef5db06 SHA512 fdf225d4a0027f09971c3f3a176a74b1e9e88c79c2449cbbc32a31e6dc5bca9367e84021ccb382b8f4cc7133a7f0ef4266517c02c0dcaedba033cab7d94bb3e7
 EBUILD emacs-26.3-r5.ebuild 11739 BLAKE2B 4dbb06bd2883c8030414558c0f42cc0fa56cad2a9c1cf865ed69002825df5b4873fb697b5490ac183ab5f8398c5ccb2b9aaac0fc5b5eac00248ef2a960397044 SHA512 0447abdb36d3a97f9247ba545bb2c35d692740cdcb33e9e73af71d795b514bbaaf8ea35a806ee3f1df4a48b5b1bb6cac3e264b4e6ac06bb7b4616bee92b0ed09
-EBUILD emacs-26.3-r6.ebuild 11832 BLAKE2B b3b5b028975897a699103872f6ce3526132c32e0876cce5fab2a7401dc56406b96978c3a728aa6520c02a28facaf7b88ac721811f4b41b7152c485038d4e0a4a SHA512 bff00110d95455d80f978fa158ac87b907d7c3541c7cfdf6d2d45570b12b8c3e972478af93bdb8cd860d6976eca330e4b01de59c4849afe36d318ce7a250cf19
+EBUILD emacs-26.3-r6.ebuild 11826 BLAKE2B 71538046832f8f5a270f93da03955a956fe7c030357146dc3501e2f44e950a4be144f8373c914f68e8bab7d175fbbf5aeff9e1aa3684fb87b34d1934bc9f4830 SHA512 6353c7566f34ac16abc672ae12ef88e91d5668c8cb07f569c98b68889ba8db8a85bed3568917afc0fff1b3eaf42ea62fc36826e5f7b1a4c7e25375ed5c23caf1
 EBUILD emacs-27.1-r4.ebuild 14334 BLAKE2B c524e15aa87eebb1eacb52368fc11b17c429a10c83509e883cea3fada349d7a63e7947b1f3c050641ed65fabfbad2ebe965ec19f96b062ddc62162d344bc044a SHA512 7238304e452cf3bae3930c25726fb92a8b76c35155c35793a69aae08b23b7066b34cbb1ae18bd385388ec07170da14008cd89397bd9483a9033f4feaf1632baa
 EBUILD emacs-27.2-r3.ebuild 14416 BLAKE2B 44040748fe6ce026c2f92c4122306bb800c7d91137c855675981039e8fa17d26a620f5620554fa37f31feadcdb2038b2636cfe0cac314440424db006074f5af7 SHA512 552db85e54deea9a8450754978e34ea882577a5efe9b8861b76bfd380b1e6e9ebf0e38a8a54ae06808026d3089cbcdbac8e08665c4133f5e853f48230a9dacd3
-EBUILD emacs-27.2-r4.ebuild 14423 BLAKE2B 5922774868e9bb3956bdc0ff9e7bdbb3ea35031cba5b24851351add13bbf5d3148dcdf2a8b5fe6f80449ebbec7d2ce8b6479d974c5a35a43285e0d1f4795ad32 SHA512 367f3566c27e509f42a534436fe1da1a605a1433400bfb2ceb28f6e617df482158b3d0e20d0c86463125aecde4ac21a19e009e4c5285b588ad64c643d4482d1b
+EBUILD emacs-27.2-r4.ebuild 14417 BLAKE2B 8c9be9c3daab3abec102becc463143f52d8ebf027d2009faa6dc86b4492f852db1349367f4d4f8a089c4e410546ee1ca3d2b1704cb54d878971eccd87c5e881d SHA512 be51c5ac64bd346f19c4df2b6d6b3f557e28c30cf1b6f7cae36af96ff94dae6ec6a513eb66cea34d0d1063e63a82d404c42edf240bdd22fd05e8b7f428c537d1
 EBUILD emacs-27.2.9999.ebuild 14283 BLAKE2B 12dbe5a161e22524bb4d02d0d659b62a8f1940a9a6382b898e6e23c268112f583938225b4f94c8ccbe2bf2e7b70356539a8623eea12e58ce5d2ee272fea16a20 SHA512 1e70761bb0b13dd24515f0e7e9e0e1676d80ff5bf7bd0138d8cc7518a8ae1b20907ba7b12c27b904ec871576a634ee265cd894a7c2e2235c7d7101c16b0f6dbb
 EBUILD emacs-28.0.9999.ebuild 14448 BLAKE2B 88fc7d442c04c87045b2715fe72845289acbaae4e5586965fb58353e48c30950090b6550e75781f9d1c3ffe135bf97d504409e7247ad933a0866bf4e53627901 SHA512 646f9df3bd50ced09b21d28b045c7bd88f6b7dfaf7c341100d4a7c8696de1235c7b410ae559378824a150896eb17b2d420fdaaa32552b3047e6d1de0a4231fa7
 MISC metadata.xml 3129 BLAKE2B d0bfee8c1d5de0496d4b7bb5fff30f8b5c19911ccdf40d8bf34c990c57a61f6a6b68528e2a393174b190c59ffa1ff657c0d5dd6b9ff1d15e59641ae2b7da749c SHA512 1e37638584eefe022ffb08951adce160d6342aa90e92cfb0481689b662ff6a04a9327bb8c03fbc302315a17c4918d082ee076caadea34a2c461957f079da2279
diff --git a/app-editors/emacs/emacs-25.3-r11.ebuild b/app-editors/emacs/emacs-25.3-r11.ebuild
index 1b851ec31383..5d17753253ee 100644
--- a/app-editors/emacs/emacs-25.3-r11.ebuild
+++ b/app-editors/emacs/emacs-25.3-r11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
 
 RDEPEND="acct-group/mail
diff --git a/app-editors/emacs/emacs-26.3-r6.ebuild b/app-editors/emacs/emacs-26.3-r6.ebuild
index 7601f81ee0e2..a000cf096dcb 100644
--- a/app-editors/emacs/emacs-26.3-r6.ebuild
+++ b/app-editors/emacs/emacs-26.3-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 
 RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
diff --git a/app-editors/emacs/emacs-27.2-r4.ebuild b/app-editors/emacs/emacs-27.2-r4.ebuild
index f1c41cc33a9b..ed16b4af7f7a 100644
--- a/app-editors/emacs/emacs-27.2-r4.ebuild
+++ b/app-editors/emacs/emacs-27.2-r4.ebuild
@@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index 1c96675674e2..700a7698869a 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,5 +1,5 @@
-AUX kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch 433 BLAKE2B 3cfe90cfa73bb82faa45402041160ce644f7cbff9a6072b4be7a68e8ea9249eda49946e6ffca898f38213aea2515c614b0b47f66bda7f53479c68ed6019fefb6 SHA512 790c0b84b044fc90a4ec8e9c6c116a169748326c383ee3d3e993a9768588749fb409291092edc3df93ae72a6e8a649c13c1c3a86d8ade6a70735483909e47cd0
-AUX kakoune-2020.01.16-gcc-11.patch 181 BLAKE2B b7d35b65a352012fc065aab8d912e1f2bbdfaa1c7d276e1c13c132a2f1202d637a05f082b3ff0d87b1ab4bc81f8f20e78d3f84e3d17c28da3a9ace0dd78d2f84 SHA512 77bb0a994fe22e8a6aab67780d6bb1dbcd00e42a6ac86462635afa7449354d08548e52176b94d99335cec199f16893f970fb84e0b8b9f904e3958366d5b8ec05
-DIST kakoune-2020.01.16_p20200601.tar.gz 597946 BLAKE2B c3d831132e29ea46c4c92a942eae1b9eeaa30c68e17e7178b00277f45fdf76784386801627125c653b50507ebebcad282512446c0cff94f7234013aa8a17efd1 SHA512 b137fa71a151e80da50bfd980a264d1d0aa98d48e585794eb1429196a6c81ef51277cc15d5db015ce8550c1cf0d6fa29f5cdeefd3930e90e2a0480dd7bbe5bf8
-EBUILD kakoune-2020.01.16_p20200601-r1.ebuild 1050 BLAKE2B 384beddd1657e9bcc14e82ce2fb59121a2de1325a9a4f81929b9ac7680bc88e4b471b339f64179a305a4a9da616c4a5f754b5e2df24de93ddf8069772fdb6d33 SHA512 de19599681da7055ae22699bf9305cc8916d853160d949ddc7ebc30581e94d27c3f2e1324457dd0baae51a31f5f3d7fe8716734f420119696d94f7a1b7e44c73
-MISC metadata.xml 245 BLAKE2B cc6e199e8d1ff374bdb7d8a466333d0b9b4bab77b928756235369130ee369e7da62755bf02a0eae323aff90ea39af9f63667448a0c6f9f0098665f515041ef7b SHA512 785c49f9d46f2e7f05705e108b98bbd80f2a241d72a00ab9a698c837d0644bb651d708ff9a21dbe53314e838d1c3dd114b76dc8241378d29ca942923c9ff20bc
+AUX kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch 282 BLAKE2B e7a8e8e79fc81b42ac5cfc987684a38d8b73a3cabf7ccf3b35324f0cc49d2176a7aae4daefff46957cf3407a0c50544ae838d07f04b650cf2e2947fa3523ec59 SHA512 245138d130e32ca61dfdc5325362dae67113a73642f82356ef3a0d33367361e51011a8cac5c9bfc134c5aa2dd6461a0a9bc98ff54921a3763e8752d8f1fb4921
+AUX kakoune-2020.09.01-gcc-11.patch 181 BLAKE2B b7d35b65a352012fc065aab8d912e1f2bbdfaa1c7d276e1c13c132a2f1202d637a05f082b3ff0d87b1ab4bc81f8f20e78d3f84e3d17c28da3a9ace0dd78d2f84 SHA512 77bb0a994fe22e8a6aab67780d6bb1dbcd00e42a6ac86462635afa7449354d08548e52176b94d99335cec199f16893f970fb84e0b8b9f904e3958366d5b8ec05
+DIST kakoune-2020.09.01.tar.gz 612970 BLAKE2B 64084c2a4ff1ccf348caad8db04df9425828378bda28d163ffa6d198b3bd80d6d078ac0095dfc5adbae505e4d4259cd86185718a8012740417056db531ea72ec SHA512 acd9edd6b2a68219a4b5f68aaf4d785aa8c430abfdf5ccc994764f5ece8acb655adf64334027525115d3cbe819591de8496c3e54e2d806ce40c494443789e126
+EBUILD kakoune-2020.09.01.ebuild 955 BLAKE2B e9e68960e0825839f40a167aa5604dca9e66ad6280935fdaab1495d0ecebdc0e96ed9cf44f0d47f2e9aecfffa19d72cda9b9aa4abb4917478760a0ebaf9258cf SHA512 bd8e52b290f30dc8e9972b27499c2b128b1e020347512598585221d4ce2877ff63362ecda440a9f0357b7fec6cdc9d8bf0f5dd41d5499b0bd3d1ff225e04fd19
+MISC metadata.xml 511 BLAKE2B 5ec5bbd3388e02601c560810a04e95e02f2d03f53e0539e98123ac3736849d49867301ebf02686ccf7c5e00b09800f6e8503792c63ffb0170ca0c7eaaffafec3 SHA512 20224a1e244a69b7d2536393b4d8f131bd97450a4223d530033b0e6391752ff0856a5929ba33c6466ee4f581c569afe11fdee1e2474f94ef18aea96675baa773
diff --git a/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch b/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch
deleted file mode 100644
index 726968e0e8c6..000000000000
--- a/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur a/rc/filetype/sh.kak b/rc/filetype/sh.kak
---- a/rc/filetype/sh.kak	2020-01-16 11:52:20.000000000 +0200
-+++ b/rc/filetype/sh.kak	2020-05-25 15:50:20.417809942 +0300
-@@ -2,6 +2,11 @@
-     set-option buffer filetype sh
- }
- 
-+hook global BufCreate .*\.ebuild %{
-+    set-option buffer filetype sh
-+}
-+
-+
- hook global WinSetOption filetype=sh %{
-     require-module sh
-     set-option window static_words %opt{sh_static_words}
diff --git a/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch b/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch
new file mode 100644
index 000000000000..d7b9083a4281
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch
@@ -0,0 +1,10 @@
+diff --git a/rc/filetype/gentoo-linux.kak b/rc/filetype/gentoo-linux.kak
+new file mode 100644
+index 00000000..251dad16
+--- /dev/null
++++ b/rc/filetype/gentoo-linux.kak
+@@ -0,0 +1,4 @@
++# portage ebuild file
++hook global BufCreate .*\.ebuild %{
++    set-option buffer filetype sh
++}
diff --git a/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch b/app-editors/kakoune/files/kakoune-2020.09.01-gcc-11.patch
index d558c49347c1..d558c49347c1 100644
--- a/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch
+++ b/app-editors/kakoune/files/kakoune-2020.09.01-gcc-11.patch
diff --git a/app-editors/kakoune/kakoune-2020.01.16_p20200601-r1.ebuild b/app-editors/kakoune/kakoune-2020.01.16_p20200601-r1.ebuild
deleted file mode 100644
index 21dafc2dd2c7..000000000000
--- a/app-editors/kakoune/kakoune-2020.01.16_p20200601-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_COMMIT="6fa26b8dd2ac0931fe688370728c47086277d883"
-DESCRIPTION="Modal editor inspired by vim"
-HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune"
-SRC_URI="https://github.com/mawww/kakoune/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/kakoune-${MY_COMMIT}"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-DEPEND="sys-libs/ncurses:=[unicode(+)]"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2020.01.16-enable-ebuild-syntax-highlight.patch
-	"${FILESDIR}"/${PN}-2020.01.16-gcc-11.patch
-)
-
-src_prepare() {
-	sed -i '/CXXFLAGS += -O3/d' src/Makefile || die
-	default
-}
-
-src_configure() {
-	tc-export CXX
-}
-
-src_compile() {
-	emake -C src all
-}
-
-src_test() {
-	emake -C src test
-}
-
-src_install() {
-	emake PREFIX="${D}"/usr docdir="${ED}/usr/share/doc/${PF}" install
-
-	rm "${ED}/usr/share/man/man1/kak.1.gz" || die
-	doman doc/kak.1
-}
diff --git a/app-editors/kakoune/kakoune-2020.09.01.ebuild b/app-editors/kakoune/kakoune-2020.09.01.ebuild
new file mode 100644
index 000000000000..bf078a51afe2
--- /dev/null
+++ b/app-editors/kakoune/kakoune-2020.09.01.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Modal editor inspired by vim"
+HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune"
+SRC_URI="https://github.com/mawww/kakoune/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+DEPEND="sys-libs/ncurses:=[unicode(+)]"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2020.09.01-enable-ebuild-syntax-highlight.patch
+	"${FILESDIR}"/${PN}-2020.09.01-gcc-11.patch
+)
+
+src_prepare() {
+	sed -i '/CXXFLAGS += -O3/d' src/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export CXX
+}
+
+src_compile() {
+	emake -C src all
+}
+
+src_test() {
+	emake -C src test
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr docdir="${ED}/usr/share/doc/${PF}" install
+
+	rm "${ED}/usr/share/man/man1/kak.1.gz" || die
+	doman doc/kak.1
+}
diff --git a/app-editors/kakoune/metadata.xml b/app-editors/kakoune/metadata.xml
index 9469b5728eda..0de50c33abc4 100644
--- a/app-editors/kakoune/metadata.xml
+++ b/app-editors/kakoune/metadata.xml
@@ -1,8 +1,15 @@
 <?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">mawww/kakoune</remote-id>
-	</upstream>
+    <maintainer type="person" proxied="yes">
+        <email>mujo@sdf.org</email>
+        <name>Ian Hixson</name>
+    </maintainer>
+    <maintainer type="project" proxied="proxy">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">mawww/kakoune</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index f9ef4b937b0f..069902d26213 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,5 +1,5 @@
-DIST mg-20200723.tar.gz 152271 BLAKE2B 5fcbe2699da60c68a0c464bb337741d7797e9da3e2ab148a821aed46f661e5f5efbe7ceb14b153dcdd51185d22d0a2b2c7ad3525fc531192ecc0c0697e483b77 SHA512 8e481cf4981b93dba95b3b318f44dda15e580962216d452ce2fddcd19b86e4686673ba84d092bfaa540533b227428bd3bc9e6becda69be881d930937b0ea7add
 DIST mg-20210314.tar.gz 152749 BLAKE2B eec9740db1a543025450746913c1b07f0646f370906665122c7f5dd1ecc46b5cab102bd29aa51afb13972f4f17118ea20c33bb619e8dc4bc8982f8423ed189d6 SHA512 816b1bf8aec97dd790b0d5bf8836d46cb87f60d0bda94c2aecce4f8a6b8599ab2e90805fa6b129c9e40b54b340e33a47fec97c60e1b59b7706aa357d58b0e3f6
-EBUILD mg-20200723.ebuild 1039 BLAKE2B eef7dd1ed4645c2cd557e702673fb57076beb717e4230147431d98d719d684415f83f90bce40b1a9c433c3084b4278740753c704dad7ce8a98ac768cb9e09157 SHA512 2ef7301ccbb7ef1d067759ff9932584864ca36a62ba1ce66ffbf35c2d6118040d77f42d6947a55c86d62251191dbe29d272a6d54e6c36a9632a37f197e246bad
-EBUILD mg-20210314.ebuild 1046 BLAKE2B 5e41a6ada17349e0e591515e07909377c9cf34d31f72f9a08464c602d8065fec45e76b7f1aaf5cc9369be506224ba78f9ba1875ecf0d6fe9bad73c110f4b3f80 SHA512 6bbfef8e6109423ac791a8b8cab55da587551a015b1e12fee2d1fb9a4656c4d23ce4ac982d95bb7003a287ec259a7745fa97f8b830320fda0cc8ec51c60949c3
+DIST mg-20210609.tar.gz 156850 BLAKE2B ed8061aa808a8570f24198fb32fa3d24d66decdd07dab871502456d734a8d7867f384122361294bda0155bc3fecea80983fd41c00a2ffe02d00e380bf94e2f43 SHA512 a17b470e5e192c1f62700c7b78b15c9403b25528a7d6603fda0b6e618196150329fe4889cedfc8dbf621053d45b78294ed5c2766604aaa4c3ddbaec545693043
+EBUILD mg-20210314-r1.ebuild 1047 BLAKE2B 58927b004dd4d86b0b265c81c4143c3f5c89f40d68c8f97af75696885c2cfa1aa2a6d4e1f72507b30a424466e7da47ac88b66d9d0d17652f8e47f9cbf791122c SHA512 77ccf850b2e25689630b8b04a3bd075f8dd1c2852a4a5a64a18b846443ca4822045986e4798bc21a45512d8ba456b4ced44a0af6a6a047a117a0133c4a06f90b
+EBUILD mg-20210609-r1.ebuild 1092 BLAKE2B c3f50c0360e6ea2b316beb43d58d1b619f17643a2bdf8d7e538aa0768e288390e44d73bd700fa20d6e58f2f479b10956e7c0a628a3ab20ace7effda5e7bda234 SHA512 dcf36883fc1f35c363fc5525b96bfb87a1cda086b5da68f48e63d788260295cb9d4058f786f1203f87e1a6fbc72c4b9110546b27cac0459eccdafc72cc972220
 MISC metadata.xml 618 BLAKE2B d6aa73580d4aebe2a43f227c56df586058260eb53bc7b09e3cd9355526bcb32bad3c92c2ba20aaa8da9e96634d43b1385921e2f9ef77168e3089eed64b9e7d45 SHA512 a61abb9ef37a2e1d8e04d3476b2ba85e66f1e6287bb81c3d2ba71c7b1022c8e025fbe4f1b46dcef27d38b5f28a75e569608e7b9d5e9b504c8d405680cd764a4d
diff --git a/app-editors/mg/mg-20200723.ebuild b/app-editors/mg/mg-20200723.ebuild
deleted file mode 100644
index a25f7051f9bf..000000000000
--- a/app-editors/mg/mg-20200723.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
-HOMEPAGE="https://homepage.boetes.org/software/mg/"
-SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ~ppc64 sparc x86"
-IUSE="livecd"
-
-RDEPEND="sys-libs/ncurses:0
-	!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# fix path to tutorial in man page
-	sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	dobin mg
-	doman mg.1
-	dodoc README tutorial
-	# don't compress the tutorial, otherwise mg cannot open it
-	docompress -x /usr/share/doc/${PF}/tutorial
-}
-
-pkg_postinst() {
-	if use livecd; then
-		[[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
-	fi
-}
diff --git a/app-editors/mg/mg-20210314-r1.ebuild b/app-editors/mg/mg-20210314-r1.ebuild
new file mode 100644
index 000000000000..59dc39a0a994
--- /dev/null
+++ b/app-editors/mg/mg-20210314-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
+HOMEPAGE="https://homepage.boetes.org/software/mg/"
+SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 sparc x86"
+IUSE="livecd"
+
+RDEPEND="sys-libs/ncurses:0=
+	!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# fix path to tutorial in man page
+	sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
+	eapply_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	dobin mg
+	doman mg.1
+	dodoc README tutorial
+	# don't compress the tutorial, otherwise mg cannot open it
+	docompress -x /usr/share/doc/${PF}/tutorial
+}
+
+pkg_postinst() {
+	if use livecd; then
+		[[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
+	fi
+}
diff --git a/app-editors/mg/mg-20210314.ebuild b/app-editors/mg/mg-20210314.ebuild
deleted file mode 100644
index 10f44d583185..000000000000
--- a/app-editors/mg/mg-20210314.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
-HOMEPAGE="https://homepage.boetes.org/software/mg/"
-SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 sparc x86"
-IUSE="livecd"
-
-RDEPEND="sys-libs/ncurses:0
-	!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# fix path to tutorial in man page
-	sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	dobin mg
-	doman mg.1
-	dodoc README tutorial
-	# don't compress the tutorial, otherwise mg cannot open it
-	docompress -x /usr/share/doc/${PF}/tutorial
-}
-
-pkg_postinst() {
-	if use livecd; then
-		[[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
-	fi
-}
diff --git a/app-editors/mg/mg-20210609-r1.ebuild b/app-editors/mg/mg-20210609-r1.ebuild
new file mode 100644
index 000000000000..8bc287431abc
--- /dev/null
+++ b/app-editors/mg/mg-20210609-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
+HOMEPAGE="https://homepage.boetes.org/software/mg/
+	https://github.com/hboetes/mg"
+SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="livecd"
+
+RDEPEND="sys-libs/ncurses:0=
+	!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	# fix path to tutorial in man page
+	sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
+	eapply_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	dobin mg
+	doman mg.1
+	dodoc README tutorial
+	# don't compress the tutorial, otherwise mg cannot open it
+	docompress -x /usr/share/doc/${PF}/tutorial
+}
+
+pkg_postinst() {
+	if use livecd; then
+		[[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
+	fi
+}
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index ff283ee93966..5623ac2ec159 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -17,5 +17,5 @@ DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cf
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
 EBUILD xemacs-21.4.24-r3.ebuild 7093 BLAKE2B b110be14467c17919c72baeff5339dcc1d135f883047cf699e781b4302a0b37a6f6dfa0175de4a66e64fc0d457531ad85a20d83ca8e01d6660dcb0a5a83565ba SHA512 5f01488f2bc7155de34d0c8e7fde30f51584abbe45ad3f2d482b442df26305f8765c0940255e607bc09f9b914facaeb554e0d969bb72e2891fae944cb08c5f9c
-EBUILD xemacs-21.5.34-r6.ebuild 7313 BLAKE2B 11dd52a16988b977ed372d0369e7b958248e2ead1926393170b9a4f58ca9062abe9d9e55963942cf53731dceb3c685b6936d46ed2d87e450614b9bcb050fdd9e SHA512 e9ef30136edec568b2c20067c1f6d5f991fea673f01f0dd04b9a7d69cf240c5a8535e7a5a7688716240ce5d4fe2472e44697a62ef4b230feff4011416bf0879c
+EBUILD xemacs-21.5.34-r6.ebuild 7320 BLAKE2B 7899c64b324d0ee03e39c4bc0e99ff376716fb9dd26a229a902392a8cbe7864c2a2069bb1d852e1bf551d7fde1e0d5dcecb62e1fea667bfc644ea4f77b6e996b SHA512 83fba83ef8fa82697a181f9c8934132e03e9452bb891112a91ddc0f720a9649942c9c2c7ea1c0151c48de8d342d85f83039f69faf685973d0112acb1cc224173
 MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7
diff --git a/app-editors/xemacs/xemacs-21.5.34-r6.ebuild b/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
index 7e8c4188da85..b1ec1ecf51e1 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 -riscv ~sparc ~x86"
 IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 0c68925e1495..66e12fcb6355 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/apel/Manifest b/app-emacs/apel/Manifest
index eb707fe0369a..9cea4cd886b0 100644
--- a/app-emacs/apel/Manifest
+++ b/app-emacs/apel/Manifest
@@ -2,5 +2,5 @@ AUX 50apel-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b5695
 DIST apel-10.8_p20190407.tar.gz 94808 BLAKE2B 47540e8c3ce96cc91efefe521942a3df4ee8423c7796d7e66b14bed7e9d662469a0767dd4863ae130fb114a1f9335d95abd13d61b6811e039db75e28679ac0f6 SHA512 6c780b0643f248e2a1409f1cea794dc6be515ee2ae766ead0834996bd9c13852492af1b9c343c4efda06fd057fae0c1b8a1ffc6b55b1469afbc7cbf1b579ea68
 DIST apel-10.8_p20201106.tar.gz 69188 BLAKE2B e0107968349fe73325503a61fbc9ada83d657f2ca66a39ae2ea833543277f536d22371e371e17dc4307380e738491e20ec0b7b52a35207f49e37fa65c66f3ab1 SHA512 fb14570d6d4f2346d386ae0012cfb9149ddf9ade8b4dc75507e6cef848d12ef65f80bd7d1dc26815031aee00461d67d4a86fe29e30d5d542756e725425634c77
 EBUILD apel-10.8_p20190407.ebuild 1103 BLAKE2B dd978f08c9b9bbb7469dc9b7b753d8d05ef860b803efbf1c393d2370d85ce271117f5ad3bd9ee20aa04dcdebce2c5558e0c5ef4f0874364a4524d71acdcb166e SHA512 a3b9ab568b86dd51f5d2f2455539ff0df43e5f659064808793b43721e38241148224da573a12b21dc79407891b0a07e301277189cc595ce43c2935ff4f23f88f
-EBUILD apel-10.8_p20201106.ebuild 1005 BLAKE2B d43b2b760d74e4c6f440b49805783dc305c579a46f9f5f1001723c8a0736416d6a7694aa48860b6c264ea1a0fc7d2953a16af20908c89e663cd43b4ad6402fcc SHA512 29f155312d3100ebf561a093cc0f9ff517de14ebfde73f8715740617bc82d68e68ee3c0c046ddcd7ab8c33bef606c105266204e6a99aa1cb04478ed101521c9f
+EBUILD apel-10.8_p20201106.ebuild 1000 BLAKE2B da596a5f151a6e6e27e7c34148db80085bb01eb86275bf03306f4e87931be8a9e52b1e7df7eb3795e897799c4832115acad478817ccebbf3e5f1f1a7396aa40d SHA512 c2cd93fb452e50288290472b624f3b40e668d9420792733d4dd37e885c5a8958086289f818cbb0f3581957519d17c14186fd1906babb8a5f7a57800dab34d7ae
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/apel/apel-10.8_p20201106.ebuild b/app-emacs/apel/apel-10.8_p20201106.ebuild
index 85482a6ff306..8e9d3d330adc 100644
--- a/app-emacs/apel/apel-10.8_p20201106.ebuild
+++ b/app-emacs/apel/apel-10.8_p20201106.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 SITEFILE="50apel-gentoo.el"
 
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 289d1d5b0d41..33ec3ed1400e 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -5,5 +5,5 @@ DIST ebuild-mode-1.52.tar.xz 36100 BLAKE2B d5207d910088de9cf1a41580ce61c49632e8e
 DIST ebuild-mode-1.53.tar.xz 35920 BLAKE2B ee932441e23ba4b876e98feb9ff9dfea2e395296846e14f776ac10f4c5bab6b711161b4c890b0d8f2ccb5749db5bced3f693aa172e3ae92af506fee26fb5750a SHA512 8fcc28139c0cace21159a0b5026573f401f65b4501ff888f9818d8f5a506a7bc1f8d8a133f775619efc9e16e2172d6b5daba539b4e38b1a378c0b35395263ef9
 EBUILD ebuild-mode-1.51-r3.ebuild 729 BLAKE2B 46f74b1b56541e80f41bf14092627d542ca6c434bad44f606d548cc388102b78855db815fa6d151588e2fca2e6913781677687dcb1eb0b058db358d80669fb4e SHA512 7adf4ff115b8aa78d5dd7a6a222fa535dd85c26390e349896d17b8b729abdf73960bd8b4dd5014c47d87d26dcae28aba5f23a0262c4f8bbaf472c7468ae4c610
 EBUILD ebuild-mode-1.52.ebuild 736 BLAKE2B 5eb9b964d2c708c5334fe9f89ee78b7628ce2e20eb23124ffcb0481abf683355925db3ee0b8aedea84f86479559b9b314f8021579533ffcbe87eb89faf6cdc49 SHA512 54c3c580b468e24669e67bae3495e03683283fb1675d2e9d9977ae0111854d0ddfe63fcc878d7179bd5454bae20d9f75a46e5c1fba69de880038a103ed5fab25
-EBUILD ebuild-mode-1.53.ebuild 736 BLAKE2B b241e8af5d898ea544bf28cf7fe3904917a26b480ffc9591e3a7b3cc7d4f53aa6f6901aee704cc9d4856b9e55631b22aebddb777ab04863b777c104407c998d6 SHA512 5832a9f2bd3f0c0bf88e83dc836200a4323671a3737f019950d7ed673b77d176312ca3983828762968da1e2f6493518cc93297545ff5d384af9f52010950a9e7
+EBUILD ebuild-mode-1.53.ebuild 729 BLAKE2B cc851471e66575177f4216249b09291adb0ba6f5ae739cc4b4621df2a5fc39bb903c67c5f25a8d6fdfe617b65a4386a5afab1e6bca8e565997bfd07ad3a28b64 SHA512 0b95e084c2972001c79ba3fdd9d9852be104a0a5065619de6ce4e0d0894a88e99914c361a789e8fd3fc56fe01a76580b5cc16a54ed1d175fb6064e41ad5e9313
 MISC metadata.xml 426 BLAKE2B d0b4dc2bd01fc6fb2f0c58b01676b80d09a4677876adc9681c3c436ebc437b6b034187b19fea30cf980927fec1f6a9feee9a0b7d1a4dd15818d02e4c8ec77af6 SHA512 058df2768030185953c7ac3622819c430681eae3ca60b0d02ad48ed22ab6a0ac7c169d93f8f54a3dddcade3f84c9bf58f662a58bfd78217ea8fc27a580ab9077
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.53.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.53.ebuild
index c972bf6d3080..19ad8ec1607f 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.53.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.53.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/flim/Manifest b/app-emacs/flim/Manifest
index aa9a95f644da..8a51646a0ce5 100644
--- a/app-emacs/flim/Manifest
+++ b/app-emacs/flim/Manifest
@@ -2,5 +2,5 @@ AUX 60flim-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b5695
 DIST flim-1.14.9_p20190526.tar.gz 173261 BLAKE2B f28b0d1474d894fd93d9899fe66bc88d6669cc6bdbb2511dcd0b2f13c05abbe42ad4cc06e2de34664204f3ddbb3cb4f09e232394419892b3fd8e71c1ab3aab75 SHA512 8991c460bf9eb411e89edb8fb05088cc09dc354e4c14d7accba26d922b2d1041742e96d8a64407ee8dd2574984c5b3a8fbd66e828c8f8fadc55f8da6428d634e
 DIST flim-1.14.9_p20210529.tar.gz 146081 BLAKE2B b5326cb67f4e1387fe5a9f0cc9360feca81bf61de18ae75b325e072e70a3f4b70a1bda148a2ab8ac9c3b872bc5ed96b53b61d0de427abfb21eb8e3dba1235701 SHA512 47a55606add53da7f399d87befc834dbbe4b52b1f3011d24d3dfd3ec7a7010ffebc2aa666e38f5878735b2ee43dfe46eec548dba3535521440c8bcd1bd08a17d
 EBUILD flim-1.14.9_p20190526.ebuild 939 BLAKE2B a2cc523e803ce3e1a0d88e4f5105d83f2552bbb08098848ceca512a76876578287f0daf7c02e9b4b720fe9561b6bd9f51330ecbb8c2d731e78e3fc640dd449dc SHA512 17cf24ad7990ba1086bd0323352105b158775b0808be8f8f40767b72ddfa542dbd4f51948c3e62c06b030b0a18d97a2573c62dd4054ca389cb5c7e33bfe18da7
-EBUILD flim-1.14.9_p20210529.ebuild 942 BLAKE2B d5a164e630579d16306322884c96ca2a262f8805973d259ceeb781b8193a8d5c536eeb19d51f8c456463ef10e5b03498bd71123ee7ea0f27eea5744b3d6ce01a SHA512 b94e80dd3cbb6adff727bec673e23b5854bda1929d55ad7298ac170c6a6f6685c49f8533091c8b7c87a5ff2718393776c4327905837f92a13ed40477e743c2f2
+EBUILD flim-1.14.9_p20210529.ebuild 938 BLAKE2B f1a440f5c10a1e7fcfe465e41bad4f2bbee6b48f979d598f6a43a06b9b48b11a34672035db35c7c183f9e888339b8483f3fce045015b631c046bba157e3910cd SHA512 830a95cd2fe9b89553434e781cfc200e4d6ce3c61ba4ee149dc23e4616a07ee38c2860e03f62d9c5f021b6a0387b35f2d4f3ab3c2f1da522ed08ec4597a640aa
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/flim/flim-1.14.9_p20210529.ebuild b/app-emacs/flim/flim-1.14.9_p20210529.ebuild
index 7dabe9f475b3..e8b1232708da 100644
--- a/app-emacs/flim/flim-1.14.9_p20210529.ebuild
+++ b/app-emacs/flim/flim-1.14.9_p20210529.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 RDEPEND=">=app-emacs/apel-10.8"
 DEPEND="${RDEPEND}"
diff --git a/app-emacs/semi/Manifest b/app-emacs/semi/Manifest
index 4d679f9a3d5c..3959d4a88e88 100644
--- a/app-emacs/semi/Manifest
+++ b/app-emacs/semi/Manifest
@@ -4,5 +4,5 @@ AUX semi-info.patch 1009 BLAKE2B 936ce69c254eca176f7bdbaae92dcda7fe921214b1d089c
 DIST semi-1.14.7_p20190517.tar.gz 152636 BLAKE2B a22b1f9a5de0a695de2d8e342ca313af05c12a1c0b597890d926496e9ce240e3329365700f91e6268cf399976ec067163ac8197c7a643e499d70851501f63798 SHA512 d25c940fdd0a048d21079d905ae91521a1f1247b8f78145baeba24c994c0d5b30985a76c909a793f82f6253b323fb4699bbf059ea48037bb49ae92505b0c6d18
 DIST semi-1.14.7_p20210613.tar.gz 150809 BLAKE2B 6e91f3c28fbadd3ad0ac7856305d7acb5354df33cfb182924712023e5c7b5dce14176af9a5e5f44e345c60d5ec014e813151ee185a5115d6d4faa8d93d9e63b7 SHA512 aa89900f7f06d76301e109c267e7e3c4d97c7f1e1f075db147fa0a9e91aadef93a58522c7a35f5cca2fb5ba4c05397b98cbb4791f3a8e72242b3dbe7f03c29ad
 EBUILD semi-1.14.7_p20190517.ebuild 1256 BLAKE2B 49ed1c01ac577f35bbc8cfb2f45b627bda0644e07c7781ba0e0dfbd55de6b8ffe77cf6259701ce9c50aae18cfc36fa1ddea4d979c1a5bb13bc74aa9d01e25028 SHA512 ef34a089f3e911b6dc43c700ee7d5b596ca817d4997dbbaec3ca792bbfccffc875a328767abea3285b2379c64332b5e06f4be331f1c75df003b65febef5b353e
-EBUILD semi-1.14.7_p20210613.ebuild 1302 BLAKE2B 623fa85d3b6a4ba1224e2221dde4be021b9e6ddc673d39bfc6e91a614070cd6b6d3d02451f554cf811b1347ec740517e69a12d51566dc78ca3b152f63dea9b39 SHA512 46232c9a97223e24bf57e46c6b27e559b6090e2804da34292aee1919b2c8b3f22c8569cd0ac98fb0001f96725a2b851c057fba0a358fbe15add4d14a2183dc3c
+EBUILD semi-1.14.7_p20210613.ebuild 1298 BLAKE2B 169df4000944d23dc85819a9545d756656e725f1fff427db44b669820e0b6256c6f5965f4b9e5120eafefd512ae6e75794e261443dc474c88f79dd82a5f0ac85 SHA512 59193034f1d114a7cb73256fdc30cf3c50f696f12480007d3e038d808d54ce34cc1f5293eebdca91201d419a83c21d70367d7b1a31ea7503957a1f3f1e1104e1
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/semi/semi-1.14.7_p20210613.ebuild b/app-emacs/semi/semi-1.14.7_p20210613.ebuild
index 2deaf91f17e8..00a4e3958888 100644
--- a/app-emacs/semi/semi-1.14.7_p20210613.ebuild
+++ b/app-emacs/semi/semi-1.14.7_p20210613.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="l10n_ja"
 
 RDEPEND=">=app-emacs/apel-10.8
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 0a0ac2bf3fe9..26f2f01fe2d4 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index d3d7be4cc8e5..f2f88f543a33 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,6 +1,6 @@
 DIST diskimage-builder-3.12.0.tar.gz 477540 BLAKE2B 9facf1d6ef9a38b960b7bcc8ee035d8f7ae6c5189d1de25e335d68a6e8389be0ab0f3b787e5d5112ee7ef508b583d1df612ca75149659f78685a2fdf6dee21a7 SHA512 edec229023673c48a3176b315c9d84067b4e7b4a30843839722a7ce300f898d92ee5f5146b6d92f2eda692bada4370b32f1b19f3b929a379b3e604b6e7ce29d6
 DIST diskimage-builder-3.13.0.tar.gz 494027 BLAKE2B 27a88118d688018a5f842e0d483e3128b0715cdc21f33308de61ea5077ad1b824738363ae066463e84e7e3821a36085afc9985fde74883ab040c67a25073e5c0 SHA512 7b099811021f199ed0680e2dc4db6302b05dc6adf95ac96e890501cf92727dc319fbf96f9c68a8b9bca26ba54d7ff5e6a67f036a9d86a3ad1752d5cc4a8edbaf
 EBUILD diskimage-builder-3.12.0.ebuild 1123 BLAKE2B e08d7364d05eb37576d34f950030e90fa5b8e4e7ad4e2d485e57e1399567af9e065f5f998b27fedae1d84a51f6df2aba33f33baea467871988cd197852a4db7a SHA512 e1f2646722a8b253408c28fe55693cf0a77e6cb1a46b846f655b68384d4761ce3c3d4c669201fae482bd012340f0b7f4896a2c7140b400bb29cfc9436cf1018d
-EBUILD diskimage-builder-3.13.0.ebuild 1125 BLAKE2B 2e91c98564bf0c4ffff2e97d5900feb0b6c74aceba0880d0d51d0fafc26a89f9de5c16b7484e223b9f190106a72e541d658ca483e0bf36e098baf250f0d39dbc SHA512 652e697141503582b7e648efe2d4448118525798ebe3db86ddd1964a741ffd3e0c68c3d42b91aa2f0df63e6903a9a922e7d0b1d6ff68c5abd1c124931ab93f92
+EBUILD diskimage-builder-3.13.0.ebuild 1123 BLAKE2B e08d7364d05eb37576d34f950030e90fa5b8e4e7ad4e2d485e57e1399567af9e065f5f998b27fedae1d84a51f6df2aba33f33baea467871988cd197852a4db7a SHA512 e1f2646722a8b253408c28fe55693cf0a77e6cb1a46b846f655b68384d4761ce3c3d4c669201fae482bd012340f0b7f4896a2c7140b400bb29cfc9436cf1018d
 EBUILD diskimage-builder-9999.ebuild 1125 BLAKE2B 2e91c98564bf0c4ffff2e97d5900feb0b6c74aceba0880d0d51d0fafc26a89f9de5c16b7484e223b9f190106a72e541d658ca483e0bf36e098baf250f0d39dbc SHA512 652e697141503582b7e648efe2d4448118525798ebe3db86ddd1964a741ffd3e0c68c3d42b91aa2f0df63e6903a9a922e7d0b1d6ff68c5abd1c124931ab93f92
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.13.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.13.0.ebuild
index 92726b9c7654..7a9c76c9cccd 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-3.13.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.13.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index aed31a5df7d5..6eb8b09799a6 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -16,5 +16,5 @@ EBUILD docker-compose-1.28.5.ebuild 2106 BLAKE2B 1ba83fc6311c7f57b5f73a19236d0be
 EBUILD docker-compose-1.28.6.ebuild 2106 BLAKE2B 4c0b6b20bb8c738885b904338b555fc3d48de10cb850113da2c3c8b79deb14f3c951242100ab12b6edf8b006b346c10d4a0b70c2026acdcb708473ec328bcc56 SHA512 c41c7543b214c369bc11b23bfcbbf84f7a3d5f263b16d02036148f191e8ea8a36fd05c243c84ec4478ac985edc8e2e0381dcb8d154c94f6cdc37928f947593cd
 EBUILD docker-compose-1.29.0.ebuild 2102 BLAKE2B e7608f2ac6c52f6760b8c859f901afca0fe63570782952b73a6be92eb4431786d87382f84468c55ea876fe60cfc9defbc9b3a486a56e1b18dbd70b8e59e2e449 SHA512 fbbe8cd918dd181605bd8e12e0ec1f5facc9779294ca40a67c405304280943feffbe73d199a0c41cfeb46ffc62c248bc6ed2b3f9a5790449dfe2a2af02175f96
 EBUILD docker-compose-1.29.1.ebuild 2102 BLAKE2B e7608f2ac6c52f6760b8c859f901afca0fe63570782952b73a6be92eb4431786d87382f84468c55ea876fe60cfc9defbc9b3a486a56e1b18dbd70b8e59e2e449 SHA512 fbbe8cd918dd181605bd8e12e0ec1f5facc9779294ca40a67c405304280943feffbe73d199a0c41cfeb46ffc62c248bc6ed2b3f9a5790449dfe2a2af02175f96
-EBUILD docker-compose-1.29.2.ebuild 2100 BLAKE2B 001ac61eb752613830383b163de93a6e0aa46cbfee4246e0cee2466f34a9afc92cf875269beea32da75fe642fcb3685c855b6d6618dcf6cb5e32f4e1c1ac14ff SHA512 18609cbce12c59bedcbb8b3039a64cd6ebfe7bc63e2f55a56f493ceedf5590a262b2170e521a51fe387a7e236c80b45d1c0b729fa1fedbb016babdd7f89d8888
+EBUILD docker-compose-1.29.2.ebuild 1969 BLAKE2B 6fd241e3f2d5f629c9d944795db8342b22f6a12fbf1a15047c3e0bd675a775fd04b3132c583440dd23d9b589a0421496713c98894c3da0e249c481e7b80ad661 SHA512 dde8c7270307f7e465ffbea8aadcda40e445b15148a5e04dd35811941cce45120c8feb95da96db7eaa6ed15504f157ab20899effb2bf116ee641575798bdfdf1
 MISC metadata.xml 380 BLAKE2B 00c5a74fedd97fdd6dd3274523d134991e50dfb8dcf798027c00049d52cb431c8d06237dd06e48b4793cd14c879eb7a22a95dff01d9ad285cfa4d75e45a19e99 SHA512 04599c73f5b724749979b44f2eb3bcfdc071dc56d06a37c22eedfe7e9b85fee511bc5a0ad5553b96b0e86c054579dab538f2a519bcc21e96b8dbe79b27b95d0e
diff --git a/app-emulation/docker-compose/docker-compose-1.29.2.ebuild b/app-emulation/docker-compose/docker-compose-1.29.2.ebuild
index cec99a23828b..8b8382057d29 100644
--- a/app-emulation/docker-compose/docker-compose-1.29.2.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.29.2.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit bash-completion-r1 distutils-r1
 
@@ -16,10 +15,8 @@ SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.g
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="
 	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/docker-py-5[${PYTHON_USEDEP}]
@@ -43,6 +40,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/compose-${MY_PV}"
 
+distutils_enable_tests pytest
+
 PATCHES=(
 	# Bug #679968 -- https://bugs.gentoo.org/679968
 	# Bug #681002 -- https://bugs.gentoo.org/681002
@@ -60,7 +59,7 @@ src_prepare() {
 
 python_test() {
 	distutils_install_for_testing
-	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+	epytest tests/unit/
 }
 
 python_install_all() {
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 2ea3d36f0b87..91d5d40e6fcd 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -4,10 +4,7 @@ AUX lxd-4.0.0.service 519 BLAKE2B 5314820c25e52449aad8db6584739cbe0f2654111e4b42
 AUX lxd-4.0.0.socket 197 BLAKE2B 8c0d2dee71c14ee5f34b2bd0804adfa06ab3ae2a73bcf8d122184434c42b7f91f66fe610bddda93c458e0f171b505fe79a4f268d8243aabdf226f47e95027e71 SHA512 d70dc867b2e92b69928c83fc5feca4e387808adbc267b9fe4ecf0c8befdf3ca13366b229c6eefcb5667e51405fb0aa4e6bb8f59a0b5b5fb3895c46b4aaab0661
 AUX lxd-4.0.0_apparmor.service 567 BLAKE2B e5951c31f90b842f5b625060326d9611ed67fb50360b11791cbd1ab1953fdfe5eb726e22b7091bb8e45c294b772e6b00e9ca65833512eb5b570627fa3234812e SHA512 364764d007f4800138c712fce70fe28b096b6e35dc6d2e4f8aa9aff4b335ecec7dfc9600a1a16cd38e69a96534b7462daf5f6e946a2ee81bce17977b8d5911db
 AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c2967c295d671df0d315d790df1849e25f0bc052e20cd0d9e4c23403289050b4538f5a52437ab8ae9ca3b40c6a9a1571 SHA512 a55f2c1a367c5c3c5eb6880e01893977de18c6e9463949236ee3247715fbf53641bbe1b69404362dd6cb6ba2a30ac6539fd362b21059e529dc4dac4ec5ca6718
-DIST lxd-4.0.6.tar.gz 15353779 BLAKE2B f699e91c53b407e5a0e47fe40b133d6216754b1e5c5829ee68993468565f2080c12cbcbf8373d6da16ca94a3648ec51b874e66ff589be09dc95f2382d18f3e12 SHA512 58efaac50dbcbb3cf0e7aa1b3b43085beae4546dfcd081720b049c2b88bf120b9a74e7db1238bbdd8cc2449e039b076ece3734e8f46f3ddbdc70aaae8b326963
-DIST lxd-4.0.6.tar.gz.asc 833 BLAKE2B 6d1756b130a944a98e62d809c45129178bfc39158c71e09319cdaff7461b14bda467e44a781bb5c15d40afdae4d3ec86f98919738a8c169d3fff910d8e9fe58a SHA512 6c59bd8ec9bf0d9bd90c8ab2970cf6928c0bef3736631ea2a56ebc464f33940366d35925ddfc4104c13fa0fd4e1bea42796e0a2eb82a8bf395957829f938c7db
 DIST lxd-4.0.7.tar.gz 15454709 BLAKE2B 6278fa058efa15a689a982dcf0bce58bf320ac500bc8bd6cd4227f5f126a03dd85a65363d4d36b3437a0a2fd8e08e8a7332b96f9aba8e8eb2aa508d1129fec13 SHA512 dd99db21a4de95d95e6bd53dcbd68f4d9f0ffbd9e60d994340cd0b1e820068e671507a9718d1c56488c79ad49019f86637a4a8b9c945cdd3f70d59c9e2026fb1
 DIST lxd-4.0.7.tar.gz.asc 833 BLAKE2B a28e43d1fd0d5851a62121069703637e7ba25cbeb142507e4e162b254eddce2b5a13a100eedb202fbf3d8aa40f6e20b4fd587ef38f6c73a07d2bd9d8d9d00c8f SHA512 561d7cbf94a37e7ed03828ac98a2022dc1a4e11b80cdee3ad925bf4226b78b9e1d1b9c51ed070e60fba881b69e06dc70be2713026285b10de5cca59549ac5f82
-EBUILD lxd-4.0.6-r1.ebuild 4147 BLAKE2B dd59abefccdae966cd5b4f02e2a81df39c82208dd4a82dc4e73878bff92c468be8ae07431930e54213e5b5e678ea28320fcce1704d4987c9a2ee3cfe6c988607 SHA512 ab448cf187f384e96f3d763a273905f2dadc6e59a83084c7dd6559f9ae4a561ba14406c93ad40c8327dd21e5f3bb9ac740b9e0b7ea7daa550a3dfc7c0a082350
 EBUILD lxd-4.0.7.ebuild 4190 BLAKE2B 2938b717899c7ad9199b13265c4f250959d1b353ea4e591b8e77470c31e2cb72da47733dd823bcfbd842c26bcca9a9e820fb56784c0aca048b8221ac5ba7fbd6 SHA512 5699cdbb47c6752012f5500abae8d0ff655111d6d7843583e97e3ebd000bb63745e77dc7f3d4099c80d60939cf5d1972f74e8f90012c195ff135d7e9e3b6e749
 MISC metadata.xml 776 BLAKE2B 5f8e6d2639982bf6564567a9775e55b777d4bd9cb01818770b5089071262ceda815e5d94e853b7c08a470234729c08e313685610b3da457a23bb7edbf5b3ff52 SHA512 050d500629b4331f2f8bd2fa5cbcabadc988d737c891edb66ad8b2ee2fd378690b2fee4c70e0b380c2579cb9a39453768242d7acbead4c5390c7f01131b939c0
diff --git a/app-emulation/lxd/lxd-4.0.6-r1.ebuild b/app-emulation/lxd/lxd-4.0.6-r1.ebuild
deleted file mode 100644
index 1a59fbf708cd..000000000000
--- a/app-emulation/lxd/lxd-4.0.6-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
-	verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="apparmor ipv6 nls verify-sig"
-
-DEPEND="app-arch/xz-utils
-	>=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
-	dev-libs/dqlite
-	dev-libs/lzo
-	dev-libs/raft
-	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp,ipv6?]"
-RDEPEND="${DEPEND}
-	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"
-BDEPEND="dev-lang/go
-	nls? ( sys-devel/gettext )
-	verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-	~CGROUPS
-	~IPC_NS
-	~NET_NS
-	~PID_NS
-
-	~SECCOMP
-	~USER_NS
-	~UTS_NS
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/fuidshift
-	/usr/bin/lxc
-	/usr/bin/lxc-to-lxd
-	/usr/bin/lxd-agent
-	/usr/bin/lxd-benchmark
-	/usr/bin/lxd-p2c
-	/usr/sbin/lxd"
-
-EGO_PN="github.com/lxc/lxd"
-GOPATH="${S}/_dist" # this seems to reset every now and then, though
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-src_prepare() {
-	default
-
-	export GOPATH="${S}/_dist"
-
-	sed -i \
-		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
-		-e "s:make:make ${MAKEOPTS}:g" \
-		Makefile || die
-
-	# Fix hardcoded ovmf file path, see bug 763180
-	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
-		doc/environment.md \
-		lxd/apparmor/instance_qemu.go \
-		lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
-
-	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-	sed -i \
-		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-		lxd/device/disk.go || die "Failed to fix virtfs-proxy-helper path."
-}
-
-src_configure() { :; }
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-	export GO111MODULE=auto
-
-	cd "${S}" || die
-
-	for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
-		go install -v -x "${EGO_PN}/${k}" || die "failed compiling ${k}"
-	done
-
-	go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
-
-	# Needs to be built statically
-	CGO_ENABLED=0 go install -v -tags netgo "${EGO_PN}"/lxd-p2c
-	CGO_ENABLED=0 go install -v -tags agent,netgo "${EGO_PN}"/lxd-agent
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	export GO111MODULE=auto
-	export GOPATH="${S}/_dist"
-	go test -v ${EGO_PN}/lxd || die
-}
-
-src_install() {
-	local bindir="_dist/bin"
-	export GOPATH="${S}/_dist"
-
-	dosbin ${bindir}/lxd
-
-	for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
-		dobin ${bindir}/${l}
-	done
-
-	cd "${S}" || die
-
-	newbashcomp scripts/bash/lxd-client lxc
-
-	newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
-	newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
-
-	if use apparmor; then
-		systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service lxd.service
-	else
-		systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
-	systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
-
-	dodoc AUTHORS doc/*
-	use nls && domo po/*.mo
-}
-
-pkg_postinst() {
-	elog
-	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	elog "including a Quick Start."
-	elog
-	elog "Please run 'lxc-checkconfig' to see all optional kernel features."
-	elog
-	optfeature "btrfs storage backend" sys-fs/btrfs-progs
-	optfeature "lvm2 storage backend" sys-fs/lvm2
-	optfeature "zfs storage backend" sys-fs/zfs
-	elog
-	elog "Be sure to add your local user to the lxd group."
-}
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 8a4397354947..67a0cb2d5a11 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -2,6 +2,6 @@ DIST VBoxGuestAdditions_6.1.22.iso 61020160 BLAKE2B e6b79942ed905654ac98323fe5c9
 DIST VBoxGuestAdditions_6.1.24.iso 61081600 BLAKE2B 66427a961c83f2de1a0b8671066154133795e8e4f50ac82e927e82e05594c520b155f29f7f19373e5846c36a1e3f6e5d2f5d17db1cebc1996c4d1737d5b45862 SHA512 8753558fcf467805bff801be43281597ef6738f90f8f7a62f6acbba2753e57f44bc72cb66411f0a0f413135026ddf683b0330b49ccad77676ec67b7bf3faf06e
 DIST VBoxGuestAdditions_6.1.26.iso 61073408 BLAKE2B 0711cb37ef21ce2fc277f1817d173f25686ae8f1f3cf983c93975f0e00df5e8e416f6bceaef3e1d1e30d0f3703186f9686a360a00683a89e5620603a41c21e63 SHA512 b1d9f02a740e61a8fdee7d8bc2ed87bbd4913ad367e8f1b7b964c496f9b10126337715cdcf5a3eb0fd299b11ae6324de8dd09657a55a7976dd14143a2d4ba285
 EBUILD virtualbox-additions-6.1.22.ebuild 777 BLAKE2B ef241fa299288ab813b6a6acfddb7910b3a8bd454527fd75143e8b3f404049374662c500aa17ce83a6edb080af267ed1710e09240058c877957e24272c782556 SHA512 53bddb2a887429730a34ea27a0859541c4c47a11a010ff33715314119500e337ed5849a8f76af106ab414dfcafbbe269ce2a282fb5137a324bac676dceb6080c
-EBUILD virtualbox-additions-6.1.24.ebuild 778 BLAKE2B 9224a26ec47d48f16e8e73333c7d87505d179c5435ad172226fa58017c6c3b5dc593dcbcbcd3174466f2f27f97ca09830478ccb13fa477be88fb2308ef2607a2 SHA512 7d80ce8e63384ca88fcde9dc3aa7f5ebbd21d527df271def115f5a700f4367a842b153d5dfc21f1ae193545f05563cbfe054d536fa9fbd7f5453e80e7b76c91f
+EBUILD virtualbox-additions-6.1.24.ebuild 777 BLAKE2B 839d72d0dce7bc4a40bcc15cb80d1247399f09b20cc2aaa3029759ccf3c5e5e93b184e4fa2928cc503735dcdfa64f583b5b25ef90504354097c5dfa310aaff54 SHA512 ceaa16e9b2905b8174d156433c4709b09cc52dd1ce2f8607fb855ab6ba776e93faf0cf7341cfb7799553c51cfd1b9c8cbe9d57f5d242d4c8a9333ff1e6e44ef8
 EBUILD virtualbox-additions-6.1.26.ebuild 773 BLAKE2B ec536183e374156adace80364b1b41a176a6906634168e87a9de31b57a2dfa131e6acfbffe0cb8397ba1c86108c197783a0a1b2a2bec06a1b358ad61c313ed9b SHA512 f43aba9da3873e6382a9580e2ac13754c582a52fb461b714eab134117ca8a849d205307b5045bf0d65604d0b4163584fd50c4ad5120b6f5cfcedbc0889dda78f
 MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.24.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.24.ebuild
index eaf1cf6fc9eb..4d641c6e58c6 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.24.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.24.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
 LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 43d46495c22b..a6b419451183 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -2,6 +2,6 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.22-144080.tar.gz 11133865 BLAKE2B f
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.24.tar.gz 11135003 BLAKE2B 53bb6dc35eb8ab1a58492ca3b67b63885ffa1ad3ed3a51a9e7e8c522845b082c420fb39a31a379ee56b45c9b02452acc5be4d72c5a5d9bddaa428bf7c9a3a086 SHA512 e2af2213e99c8c35a3090f5e36d05b1ef27c920cd31a2bf97b0368a89f27a5e2d0e0e0dced5e4e7bacda50fe4b57738924f13a933f5307ff2c8c4015ecc030ae
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.26.tar.gz 11134336 BLAKE2B 61e543124c7b2566175f35d0eecb046ce2c69a7fe8102ccbc96f61c4bf700d0b78732e535e09f9056ee8c53ca2f11615bbf5788684a35b04116501d9dc4b4f68 SHA512 b4be713b3e3bdbdecb38d4b27f70e9a34630ea6e4f10beddf96ad1372e3d64aa2ee85b0774e871aefb4f9872b3dcdd3005fc3a7bded6be37d06157f3fe2861e3
 EBUILD virtualbox-extpack-oracle-6.1.22.144080.ebuild 1083 BLAKE2B 088e4a97b7fb82fdbbe2206c79bf4296ca886d008df1c5cf1d789c0bbaced88b83fd8b5cee42f5aa6a5c9246c07ad9c8d2b7363a4a0f09cc687b3fbd6a64331e SHA512 e674994322cdcf4f0151f488c28324c786a72039ad32147dca57f84774ab39100f5534506e1ff5e6adeda75314ba3ef071b032c39ab4b6754b3469ccb79707ae
-EBUILD virtualbox-extpack-oracle-6.1.24.ebuild 1070 BLAKE2B 213b49c6213be21d5f5da9e0ecfb7fb43b0af9525ca9052660036c8fb2bdfd0153afce75e903fa178c7fb09a67e3d270bc9b054d4b1c2889727e5bcfe26e00cc SHA512 e2f3cf167a0a8781d8a4a7e8aeee4fb626e04db82203bc6f0202efb93d80c0e726bf5fc2fadefbaeebd82174859db4fcc4fcdf749d23256b15d31d44bb480ece
+EBUILD virtualbox-extpack-oracle-6.1.24.ebuild 1069 BLAKE2B 46bf0d096f1aa85748656eb44fd646d357c1621272791b343472c3bf6ad5ec87bec0ff9bcbf9b4f692501eb6382a75ff68acdb2fc3c1a2828651dd42dc4190db SHA512 ee701af686a5f260a93699cf4dbb030edbaa8a0dda9479c3d3af977abcb27d033a745dcb16139f1ef1ef7e6cfc20f9e479d08b173ddb340ff3334cacb8813d4a
 EBUILD virtualbox-extpack-oracle-6.1.26.ebuild 1065 BLAKE2B 6728457bdc028b46b989d9d22f557fe7c026f6c2e89628defd10f98552f998e3a3952a5c4f0b259189d9b06cd2a6784fc1552aa14b0661f1ee5567b4231c5ff7 SHA512 7d5e08213780896e7162775760270df178838cfc0bbee7b49449263c94ee0bb504e6bec413c2cff4f185f2ed0f7097112e55e795dbe5d5dc290790685d6e9ed5
 MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.24.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.24.ebuild
index 0634acf398dd..5a3004e25465 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.24.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.24.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpac
 LICENSE="PUEL"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 RESTRICT="bindist mirror strip"
 
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 307103bd41e3..92607c16cb38 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -12,6 +12,6 @@ DIST VirtualBox-6.1.26.tar.bz2 165690074 BLAKE2B c522889191ca2ae2749978853463dd7
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
 EBUILD virtualbox-guest-additions-6.1.20.ebuild 6205 BLAKE2B d1171f7d2e7f363eec0376812cfd34ac725f24083a4acc3ca4ca5346f84cbbeea1414a4c93915b5f82f323f641d78e0967a02f5f0853cd5c57b1b10fa5b0e455 SHA512 4cea83e923f2037bc3058bf349f640e46be929f5c5425d353923bf7ce6cb17ed2a53fe986f5e24fdc6a05f8c7f1a679356a71b6bc84c5eda74cdec7430afffd3
 EBUILD virtualbox-guest-additions-6.1.22.ebuild 6206 BLAKE2B ea540bc820358581e7d95aeadb13ad2fda156b0735b4a33676a163c1dbaae235db82907cf08ac833700fd297e57fecfe775bc1036f323fc04c2cb279ccf807f8 SHA512 f1ef13f8dd2d890e729c797375b5e8662fe776d008f78008668114e7467ef0fe98b277bd12e3a67a685d66c13ed38731e6dc7590722440acbe7541fcccf67965
-EBUILD virtualbox-guest-additions-6.1.24.ebuild 6206 BLAKE2B 9ed00a98527cc3a1bf89a4bc22c0180c9bd08105d971997943b0e21f19ee00986d0272f9a257ca83790433680704244658f97ed7f2653532771876c647e1d0d0 SHA512 5a8047e8f1b0f1feb3a14f9da306e9cf79a7ec5f7018ff6469ad27568758694cb2dd05000448792a7dacf2187843ef9d8fec8d9f803d94a058bc6fd0d9383a9e
+EBUILD virtualbox-guest-additions-6.1.24.ebuild 6205 BLAKE2B d1171f7d2e7f363eec0376812cfd34ac725f24083a4acc3ca4ca5346f84cbbeea1414a4c93915b5f82f323f641d78e0967a02f5f0853cd5c57b1b10fa5b0e455 SHA512 4cea83e923f2037bc3058bf349f640e46be929f5c5425d353923bf7ce6cb17ed2a53fe986f5e24fdc6a05f8c7f1a679356a71b6bc84c5eda74cdec7430afffd3
 EBUILD virtualbox-guest-additions-6.1.26.ebuild 6202 BLAKE2B 641664ed30c93f0e23ee6dd992b1851f19c9731a319f92623da31dfd6470ff168a369dc176f497a1a91346beda9e11037e7ea921d67b18f87e52f7949f563d82 SHA512 db330f5dec72d25937e4d3d014e6d8999b460d9241d71ef1a99f32389864b2bc0dad408bde877d7a0848150e4ed8be41469681ea27dda57f3d38f5bb38670f10
 MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.24.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.24.ebuild
index 92c060741b1a..87c84047ba44 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.24.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.24.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 # automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 45a8ba8f1450..ff91e5629195 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -6,6 +6,6 @@ DIST vbox-kernel-module-src-6.1.22.tar.xz 672348 BLAKE2B 331f81c370c24487f4966c7
 DIST vbox-kernel-module-src-6.1.24.tar.xz 674584 BLAKE2B 3a20f615426a7b788bc4bce00e416fa3822cbec3f00691651acd53b7c7bda8b43d3669195cececa83f1fc50a792e417adcd709d859497da143c4d93a2b414912 SHA512 220d57ab33a41464cd9e506d38390e60b9e67ca8262b1a13732f3d40820e038365c129eb7144f1932b8c2d3fdcea828de3070dd927788015301bf4aa59c1cc48
 DIST vbox-kernel-module-src-6.1.26.tar.xz 674624 BLAKE2B e38fdbb63e309463a526c4f6607f0cf6193109a9cd9ac4ac4cd752e614ce1594612dd76da7fda9d9453cbc45e9d3aa2989f370d8900f080e604ef1a903d8a736 SHA512 0755a802ae901664d3ef1481ffc8987a0f94d8be1d95c1969f370e2fe6eb479aba1da38d2206eb8191c05d3b7da4cf3d16e4e53d40fcb3f758622030a8864c98
 EBUILD virtualbox-modules-6.1.22.ebuild 1433 BLAKE2B c37f4ebb63aed96ba78b0135688f576a703fd2dcf2b677c64ead9b89dd1b0c4e40bff9076f433034c1330739c295c015a61e949118410c0c59ec609155d8f535 SHA512 31ab9638f1a2c89b9abf6cab996a345ffd9b72a57ed95046cea436aea25e12709018f1d3504cb4b0d1254a4ec8f2756612c682d5d84b2630dff9301bec24ef90
-EBUILD virtualbox-modules-6.1.24.ebuild 1434 BLAKE2B f799d32f49be7d6d343ab002f2b6d1f6d6ce17ca1f4973d5b375499b4f42dba23b8f467f807f6edc27bf534db2bbb671ab6984d32fdb9a0e42d9b7345491410a SHA512 c075093ff44a6d31d049a3182131ad084066b657cd4cbd15af9d4948944543231e9c67a12f96ae760b2fab953498c3bfe2cd5761a0292e2be3fa5dedd8187d18
+EBUILD virtualbox-modules-6.1.24.ebuild 1433 BLAKE2B c37f4ebb63aed96ba78b0135688f576a703fd2dcf2b677c64ead9b89dd1b0c4e40bff9076f433034c1330739c295c015a61e949118410c0c59ec609155d8f535 SHA512 31ab9638f1a2c89b9abf6cab996a345ffd9b72a57ed95046cea436aea25e12709018f1d3504cb4b0d1254a4ec8f2756612c682d5d84b2630dff9301bec24ef90
 EBUILD virtualbox-modules-6.1.26.ebuild 1429 BLAKE2B 1faa947e406ad79161cd598d495989dfa82fe9a59d8668f6cf25ded538623180e7e67535698948dcc54e9e007531695e3dffd5ee8345104284ea7dae784d6161 SHA512 456a3f1c5fb2319059c9e60ee9dc4b26eed0c82839dabd3668ac3954d9d1545a757d10e49aaa93dfb8219619a9b61a8314d8ae089c87bc0e4d7dec565d144ec9
 MISC metadata.xml 352 BLAKE2B c8715abe9ff5c699ae15dd0906ac10eb7f750cb00092994d174a2a6a3315aff2601781a5392058087706dcf744614fa32cd950c7fa19dd896f7617f735089a0f SHA512 4e57c8aee47fe806315d0d138c81ac919197ed0a6dbf4273994228ceae32e06791e1951e9599bdfbdb6e2f329f74cbb08ce9d69ad3e6264668872dca3e4371f9
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.24.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.24.ebuild
index 0a6e70d58259..ac30ee8cc037 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.24.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.24.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="pax-kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 6e770fd8238c..8b806a83539a 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -13,6 +13,6 @@ DIST VirtualBox-6.1.24.tar.bz2 165754851 BLAKE2B 65bbc130281a745a00eee2a055dd598
 DIST VirtualBox-6.1.26.tar.bz2 165690074 BLAKE2B c522889191ca2ae2749978853463dd74a8ecbd312b6f9ee05b186577b675efd02b0f66293f7486a3a44cb9619e720f7a4012761ad98907496546fe9be362541f SHA512 7668abaa6e5e9cfbc3c7ae1c6efc11663bce906aa002f78cf2c7acbf9b47f96faeb64c2762330c7091694c191ff2311f3674bd930cfdc020c23ef1d4fd893c9b
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
 EBUILD virtualbox-6.1.22.ebuild 14342 BLAKE2B 8f7472f3cb2b25c9aa9079bc6732ba65c33a67fc166cc28d3dcea83886739cae019f6f5572301b7bde8c1b2c825677b610ba571462a187b3bb1f53cd84dd1bd9 SHA512 cebb5863ef8538ca1d503cd85605f279afb0d46d62f6b1ba343a4af422aceffdbac15e51ee20428f11dbc4361aeef91a59c77c489c08a90dae8709fd39076b3a
-EBUILD virtualbox-6.1.24.ebuild 14343 BLAKE2B ce8b34283b04367d1bf2c22af58bb0fbae9b513bd82cad3826f989633a40988cc5e57f5360ad02d452f789e8a7c118338ad0deb874cf350c03f397e405b6fe24 SHA512 791567627577a0025fd95c0aad0667e9b4ff6ea3636f709a7ef5010dee157d16bd5d42edc192ef73e2da13e918a4d38c7a535d3af1f7c46362b29196933dea31
+EBUILD virtualbox-6.1.24.ebuild 14342 BLAKE2B 8f7472f3cb2b25c9aa9079bc6732ba65c33a67fc166cc28d3dcea83886739cae019f6f5572301b7bde8c1b2c825677b610ba571462a187b3bb1f53cd84dd1bd9 SHA512 cebb5863ef8538ca1d503cd85605f279afb0d46d62f6b1ba343a4af422aceffdbac15e51ee20428f11dbc4361aeef91a59c77c489c08a90dae8709fd39076b3a
 EBUILD virtualbox-6.1.26.ebuild 14407 BLAKE2B d702060fb9488b7af42cb6510ddcd4aa233b784e6f42437007cde1fc3f5f0de704fbbde02c4cdee9df1f40e2e5939ad777d6ac00e385893e9966df090802d792 SHA512 b46b702c8bd2dae587cb3f8aea746ec132e46dfbdfe24d7e0ff4f38bf5ce197c7984bbcbe94174d8ff4e0a7a7b36db86de0c78678b567c20e814d4377101c82d
 MISC metadata.xml 773 BLAKE2B 52e55a63efff63886bedad4ac72e8b31088834ee55f3ac257f874afd77cf7763c5343ebce6defa399c55f8045dd1b17bfbd3ca3669adbfbe51585a59aa62bf0b SHA512 212e94588bc598d27ab46c3955b1e9963c38a7fee58502b13ce56bb14f241fe37961cd2f57150f96943f893314c2668a67afbb5b3b7e7db4354436965b7c66e3
diff --git a/app-emulation/virtualbox/virtualbox-6.1.24.ebuild b/app-emulation/virtualbox/virtualbox-6.1.24.ebuild
index 9e63054b0210..8e2979cd1985 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.24.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.24.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.
 LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 CDEPEND="
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index b4484fe38fef..baab6ebe510c 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/aflplusplus/Manifest b/app-forensics/aflplusplus/Manifest
index a774768c1632..d87dd9b8a666 100644
--- a/app-forensics/aflplusplus/Manifest
+++ b/app-forensics/aflplusplus/Manifest
@@ -6,5 +6,5 @@ DIST aflplusplus-3.13c.tar.gz 2128787 BLAKE2B 40fa65654468dc1de7f6e1b63d2266915a
 DIST aflplusplus-3.14c.tar.gz 2162934 BLAKE2B 0830b320cea65b9bdd048a08a388c7145164f6b7f4dc140a2f4268a3aa22dc608a771169c830e2196e7a0d543e6f3da49f39736f3b2514c559b986ce929d43c4 SHA512 318607cff40b5f2fc94938747e2ac6b8f400767138eb39edf4daf320afbdab417d0d97a80a1c9db8bb557ad4b7b62f887ae6e692c376f5d5673a493bd23bb811
 EBUILD aflplusplus-3.12c-r3.ebuild 2139 BLAKE2B 34c4f1e336fccd6ba6d6e91b679043430fa50bace3be3e7e7d6fed9ee3444aa0769997ffc535dad7d6246560912ffab03344d38c8e88726b667b23554e612dea SHA512 b937af8dd761839bbeda049f4b5d8000a50658232a57a4eef2e601e0ed5748e7e5367eccf29c6daa74b259419d6144ed1dd6186a18492be503693683f6e6e472
 EBUILD aflplusplus-3.13c-r1.ebuild 2138 BLAKE2B c761276b940a79c6455920fcf6bb3b4967a91edb353932e34b4368bdcd0d343c4d0d8051295dc0f2ea3116916487c6bc5bc643b3936b4cc4c183196182913ce9 SHA512 f7e349849606c584cd409a62f417c27297f039f08d18f81a23c7629d5071b942924ab10a1e8ae7a0e9d8ba32fcfcb6cf761db857a27b64e96806055fe2c99ac6
-EBUILD aflplusplus-3.14c-r1.ebuild 2162 BLAKE2B 11113de7c3f6d4c5107ccaf1895d0699f290bc86c388dadeb0d0dc383d082658b012006b04a2529d749a0c5fd64174a345dc79df43b4d93db4abb1c53f1fb5c9 SHA512 c59d194efa1910f8d1b7bef62cc565d8360b41c5480fe9f4e1fd384eb250dc6b16deb5a45239dfb3f2e359d89fdaacd7cf5d1a9ddbcb143d5b425f3fb9c426e6
+EBUILD aflplusplus-3.14c-r1.ebuild 2160 BLAKE2B 903529c7a7efdb979869fe55a3b34dbc4f40aa1e639edd802d35c84c3576f2ff6b1d855a6ed753e9c16ad71f0f6e4e2d6c898b675ff65369a528a8b515813120 SHA512 862908773affa10e09d2b8c544eae67a89a0e3705bc4fef0bfb7149ee02b350289d309fecf4e9b4f97ddf46df975c604ec559250f6e01a8cfb4f752a672cf9b7
 MISC metadata.xml 327 BLAKE2B 25fff77dada492976b7c412879dadd7df2a78a05cfa2be3ef00557f84c3f6679dd2977c8ea11573ffda864b0c88da327ea912a358a2b44b4186c71c6ed7086e8 SHA512 b2c58af252bae6ba27785f059c67edbd7c05469965e67c5e6f053bd385463b5f02b2ee65df3174fda85dfcf741add66bbc33836b3d8edb76acec91727f008746
diff --git a/app-forensics/aflplusplus/aflplusplus-3.14c-r1.ebuild b/app-forensics/aflplusplus/aflplusplus-3.14c-r1.ebuild
index 066cbd062f6a..74e2f4d3a725 100644
--- a/app-forensics/aflplusplus/aflplusplus-3.14c-r1.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-3.14c-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/AFLplusplus-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 0e995c935115..632b54647ec4 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/anthy/Manifest b/app-i18n/anthy/Manifest
index b97a1530239e..1b7b6d7992c6 100644
--- a/app-i18n/anthy/Manifest
+++ b/app-i18n/anthy/Manifest
@@ -1,5 +1,5 @@
 AUX 50anthy-gentoo.el 63 BLAKE2B 8680f0a54f0c16a4d869f52d1589c6af39d29c151a5f7e7182f7afb2417aa5ba2fea002d7638271f486f95931036a1e4e4a83af8d796c3b751760d5750adf1d6 SHA512 ca11bd44d092da07278905555513e8b5215413af64c46cfb9213cbd27948727133c06fb1fcfc1a48d67d196c693ed2835e8dbae142a52ff4dbd5ea8d49e6e65a
 AUX anthy-anthy_context_t.patch 174 BLAKE2B 0a38c7a467b5a0331762fa1083c2dffef8f4c39c8bfbf7ce0ec431f6f865dc8727fac391ff77a6a1cf5e455ca274c78b7a6ebf7a2326ba90c6cd979f8e3c7a3f SHA512 3f252628f77f53dd96eac50f08a36bb782f0ddc37446c1bdd5bd94fffa3454b9adcaff7118d76fdc7e8bc3f86b1a84e9830da5b67b2b0d281847b26ff62cdee3
 DIST anthy-9100h.tar.gz 4446148 BLAKE2B b07da205694db9223c22ebcf6158158247611be41448457ee112766d1ea5fe72eee3f2292276363245d751eb49bd582c39330cc6df5e52547b6188386439d29a SHA512 315ebd9e1af208f3ecaeaa13620213b35f004e47edb54e60c3e02c2997444cd2326cc58b725dd2d0bd6a723130884d946ea193ea3d92418082256b59ecc8d88b
-EBUILD anthy-9100h-r3.ebuild 1056 BLAKE2B c81b450a0808bea13587bd39386ba92bf19137594b8da7fa50e8a72fba4b9b1cd884f29b83c7baf158851f7c9e451a30ab8a88401087dd0b0a90b3d5d3798b28 SHA512 61ae32a2b25e0c425b626bcfcacb9b5c18c4ca7608db01f86a1749591cdf01d02ae4eaa31b0422510a915beae536a0b2ac5a671e892dea9cdac06380bfe60a83
+EBUILD anthy-9100h-r3.ebuild 1063 BLAKE2B ee33109cb844ae112a8fe98ef13c08f5a57bd6ca61e91a1892b64c191d0eec1742e1fd6e0fcba3e47af384941beb78dbe121975f99d1360684cf5fc9af680c7d SHA512 f0d670a1cd59a0f0e40ce532968be52d8fc049a964a95d57ee2afb899ce0599081f17d32ac38e21e0071bcbbd061d0b9b9f33f7b1007308cef7cbe14a96b308e
 MISC metadata.xml 806 BLAKE2B 53481d14a789c34c69cf56476e7930f57a18982d7ef7e6b1dbe3bdf3cf13a57fad5c2e76e8d1c6202d016b2b8d67c45b0e02ae953dcc90b60056648b34e9ca4e SHA512 ccdd97451f76963242b3698bb6ca76c98ee10110305a4a725289517c53910c9627967f6edb1949a218e4b411fb50b1fcf752be226f831471d5211ed8cdc5f0d7
diff --git a/app-i18n/anthy/anthy-9100h-r3.ebuild b/app-i18n/anthy/anthy-9100h-r3.ebuild
index 0a4beeca472b..f53d63aa55a3 100644
--- a/app-i18n/anthy/anthy-9100h-r3.ebuild
+++ b/app-i18n/anthy/anthy-9100h-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/37536/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="emacs static-libs"
 
 BDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index a9a1a45d276b..d4999adecd91 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -5,5 +5,5 @@ DIST nkf-2.1.5.tar.gz 215879 BLAKE2B b5ae8f51b0ed97261f9e82ad469adbc9e469e709dc5
 DIST python-nkf-0.2.0_p20141211.tar.gz 187761 BLAKE2B b607e155934dd14ad4d29298f209a233d846122299326df48e45339661d1cd08a789f5278928cb4a32c747673723f5f8877d98c7a6200af6b2dbbf29cd100f00 SHA512 5a493f32244e3cb72d188fa39b810baef31ce5f530309797a05474e3f58cf22fd5f8b6c66cdf5268451c49ffb759c476c707329ce1ccf42da0362ad4f5c24d71
 DIST python-nkf-0.2.0_p20191121.tar.gz 188496 BLAKE2B f7c9baaff8129956b7981011634f7ee5ece97e1b6650551a5cc2b50ff51a0c96a454f39e888c80120242a12b202c0422c0ecfc21858b1822a4959ff4c108b10d SHA512 ae1494ebdd488dc40802178a1b7b05c9a9b0bcf9cf9fa5017c6bc9f153c01b475c00f993489a21f643acc4ad61595c38c5afe28f3512a4d24f36eda7abd33958
 EBUILD nkf-2.1.4.ebuild 2271 BLAKE2B 33bd683f6c33dd527c468fbb864ede39309e470841a98411dd6d89991c804be9d760b5c3573608851be2ce2354c5b1ed7b40ec9c652690998def3bd5c0b3d512 SHA512 ff1a5f0359d4b8a2e447c05ebfa883378e2474067afb079e4793f83bf333063b8dc555146b43d7843baca5dc0f961dfad1b0fe0a0dec07b4709c485af19edfa0
-EBUILD nkf-2.1.5.ebuild 2233 BLAKE2B 6560ebd3461709894a724b6aeedb8f551a79b9d629e5e66e3808f2cdd4d01575afb09ae76dad39fd9b077293769a41db673f4f0f8a347657687d55a910f94b60 SHA512 a31c0bb4eff1e77684d05ca1b5d68fef2af1772551ee019de22981b8c6ec51889a62aa6d0d261e2571440a7e6bbe983ce971c414a7916657f5825501dafe9825
+EBUILD nkf-2.1.5.ebuild 2321 BLAKE2B fefcdde330680b9158a89910af10fa6c093b2189e49def4054792374e571cdc600eb6d2ccf212e4e356b35241184761194fbe1f9254e19f40c31299c86932585 SHA512 a3f77b7faf0f3f3e41dc7ec1f8643a2950196e79acf1cba54e230c9fe6975f4b6416fba147e2af9758a47343e8bcf3fcd9b4649e89bf76cdf8ec5075535b7c64
 MISC metadata.xml 310 BLAKE2B 5db509d8ef0ebd0727be43314f12d877a704ff9eb8b9cde61733c4dbad8196780c07c9de484f29786116e7fe9267ca3f6be9f727be9f4fa34e582b23fa586594 SHA512 2db03c97fb76c37b779c7f6e467c03b2bc08d2642090cc27a99ae07296edcde04924e37c8a3e6cb23d61552e8cf4bee273e5c17077fac0ae0ea3458aaa81eacd
diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild
index e937e5a5aebe..7720d4a3faec 100644
--- a/app-i18n/nkf/nkf-2.1.5.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL="1"
-DISTUTILS_USE_SETUPTOOLS="no"
 
 inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
 
@@ -22,13 +22,12 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="perl python l10n_ja"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="python? (
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="python? (
 		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
+		dev-python/setuptools[${PYTHON_USEDEP}]
 	)"
-DEPEND="${RDEPEND}"
 
 src_unpack() {
 	use python && vcs-snapshot_src_unpack || default
@@ -42,9 +41,9 @@ src_prepare() {
 	if use python; then
 		mv "${WORKDIR}"/${PY_P} NKF.python || die
 		eapply "${FILESDIR}"/${PN}-python.patch
-		cd NKF.python
+		cd NKF.python || die
 		distutils-r1_src_prepare
-		cd - >/dev/null
+		cd - >/dev/null || die
 	fi
 
 	default
@@ -53,37 +52,37 @@ src_prepare() {
 src_configure() {
 	default
 	if use perl; then
-		cd NKF.mod
+		cd NKF.mod || die
 		perl-module_src_configure
-		cd - >/dev/null
+		cd - >/dev/null || die
 	fi
 	if use python; then
-		cd NKF.python
+		cd NKF.python || die
 		distutils-r1_src_configure
-		cd - >/dev/null
+		cd - >/dev/null || die
 	fi
 }
 
 src_compile() {
 	emake CC="$(tc-getCC)"
 	if use perl; then
-		cd NKF.mod
+		cd NKF.mod || die
 		perl-module_src_compile
-		cd - >/dev/null
+		cd - >/dev/null || die
 	fi
 	if use python; then
-		cd NKF.python
+		cd NKF.python || die
 		distutils-r1_src_compile
-		cd - >/dev/null
+		cd - >/dev/null || die
 	fi
 }
 
 src_test() {
 	default
 	if use perl; then
-		cd NKF.mod
+		cd NKF.mod || die
 		perl-module_src_test
-		cd - >/dev/null
+		cd - >/dev/null || die
 	fi
 }
 
@@ -98,16 +97,16 @@ src_install() {
 	dodoc ${PN}.doc
 
 	if use perl; then
-		cd NKF.mod
+		cd NKF.mod || die
 		docinto perl
 		perl-module_src_install
-		cd - >/dev/null
+		cd - >/dev/null || die
 	fi
 	if use python; then
-		cd NKF.python
+		cd NKF.python || die
 		docinto python
 		DOCS= distutils-r1_src_install
 		dodoc CHANGES README.md
-		cd - >/dev/null
+		cd - >/dev/null || die
 	fi
 }
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 272cb66df704..4f2ed20ee2a4 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
index 2853c72cc588..f09a6b48f604 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -871,7 +871,7 @@ DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b20
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
-EBUILD node_exporter-1.1.2-r1.ebuild 31521 BLAKE2B ea0fc9ad2bd284b467985f01f91e6e77943439dd0c4d1b1ad7656bc96eb6a147b6c23b60d81734b68d41798aba1eb60d29844db249b4f26133f3ce0fd1499271 SHA512 989db2b1bdbd6b6741c35da128f624a8cc80401ebd209bf197d448d4fcbef1555a4e48bc017abdb9405ef61198dc72fc092fa217932b8d9cfde3efaf8a475f7c
-EBUILD node_exporter-1.2.0.ebuild 32998 BLAKE2B 7263b16f4763ce08c4395f19d8c0d28b1680bfd341e91d9f5013a4041d18b64d262261eeadd7549278bcbd41b134acbe90a6ba4e75fd67dbe0829fae19be65ac SHA512 ec1ed1d9a9e944630265a785980345901f5da93ad170807e2632524664eb966030f914ad37a1c01d12a53fffb34000abda586fbec74f4a4e596fcd5954d41635
-EBUILD node_exporter-1.2.2.ebuild 32998 BLAKE2B 245f26a1ff5c28099fe2d407bee2105e9580a5993fc01c8f06198f44c43674ae9e0d5c062febcac85a32762eb4c0bdce7f216f13838487a8f967d0c5db94608a SHA512 42fcb10ab33e2e238944f81a3549d133f002be531081eca236561e50d55b916409dfa67d53264b6e3485fb083d8823c7a8d99fac6950fd59aacd3af5c4bea8f9
+EBUILD node_exporter-1.1.2-r1.ebuild 31526 BLAKE2B 8f103fbbaff226b1eb640cb546dff1662e0ecbdfb31d28e4b94acdcda61741c9c97767c302926b9b89b9ae27faf5739e15f0248f3932b3512ea2c07b817c8a5c SHA512 5e7e5f8807cf859c267fd94c326f0538357fe0309a924764dbc6adc758eaa418771e64b2352f70d3bde503faa3eaf27760477f0e94dd2ebd473aa5251d49f885
+EBUILD node_exporter-1.2.0.ebuild 33003 BLAKE2B 145845f6c72fb5c2412a04011603aac4474b2458447c2a2a0ee26ba4f685e5e13bddb96b9fbb03110a68bb73ad65c317976841f4d6eaf585c42be814c98c8575 SHA512 4e65cb04b917f6168599666d57ce702e100bff24b6bada5ac1936553a1ac54f24d80dcba7b27990ba5b92e5c791493b0856c435032b7dadfeb54b5282079d39b
+EBUILD node_exporter-1.2.2.ebuild 33003 BLAKE2B 443e5dab44c7b1a13fafc1f45d0ac78452c6fd84af143aef17deab1237d5e20b540e159e9bd5db22f7510e64838d1cfe2ca5709e0ecd62d9aa1f81765befa0e7 SHA512 2f1580ca8c42c5c3a685cc4a911c2d8f74cc7c527a49c2c14cb4051417ee9408f51c422eb6b5f1798c6fad3cefed2746912b80f5fbbee3de71b4fea41448ffda
 MISC metadata.xml 445 BLAKE2B 65ad954909f6cf7f8fb29c952bd191e8be48f734ab691ed5b49cc0c4136bb933bae3bbfb151b7d3bd83034472b49d2365d89c61191da90c9a1db11b7828a3439 SHA512 cef702cbf0fc117db0b8c8329835baad9e6465cb2dfb06d5f55b04577b12d3ee5d1d75003a9dbc262c2c1c84093b2124b23f7bb7c0be1ad88c06853a589ed075
diff --git a/app-metrics/node_exporter/node_exporter-1.1.2-r1.ebuild b/app-metrics/node_exporter/node_exporter-1.1.2-r1.ebuild
index d3c63f4c9580..03d52db8ef3e 100644
--- a/app-metrics/node_exporter/node_exporter-1.1.2-r1.ebuild
+++ b/app-metrics/node_exporter/node_exporter-1.1.2-r1.ebuild
@@ -578,7 +578,7 @@ SRC_URI="https://github.com/prometheus/node_exporter/archive/${MY_PV}.tar.gz ->
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~x86"
 
 CDEPEND="acct-group/node_exporter
 	acct-user/node_exporter"
diff --git a/app-metrics/node_exporter/node_exporter-1.2.0.ebuild b/app-metrics/node_exporter/node_exporter-1.2.0.ebuild
index 11d5bdc01ad1..0374d48a00cd 100644
--- a/app-metrics/node_exporter/node_exporter-1.2.0.ebuild
+++ b/app-metrics/node_exporter/node_exporter-1.2.0.ebuild
@@ -588,7 +588,7 @@ SRC_URI="https://github.com/prometheus/node_exporter/archive/${MY_PV}.tar.gz ->
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 CDEPEND="acct-group/node_exporter
 	acct-user/node_exporter"
diff --git a/app-metrics/node_exporter/node_exporter-1.2.2.ebuild b/app-metrics/node_exporter/node_exporter-1.2.2.ebuild
index 3b77e736e002..b1e530643852 100644
--- a/app-metrics/node_exporter/node_exporter-1.2.2.ebuild
+++ b/app-metrics/node_exporter/node_exporter-1.2.2.ebuild
@@ -588,7 +588,7 @@ SRC_URI="https://github.com/prometheus/node_exporter/archive/${MY_PV}.tar.gz ->
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 CDEPEND="acct-group/node_exporter
 	acct-user/node_exporter"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 5b53f6d086dc..aa75822b9c95 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/inputlircd/Manifest b/app-misc/inputlircd/Manifest
index 7112649d9158..0450889b4d0e 100644
--- a/app-misc/inputlircd/Manifest
+++ b/app-misc/inputlircd/Manifest
@@ -3,5 +3,5 @@ AUX inputlircd.conf 75 BLAKE2B 5de0021457cc642073bd3491344ed404c59d8cedd80c6a451
 AUX inputlircd.init 259 BLAKE2B 19ed54f2a354fc9efd4a6f48944c5546901d8d23c7e2a45d1272428c874d0d7daad69b93e3206b271e75f98f1fcf1d57d5a5a44bcd39969d44bafd5c88bc575f SHA512 0d6299a2b1ffd2b6161013888e06a59b531769ce2723b00c1ba55e9420ed4a6055023b1d892e372d1d9c438eabe446a6341adfb2dd9b19371727d1c92b5c27b1
 AUX inputlircd.init.2 297 BLAKE2B bf8676b94101dcc9e4ed5480ac5a0f0c3654188892d9049af0fd72359b5da4e160c9e34e371d68278264ca810af0dca4174e97c09e30e4602913a78e3bba5915 SHA512 50f50859ed048b561416e7c21cf083ddda3114331ea14abef470fb04c0108f925f47a75be2b4396fd98b7d140d988288852f2c0ce9fce8218ce2a31e90c48626
 DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083e93bfbd8cdd3233389301032678160bb622cf4b92837470151494ec87bcbde5462c557e5cef9fa601ad6da71607dbb78 SHA512 6f7dd15875eeccac1f666af82dabba243707c9b3c3b2e39070032fb3d4a40c1c0ae6fbca2e7be02ce7061d289d9ad07b9ee38c5f5b0f33d5a6c413df5bfd6365
-EBUILD inputlircd-0.0.1_pre15-r2.ebuild 911 BLAKE2B 2516e6f232f9da1ea9884358dd3f40f3651de98a67f25ccb6bff655b39dd29c6ce7b478c0308421b41b2e70279b8cdc0767920748026a9fcab913023dd93d485 SHA512 a1a4a1b71811d7180093d90e7c3fb53adba81e6af9b3c0daae4aa48a8cc8f23a2315532d37528e7af0c029c0417fd79458c7f2c69a2f978d76236d4a27745ff4
+EBUILD inputlircd-0.0.1_pre15-r2.ebuild 918 BLAKE2B 8a577f53bf67e0f1ff5a8087ed7fb63d49b6743809d40e5be4ce905f528f964642020c298e5540d834f725928315eec3ee8e9022f20823795f20d656ebdc3084 SHA512 7de73915bc37f7b17b598193d101b1524624668d818e970a6f7af7b0f5d9e5da2c85ec832ce67b065cb9f56d3af8724acf9bd34ab471c6e9404dba94775c2d24
 MISC metadata.xml 258 BLAKE2B 488b1dca6ab52f028034ed9f03d7b4bcd929e80df6f5b4532514431e88e74baa3126653a549f7d543150fdfd0ed486c728945bb51cd93ee7683e364220bbb1b8 SHA512 c0b896a13e974ab97943c68645785443061cb0495466e9bffbb01c8683cf56fc8ac4ae476aba6d287b1b902112cd36fe267ccf3b305b1c991704640f50f8fd38
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
index 6f80356b5617..832ae5d90026 100644
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
+++ b/app-misc/inputlircd/inputlircd-0.0.1_pre15-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
@@ -11,7 +11,7 @@ SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv x86"
 
 src_prepare() {
 	local ver="$(best_version sys-kernel/linux-headers)"
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index d8787dce1325..71ef34863e80 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -8,5 +8,5 @@ AUX jq-1.7_pre20201109-no-git-bdep.patch 540 BLAKE2B 745496f01bbc19ede3f5c17be4a
 DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480
 DIST jq-1.7_pre20201109.tar.gz 1181867 BLAKE2B 9db187ab927b635c43fbc6191aeffa00451b12253ae023bbabe6fba5fdf8fb393f8450ee2011ef58cb93e2f27994d454fac967984a721439aaac93259c02f7f1 SHA512 f2997d70edb36d0a23b71a7d933a763cedd7c74ffa3129c2a6cb7189aaff1c5095cdc51062b7cd119324ec2c83ebae6ff0b7da3941315303b7a31146b9eb285a
 EBUILD jq-1.6-r3.ebuild 2000 BLAKE2B e3d647a6c444db493d291f586d2accd96c34df232dcffc6137e66bbd7cbf7d164dac43d5d783e2666e6ff1135f9583dd2b1a48826808058295abf7c1ff2a311c SHA512 746bbeff6451adbd25916d5c0aad6630a5c2728841731d918b29bf7e4ea679b36b0b61489c8e5aa5bdd8e0a093b117fe04788a4046bbfc39039cb5c510e7cd69
-EBUILD jq-1.7_pre20201109.ebuild 2365 BLAKE2B a61d88a4b7fc5dabc8d74fd4b7839f5e02ea8fd157ea190a32ea1c93576b7feb079fadd96724ad21515de2e4e52d7ec5a846cb1aaf6529c98fcdff817399f352 SHA512 661b168574cb384fe1702f5bf0a7b15b5123d64e31623e8b6e2311dd529f8a48b6b6418f957cab035cba282e62825f009958878cc69c9f3cd90dc488aef315bc
+EBUILD jq-1.7_pre20201109.ebuild 2372 BLAKE2B c965fc39eed0d793b082116bb239e0dc1e940596d8ccbf193fe337bfdbe2d9fce24488517e7351aa33250edfeebb2a75e96a9873d3800815c954b27db3565d73 SHA512 58cd179ae5b474781611f9602956518c355932c1b158721ce5926ec4c98a1d2259c7802f9bddf496cb3749fd956c00d961c4a803635c19cec94f7ecb81b03082
 MISC metadata.xml 609 BLAKE2B 0ca0b4be60514d2a6ca287fab34e3e16574600fbaea6d924965242b27f25527f3ee3ad5b2c5ffbdb63662fba16511a9d70589990d4f4a506ecf7aba3e6541fbb SHA512 ca934d537070ea1ff8c7b6285870ee3aac60552b6b99e9fd7d361c157bb371926f532388d43e10570a27dbad008c5068ff4c9a17a05ffb14e7f95c84eeef19d0
diff --git a/app-misc/jq/jq-1.7_pre20201109.ebuild b/app-misc/jq/jq-1.7_pre20201109.ebuild
index 7d92e06d34ad..62a69454eb2a 100644
--- a/app-misc/jq/jq-1.7_pre20201109.ebuild
+++ b/app-misc/jq/jq-1.7_pre20201109.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT_HASH}"
 
 LICENSE="MIT CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
 IUSE="+oniguruma static-libs test"
 
 ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.1.3' # Keep this in sync with bundled modules/oniguruma/
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index f9988ffb5a28..609abf55ab57 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 6657f2af0622..2341734c06af 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -2,7 +2,8 @@ AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27
 AUX scribus-1.5.5-findhyphen-1.patch 1118 BLAKE2B c542a292601b43f12ee2b682225064bd650f2017466aed4aa3a256610dfe1aaa662857cf60682b3c8f1a0dd1b22b34b8c058967bc4879412e8599a641e254b18 SHA512 d536cce91eb161e2d8ead619f932111bcfe661bae9e0706567a0a789ef80eef28e6f81c357bd7bdaaeb97f8c6a872deb7147fea7fef84e279b7e8e812a821cef
 AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5fe1e5b5d12da1c92b14397e50d3a9ae40b20c2638e9e0eada080f3b9df30ddba3190f25bbde4102a887101d1b609 SHA512 fb6d23f6e5a53246a8f1dd168195c8f101d8ff3e2f05b7af09e1a58a4c3ed3ab05b07803cf5e7877da1b9e9c17dd0677580dbdeeeacd83063ab0bf4bbf60ae06
 AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9
+AUX scribus-1.5.8-findhyphen-1.patch 1264 BLAKE2B e35c561c275ef945aca9a7cc34e9ac9732450d7a2d15f5766c2a637f296d026fbc1d777266634b98cc5e8ad09364019f8eeeffd63f634e0836144cb6dacd3f5d SHA512 c0db1a12698b2e9770049b20c73b33e3cd5f56d8a69486a42955949f37216c0347df32e6acbdd7567075f98450dd59e9ef2f6a42f82ce38699fa704d77fbc60d
 DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01
 EBUILD scribus-1.5.7.ebuild 3981 BLAKE2B a1e9e67d0c942109d2270ffd4bda424176f695ed6ccc01b3b64aca1bf68ad5f08faa1f2ca2b6a079dd61263af860f8dac63678e8831705804e83a6fa685dc55d SHA512 97e876421064b7e3669e30af46f335a0e6755e196de579e0b062441819720c3edc7ec77039ce83a951c6de34689e1168be3ab66f53415a18732a801278b14bfa
-EBUILD scribus-9999.ebuild 3944 BLAKE2B 8153081fc91237f982398981ff2e23944d74f70ed0da082c322054458526179fe2b10600403eff6ffe1e14eaef3a27ed6795cc728766ba9ba6380a3bfa6d646a SHA512 a27f91f0a3a25857cc74d568faefdee64b1cd5cafaeac00b681cc87fda6e84a5fc378296a52a5175a45e63dc8c36db7f1ad8d0758bc0ef294f2c0ce254663d47
+EBUILD scribus-9999.ebuild 3944 BLAKE2B cfbe26f95ec4dbf0b1044e61882ce00fbdda133a113bc76c87a30814e64044cdd16b1128da4f1259ca5855440f748a6a849387210982f2442e9d323c9823fa6a SHA512 f1a0bc8c0e395ee24b3d9ce7404c4106f12289cbd1506c0c1f8153f7d3a07154770a9f5cb4f20bb1a5752e83367e5a950e9ec363142d8725b4432f1561aea8c8
 MISC metadata.xml 882 BLAKE2B 87f52990c93874472eeb73cbf7b46b4c1fa41d25e17d179f5cb9f5067d21aea18ac4ac323e5878c2bf49d075f67230353860cd6b45b9458435ca7b0fae9854b0 SHA512 403eb2874bccc2929284f1e44042e1fa84c2ad9d6abcb1b9600f327060e1b476366ab40cf6f8876aa18bf8195c21f82e2deaecfa7e1868b2fcfeba42c72e9d58
diff --git a/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch b/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch
new file mode 100644
index 000000000000..39a11b0ee4a9
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch
@@ -0,0 +1,54 @@
+diff --git a/scribus/CMakeLists.txt b/scribus/CMakeLists.txt
+index aec69d3..9451404 100644
+--- a/scribus/CMakeLists.txt
++++ b/scribus/CMakeLists.txt
+@@ -587,7 +587,9 @@ set(SCRIBUS_SOURCES
+ 	${SCRIBUS_GMAGICK_SRC}
+ )
+ 
+-if(NOT HAVE_HYPHEN)
++if(HAVE_HYPHEN)
++	include_directories(${HYPHEN_INCLUDE_DIR})
++else()
+ 	include_directories(third_party/hyphen)
+ 	set(SCRIBUS_SOURCES
+ 	${SCRIBUS_SOURCES}
+@@ -678,12 +680,6 @@ if(HAVE_PODOFO)
+ 
+ endif()
+ 
+-if(HAVE_HYPHEN)
+-	target_link_libraries(${EXE_NAME} PRIVATE
+-	${HYPHEN_LIBRARY}
+-	)
+-endif()
+-
+ 
+ if(GESTURE_FRAME_PREVIEW)
+ 	 message(STATUS "Enable gesture frame preview [experimental]")
+@@ -743,6 +739,12 @@ if(WANT_PCH)
+ 	target_precompile_headers(${EXE_NAME} PRIVATE scribus_pch.h)
+ endif()
+ 
++if(HAVE_HYPHEN)
++	target_link_libraries(${EXE_NAME} PRIVATE
++	${HYPHEN_LIBRARY}
++	)
++endif()
++
+ if(WIN32)
+ 	set_target_properties(${EXE_NAME}
+ 		PROPERTIES
+diff --git a/scribus/hyphenator.h b/scribus/hyphenator.h
+index 7fa4abd..2863c70 100644
+--- a/scribus/hyphenator.h
++++ b/scribus/hyphenator.h
+@@ -13,7 +13,7 @@ for which a new license (GPL+exception) is in place.
+ #include <QSet>
+ 
+ #include "scribusapi.h"
+-#include "third_party/hyphen/hyphen.h"
++#include <hyphen.h>
+ 
+ class ScribusDoc;
+ class ScribusMainWindow;
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index d3fee462bbaa..9ee1a1dcf524 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -76,7 +76,7 @@ PATCHES=(
 	# non(?)-upstreamable
 	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
 	"${FILESDIR}"/${PN}-1.5.6-docdir.patch
-	"${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch
+	"${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch
 	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
 )
 
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 4a2cb1c6815a..1b743911b63a 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index 70d4401682bc..86d8a406bd10 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -1,5 +1,5 @@
 AUX libimobiledevice-1.3.0-missing_libflags.patch 796 BLAKE2B 2887ea67b4eaaca48d4fb63e8a7e46d7f66a8a255256a702b186426dc522ad4fc2727810cec9712b36ab78fd12dd4995110d945b0ff4f21ade0cc38a6211fc64 SHA512 25a0257260d85bb0722185251a430a5cc75fb7fd3b3eeeac8e2378fde0a223836c0d827473208663ee2cad9dbe8eabd7f15eb542509e3a2dba30067f21d52dd4
 AUX libimobiledevice-1.3.0-slibtool.patch 5477 BLAKE2B 963072a0e577c52a2434d011bf684c5955a473154ad9726e77ba6e818071c9955bdc72e510721b6161031e96db49069e84948dff8458fc510526b9f21f8d78e1 SHA512 5064091b7bf858f78df9aec94f39fad98ac4969aa5c8889891840d07b8a404a0ba46949a22688805610cfcf287695c08dc11912494d7fbb9de75e6867d8a1b4f
 DIST libimobiledevice-1.3.0.tar.bz2 733949 BLAKE2B 40717280bb3424c7431aa93d06d10de817e6761acf2b19948d80b691cfb4dd4ef0e31b81c8458eed29a43c8c8aa256da7baa3648fb785cfbdb7316daaba119a3 SHA512 7b22040552a6561729c79c0846f571b0e608abb7c297567d2ecfdd1718ce86df08a5e34ba51f209bdee96a1917da15e7ba3aaef1d289a951d1d3470b1f89e6a8
-EBUILD libimobiledevice-1.3.0-r1.ebuild 2543 BLAKE2B 6982910e38989a301aca7ed2127cfb6737decd86d3e478b24bad449481e1c782e11fc542570afe224d59edfed7e3aabfdd20e203514e71b2a15d1c7c0aee25fe SHA512 143206663cf290fff468978ab91a2494e03269124569b557b331a880905f974e41e0dc3315f585f7264b2d82a77420f05028474cd788ec9c8b5aa3497872abcb
+EBUILD libimobiledevice-1.3.0-r1.ebuild 2550 BLAKE2B b6a463f86abed493bb81dbb8bdc6e33e472d22769d962e23e91db656fdb54eebedae14854028f07d0c6a250265f8e9ff16f2653db66a1a37e651657d19e304eb SHA512 c81a823e7a34c6369407eb0a6d8b9b164d8c1983dc916a858db0899b6bcd7e8c4a8a7269db1a5d674131ce38d39704a0c8416894adc69317ae26836b03362697
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
index 2ab8f78335dd..f808077d4e79 100644
--- a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
+++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/libimobiledevice/libimobiledevice/releases/download/
 # While COPYING* doesn't mention 'or any later version', all the headers do, hence use +
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/1.0-6" # based on SONAME of libimobiledevice-1.0.so
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 IUSE="doc gnutls python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index 4663a569447b..3a264f5db431 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1,5 +1,5 @@
 AUX libplist-2.2.0-fmin.patch 1102 BLAKE2B ce8c76a369ae1ddc54016bbc941efeafa96d093bce14c0cdaf1da17fe7d201673bd0565669dc12209ee1230b66f56750ba64e8431d72f0d118ea5880b0764a0e SHA512 683203116ffdae053c4da35704aaf2b707b804a19316286f890df4bb6a9ae8dd6b6a4ee0f6db6164f124887e8a602db709d985496b0734899826f04e19846d78
 AUX libplist-2.2.0-pkgconfig-lib.patch 305 BLAKE2B 67da57f080454e8b01408872ab76b66703e0339052f64c3738964b02e6a389b03aac65d7d6ca30bfd78b1366c4a7fec843b039b32269db0a4e7e95850638e34d SHA512 1c2c628f178ed64a8f7e1dd84657d7d365e980a2b2d8af9dd6bbe55d245997cf51974d9ed451eafb715299097029886f7ec0a863f199a72bf15f50281c9bfab7
 DIST libplist-2.2.0.tar.bz2 126808 BLAKE2B 7c3ec04aaa52eca33ae28851a6524c9ea531df939feef0f10827c8c2de78a6ccd856ea4d8a568b146ccb5de96f70dd5accec34aa2fdd61f9e6eba01256c0b518 SHA512 641bfd3ec0565f104d3a2d1ebdf6137bc9252b67ce90550e24ab0deeee4e820e119ba4f8f1ba04a0358d995d196fa61e35f2f0ee8ba37fc0270752ae842ab1f5
-EBUILD libplist-2.2.0-r3.ebuild 2651 BLAKE2B 2d4661f171472705506da9fb0d30133b1857d57d4e7d818bfbe17846c649846af98f0a6588a89d80f2d8ec965e84ca621d487224f3b829f39a7a57c20d5cf3d4 SHA512 09e663b7cc6033c9a7b13d922dc850ecfcc5d3c78da8111daddb6fad14dfe215262390822d411c63e576ee1c3b1982980e6c91de2d9fe62adc857dc4dd7a9872
+EBUILD libplist-2.2.0-r3.ebuild 2656 BLAKE2B 85308808943ba24d072d5182f6fd0be7ed7b23777c36becaf1db387e93480998a9827a068a55a84b9e9e53956b4b35e8fdcd08dd62f8e8c29045633a40622357 SHA512 4fac0bed7d9073895c33b71d6d3c18943edecabd9ce22d0bb0896c3f52870674dc1ce8ef8934f4a7e40f0a1511f1cd7b0fed9170dcd4109334256e99b7550257
 MISC metadata.xml 329 BLAKE2B accbb4a0f223b37358e54635e61f1488abf2148d89e166e4a68e8ddfc90e0d4c3438c52d75c24aeced91c2246e537cb0b1d64e6e9c63425c6392148cbc3bcd58 SHA512 69d57118df488610f977fe8722d463bb858e8329855cf439ae3c1c7c52260dec96505535e9424041d71d000951db199312e382d24f66296c9c408113ead5219d
diff --git a/app-pda/libplist/libplist-2.2.0-r3.ebuild b/app-pda/libplist/libplist-2.2.0-r3.ebuild
index 0973821ae4e3..d8b219437962 100644
--- a/app-pda/libplist/libplist-2.2.0-r3.ebuild
+++ b/app-pda/libplist/libplist-2.2.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit autotools python-r1 toolchain-funcs
 
 DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
@@ -12,7 +12,7 @@ SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/2.0-3"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
 IUSE="python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-pda/libusbmuxd/Manifest b/app-pda/libusbmuxd/Manifest
index 80f293f6b344..34cf3110e838 100644
--- a/app-pda/libusbmuxd/Manifest
+++ b/app-pda/libusbmuxd/Manifest
@@ -1,3 +1,3 @@
 DIST libusbmuxd-2.0.2.tar.bz2 43162 BLAKE2B e3559583e691a5f87a61ffece0ebf944d4aed48d37f83a504ee4d7a245e05511c6620c4a82d29bea2a10686910a14f7a730afec0f2cfc9435f748499e35df433 SHA512 3086ce1a05026afeabcdb5364ec30f4a6a5c84fe6f09e15ef6ff438bd3dfdb262ebdff94e5e0d0828b6d946bc8bdf01760271ba0d1fbf98d743dce149764a519
-EBUILD libusbmuxd-2.0.2-r1.ebuild 839 BLAKE2B c4d4bcea555332a7eb5c75204e7c30c22b6144fa8fa078fd2d7cd6789dde8e3cb595c56330aad82a241ecc606f2867a5dcddcd7174d85f334c73ab10fea13b9c SHA512 2c14a6036ca23f45ce2734e9938b5ff2623bf04bf75b1876560f1117a9a6fbf0af07f194b8f08b1723e566235839a2a4105b8841ca174aa01a68b24d5d5b36bc
+EBUILD libusbmuxd-2.0.2-r1.ebuild 846 BLAKE2B 56cde05b94595aa7aa7e5438c1001a9940ee176769bb97caeec730a1a3c6618607ea4c247c6828194196c492170cb0fcddb3a4b7204c0ce4925a11e2a3bdcd3a SHA512 0c63b227f16b1bb0830a2da759d047f82a8f7048933b8210e3f0be7b891abfd3446baba11f3540e4c3cb33e3579f29551ce963251fea9edeed7f90aaf87d0548
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild b/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild
index 66992dce2f80..cc364a448d82 100644
--- a/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild
+++ b/app-pda/libusbmuxd/libusbmuxd-2.0.2-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=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.libimobiledevice.org/"
 SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
 LICENSE="GPL-2+ LGPL-2.1+" # tools/*.c is GPL-2+, rest is LGPL-2.1+
 SLOT="0/2.0-6" # based on SONAME of libusbmuxd-2.0.so
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index ae1714bf1f14..ef3545f1c6d6 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/deltup/Manifest b/app-portage/deltup/Manifest
deleted file mode 100644
index 39caa655516f..000000000000
--- a/app-portage/deltup/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX deltup-0.4.6-cxx.patch 659 BLAKE2B 1005ff5439b96eda1f8106dc3620a00e343fd4df6f1736b9ca1b5fe6f06f8bafcc332852f7e51565179fccf8994515ce8dff19c6eb89b8263253e71132cdfdd5 SHA512 fae1d6c90a7458b0c4a7795a16ac794a506e2bd002be0be9e0772ef7a9f5174aeef35422d6ee1cca69e4dccc49b36dc732a3408d92d0c960e229935318d0033c
-AUX deltup-0.4.6-ldflags.patch 241 BLAKE2B 43091ce7b06d5b554183248b3e26732a00c0a7eccaaeaa7aa5dcdd4b2d11ca4f6cde707941545b9ecc13367152efd85e086f5ee94d8816ac967a79e5d29e01ad SHA512 e8b705bd581928b15523e6692648fb89f2bb0c15c565a7dee4d45292fae8aad88e9c6e83b29672825943c2bc15d8b151e57f603dd1c6577a62203249f1e96316
-DIST deltup-0.4.6.tar.gz 14869 BLAKE2B d0332eca70da268f0f85718bf08f8b19da7e7e8a1868d6bb4b2edd386d498f61342538234defebbc0430cc176da13b57efc11ecd62f300eef960b62e738d3147 SHA512 196be319f31860d89654c23241edde503d4194064617970d87cb0d0a66544959bc666dd34a3bf1a42e69ddb5927420728a1e208b7bb848e935e99f3a090ffa7a
-EBUILD deltup-0.4.6-r1.ebuild 837 BLAKE2B a44c8ae42bd704a52820864262f9ace04492143dc4d063a517b370689c81b96563eda7dc8b2a14a8758d535c7dcdac7218267991379baf4db35e144a20e120c0 SHA512 0da562677bd95e7ea5ce6a8f1ff12a7a6e3d31bda1e08c2ac2653ed9dad72b2a77603915b2d791195eed4e6bcac7354edd6129a2a00897f0c7cf8d32feef50cc
-MISC metadata.xml 559 BLAKE2B f519d2d6a797e16aba8fd7aabe17554c5b4a2ba03ebe6c7c5bba44f5eaaf0c5bb4b5bb72de383147a3ced0f6f0a7034a357488e37506797a920fcb3455a97026 SHA512 e3f2234ad04c520aa8aa260b50177c3027acea5ef9e71861dcc9328e0d95e2d3d6df9d29705ce810b4ed6236412a1178512f7bb3bebbedad706c62eba98e98d0
diff --git a/app-portage/deltup/deltup-0.4.6-r1.ebuild b/app-portage/deltup/deltup-0.4.6-r1.ebuild
deleted file mode 100644
index 81b8f8efe465..000000000000
--- a/app-portage/deltup/deltup-0.4.6-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Delta-Update - patch system for updating source-archives."
-HOMEPAGE="http://deltup.sourceforge.net"
-SRC_URI="https://github.com/jjwhitney/Deltup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-MY_PN="Deltup"
-S="${WORKDIR}/${MY_PN}-${PV}/src"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="
-	sys-libs/zlib
-	app-arch/bzip2
-	dev-libs/openssl:0=
-"
-RDEPEND="${DEPEND}
-	|| ( dev-util/bdelta =dev-util/xdelta-1* )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.6-ldflags.patch
-	"${FILESDIR}"/${PN}-0.4.6-cxx.patch
-)
-
-src_compile() {
-	emake CXX=$(tc-getCXX)
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-	dodoc "${S}"/../{README,ChangeLog}
-	doman "${S}"/../deltup.1
-}
diff --git a/app-portage/deltup/files/deltup-0.4.6-cxx.patch b/app-portage/deltup/files/deltup-0.4.6-cxx.patch
deleted file mode 100644
index 6a07dc1ee0a1..000000000000
--- a/app-portage/deltup/files/deltup-0.4.6-cxx.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 6a3aa95..a591a6f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -7,3 +7,3 @@ CC = g++
- objfiles=bpatch.o archfunc.o file.o system.o tmpstore.o deltup.o 
--libs=-lstdc++ -lz -lbz2 -lcrypto #-lssl
-+libs=-lz -lbz2 -lcrypto #-lssl
- 
-@@ -12,3 +12,3 @@ libs=-lstdc++ -lz -lbz2 -lcrypto #-lssl
- %.o : %.cpp
--	${CC} -c $< -o $@ ${CXXFLAGS} #-g #-Wall -pedantic
-+	${CXX} -c $< -o $@ ${CXXFLAGS} #-g #-Wall -pedantic
- 
-@@ -17,6 +17,6 @@ all: deltup
- depend:
--	gcc -MM *.cpp > .depend
-+	${CXX} -MM *.cpp > .depend
- 	
- deltup: $(objfiles)
--	${CC} $(objfiles) ${LDFLAGS} -o deltup $(libs)
-+	${CXX} $(objfiles) ${LDFLAGS} -o deltup $(libs)
- 
diff --git a/app-portage/deltup/files/deltup-0.4.6-ldflags.patch b/app-portage/deltup/files/deltup-0.4.6-ldflags.patch
deleted file mode 100644
index 0d06255abcd2..000000000000
--- a/app-portage/deltup/files/deltup-0.4.6-ldflags.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 6a3aa95..6e7c5cf 100644
---- a/Makefile
-+++ b/Makefile
-@@ -20,3 +20,3 @@ depend:
- deltup: $(objfiles)
--	${CC} $(objfiles) ${CXXFLAGS} -o deltup $(libs)
-+	${CC} $(objfiles) ${LDFLAGS} -o deltup $(libs)
- 
diff --git a/app-portage/deltup/metadata.xml b/app-portage/deltup/metadata.xml
deleted file mode 100644
index a777a3761381..000000000000
--- a/app-portage/deltup/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>Ameretat.Reith@gmail.com</email>
-    <name>Ameretat 'reith' Reith</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jjwhitney/Deltup</remote-id>
-    <remote-id type="sourceforge">deltup</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-portage/getdelta/Manifest b/app-portage/getdelta/Manifest
deleted file mode 100644
index eaf18848ec05..000000000000
--- a/app-portage/getdelta/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX getdelta-0.7.9.patch 9393 BLAKE2B 1b105cccd24dc039ea5c14f119b67fb9ea570172d1e0808af905951ef23275ea1843a60cda1156cfa653904ec42ae5c869faaf4133a5c614162956dc064691c8 SHA512 c9c363c8e36245a8cd409d3a43c0d9110c409311f6972893d993f16f2911496c33c50c98e8dd9138b52bb7d7dc5ffb56b0611c28e9682ea5ac189cb27c5755dc
-DIST getdelta-0.7.8.tar.bz2 10335 BLAKE2B ab2093a805649904405d23d7ec7afb2f338e87864c91f8aeb13efa2547f5493080cc1249a28a73da8e17d6b5aaff6fc00f217fe5b8df51db4fbea2420a88a523 SHA512 66374ce1a0ec5492d11478ddcaeb67b497a44357605f3cd1b9176796ca9f69d8c6865f9db188a6d7722c4ab372a5a317dfa6fafe97d9f08f76f332469f1ee2b2
-EBUILD getdelta-0.7.9-r2.ebuild 1380 BLAKE2B 5a2ebac4ba4c28e1d7ae1b6ead82367cf57750368a4d30ba010db0d18c7703d76ebb574d7ad03c5ef1dc7502d157426423a8e5a69d796bf9537a25a312de9f0b SHA512 1ff9fa5062763fc73b6e893251356fc7c12e114e5258411b9acb9817c4be3417211f032faa7ac5b7d36f749bf4b1d0bc43341b9e840f49a6ab4ab67cbe0a9995
-MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/app-portage/getdelta/files/getdelta-0.7.9.patch b/app-portage/getdelta/files/getdelta-0.7.9.patch
deleted file mode 100644
index 9ab117e59c95..000000000000
--- a/app-portage/getdelta/files/getdelta-0.7.9.patch
+++ /dev/null
@@ -1,252 +0,0 @@
---- getdelta.sh	2007-07-13 16:30:26.000000000 +0000
-+++ getdelta.sh	2010-08-27 17:23:31.692000002 +0000
-@@ -25,6 +25,9 @@
- VERSION="0.7"
- 
- # Changelog
-+# version 0.7.9   2008/10/08
-+#		- add second parameter for destination name (EAPI=2)
-+#		- quote more carefully
- # version 0.7.8   2007/07/13
- #		- added option -O to call of emerge when finding mirrors
- #		- replaced some calls of coreutils with bash-internals
-@@ -326,13 +329,13 @@
- 
- remove() {
- 	output "${GREEN}You have chosen to remove ${CYAN}$1\n"
--	pushd ${DISTDIR} >/dev/null 2>&1
-+	pushd -- "${DISTDIR}" >/dev/null 2>&1
- 	removeme=true
- 	for n in $(grep -v "^#" ${DO_NOT_REMOVE})
- 	do
-        		grep -q $n <<< "$1"  && removeme=false && output "${CYAN}${1}${RED} is not deleted, since it matches ${n} in ${DO_NOT_REMOVE}"
- 	done
--	$removeme && rm -f $1
-+	$removeme && rm -f -- "$1"
- 	popd >/dev/null 2>&1
- }
- 
-@@ -349,7 +352,7 @@
- 			-e "s/src4/srcDDD/g" \
- 			-e "s/src5/srcEEE/g" \
- 			-e "s/src6/srcFFF/g" \
--			-e "s/src7/srcGGG/g" <<< $MASK_FILENAME)
-+			-e "s/src7/srcGGG/g" <<< "$MASK_FILENAME")
- 	fi
- 	
- 	# ignore PR for src-files of firefox
-@@ -375,7 +378,7 @@
- 		   -e "s/rc//g" \
- 		   -e "s/[\._-]//g" \
- 		   -e "s/\+//g" \
--		   -e "s/ //g" <<< $MASK_FILENAME)
-+		   -e "s/ //g" <<< "$MASK_FILENAME")
- }
- 
- # create or update a config-file
-@@ -384,6 +387,7 @@
- add_to_configfile LOCAL_MIRROR "" "set this to one or more (space separated) URI ending with '/' if you want to check one or more local mirror(s) first\n# most people just leave it empty."
- add_to_configfile DELTUP_SERVER "http://linux01.gwdg.de/~nlissne/deltup.php" "deltup-server to use"
- add_to_configfile FETCH "/usr/bin/wget -t 1 --passive-ftp" "command to use for downloading"
-+add_to_configfile FETCHNAME "\$FETCH -O" "command to use for downloading; first parameter is the filename, second the url"
- add_to_configfile QUEUERETRY 15 "number of seconds to wait before a queued request is retried"
- add_to_configfile MAXIMUM_ACCEPTABLE_QUEUEPOS "15" "the maximum queuepos you would accept (if higher download full archive instead)"
- add_to_configfile QUEUETIMEOUT 900 "when a dtu-request is queued - how long should we wait max. before downloading the original archive instead (in seconds)"
-@@ -424,14 +428,14 @@
- add_to_donotremove "^rp-pppoe"
- 
- 
--if [ -z $1 ]
-+if [ -z "$1" ]
- then
- 	COLOR=true
- 	echo -e "${YELLOW}getdelta.sh version ${VERSION}"
- 	echo "This script has to be called like this:"
- 	echo -e "${CYAN}$0 <URI>"
- 	echo -e "\n${YELLOW}To use it, you should just put the following line into your /etc/make.conf"
--	echo -e "${GREEN}FETCHCOMMAND=\"$0 \\\${URI}\""
-+	echo -e "${GREEN}FETCHCOMMAND=\"$0 \\\"\\\${URI}\\\" \\\"\\\${FILE}\\\"\""
- 	echo -e "\n${YELLOW}There is a config-file ${CYAN}${GETDELTA_CONFIGFILE}${YELLOW} with some variables to control the behaviour of this script."
- 	echo -e "Edit it to your needs.${NORMAL}"
- 	exit 1
-@@ -464,10 +468,12 @@
- 	output "use getdelta.sh for your FETCHCOMMAND, only." &&
- 	sleep 5 && exit 1
- 
--pushd $DISTDIR >/dev/null 2>/dev/null
-+pushd -- "$DISTDIR" >/dev/null 2>/dev/null
- ORIG_URI=$1
- NEW_FILE=$(basename $ORIG_URI)
- 
-+[ -z "${NEW_FILE}" ] && NEW_FILE=${ORIG_URI##*/}
-+
- # repoman downloads metadata.dtd with FETCHCOMMAND
- # this should not be done with getdelta - so just fetch the file and exit
- 
-@@ -475,7 +481,7 @@
- # dtu files.
- if [ "${NEW_FILE}" = "metadata.dtd" ] || [ "$GETDELTA" = "0" ]
- then
--	$FETCH $@
-+	$FETCHNAME "$NEW_FILE" "$ORIG_URI"
- 	exit $?
- fi
- 
-@@ -516,7 +522,7 @@
- #
- output "${GREEN}Searching for a previously downloaded file in ${YELLOW}${DISTDIR}\n"
- 
--first_chars=$(sed 's/[[:digit:]][[:print:]]*$//' <<< $NEW_FILE)
-+first_chars=$(sed 's/[[:digit:]][[:print:]]*$//' <<< "$NEW_FILE")
- length_first_chars=${#first_chars}
- [ $length_first_chars -lt 3 ] && first_chars="${NEW_FILE:0:2}"
- 
-@@ -527,7 +533,7 @@
- let len1=${#mask}
- filelist=""
- 
--for name in $( ls ${first_chars}* 2>/dev/null )
-+for name in $( ls -- "${first_chars}"* 2>/dev/null )
- do
- 	mask2=$(mask_name "${name}")
- 	# add any file, that results in the same mask or differ not more than two letters
-@@ -582,7 +588,7 @@
- 
- 	# find matching part of filename - first: frontmatch
- 	x=0;
--	a=($NEW_FILE $filelist)
-+	a=("$NEW_FILE" $filelist)
- 	match=""
- 	while [ -z "$match" ]
- 	do
-@@ -657,7 +663,7 @@
- 	FILE_IS_CORRUPT=false
- 	if $CHECK_OLD_FILE 
- 	then
--		file_digest=$(grep -h ${best_candidate} ${FILESDIR}/digest-* | sed -n 1p)
-+		file_digest=$(grep -h ${best_candidate} "${FILESDIR}"/digest-* | sed -n 1p)
- 		if [ "$file_digest" ]
- 		then
- 			file_md5=$(cut -d ' ' -f2 <<< "$file_digest") 
-@@ -669,7 +675,7 @@
- 				FILE_IS_CORRUPT=true
- 			fi
- 		else
--			if [ $(rev <<< ${best_candidate} | cut -d. -f2 | rev) = "tar" ]
-+			if [ $(rev <<< "${best_candidate}" | cut -d. -f2 | rev) = "tar" ]
- 			then
- 				output "${YELLOW}Could not find a digest-file for ${CYAN}${best_candidate}${YELLOW}. Testing file integrity with tar.\n"
- 				if ! tar -tf ${best_candidate} >/dev/null
-@@ -698,17 +704,16 @@
- 
- 		# Remember where we are, and go to a new dir there we can work
- 		tmp_dwn_dest="${DISTDIR}/.getdelta-`date +%N`-tmp"
--		mkdir ${tmp_dwn_dest}
-+		mkdir -- "${tmp_dwn_dest}"
- 		# If user abort Ctrl+C (signal 2), remove tmp-dir; enabable trap again and send it again to stop wget
--		trap "rm -r ${tmp_dwn_dest}; trap 2; kill -2 $$" 2
--		pushd ${tmp_dwn_dest} >/dev/null 2>&1
-+		trap 'rm -r -- "${tmp_dwn_dest}"; trap 2; kill -2 '$$ 2
-+		pushd -- "${tmp_dwn_dest}" >/dev/null 2>&1
- 
- 		# thanks to MATSUI Fe2+ Tetsushi for idea and patch
- 		FILESIZE=$(stat -c %s "${DISTDIR}/${best_candidate}")
- 		let TIMELIMIT=${FILESIZE}/${BANDWIDTH}
- 		[[ $TIMELIMIT -lt $QUEUETIMEOUT ]] && QUEUETIMEOUT=$TIMELIMIT
--			
--		if $FETCH "${DELTUP_SERVER}${query}"
-+		if $FETCH "${DELTUP_SERVER}${query}" -O ${best_candidate}-${NEW_FILE}.dtu
- 		then
- 			# thanks to deelkar for this much more elegant solution to the "broken pipe" problem with "head -n1"
- 			GOTFILE=$(ls -c | sed -n 1p) 
-@@ -718,15 +723,15 @@
- 			# may have sento to us.
- 			
- 			# first: the request have been queued
--			if [ "${GOTFILE}" = "deltup-queued" ]
-+#			if [ "${GOTFILE}" = "deltup-queued" ]
-+			if [[ "$(file -bi ${GOTFILE}|cut -d ";" -f1)" != "application/x-bzip2" && "$(cat ${GOTFILE}|cut -d "," -f1)" != "sorry" ]]
- 			then 
- 				let QTMOUT=$(date +%s)+QUEUETIMEOUT
--				while [ -f deltup-queued ]
-+				while [[ "$(file -bi ${GOTFILE}|cut -d ";" -f1)" != "application/x-bzip2" && "$(cat ${GOTFILE}|cut -d "," -f1)" != "sorry" ]]
- 				do
- 					output "${GREEN}destination file: ${CYAN}${NEW_FILE}\n"
--					output "${YELLOW}$(cat deltup-queued)"
--					QUEUEPOS=$(grep "has been queued" deltup-queued | cut -d. -f2 | cut -d")" -f1)
--					rm -f deltup-queued
-+					output "${YELLOW}$(cat ${GOTFILE})"
-+					QUEUEPOS=$(grep "has been queued" ${GOTFILE} | cut -d. -f2 | cut -d")" -f1)
- 					TSTAMP=$(date +%s)
- 					if ((TSTAMP<QTMOUT)) && ((QUEUEPOS<=MAXIMUM_ACCEPTABLE_QUEUEPOS))
- 					then
-@@ -741,7 +746,7 @@
- 							sleep 1
- 						done
- 						echo -n -e "${NORMAL}"
--						$FETCH "${DELTUP_SERVER}${query}"
-+						$FETCH "${DELTUP_SERVER}${query}" -O ${best_candidate}-${NEW_FILE}.dtu
- 						GOTFILE=$(ls -c | sed -n 1p)
- 					else
- 						if ((TSTAMP>=QTMOUT))
-@@ -761,20 +766,20 @@
- 				done
- 			fi
- 			
--			if [ -f ${best_candidate}-${NEW_FILE}.failed ]
-+			if [ "$(cat ${GOTFILE}|cut -d "," -f1)" = "sorry" ]
- 			then
- 				output "\n${RED}The server could not build the dtu-file for ${NEW_FILE}\n" 
--				output "${YELLOW}reason:\n${RED}$(cat ${best_candidate}-${NEW_FILE}.failed)\n" 
--				rm -rf ${best_candidate}-${NEW_FILE}.failed
-+				output "${YELLOW}reason:\n${RED}$(cat ${GOTFILE})\n" 
-+				rm -rf -- "${GOTFILE}"
- 			fi
- 
--			if [ -f ${best_candidate}-${NEW_FILE}.dtu ]
-+			if [ -f "${best_candidate}-${NEW_FILE}.dtu" ]
- 			then
- 				output "${GREEN}Successfully fetched the dtu-file - let's build ${NEW_FILE}...\n" 
--				downloadsize=$(stat -c %s  ${best_candidate}-${NEW_FILE}.dtu)
--				if deltup -p -v -D ${DISTDIR} ${best_candidate}-${NEW_FILE}.dtu 
-+				downloadsize=$(stat -c %s "${best_candidate}-${NEW_FILE}.dtu")
-+				if deltup -p -v -D "${DISTDIR}" "${best_candidate}-${NEW_FILE}.dtu"
- 				then 
--					newsize=$(stat -c %s ${NEW_FILE})
-+					newsize=$(stat -c %s "${NEW_FILE}")
- 					let savedsize=${newsize}-${downloadsize}
- 					let percent=${savedsize}*100/${newsize}
- 					unit="bytes"
-@@ -791,8 +796,8 @@
- 					esac
- 					output "${YELLOW}This dtu-file saved ${UCOLOR}${savedsize} ${unit} (${percent}%)${YELLOW} download size.\n"
- 				fi
--				mv -f ${NEW_FILE} ${DISTDIR} &&
--				${REMOVE_OLD}  && remove "${best_candidate}"
-+				mv -f -- "${NEW_FILE}" "${DISTDIR}" &&
-+				${REMOVE_OLD}  && remove ${best_candidate}
- 			fi
- 
- 		fi # if $FETCH "${DELTUP_SERVER}${query}"
-@@ -812,7 +817,7 @@
- 			read
- 		fi
- 		popd >/dev/null 2>&1
--		rm -rf ${tmp_dwn_dest}
-+		rm -rf -- "${tmp_dwn_dest}"
- 		#stop respond to trap2
- 		trap 2
- 	fi # if ! FILE_IS_CORRUPT
-@@ -824,10 +829,10 @@
- 	
- # Ok, once we are here, we should have got the delta (and used it)
- # or we still have to download the full file
--if ! [ -f ${DISTDIR}/${NEW_FILE} ] 
-+if ! [ -f "${DISTDIR}/${NEW_FILE}" ] 
- then
- 	output "${RED}The dtu could not be fetched,${YELLOW} downloading full file from original URL\n"
--	$FETCH $ORIG_URI
-+	$FETCHNAME "$NEW_FILE" "$ORIG_URI"
- # remember we had a fallback to use correct exitcode for portage
- 	FALLBACK=$?
- fi
diff --git a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
deleted file mode 100644
index db9e237e7914..000000000000
--- a/app-portage/getdelta/getdelta-0.7.9-r2.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
-
-inherit epatch
-
-DESCRIPTION="dynamic deltup client"
-HOMEPAGE="http://linux01.gwdg.de/~nlissne/"
-SRC_URI="http://linux01.gwdg.de/~nlissne/${PN}-0.7.8.tar.bz2"
-SLOT="0"
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~sparc ~x86"
-
-RDEPEND="app-portage/deltup
-	dev-util/bdelta"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
-}
-
-src_install() {
-	# portage has moved make.globals, so we just hotfix it
-	sed -i -e "s:/etc/make.globals:/usr/share/portage/config/make.globals:g" "${WORKDIR}"/getdelta.sh || die "Couldn't fix make.globals path"
-
-	# make.conf has now two locations. This should fix it ( #461726 )
-	sed -i -e "s:source /etc/make.conf:source /etc/make.conf || source /etc/portage/make.conf:" "${WORKDIR}"/getdelta.sh || die "Couldn't fix make.conf path"
-
-	sed -i -e "s:/bin/sh:/bin/bash:" "${WORKDIR}"/getdelta.sh || die
-	dobin "${WORKDIR}"/getdelta.sh
-}
-
-pkg_postinst() {
-	elog "You need to put"
-	elog "FETCHCOMMAND=\"/usr/bin/getdelta.sh \\\${URI}\""
-	elog "into your /etc/make.conf to make use of getdelta"
-
-	# make sure permissions are ok
-	touch "${ROOT}"/var/log/getdelta.log
-	mkdir -p "${ROOT}"/etc/deltup
-	chown -R portage:portage "${ROOT}"/{var/log/getdelta.log,etc/deltup}
-	chmod -R ug+rwX "${ROOT}"/{var/log/getdelta.log,etc/deltup}
-}
diff --git a/app-portage/getdelta/metadata.xml b/app-portage/getdelta/metadata.xml
deleted file mode 100644
index f3de5f693ed8..000000000000
--- a/app-portage/getdelta/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>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index b5756b23eefb..b4123b6483c1 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,4 +1,8 @@
 DIST iwdevtools-0.1.1.tar.gz 16139 BLAKE2B effceb407319d2f8acf44db5642a55c426c73628bef9c2004dd76118dc042cbc1178975e06b14d6950cef417790693af9a98dc77e4873f0175a408ca14f71384 SHA512 b0d3a1145c3ecfc71e7f8b0d8d8e321840869037841e1faa547ad4a385751b4fb13de31b3ed497eeacbdf227a81c4f28ff6fd229b008105489ada7c1a15b88e4
+DIST iwdevtools-0.2.0.tar.gz 23498 BLAKE2B 50c946bb69ae720b27836aebb825d6b1e9545e80dda6d0c939c4be7be30f0f4017c309b2794805fc030e074cc2629bbc328545024d5f89860d05693731ab0b55 SHA512 c31d8646477f1cb8ab784441e2f16155248fc337d2138ce6780810dc7e81cdd6792d610db26e8f7759f89f50732c784bf4938c4a861420412f0056fd9b391a08
+DIST iwdevtools-0.3.1.tar.gz 25597 BLAKE2B 1129ff57f95c27156023752a85b9cb25f66c75d2548a2d7be284b5de9b2b1dee7ed56fa806d175c7751f29a05529f659de7524f967484deacf9138e83899dd9a SHA512 4504d8fb1ff18497fc747482ab1c707b6c581f6b4ac74a494459e4e5e45867e2ee8e39e60b020225509a6c5654e40b31f17d9de0300a2ef76e9d5df248c01847
 EBUILD iwdevtools-0.1.1.ebuild 955 BLAKE2B 62661252672c6a17599ff49885cc27fefb0025444786888941c0900d45e11674884ce940109934b9c0abba2dc5ecd62387c89c148772f28476c9e20717b9cd70 SHA512 ba5cd8d8c7d37529a32d8382986e03d45f295914c9e2545ca7f8358e10ceca276909c41d0a5351085f9316bf389127dd835ba6501e188a9de693fe22983dc93c
-EBUILD iwdevtools-9999.ebuild 934 BLAKE2B 1f360c2597a7bfa117da615743676860d643ae7a4e54b116528a1d4eeefa20829b627af12157c062ed1dca2ea806ad4dd3c9f2ad3597ebd42b769aff224e702f SHA512 5a998419db151b5a0cb46bb23c0374064fc02acf7ce66a84ac64e987a08270842c8786481e890b5356a8652987fcf328978211580d839e051ab62c4db8cc81b2
+EBUILD iwdevtools-0.2.0.ebuild 1139 BLAKE2B 12e5456739590061da4ea8cb55c27390810aa9bf4925fe4a6bcace09f7bb82c7d927fba651a0c0cecde0609bc2b7a918f7783098012011e88c1ab9eb21f08b58 SHA512 444672e125e95ca90a370a28b8d73273a4cf901ebe96cbd52a1905cfdb39010711417989e1c12dcbc1beb48d422d734617d09efe14a793e3b201062c979f1525
+EBUILD iwdevtools-0.3.1.ebuild 1139 BLAKE2B 12e5456739590061da4ea8cb55c27390810aa9bf4925fe4a6bcace09f7bb82c7d927fba651a0c0cecde0609bc2b7a918f7783098012011e88c1ab9eb21f08b58 SHA512 444672e125e95ca90a370a28b8d73273a4cf901ebe96cbd52a1905cfdb39010711417989e1c12dcbc1beb48d422d734617d09efe14a793e3b201062c979f1525
+EBUILD iwdevtools-9999.ebuild 1098 BLAKE2B bfc12186e24ba828d38fc480d1e2e922dabbc45fe193801a42b6873be1247d2bc35ec4e6b68c9bdfda5b5d6336a947bb85a050613710732a14b101add42a8460 SHA512 af89291b91cd2f676f5bea188d99535496857ff45e1522fa00cef34c5f88dfbda92be2c268c1b9fa3663c3980900d7c5bbf180e5429846f6ed8e818c28c399d3
 MISC metadata.xml 353 BLAKE2B f4868e3da19d4f84861e6b6c4dc90bc7e75804eb6d5db4b52992ec3ab9b33e5c4fb44811c8cec56ea5049de90c3ed499795d3b2b402557cf9bd0cb63a4718dcd SHA512 e63ba6b3d19b2ffa64561c986be1fe5094abc27db85c9cc8c71cd2879c1450c44d37370bdce662f0b4295c5d63b8a9dab3088bd645552039ccb76f93b7a0e2d2
diff --git a/app-portage/iwdevtools/iwdevtools-0.2.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.2.0.ebuild
new file mode 100644
index 000000000000..7637b8439253
--- /dev/null
+++ b/app-portage/iwdevtools/iwdevtools-0.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature
+
+DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
+HOMEPAGE="https://github.com/ionenwks/iwdevtools"
+SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-misc/pax-utils
+	app-portage/portage-utils
+	sys-apps/diffutils
+	sys-apps/file
+	sys-apps/portage
+	sys-apps/util-linux"
+
+src_configure() {
+	meson_src_configure -Ddocdir=${PF}
+}
+
+pkg_postinst() {
+	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "To (optionally) integrate with portage, inspect the .bashrc files installed"
+		elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use"
+		elog "the example bashrc directly by creating a symlink:"
+		elog
+		elog "    ln -s ../../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools."
+	fi
+}
diff --git a/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild b/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild
new file mode 100644
index 000000000000..7637b8439253
--- /dev/null
+++ b/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature
+
+DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
+HOMEPAGE="https://github.com/ionenwks/iwdevtools"
+SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-misc/pax-utils
+	app-portage/portage-utils
+	sys-apps/diffutils
+	sys-apps/file
+	sys-apps/portage
+	sys-apps/util-linux"
+
+src_configure() {
+	meson_src_configure -Ddocdir=${PF}
+}
+
+pkg_postinst() {
+	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "To (optionally) integrate with portage, inspect the .bashrc files installed"
+		elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use"
+		elog "the example bashrc directly by creating a symlink:"
+		elog
+		elog "    ln -s ../../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools."
+	fi
+}
diff --git a/app-portage/iwdevtools/iwdevtools-9999.ebuild b/app-portage/iwdevtools/iwdevtools-9999.ebuild
index 567370192dbf..e1cb0aed9c1c 100644
--- a/app-portage/iwdevtools/iwdevtools-9999.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit git-r3 meson
+inherit git-r3 meson optfeature
 
 DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
 HOMEPAGE="https://github.com/ionenwks/iwdevtools"
@@ -26,6 +26,8 @@ src_configure() {
 }
 
 pkg_postinst() {
+	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
+
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog "To (optionally) integrate with portage, inspect the .bashrc files installed"
 		elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use"
@@ -33,5 +35,6 @@ pkg_postinst() {
 		elog
 		elog "    ln -s ../../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
 		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools."
 	fi
 }
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index fd6ba7a75cf6..950c8989e4c8 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/bibutils/Manifest b/app-text/bibutils/Manifest
index 71d96696e580..709aed24ee69 100644
--- a/app-text/bibutils/Manifest
+++ b/app-text/bibutils/Manifest
@@ -1,3 +1,3 @@
 DIST bibutils_6.10_src.tgz 590002 BLAKE2B 91ea6c961978d381a65c1d5071c541409609dd9fdeb664cd7e66eb4871c2ecd0dfd6b06857294ae6ec049751a5939be23518782a5e1f14fdf848918849269402 SHA512 43cf107ee6d1bf6bf27a6bf46e1f4cbd83a4b78ef355730a9f37282fac399ee21d78538248730be85c0a8f724344782dcc6ab68e50f857d8ac4ea24cc4102911
-EBUILD bibutils-6.10.ebuild 786 BLAKE2B 69b2c6974fcae13f854ed65a231721d54a2b8111dfa2e37c1e58e09534b108043fd12d9390195e26f3316ae45ead4de445057873ec7fa861c6dfc06fb07d234c SHA512 06f292f7569893b17a3f996fc9c474d7e26db3415ee6ff74c263a4ca5b12ac8fe30733230098101d7bbd8acd524497ad2c892f8e334dbfbcd19118bec4438847
+EBUILD bibutils-6.10.ebuild 987 BLAKE2B 121e71d7e351135fc1d70b3c56706d68d74e8b4f454806e1211f3e428b9d617e885f7d8fd909121b7d6a78e5d82f4a2ecd37e7056f8f4204a8b8dc7b6581efa8 SHA512 04c331b7c4e54dbab631e27ddf2281a6bd8dcb332cbdf212b7adc5ccce61186b920b00f5fbaf231eb5bbad8c613e4f2aeafc5e385a9473310bdcf590a5af624b
 MISC metadata.xml 331 BLAKE2B 4c03c4b29798f311d30bc4056784f3f999a703ace4e099ba980c4af28b858e712d7b59c73f0fa9899e06ac83d5b29076a1711753685e61dff49253a9822159cc SHA512 7f5bdb652e9a72fa17c0194acd99ad9c72197f3a434af9ab35635e940a7ecf03bfa7bc469b828256a378f7c657a104de8f3e3dfe9c2e7f65e7854fc4d646cbbe
diff --git a/app-text/bibutils/bibutils-6.10.ebuild b/app-text/bibutils/bibutils-6.10.ebuild
index fb3e20024c41..9b7f812f98cf 100644
--- a/app-text/bibutils/bibutils-6.10.ebuild
+++ b/app-text/bibutils/bibutils-6.10.ebuild
@@ -16,11 +16,17 @@ KEYWORDS="amd64 ~ppc ~x86"
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	default
+	sed -ie 's/REPLACE_INSTALLDIR/${DESTDIR}&/' Makefile_start || die
+	sed -ie 's/REPLACE_LIBINSTALLDIR/${DESTDIR}&/' Makefile_start || die
+}
+
 src_configure() {
 	./configure \
-		--dynamic \
-		--install-dir "${ED}/usr/bin" \
-		--install-lib "${ED}/usr/$(get_libdir)" || die
+		--install-dir /usr/bin \
+		--install-lib /usr/$(get_libdir) \
+		--dynamic || die
 }
 
 src_compile() {
@@ -36,3 +42,7 @@ src_test() {
 		DISTRO_CFLAGS="${CFLAGS}" \
 		LDFLAGSIN="${LDFLAGS}" test
 }
+
+src_install() {
+	emake DESTDIR="${ED}" install
+}
diff --git a/app-text/catdoc/Manifest b/app-text/catdoc/Manifest
index 47d0f98f4652..940dece1eb9a 100644
--- a/app-text/catdoc/Manifest
+++ b/app-text/catdoc/Manifest
@@ -1,4 +1,4 @@
 AUX catdoc-0.95-parallel-make.patch 1568 BLAKE2B 868cad85a1882c60e1f6f37b630a233949c457afd66f59b1e07616a8403bcb4710cb7ed7d914e58ea2e5022787ad94a4c4db20572386d373b27e61257c5cb2ef SHA512 f40d7440bf19157b862226e8d956b5505e6d79db3a39a21f71f68d6943b162f62863333739f1f4777c2c38b4116b4745888ed0cf5cd4159ccc84d02979f691ea
 DIST catdoc-0.95.tar.gz 217779 BLAKE2B 37c01c485410a6eb08c5935351b00f60f1d4c418f4c1b3cca73da23f870cb5d5414ea6cf7c37effb295e6ccb12a7981367bd08ca6226ee0fc64d2dfdca2762ea SHA512 dd6bded4b6b70749c007256b182b063ff266f86d53024d8582001678821e8096c5b980bc8f43015d9c82bbe022d71d4ba5fe68aff31b2ff6db3688595e651b2c
-EBUILD catdoc-0.95-r1.ebuild 1336 BLAKE2B a90b5b458be3ef9d5df1c9a977fd316aa6c556023f9b00884e7eed90b42eb6ae2e040a7a5692955155dcf0c59c6979a6fc18452700f63155251159eb9edc8761 SHA512 dc3d0bbc689bb838a3ed640017db2f356a02f2e68c2400bcbcadb0bedbf769dc3b8d331f7794b9d3f732c017cb2c1068e2eff408bccd0c82859ae8db3cf73b3f
+EBUILD catdoc-0.95-r1.ebuild 1335 BLAKE2B f112d05b2dc6e6dcd03d4682eb10ae451e8fb34f49368f12640ca0276d46fcb82c2ec46a223b71388f7caa7e68fec277c09880aeed6881652417f6896a48852b SHA512 0f3469c34bfa29e986ee4edceb32890e2f540f983143074be5c15483575260e060720609913ad1e2902144815e8583ba8806c3ccab61cd86e1bb828d909ce17f
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/catdoc/catdoc-0.95-r1.ebuild b/app-text/catdoc/catdoc-0.95-r1.ebuild
index c3758c220516..6940f7b90c38 100644
--- a/app-text/catdoc/catdoc-0.95-r1.ebuild
+++ b/app-text/catdoc/catdoc-0.95-r1.ebuild
@@ -31,7 +31,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-install-root="${D}" \
+	econf \
 		$(use_with tk wish "${EPREFIX}"/usr/bin/wish) \
 		$(use_enable tk wordview)
 }
@@ -41,7 +41,7 @@ src_compile() {
 }
 
 src_install() {
-	default
+	emake install installroot="${ED}"
 
 	# dev-libs/libxls and app-text/catdoc both provide xls2cvs
 	if [[ -e ${ED}/usr/bin/xls2csv ]]; then
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index 01df9c4e4df6..e06754f54914 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -6,5 +6,5 @@ AUX dblatex-0.3.11-setup.patch 1751 BLAKE2B a83e41c4fa68eaee1b6e80404cd5486e64f1
 DIST dblatex-0.3.11py3.tar.bz2 1671505 BLAKE2B 44e89f5f8d81105a3401074ad765479c04a495962c3efb3677cec81bf3b85c67a03585e7da8bdbd103cbea84e38d2bc633bd13704a5835c98d70fed644bfc6ba SHA512 48c1445c702e9c7c3ff83c57bb8a0caf5f4b027669a70887af0a23f75f5f99fb6840c4281b8bad9402910f3850af485d432e3109e5fd93184434cc87eb712695
 DIST dblatex3-0.3.12.tar.bz2 1693272 BLAKE2B 9310ce5db3b5f92e183f2656c5b1881edaf0208ae4f78f853332c844258fa38d443921fc42c03301773b1451ce272a538c305d765acbdc6eafbdcf25ebf5d2d3 SHA512 5bfa774c8dbe362775f6bbb5e1196e5a2bb1af239778133c12ddc725406ced67f3ff422433a2a1aa02d4431e9be58ba12e918379deb81fcd5b96533d2bdf029a
 EBUILD dblatex-0.3.11-r1.ebuild 1828 BLAKE2B e8076d8450189cf9d9dac43bcb0c8f1659da8d8e83ae7c73b8c3829e4dd95e7c8b7016f7c67060ac5fa32dfcb83c29197a33facf4f070224379ff0c5f4ef8c61 SHA512 a967e261d36f2e05a030a7fbe18956e4bdf01acadc6601182347af035b477ce4812ce106fc6dd28e82b0a86c08a25abed5eda29f867d44b152daace7ddbd8eb6
-EBUILD dblatex-0.3.12.ebuild 1741 BLAKE2B b500a50c81ebf3bd845832d4af60162a3e8ed49dff27dbf61c409c937798e50be131aaaccbb21a720a3bb8859cdb87063a85a146347b623a5bb0628d753b4886 SHA512 fb5baccc7a2330837ad5f776ec9040275a6b8da99dd083a79d1c60d3125bb47d07a847af76cc077bf9c91edea54372042b65162c42fe6ba3f99de5b64fbde54e
+EBUILD dblatex-0.3.12.ebuild 1746 BLAKE2B 3833a415e1eb17abe794d08d2a116f3c007aefab8636b342586b3a82a67276d6ae0058b49038c54102900e09868241896091e4fbbd6b18da84d7c3b1ec072525 SHA512 dacd041c351cbc1cac238b504d2ad8b1dc6281d8bf795622fedc821956762c7a27c92b8cbdaf71934727ae74af0fbbac9b6dcda30c63eb648bbd952a55a21035
 MISC metadata.xml 896 BLAKE2B c01d462757e3af55ccbca34bf8aa601155be93586ab6da5028b9deaf4c71fad74965a1da586a89daddee0e3037ecfac8a59f497cb796fdef45bbf2eb3f6f044e SHA512 79a4f0bd55ea9c240e0490c37db08a365b17ae1837c50d29f5c611a09c3ed2594d8f7dd0d20391b45f740ec69bd36eb99a858aaf921adcaabea97ee6a7743d06
diff --git a/app-text/dblatex/dblatex-0.3.12.ebuild b/app-text/dblatex/dblatex-0.3.12.ebuild
index bf46b5ae0c83..cad3460da6c1 100644
--- a/app-text/dblatex/dblatex-0.3.12.ebuild
+++ b/app-text/dblatex/dblatex-0.3.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${PN}3-$
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="inkscape"
 
 RDEPEND="
diff --git a/app-text/lout/Manifest b/app-text/lout/Manifest
deleted file mode 100644
index 3749840175eb..000000000000
--- a/app-text/lout/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX lout-3.38-makefile.patch 715 BLAKE2B d2d72e707691a5fe09e152de7c113a821e524c2f67a37e1b6ad1d064e8ab499bc32004967bf226a225ce7fc41e808f4758f9f50dcfd6254b51c0500a53d9d1bd SHA512 17fbc465143bec59ca1bb410aa3b4e376ce2fc4e65a15747f72104db9387ba9429ce21f83e2b64224ed8b856c42b68df4bf27e2c9df9ed4d9bae872b126967bc
-DIST lout-3.40.tar.gz 2172651 BLAKE2B 0bf2ee498d6fbb91e353d46fe1f7f0f44053be174df901b08ee630f0b4935e19c056a50e2eda4d07ab69aac6d7bf738b42277bb37060e967db73ace6a51029af SHA512 adffbb44b9328f0d64b1c8f08fe0217307b1cca870827ca54e0aaae5a2258f519e3e6f0adc715ba6d192dd731ab26c2cc86aa8611d991d5665503842e599c061
-EBUILD lout-3.40.ebuild 2046 BLAKE2B 24a403a7b363bf9a43a91a1cf1696467131eca94fd6371cd13ba534b326af7e8b11b03ccea54031b48fddf5b5beeddaf8abad6d7a84d9831c64afb14ccb542ee SHA512 31ffe212dfa3f64156ad8376c862eedf4ea568c2b3649ce92d62789820cc8bbc7f2c9778e08fc29d5bf0dea76064e6ae6caac62f7692153109fccf9dd83ffeea
-MISC metadata.xml 241 BLAKE2B e0a2a0802fa3cdf63e76215187d14bf8f7dce89bfa0a518034c19f8efc658f8c1264e0c8d27647dcb08be031828619220f457168941be3dc067a4092fbf9ff88 SHA512 a51c29d1e99be12f982724f0d4e738b509cbf9bdfa71461320386fcbd9f44431c09e78487ea246540285b39cb271d5e75da04512ef89fca87729161388aaf8e9
diff --git a/app-text/lout/files/lout-3.38-makefile.patch b/app-text/lout/files/lout-3.38-makefile.patch
deleted file mode 100644
index cb7fc66bf432..000000000000
--- a/app-text/lout/files/lout-3.38-makefile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- lout-3.38/makefile.orig	2008-10-13 23:35:17.000000000 +0200
-+++ lout-3.38/makefile	2009-09-04 16:40:00.000000000 +0200
-@@ -295,11 +295,9 @@
- ZLIB		=
- ZLIBPATH	=
- 
--CC	= gcc
--
- RCOPY	= cp -r
- 
--COPTS	= -ansi -pedantic -Wall -O3
-+COPTS	+= -ansi -pedantic -Wall
- 
- CFLAGS	= -DOS_UNIX=$(OSUNIX)					\
- 	  -DOS_DOS=$(OSDOS)					\
-@@ -333,7 +331,7 @@
- 	  z49.o z50.o z51.o z52.o
- 
- lout:	$(OBJS)
--	$(CC) -o lout $(OBJS) $(ZLIB) -lm
-+	$(CC) $(COPTS) $(LDFLAGS) -o lout $(OBJS) $(ZLIB) -lm
- 	chmod a+x lout
- 
- $(OBJS): externs.h
-@@ -341,7 +339,7 @@
- externs.h:
- 
- prg2lout:	prg2lout.c
--	$(CC) $(COPTS) -o prg2lout prg2lout.c
-+	$(CC) $(COPTS) $(LDFLAGS) -o prg2lout prg2lout.c
- 	chmod a+x prg2lout
- 
- all:	lout prg2lout
diff --git a/app-text/lout/lout-3.40.ebuild b/app-text/lout/lout-3.40.ebuild
deleted file mode 100644
index e6d0cc7f1f25..000000000000
--- a/app-text/lout/lout-3.40.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-IUSE="zlib doc"
-
-DESCRIPTION="High-level language for document formatting"
-HOMEPAGE="http://savannah.nongnu.org/projects/lout"
-SRC_URI="mirror://nongnu/lout/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="zlib? ( >=sys-libs/zlib-1.1.4 )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.38-makefile.patch"
-)
-
-src_compile() {
-	tc-export CC
-	local myconf
-	use zlib && myconf="$myconf PDF_COMPRESSION=1 ZLIB=-lz"
-	emake COPTS="${CFLAGS}" BINDIR="${EPREFIX}"/usr/bin \
-		LOUTLIBDIR="${EPREFIX}"/usr/share/lout \
-		LOUTDOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX}"/usr/share/man/man1 \
-		${myconf} lout prg2lout || die "emake prg2lout lout failed"
-}
-
-compile_doc() {
-	#
-	# SYNOPSIS:  compile_doc file times
-	#
-
-	einfo "${1}:"
-	# yes, it *is* necessary to run this 6 times...
-	for i in $(seq 1 $(expr $2 - 1)) ; do
-		einfo " pass $i"
-		lout all -o ${docdir}/$1 -e /dev/null
-	done
-	# in the last one, let errors be reported
-	einfo " final pass"
-	lout all -o ${docdir}/$1 || die "final pass failed"
-}
-
-src_install() {
-	local bindir libdir docdir mandir
-	bindir=${ED}usr/bin
-	libdir=${ED}usr/share/lout
-	docdir=${ED}usr/share/doc/${PF}
-	mandir=${ED}usr/share/man/man1
-	export LOUTLIB=${libdir}
-	export PATH="${bindir}:${PATH}"
-
-	mkdir -p ${bindir} ${docdir} ${mandir}
-
-	make BINDIR=${bindir} \
-		LOUTLIBDIR=${libdir} \
-		LOUTDOCDIR=${docdir} \
-		MANDIR=${mandir} \
-		install installdoc installman || die "make install failed"
-
-	lout -x -s "${ED}"usr/share/lout/include/init || die "lout init failed"
-
-	mv ${docdir}/README{,.docs}
-	dodoc README READMEPDF blurb blurb.short whatsnew
-
-	if use doc ; then
-		einfo "building postscript documentation (may take a while)"
-		cd doc/user
-		compile_doc user.ps 6
-		cd ../design
-		compile_doc design.ps 3
-		cd ../expert
-		compile_doc expert.ps 4
-		cd ../slides
-		compile_doc slides.ps 2
-	fi
-}
diff --git a/app-text/lout/metadata.xml b/app-text/lout/metadata.xml
deleted file mode 100644
index d87f47dba103..000000000000
--- a/app-text/lout/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="sourceforge">lout</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index be2fbe591751..4610c3be4ebc 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -2,6 +2,6 @@ AUX pinfo-0.6.13-fno-common.patch 217 BLAKE2B 80bfe222627299bb078cc33005a6470278
 AUX pinfo-0.6.9-GROFF_NO_SGR.patch 259 BLAKE2B a49a7addbf822436bc5cb8cf2da9964eca3b354274de1fb5f64cf4d634164fbe55e634c99282f87b3cbda5ac9f334b25d9123237b4cc64e7e5286b57ddf2a057 SHA512 373eea0e8feca230c14bf658ca5e73698ea16d35b5ca790c46b5bf02a83aaf1d55628183f89666913dfea96ef0f3653789255f8dfd616fe5b3a19be195d46ce6
 AUX pinfo-0.6.9-lzma-xz.patch 614 BLAKE2B 0b84247de91a42f75d0664f4ccab23e3d57bc66f6af2444e8b9dee2c0e6edb5afad1d467725507c9618947463cdd2f221024c7feb387282ebafcb6bc62741c89 SHA512 8e3ec8a98347c061826cc913c09fd2177d0f8625947c319b527e85d5ae3dcbf7dafb34b5f4a5e2fc9639bcc4db45afdea7dda6db6a88001e1c6a3994b4847ae4
 DIST pinfo-0.6.13.tar.gz 157103 BLAKE2B 18af4a5ae1bbd2abccb174ce1a3a16e4d17207a10015042723c58f80695c2580ca0c1c60f4f6f4f08e67eb01316fe48cd848a887e65159a6cd4463eca14bdecd SHA512 739e24821a363a087fb9df5651694f051286d4a15c3e51f2421a2aa60b1efe1da558b959ba22a0094e22854534ea5875498156e8ea2e198e31001aecab1a18df
-EBUILD pinfo-0.6.13.ebuild 1080 BLAKE2B a30f5f1a90fa8cd988839ca7ab3e89aa84f70837dd7e8291f0be259b7fcb49b79cea9f069fe8167cbefd507d407df457ddcbda0ba0357a6008e56865692d9282 SHA512 4da1a32abb1417058e55697f44ae9b03b8d7a879a6e58ef2f25bd81cab387804c61c894759b00b657086453ced3b83ba937878472faeaf700d793a7a2c3b6f45
+EBUILD pinfo-0.6.13.ebuild 1087 BLAKE2B e4fc77671bb3cac6a1a9fdcfaf4b898caf61ea313cc9a630d0ff29f2e519831821ba27a411dbfedfb761921f383d0f5043d33a451f48358c118197c5cfa8b230 SHA512 cab73af963721e6b7b5c3e42a9684679f96f176cf2444d2ad7b1d0a10dce4ecb5d4c62cc6e7cc3acb9f1859bdfd367151d14181619b48d9a794b291138ef53a5
 EBUILD pinfo-99999.ebuild 965 BLAKE2B 70eea0fb86462f8cea446b270fcde21247bb2d497946ddf585bbf5f21651de0068746f82133cb0dbf8b3802be02af7ccbd8189118bc4da21e525b2cf456872eb SHA512 38490ae9c934f6a73e31b4e30df86d249f5c54199622ec6d9c9185f3d13cc83cc56a711b62c9fb639ffd80ae8448ccd9c8548121bcbb21356e272c3f44a7381f
 MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-text/pinfo/pinfo-0.6.13.ebuild b/app-text/pinfo/pinfo-0.6.13.ebuild
index 00dad93c8fc9..fd125b72037e 100644
--- a/app-text/pinfo/pinfo-0.6.13.ebuild
+++ b/app-text/pinfo/pinfo-0.6.13.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/baszoetekouw/pinfo/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="nls readline"
 
 RDEPEND="
diff --git a/app-text/tessdata_best/Manifest b/app-text/tessdata_best/Manifest
index 575a20d18629..be3ceb18a78f 100644
--- a/app-text/tessdata_best/Manifest
+++ b/app-text/tessdata_best/Manifest
@@ -247,5 +247,5 @@ DIST yid.traineddata-tessdata_best-4.1.0 3278995 BLAKE2B 52dec464f0cd020d8060e42
 DIST yor.traineddata-tessdata_best-4.0.0 3736121 BLAKE2B 370679dface083eef9f5c71e6f0c21bfb78dee7720b54c4431d4414468a6fd6c1ea01144eabe6d4fd992930efeb852f3ccfbc3428b7f3f8c6ac81f5e2613f048 SHA512 fd383977a7196f5e7d50bbd9a04c50783c8e5fb1512593c23a9fec6c49c3f756f0ecd78986cdf1381d6947031eece84680c1db51a727981ec905b3ade8829ddc
 DIST yor.traineddata-tessdata_best-4.1.0 3736121 BLAKE2B 370679dface083eef9f5c71e6f0c21bfb78dee7720b54c4431d4414468a6fd6c1ea01144eabe6d4fd992930efeb852f3ccfbc3428b7f3f8c6ac81f5e2613f048 SHA512 fd383977a7196f5e7d50bbd9a04c50783c8e5fb1512593c23a9fec6c49c3f756f0ecd78986cdf1381d6947031eece84680c1db51a727981ec905b3ade8829ddc
 EBUILD tessdata_best-4.0.0.ebuild 2196 BLAKE2B 5cde56a7f95464cd4ab531c806c56cc0315cc0679fc61940fdf3f66b0ad41e87dd768c949706669c3eaf0d8c51f07179aadc150971aa23067234b0d42903cce4 SHA512 ce605018b6c91ac3d65d7f429354a7f4cfcc1e3f137e3ab65ba6dfad0f7f3fcea550f1465125f2e29bedb8d7395edd9f9c640f66f8cc7b07d359925d23cd5b6a
-EBUILD tessdata_best-4.1.0.ebuild 2196 BLAKE2B 74e21c174f191ac65ca3311d80ae2da2124408f8b2666b486126cd01fac9281f27158ee4ec0f0acd463eb20ea36ab4b78caaeb8567d4c3f4791786bb468ec4c1 SHA512 72b85288c97e6e06df482ec63ce22b787b8910600d49cf8fe2c86f75daca10080ededc7e02ef2da97448843cdb4ee97005e562c1f0b84e099315f315c200f36b
+EBUILD tessdata_best-4.1.0.ebuild 2203 BLAKE2B ac7ddd1eb4431adabf24eb5629b4f20f5266819fbaf1f9123a824fecd7334b9396c789e08d6e4d67f9b04ffffb32e07a66f2e4edfec1df2247ca09da5ac99356 SHA512 851321b585bf80d4952e3763fe8167cd57f5279ce7597eb23c78be9b443a388a318241128197e3de29645dac206b11a0618ca0f55fc250c947cba825194e8f0f
 MISC metadata.xml 449 BLAKE2B 8ab22713a9c1c56d67de86275133d22024490a8b9957ddb5bb4a68b45e4e38a69e4d864d50e9f638bab9b840f3802dad01b7b818a95da42c7502e2715975239e SHA512 21f4673eef772853958197283e519e920d9451c32cc3e7baa5bfc2d9c75ecf9b522ca082e8d673a41f978b1a16e0f727777868aa1dabb6ba21592b50f20a0ae5
diff --git a/app-text/tessdata_best/tessdata_best-4.1.0.ebuild b/app-text/tessdata_best/tessdata_best-4.1.0.ebuild
index f443489a3559..580847d36fa1 100644
--- a/app-text/tessdata_best/tessdata_best-4.1.0.ebuild
+++ b/app-text/tessdata_best/tessdata_best-4.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+osd"
 
 RDEPEND="!app-text/tessdata_fast
diff --git a/app-text/tessdata_fast/Manifest b/app-text/tessdata_fast/Manifest
index 69e95366893e..2a981375cf8a 100644
--- a/app-text/tessdata_fast/Manifest
+++ b/app-text/tessdata_fast/Manifest
@@ -247,5 +247,5 @@ DIST yid.traineddata-tessdata_fast-4.1.0 545606 BLAKE2B 96d06916e67e5712d708d6c4
 DIST yor.traineddata-tessdata_fast-4.0.0 963400 BLAKE2B 38f84a1c331ef161cf3d6bb25e8586d1cd5fa0458fcd295fec3481f3c02cfe3f9f138c22731af3beec09471570b5d790917bb42ac40e5597dd5336afe2f55cea SHA512 da4d086f52534fbf01ac00dd996aceb2c646fc61b60199cf539cc7a223c050e69079ede591b95abbe1d3927a39ca7f9bedd68c558e6df54d949dff5c6428f449
 DIST yor.traineddata-tessdata_fast-4.1.0 963400 BLAKE2B 38f84a1c331ef161cf3d6bb25e8586d1cd5fa0458fcd295fec3481f3c02cfe3f9f138c22731af3beec09471570b5d790917bb42ac40e5597dd5336afe2f55cea SHA512 da4d086f52534fbf01ac00dd996aceb2c646fc61b60199cf539cc7a223c050e69079ede591b95abbe1d3927a39ca7f9bedd68c558e6df54d949dff5c6428f449
 EBUILD tessdata_fast-4.0.0.ebuild 2201 BLAKE2B ab52780b5c63d4ce062a0964abee89f5a2924c0a2c1a4fd993ad7de5159cc7a1c7fd7a90933ea25711008cec249db171387c24680a5167be4b296f6382508775 SHA512 d7dd529f1c9efb40cbddb65c55ebdf5427d36e70e9f070b331a07a333c73b308d1114904d59073f072b2593ccbac70b5c057371127069b2d30e3dc2016d3b75f
-EBUILD tessdata_fast-4.1.0.ebuild 2207 BLAKE2B de88fffef51a9036a3984567b6689ca6b86dac1b9fc5a1baa6900078213232919b780184ee73f111296c92910193d18384686ecc8f6bf7c9afb8500a2517345c SHA512 4340dae310243a84301a8ee26af353b2f46cd1649677bd63a58a0515c93b7963e221838bd579af5646e383fed79b3ef36ec5aed424694c02929d52ec2b5216b7
+EBUILD tessdata_fast-4.1.0.ebuild 2214 BLAKE2B 1b0616b901642e5ea4748e36f7e1cca7d81975eb6be2d04a2fab7e7f26b5014578affcb1a72011b4f1247c257b10f77472187a86eb3161ed04e6a27e8623f6cf SHA512 aa08ec31dc8e86952d8414b5652472990aeafd2a26574c4129c0a05954073d460ad668d4faf5a540fcedaffed387322b07b542c68fdd3930bb9bdd7378271428
 MISC metadata.xml 449 BLAKE2B 686a3f75047fc2a66e169cc6d04706aa1d9590e2fc5cda367783212b4a6ccabde1f91de469d89af4aee466515f078649b2c5ce54d95baf3ce632b500fd81f009 SHA512 cfe14b58c55808e20ae2cfe102ab13939531bcd6cb0fa9897b154dfc3c6d9e25723c02e2f2fb9897497a70213c202d3b6a8a3db4fa01d8c46fc5baaf075ecadc
diff --git a/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild b/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild
index a987bdcdf6ae..d883e9719cd0 100644
--- a/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild
+++ b/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+osd"
 
 RDEPEND="!app-text/tessdata_best
diff --git a/app-text/tessdata_legacy/Manifest b/app-text/tessdata_legacy/Manifest
index afd794ad283d..b6c2636d10b3 100644
--- a/app-text/tessdata_legacy/Manifest
+++ b/app-text/tessdata_legacy/Manifest
@@ -252,5 +252,5 @@ DIST yid.traineddata-tessdata_legacy-4.1.0 4882707 BLAKE2B aec63586bfa9d9f55a48f
 DIST yor.traineddata-tessdata_legacy-4.0.0 963413 BLAKE2B e4d16812ade81cac1f685587837b431c122ea29551bccd52ff1bef5a4aa8b316eb741aee3d0eb790c941d15401ea1c190850e225765a819d8899149e35af278a SHA512 4a04821d7e76feb0e71f31ff2ed794fce5a4e53ed98aeeecc06bd36d2c07301e8a7a86123ec5747b36d9df1d6d8e24d148f31f70093f944e83dfd3f2162661b0
 DIST yor.traineddata-tessdata_legacy-4.1.0 963413 BLAKE2B e4d16812ade81cac1f685587837b431c122ea29551bccd52ff1bef5a4aa8b316eb741aee3d0eb790c941d15401ea1c190850e225765a819d8899149e35af278a SHA512 4a04821d7e76feb0e71f31ff2ed794fce5a4e53ed98aeeecc06bd36d2c07301e8a7a86123ec5747b36d9df1d6d8e24d148f31f70093f944e83dfd3f2162661b0
 EBUILD tessdata_legacy-4.0.0.ebuild 2393 BLAKE2B c1faeda7cbd7e00bc807099520b0fdd4b505935f569b2b94ac708f9fdb496a39a468c29d25911e1bd60e65a9832ee49e24ab0e3cd7d3c440418e2f40f6bc9f12 SHA512 b8b203c57e318a4cc29381174faee00fd74f4f06436729f5eec64e28df59cde666cf096665a8dc59ab5474e969463d6ca7bea7e7054ba9208e597578247277d0
-EBUILD tessdata_legacy-4.1.0.ebuild 2385 BLAKE2B 1eed958b233a75e42f118db596bbafa45be62124e199eca5afdb1a8d639c58587c0c3ee087859ac55f9539acc8adb6828e7e2c0a0580eca30d7d1dd5b9497a3a SHA512 a75502e1293435cf1173c5993cc8dacc86e0d238d8313201222eab8add2805ff5fbe2a05e423cbaded20977d73ae418586d84b16881dea9f9062ce2c1f417a18
+EBUILD tessdata_legacy-4.1.0.ebuild 2392 BLAKE2B 563e84e432a42cfab6ed12b776cc972ab9b6b116268899f55a88e08d892a8bac39e4607cc23f672844359f3bbac2fb24eba626e3fc7690ed17a02c95628d70a4 SHA512 d53ceab5ed7849a7fed04b05b53a5135880793a5f0c218a4da744d5f3b75222a92a36f770c892e2942510a8d595940fd6845f4b240a5b735505f8a07a5933a64
 MISC metadata.xml 519 BLAKE2B 8fda99b2b34f605623be8b2b2836825e0066d2ab3f36419437b87e689386682ad37914775cd9e8cf8b4004fc9de87ed5d54af05a5fc34d5dbc5378d5708cc8ba SHA512 1ba257efb58d0f0b0a92dfd180cd91482eca05bac787bdd08a9126435384a30e6a4771457a4aa5c3ab7c866ff849e8c2b0f78fa4784315df18db35f99ac0edc2
diff --git a/app-text/tessdata_legacy/tessdata_legacy-4.1.0.ebuild b/app-text/tessdata_legacy/tessdata_legacy-4.1.0.ebuild
index 1a38a3063e1e..1af981619221 100644
--- a/app-text/tessdata_legacy/tessdata_legacy-4.1.0.ebuild
+++ b/app-text/tessdata_legacy/tessdata_legacy-4.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="math osd"
 
 RDEPEND="!app-text/tessdata_best
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index f819469dac64..84d3b5b6b97e 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -48,6 +48,6 @@ DIST ukr.traineddata-3.04.00 8043189 BLAKE2B 3435bdbdac2e4f343479515632f54345c96
 DIST vie.traineddata-3.04.00 6096118 BLAKE2B 2314880eef055eade892e788cc1458ca1b4b3ee3a8ce7c8657ab7d36c2f57556d21045094f055961ab0ecca38300d4c986162ee79d437e706a8e54c35b552feb SHA512 51087e2141051906a1815798175ff8b9f214ae36c7d87cb60999489ccc684307ea7ef65c5ae4024f95c51b89084ab9f0e8dde0a4d480eaf78dceebfba87350cf
 EBUILD tesseract-3.05.02.ebuild 5858 BLAKE2B 896c323d034f43d22594ba2292fca73ee07336f8b4550b6af92bd02e74138a3ffa41a70db1ef52632d52fd7f425225fe69b4996823d87faa7dd933f5277a7fb7 SHA512 e514ee7d2a58eff04bb85e672915985405f3766e2aa4bf0760add3377cfa2e321c484081129dd29cee06090146807c239e4bab9ebd2f55093ce483902f6b55be
 EBUILD tesseract-4.1.0-r1.ebuild 2059 BLAKE2B e817adce0988a94490891f6cb246636cac20f6552852fa2d684546402822b4cc1736e3e50cf390887e7921fce797fe8271618209d49cff076cd989e65e8ec349 SHA512 e3e1ba6bdb0edc304e1ad2b14ae07cef5469f74cfc9e863f4b84761f6dba75ee3b328c4701a720cc4f50d99165d9fefb2f236f80d902bad67c8b2955f086031e
-EBUILD tesseract-4.1.1.ebuild 2053 BLAKE2B c10968fd403a7d4892dde87e027b75648200ad6b0f0b767f59a340e1e6058a948e1f0e713508bafe1b16e64307fa81caf5758d2add86f7859609f659d9a81cbf SHA512 9ecaebe2c0f32e1d01ba029b2dcbcacc59def2642a7dda2edb4002c6dbd7bb5c4a7e31b958808d190e891c24cfac5eb52def28a08e550bdf260f35ef338aac59
+EBUILD tesseract-4.1.1.ebuild 2060 BLAKE2B 666503a1ac91f31b3ccc17263d15892f9ee8c9887e021f019e62abb635e7069b8394d2548c66b3d5c60c1b1903569a40bb1b1c81a252c39a86cc02b6acc803cb SHA512 c0f22b7a07c8371cc81744eae7b90359f02d8399c6362ef71bf7e7bd67ebe88b2e18777f122fbfbea721871a342c92456a5363a1eaf642134f2faee5554a980c
 EBUILD tesseract-9999.ebuild 1985 BLAKE2B 61ca3f12ce35a89999de392f8f96a3a55571c7b37a10d59d28fbd8a14f97ba3eea2c96ea17337ace2a6ff768f3bed96efbf45ca0b3bd5cca79ebb0edf15d8a7b SHA512 4e84e0f3a68232333182b1195ef8b443ba95575bd5912acbbe306788d2174ead368becd43fb1d7daa20b7d73e136309143572322b85860adf05826c5289e5023
 MISC metadata.xml 1144 BLAKE2B 1b9ecd743c9a6b016ae04ea28b8bc2f80f6192c8c52d9d7e165cb8a2f222cc08408c97b0e01cebd4840b46cf0f046b2a7511b56c8f14b1a6434fea6e1149a48f SHA512 a86b76ef0f4bdf4339df2d061d1ef4c4fa80b60bc1d748a8c8c06023a9a5bc025bd14ee2d5e06f25706fc8055d8722cef41048e39908fc3771ec5ddd314eea4e
diff --git a/app-text/tesseract/tesseract-4.1.1.ebuild b/app-text/tesseract/tesseract-4.1.1.ebuild
index 805fff26819f..2351e1f1609e 100644
--- a/app-text/tesseract/tesseract-4.1.1.ebuild
+++ b/app-text/tesseract/tesseract-4.1.1.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc jpeg opencl openmp png static-libs tiff training webp"
 
 COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 378d4e3e3613..db9de2cfd46e 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/libcutl/Manifest b/dev-cpp/libcutl/Manifest
deleted file mode 100644
index ca785bfcac65..000000000000
--- a/dev-cpp/libcutl/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX libcutl-1.10.0-boost-1.65-tr1.patch 4688 BLAKE2B b896957b8a1ff399b51210052df2eb080ef52d887ad6e4734921945c497e172c8f9557c371947f4ba759d50911db4d9b99cd6a62a3765eabb29b0743fa407945 SHA512 0fc264a7e8b19c1da93384ec799cf2f8178af26f2baca53d92530ca6086371a6fc6ba5b7c8134b318846079b99fb2ba8872e1b14ab58da4422e0309bcbfe2b9f
-AUX libcutl-1.10.0-fix-c++14.patch 1045 BLAKE2B 91e954048739a53dc5dcf757ee7b3541b958fc30063df2da3ffe47f9c020ee8f80cfde07d351b21ac8ebabb00a84ed5f29b6063082fe18374172129537e0a6a0 SHA512 37033c583b55e66d4edc03e483f01e3c6d331862748eaa23cecc8a24614368d294193642c481ba91d9ee56eed952c6ad0f4997e30ace9e572653b3780be75cec
-DIST libcutl-1.10.0.tar.bz2 763920 BLAKE2B 8d6741b19cc7c1d320225b6f412c08d6dd1d975a9f1e2f55914a23b8813e42228616ea525905bcf456f4b6e60a72fbf4128a03275833975ce3b8c87d6e4cb631 SHA512 c03f39e87e660fdd07aa9cccb2d82d411ca8226b56475c74b7b2147b90cdb83d13246bc0c09513e407271bcf568d6a08f92c9006e48d1e7f06e4b18dde34dc5f
-EBUILD libcutl-1.10.0.ebuild 1027 BLAKE2B b9c108c5076b18a9b6e10cdd90a6180a0948ec0b39b2190d09a7c2979ecdecb5f12b9c4283d8e5fe78ec665495d6cef6eaa06f765364f9d9f198cd4f05e11bdc SHA512 c05e606af9647aa004d87986bdb2db55f5d58ba26103066df11f9c50f3cf909de7b28298023c61c5fd79c9c8f3430860a91b8203d0decd725c6f69d2c1f42dfd
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-cpp/libcutl/files/libcutl-1.10.0-boost-1.65-tr1.patch b/dev-cpp/libcutl/files/libcutl-1.10.0-boost-1.65-tr1.patch
deleted file mode 100644
index ebb15ee9b404..000000000000
--- a/dev-cpp/libcutl/files/libcutl-1.10.0-boost-1.65-tr1.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-Use regex from C++11 instead of boost/tr1's version (the latter is gone as of boost 1.65).
-Patch: https://svnweb.freebsd.org/ports/head/devel/libcutl/files/patch-cutl_re_re.cxx?view=markup&pathrev=445764
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=630016
-
---- a/cutl/re/re.cxx
-+++ b/cutl/re/re.cxx
-@@ -9,7 +9,7 @@
- #ifndef LIBCUTL_EXTERNAL_BOOST
- #  include <cutl/details/boost/tr1/regex.hpp>
- #else
--#  include <boost/tr1/regex.hpp>
-+#  include <regex>
- #endif
- 
- using namespace std;
-@@ -40,17 +40,17 @@
-     struct basic_regex<C>::impl
-     {
-       typedef basic_string<C> string_type;
--      typedef tr1::basic_regex<C> regex_type;
-+      typedef std::basic_regex<C> regex_type;
-       typedef typename regex_type::flag_type flag_type;
- 
-       impl () {}
-       impl (regex_type const& r): r (r) {}
-       impl (string_type const& s, bool icase)
-       {
--        flag_type f (tr1::regex_constants::ECMAScript);
-+        flag_type f (std::regex_constants::ECMAScript);
- 
-         if (icase)
--          f |= tr1::regex_constants::icase;
-+          f |= std::regex_constants::icase;
- 
-         r.assign (s, f);
-       }
-@@ -118,15 +118,15 @@
-           impl_ = s == 0 ? new impl : new impl (*s, icase);
-         else
-         {
--          impl::flag_type f (tr1::regex_constants::ECMAScript);
-+          impl::flag_type f (std::regex_constants::ECMAScript);
- 
-           if (icase)
--            f |= tr1::regex_constants::icase;
-+            f |= std::regex_constants::icase;
- 
-           impl_->r.assign (*s, f);
-         }
-       }
--      catch (tr1::regex_error const& e)
-+      catch (std::regex_error const& e)
-       {
-         throw basic_format<char> (s == 0 ? "" : *s, e.what ());
-       }
-@@ -146,15 +146,15 @@
-           impl_ = s == 0 ? new impl : new impl (*s, icase);
-         else
-         {
--          impl::flag_type f (tr1::regex_constants::ECMAScript);
-+          impl::flag_type f (std::regex_constants::ECMAScript);
- 
-           if (icase)
--            f |= tr1::regex_constants::icase;
-+            f |= std::regex_constants::icase;
- 
-           impl_->r.assign (*s, f);
-         }
-       }
--      catch (tr1::regex_error const& e)
-+      catch (std::regex_error const& e)
-       {
-         throw basic_format<wchar_t> (s == 0 ? L"" : *s, e.what ());
-       }
-@@ -166,28 +166,28 @@
-     bool basic_regex<char>::
-     match (string_type const& s) const
-     {
--      return tr1::regex_match (s, impl_->r);
-+      return std::regex_match (s, impl_->r);
-     }
- 
-     template <>
-     bool basic_regex<wchar_t>::
-     match (string_type const& s) const
-     {
--      return tr1::regex_match (s, impl_->r);
-+      return std::regex_match (s, impl_->r);
-     }
- 
-     template <>
-     bool basic_regex<char>::
-     search (string_type const& s) const
-     {
--      return tr1::regex_search (s, impl_->r);
-+      return std::regex_search (s, impl_->r);
-     }
- 
-     template <>
-     bool basic_regex<wchar_t>::
-     search (string_type const& s) const
-     {
--      return tr1::regex_search (s, impl_->r);
-+      return std::regex_search (s, impl_->r);
-     }
- 
-     template <>
-@@ -196,13 +196,13 @@
-              string_type const& sub,
-              bool first_only) const
-     {
--      tr1::regex_constants::match_flag_type f (
--        tr1::regex_constants::format_default);
-+      std::regex_constants::match_flag_type f (
-+        std::regex_constants::format_default);
- 
-       if (first_only)
--        f |= tr1::regex_constants::format_first_only;
-+        f |= std::regex_constants::format_first_only;
- 
--      return tr1::regex_replace (s, impl_->r, sub, f);
-+      return std::regex_replace (s, impl_->r, sub, f);
-     }
- 
-     template <>
-@@ -211,13 +211,13 @@
-              string_type const& sub,
-              bool first_only) const
-     {
--      tr1::regex_constants::match_flag_type f (
--        tr1::regex_constants::format_default);
-+      std::regex_constants::match_flag_type f (
-+        std::regex_constants::format_default);
- 
-       if (first_only)
--        f |= tr1::regex_constants::format_first_only;
-+        f |= std::regex_constants::format_first_only;
- 
--      return tr1::regex_replace (s, impl_->r, sub, f);
-+      return std::regex_replace (s, impl_->r, sub, f);
-     }
-   }
- }
---- a/m4/libboost.m4
-+++ b/m4/libboost.m4
-@@ -129,13 +129,13 @@
- AC_DEFUN([LIBBOOST_REGEX], [
- LIBBOOST_LIB([regex],[
- AC_LANG_SOURCE([
--#include <boost/tr1/regex.hpp>
-+#include <regex>
- 
- int
- main ()
- {
--  std::tr1::regex r ("te.t", std::tr1::regex_constants::ECMAScript);
--  return std::tr1::regex_match ("test", r) ? 0 : 1;
-+  std::regex r ("te.t", std::regex_constants::ECMAScript);
-+  return std::regex_match ("test", r) ? 0 : 1;
- }
- ])],
- [$1],
diff --git a/dev-cpp/libcutl/files/libcutl-1.10.0-fix-c++14.patch b/dev-cpp/libcutl/files/libcutl-1.10.0-fix-c++14.patch
deleted file mode 100644
index a6f1a505485b..000000000000
--- a/dev-cpp/libcutl/files/libcutl-1.10.0-fix-c++14.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Make dtors noexcept(false) when compiling in C++11 and above. This avoids silent
-breakage due to the semantic exception changes between C++98 and C++11.
-
---- a/cutl/fs/auto-remove.cxx
-+++ b/cutl/fs/auto-remove.cxx
-@@ -13,6 +13,9 @@
-   {
-     auto_remove::
-     ~auto_remove ()
-+#if __cplusplus >= 201103L
-+    noexcept(false)
-+#endif
-     {
-       if (!canceled_)
-       {
-@@ -23,6 +26,9 @@
- 
-     auto_removes::
-     ~auto_removes ()
-+#if __cplusplus >= 201103L
-+    noexcept(false)
-+#endif
-     {
-       if (!canceled_)
-       {
---- a/cutl/fs/auto-remove.hxx
-+++ b/cutl/fs/auto-remove.hxx
-@@ -26,7 +26,11 @@
-       {
-       }
- 
--      ~auto_remove ();
-+      ~auto_remove ()
-+#if __cplusplus >= 201103L
-+      noexcept(false)
-+#endif
-+      ;
- 
-       void
-       cancel ()
-@@ -51,7 +55,11 @@
-     struct LIBCUTL_EXPORT auto_removes
-     {
-       auto_removes (): canceled_ (false) {}
--      ~auto_removes ();
-+      ~auto_removes ()
-+#if __cplusplus >= 201103L
-+      noexcept(false)
-+#endif
-+      ;
- 
-       void
-       add (path const& p)
diff --git a/dev-cpp/libcutl/libcutl-1.10.0.ebuild b/dev-cpp/libcutl/libcutl-1.10.0.ebuild
deleted file mode 100644
index b88f5363b9ee..000000000000
--- a/dev-cpp/libcutl/libcutl-1.10.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic versionator
-
-DESCRIPTION="A collection of C++ libraries (successor of libcult)"
-HOMEPAGE="https://www.codesynthesis.com/projects/libcutl/"
-SRC_URI="https://www.codesynthesis.com/download/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/boost:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10.0-fix-c++14.patch
-	"${FILESDIR}"/${PN}-1.10.0-boost-1.65-tr1.patch
-)
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -r cutl/details/{boost,expat} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# ensure <regex> works on GCC 5 and below
-	# bug 630016
-	append-cxxflags -std=c++14
-
-	econf \
-		--disable-static \
-		--with-external-boost \
-		--with-external-expat
-}
-
-src_install() {
-	default
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-cpp/libcutl/metadata.xml b/dev-cpp/libcutl/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/dev-cpp/libcutl/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-cpp/libxsd-frontend/Manifest b/dev-cpp/libxsd-frontend/Manifest
deleted file mode 100644
index 6e5081a07c5a..000000000000
--- a/dev-cpp/libxsd-frontend/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libxsd-frontend-2.0.0.tar.bz2 66784 BLAKE2B 3d41a97dc01f7d9231f981043ab00523f27decba428395940dd008b9a35e434e9f1a002f4214c11fe4fb9d228149eb3e05ba7da3d7682ae9d334d3d0db66dc1d SHA512 8a296fdfe2e562237d46774b33ee82e8f67835b0869c03ffdf04570db1e6f398cf97734685d44c2207abbb73cea20b57e53c8fd80a121f98196c1c7d4bacbc68
-EBUILD libxsd-frontend-2.0.0-r1.ebuild 2142 BLAKE2B ad44e514875e693d803c8b04786ae629bf56a38ee3a77ba05740e386017a6ef250d2aceafe8c9b06073ea636a8f3e33b0de7cb97243ea4d2a1dec28a949bb9e4 SHA512 678d5541971c93c1b20bcd36340328e77b289c674fc27d486b6a13b3ddc1afcb02823986a0aef7535a096e92ed1d766794ed296b92ce92ea9f118345b4e383f4
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-cpp/libxsd-frontend/libxsd-frontend-2.0.0-r1.ebuild b/dev-cpp/libxsd-frontend/libxsd-frontend-2.0.0-r1.ebuild
deleted file mode 100644
index 9a16fd1f89a8..000000000000
--- a/dev-cpp/libxsd-frontend/libxsd-frontend-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs versionator
-
-DESCRIPTION="A compiler frontend for the W3C XML Schema definition language"
-HOMEPAGE="https://www.codesynthesis.com/projects/libxsd-frontend/"
-SRC_URI="https://www.codesynthesis.com/download/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/xerces-c-3.0.0
-	dev-libs/boost:=[threads(+)]
-	dev-cpp/libcutl"
-DEPEND="${RDEPEND}
-	>=dev-util/build-0.3.10"
-
-src_configure() {
-	mkdir -p \
-		build/{ld,cxx/gnu} \
-		build/import/lib{boost,cult,frontend-elements,xerces-c} || die
-
-	cat >> build/cxx/configuration-dynamic.make <<- EOF || die
-		cxx_id       := gnu
-		cxx_optimize := n
-		cxx_debug    := n
-		cxx_rpath    := n
-		cxx_pp_extra_options :=
-		cxx_extra_options    := ${CXXFLAGS}
-		cxx_ld_extra_options := ${LDFLAGS}
-		cxx_extra_libs       :=
-		cxx_extra_lib_paths  :=
-	EOF
-
-	cat >> build/cxx/gnu/configuration-dynamic.make <<- EOF || die
-		cxx_gnu := $(tc-getCXX)
-		cxx_gnu_libraries :=
-		cxx_gnu_optimization_options :=
-	EOF
-
-	cat >> build/ld/configuration-lib-dynamic.make <<- EOF || die
-		ld_lib_type   := shared
-	EOF
-
-	# boost
-	cat >> build/import/libboost/configuration-dynamic.make <<- EOF || die
-		libboost_installed := y
-		libboost_system := y
-	EOF
-
-	# libcutl
-	cat >> build/import/libcutl/configuration-dynamic.make <<- EOF || die
-		libcutl_installed := y
-	EOF
-
-	# xerces-c
-	cat >> build/import/libxerces-c/configuration-dynamic.make <<- EOF || die
-		libxerces_c_installed := y
-	EOF
-}
-
-src_compile() {
-	emake verbose=1
-}
-
-src_install() {
-	einstalldocs
-
-	dolib.so xsd-frontend/libxsd-frontend.so
-
-	# clean header dir of build files
-	find xsd-frontend \( -iname '*.cxx' -o -iname 'makefile*' \
-		-o -iname '*.o' -o -iname '*.d' -o -iname '*.m4' -o -iname '*.l' \
-		-o -iname '*.cpp-options' -o -iname '*.so' \) -exec rm -rf '{}' + || die
-	rm -rf xsd-frontend/arch || die
-	doheader -r xsd-frontend
-}
-
-src_test() {
-	export LD_LIBRARY_PATH="${S}/xsd-frontend:${LD_LIBRARY_PATH}"
-	default
-}
diff --git a/dev-cpp/libxsd-frontend/metadata.xml b/dev-cpp/libxsd-frontend/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/dev-cpp/libxsd-frontend/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-db/Manifest.gz b/dev-db/Manifest.gz
index 5e4b7a239b66..c2fb6cc39df2 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/m17n-db/Manifest b/dev-db/m17n-db/Manifest
index 55d156f8481a..b966bf36d173 100644
--- a/dev-db/m17n-db/Manifest
+++ b/dev-db/m17n-db/Manifest
@@ -1,5 +1,5 @@
 DIST m17n-db-1.7.0.tar.gz 1939608 BLAKE2B 1b79e6ad32336a9ce34e14a52907b4064c410f70e356797ef59b1c9b8c83180453d820475b4dfb486eb1eb1d063607274b561a5120a60db0e0cfccad53d67eca SHA512 02c3cb347e9f5c840a723de9ed85be84fc9fb5f86d4963f0d1c6b669045d37d10e5efcf5ac0e0c3cb7249fb391b0dd32bd50fbc3332455aaf0b49d96fc09b2f2
 DIST m17n-db-1.8.0.tar.gz 1977364 BLAKE2B 303afaf8eb105b8cc034be96efc7790f774870c5cbb688dc33da02847b545b42b20fc041c3842d9fbf9d17417472815e8185df37b58f4d2d72fac762a2669272 SHA512 b21abfdcb5eb42e71fbd5edd1a99eca4a05df14f5a57eac7cdd3dc657337bd143a419f4b3f3dd0b74b82c827ede4d3666dd213af9041593cef50118ee43898d5
 EBUILD m17n-db-1.7.0.ebuild 564 BLAKE2B 088d96d2f54149878a1c14b31e1b13841f880c8ec3dc887864750b21f0a6f2c082d708ab61f4dfde95ccc8b43d3d8de3cc40cbf5e9f209149cc0836521139b91 SHA512 29667c9ff7903c9952b183b6323ed1e62d4f00250a76f8547c25c2b4d8dc7a79c933da79a88e0d111f204ed3c27fe984e2f390e608751fb6a77e70912c7faf8d
-EBUILD m17n-db-1.8.0.ebuild 571 BLAKE2B 0b2ad70ff457150873590bee0a92724b24004092047335fb1144b904c62d502eee520d1c8a60e107a57e4050aa995d99690f4b57f228b2aa8ca236f248a25d3f SHA512 fb86200a91f8b4cd846d1a0d18a309a25c3f12d70ac9da762fe9d021bd2c30a0e559d09a58781b4d77e0deeffffe3cf6a5b4127aaa4ca90f604c2c5550665654
+EBUILD m17n-db-1.8.0.ebuild 578 BLAKE2B 8cee1eea373e595dccbfd0e4b4c460e43dde492e5859bed976a1006be9ab16355f34d37b3398658741d5f96bac1fef02195f7234a1395bfcc36397753a49755b SHA512 5cdfbbdb0bc43b44fbab137ddac54097e0cd87b44a3a5da10a18c2b46373b0be405844582977582b96f9a5b8ad8c67dc46200d708b1d9b969283bebf6f853d1a
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/dev-db/m17n-db/m17n-db-1.8.0.ebuild b/dev-db/m17n-db/m17n-db-1.8.0.ebuild
index 035eec6709df..3227d7d76d24 100644
--- a/dev-db/m17n-db/m17n-db-1.8.0.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.8.0.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"
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 DEPEND="sys-devel/gettext"
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 2f0a22fadb8b..c843c765c029 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -31,5 +31,5 @@ EBUILD mongodb-4.2.15.ebuild 4810 BLAKE2B c32040a0155d97f35446402043c3c15654aa17
 EBUILD mongodb-4.4.1.ebuild 4856 BLAKE2B 86aa185d44eea9397c191fe48a72d707e5b24bda578080524abc84ade90ebd6cca161f520263cf86b34e39c72ee57a4f96864876d3cf872d7e7c1e94208c7607 SHA512 698c382d279ca85f9d9bd8e1c03af4989967dbb1ca13f4fe90d1f73004b54f07736cafe46dc8bd34a43177131e7d150cde60ffbc6f5f7c36c1b1ed53999eaa90
 EBUILD mongodb-4.4.4.ebuild 4818 BLAKE2B 139a4f6c196058bb13ba154fa98ed4a9890be26a9747ba7b14aceaaf58761d36a34a745fe3a5c77fcbb0856c0ff2f55c71d44c8cdd9b08f894906eb0442e2c70 SHA512 8c371b107f92c294d790c6de5222200017c461a098fda3a4cfcc473595e7dfc0527de4d1b4fb02365bc5dc5cb38f52c14df5affc399b2fb7bb7b4b39d8a0fb07
 EBUILD mongodb-4.4.8.ebuild 4862 BLAKE2B c5364688ce530b2e919664228fcd95a37db59e1a3a97cc48972bf2ae1d60dc2481f558b81a405df57c7592bd1a7bdf1beb2ff1a94f87128ee6097e4a438d49a7 SHA512 99ff43345917359f9e990b1fa486c65e8da0be463a97be3e615a1dffd94fc8bdba2b682c3d03d61a893fc6ec2ba0189bec38bf925dad211e53aaa2ccf5b2e523
-EBUILD mongodb-5.0.2.ebuild 4646 BLAKE2B 20eb39c2b8b13329efde1ba59a561a0870bca092510743c61d0b8506e1cf5065a5ccdffa892b1beba2efcd095a3a81896261d42f4e173ffce63602e6ff36d3f5 SHA512 57017e246575c6439a8e673b8b2f3b3cdbaedf596d90a55419931ba10e5a8c7b6922e51462974b46d52dfcfc1a31de96d94f905e340bfe6af47685bbfe3b8846
+EBUILD mongodb-5.0.2.ebuild 4908 BLAKE2B fa1e5caa705c1b45c9dcb5310c0d840377ff85da976e087e2743590dd0703082166d6cf9f81c7ebc5a90910dba173260991c1aa014b3d394b29bd8f9aa400353 SHA512 60ac73ed0b375bdf34dc7e4801b6700d0590edaea7c707486dc6530e22514a60b45368574ba446862a809ee164b62dd6a27b4acea0000ab35f44170596cd002e
 MISC metadata.xml 918 BLAKE2B f231cb9173bc38f2f8e7902a05681f6d852f4c11ef33c9c64d7bfab58f52b0d79b7e9c4ad62e352d6fae6c214081946afdc1bae173c11f1315cdd0a74ec6c238 SHA512 507c50c7b1bea2ffd54e42181e54077ab2164c4fed081bc78a9aa13273faab1b2175b72ae44e2ae9743a81ac2f5b5013f200a41bc605f39ff3c297913ca0d79f
diff --git a/dev-db/mongodb/mongodb-5.0.2.ebuild b/dev-db/mongodb/mongodb-5.0.2.ebuild
index 03eb379258b4..a2ee4340b7f1 100644
--- a/dev-db/mongodb/mongodb-5.0.2.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.2.ebuild
@@ -21,7 +21,8 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 -riscv"
-IUSE="debug kerberos lto mongosh ssl +tools"
+CPU_FLAGS="cpu_flags_x86_avx"
+IUSE="debug kerberos lto mongosh ssl +tools ${CPU_FLAGS}"
 
 # https://github.com/mongodb/mongo/wiki/Test-The-Mongodb-Server
 # resmoke needs python packages not yet present in Gentoo
@@ -77,6 +78,13 @@ python_check_deps() {
 }
 
 pkg_pretend() {
+	# Bug 809692
+	if ! use cpu_flags_x86_avx; then
+		eerror "MongoDB 5.0 requires use of the AVX instruction set"
+		eerror "https://docs.mongodb.com/v5.0/administration/production-notes/"
+		die "MongoDB requires AVX"
+	fi
+
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
 		if ver_test "$REPLACING_VERSIONS" -lt 4.4; then
 			ewarn "To upgrade from a version earlier than the 4.4-series, you must"
diff --git a/dev-db/pgmodeler/Manifest b/dev-db/pgmodeler/Manifest
index 85dace2dc2fb..3883db84ad10 100644
--- a/dev-db/pgmodeler/Manifest
+++ b/dev-db/pgmodeler/Manifest
@@ -1,3 +1,3 @@
 DIST pgmodeler-0.9.2.tar.gz 3930988 BLAKE2B 36d89c3bb400cd82199492208acf40fb872cb832a4911f818581672478d80e43bf56246a4485dd9b3a65a378bc261ad1c4b40243f1007aa2e67e75b62233ded4 SHA512 1bc48998623e39139e930c028095aace808084bb05d837273386a96aaeccd292890bbee58059b27710331f87d6e89a79005f2b0cdf901d229be6f777958fe051
-EBUILD pgmodeler-0.9.2.ebuild 1247 BLAKE2B 7bfbe91ee4e4dfd60cea2bbe863ce20dc153587da485fd24e445f4a9664cf3b99f2638f05b46af0de09e41e415711fe839d4de6fedd25c023a09c22924cb0cda SHA512 2e93e90361d7ef10c22c6a26e021987dadbc43696d4b3ff81a79b5e840468642168b1e1e456fd9f68d603a203e7ca266cc0af536f28698aa5025d6e07bed0845
+EBUILD pgmodeler-0.9.2.ebuild 1242 BLAKE2B 247e11983196270bc4726d444a1e7f0252c00106dec736d2074bdd9735a6c647ad1ecf7d5d94970b132bacb76a7542e5e21dd05b015ba8726de57c437d70e6e3 SHA512 5f821619920e5ae860085c9452e5b1181b3aa4392d09d06ef244461142e5946a3e372723b090fb3317ee20f6e758b822924b6e6dd9b3fea25c536283690b5f81
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgmodeler/pgmodeler-0.9.2.ebuild b/dev-db/pgmodeler/pgmodeler-0.9.2.ebuild
index bb15a8302a3a..04fd2b04d24b 100644
--- a/dev-db/pgmodeler/pgmodeler-0.9.2.ebuild
+++ b/dev-db/pgmodeler/pgmodeler-0.9.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-POSTGRES_COMPAT=( 9.{5..6} 10 11 12 )
+POSTGRES_COMPAT=( 9.6 10 11 12 )
 
 inherit desktop postgres qmake-utils
 
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index f87e3ee54653..292d4664d2db 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -6,7 +6,7 @@ AUX pgpool2.confd 649 BLAKE2B 1c520c4fa954c7411c1b700c03bf4e39196c599eb239cf8641
 AUX pgpool2.initd 2162 BLAKE2B b04f6b952507b8e4815c7b27f09b59ffe64f6262719c5490377fdbc5f8490cdead18fdbeb0ce8379d9cbd4bbb1aa21221d61853ff49a456a5ef6a8d78f3f5129 SHA512 05dd358d20bae60cfdefd7116b1111288b5a2be6d68a9dc40eaf6ba641524d422f2faac79bd3c629cee4f8b1ca601a9b6e303d4228e538d742ea407b6190ee53
 DIST pgpool-II-4.2.1.tar.gz 4713114 BLAKE2B 207cb3c43e47d40385d6808195561117293e5acec6bc34664ec7a1d8754bf9beb8c5350252a4274d4c50520254089f0e5a5fdfc0faf778186fa8000db6124df2 SHA512 b859a3952f69dd98a3df60b33b801d3bc96b9a11757593795a89751abe558c6baab10a37701d69d415c9da26a16abcdc72e0209e74c62204facfb25cdbc512f8
 DIST pgpool-II-4.2.2.tar.gz 4734840 BLAKE2B 2b4d26991732293e1411d1219f85a8c9ad1dca72c63069381ae1377a02ae215e813356172f3b89b42b9140549c92c76d443b125bb65cbc6abf03d2b99cf18dab SHA512 a147c810cc691fb27b823a813cbd2eaad66822c7c9f5c0f829cc70d4ac65911bbe827640f2dbd8060913276ed97340b52167e4332e9cdf013b6c9bc144c7b5d8
-EBUILD pgpool2-4.2.1-r1.ebuild 2375 BLAKE2B 90f7c1915abd39cd3ea8513f5f58bd73d6863547f0d8c9a719fbea7118210fe36f495f616a11bcd834b6caf5107aff6c7a5bf148a56c4652f993a2e32349116a SHA512 11f845b16205823a699d42f466fe06e6ff37296c71d65700a6218ddc663970a6f0767460dd7110ab6fc93968765d944ee39f9f7a4105e9dcfec8ec1428ac7c20
-EBUILD pgpool2-4.2.2-r1.ebuild 2377 BLAKE2B 54f4007d8e85512712c0d3ab1feb27eb25e06b8114962807df2a7fa2c9267b2dbc1b5e3d0a5d63f4525ec9fa31582319b8f19e58a7de8f765d545625054bf061 SHA512 5cf13f06e125b7da665666b5026a0a0086b7a211ec3c929cda3ad764b01b4052b443816b99bdcb1b4c92e8ecd87d590e6001ac3ac9676a770df2fe50e0cf2284
-EBUILD pgpool2-9999.ebuild 2452 BLAKE2B 3e2e76114c91947e42572c175f74097feac002b4c52901c7a97d100977acaa14abe4212a7fb873ab931f7c01490db52a4ad24def0ed1bf032bf3b20b8b986759 SHA512 1ec644d51b49fc732f39f49ae9dc5bde1ae32fc122f019ae97075b2c9d629a2032253b94e730d5bba1f1aabadc745d91c3abf8b50074c5492f362a9d07db8e05
+EBUILD pgpool2-4.2.1-r1.ebuild 2370 BLAKE2B a3dc7b05d938fb765b77efa0f4f015484d91e0081b16ee8cd3b8a245d82c94e77862d3d085b1c3934328a1831c81afb3591ce3fdd9c0cc9d00f2f2b1d70d2dd2 SHA512 9347ebb00dd294aa55c35674224bdc64e288d9e35058fdeb3c92b1691de89418dd31e72a0f0c2a3bbca16d1d2c1b8636eb6c1e1678e14d46060cd59809be3c2e
+EBUILD pgpool2-4.2.2-r1.ebuild 2372 BLAKE2B a084a6d0ea275779d28803646c498d2a963a79fd5fe9f02145a07e50bbba7442ee3e52e201b656fcc4b612ce950e44fb56360d308c7c263d543ca9366fcc3a5c SHA512 cf7846ec0b75921c72b839061fa6bf211b299c8b5a6239e984ff439d861f1ca33ef91005d813bdf762145bdceff95e93919a0b6aab52ece103d66d81358c84fc
+EBUILD pgpool2-9999.ebuild 2415 BLAKE2B fed7c759accfe5dc506e2eedd772c90fccfca9a599952298aa81b45a0f645d5a0a0b92765c2eb27a8bb0ee1394585c24bb20b4551ca316dda0bd98d647eb75ec SHA512 6576298c11fae80eafa136f3cfa0942cf9c029526baffc25a1eb19626ec1354752c3bec22f48418ec516bd5d2c1671c792ef4e6239e01c706525ec05eaa52e5c
 MISC metadata.xml 390 BLAKE2B d6a0560051449e95bb43e81589eee966a477a75d7ec8211ae96b15f2d51ce9555181b8640d9d830f2b42f8159989e9126423c6ccbbc2bf2dd8121f4920a87a16 SHA512 ce26ee116c3c7ff77a771294ed07f38d8f940dc380915c339eb4c543d86fa5bde025ba83e70af2b7bf4a1bef1e51957f151131836855e0dae2e1daed73ffae8d
diff --git a/dev-db/pgpool2/pgpool2-4.2.1-r1.ebuild b/dev-db/pgpool2/pgpool2-4.2.1-r1.ebuild
index 68b7ecabf291..7e2ba70df24b 100644
--- a/dev-db/pgpool2/pgpool2-4.2.1-r1.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_COMPAT=( 9.6 {10..13} )
 
 inherit autotools postgres-multi
 
diff --git a/dev-db/pgpool2/pgpool2-4.2.2-r1.ebuild b/dev-db/pgpool2/pgpool2-4.2.2-r1.ebuild
index af575e001949..45d450412b69 100644
--- a/dev-db/pgpool2/pgpool2-4.2.2-r1.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.2.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_COMPAT=( 9.6 {10..13} )
 
 inherit autotools postgres-multi
 
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
index eab9b3bd7651..364ed807be0f 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -5,18 +5,15 @@ EAPI=7
 
 EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git"
 
-POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_COMPAT=( 9.6 {10..13} )
 
 inherit autotools git-r3 postgres-multi
 
 DESCRIPTION="Connection pool server for PostgreSQL"
 HOMEPAGE="https://www.pgpool.net/"
-SRC_URI=""
+
 LICENSE="BSD"
 SLOT="0"
-
-KEYWORDS=""
-
 IUSE="doc memcached pam ssl static-libs"
 
 RDEPEND="
@@ -25,18 +22,16 @@ RDEPEND="
 	virtual/libcrypt:=
 	memcached? ( dev-libs/libmemcached )
 	pam? ( sys-auth/pambase )
-	ssl? (
-		dev-libs/openssl:0=
-	)
+	ssl? ( dev-libs/openssl:= )
 "
 DEPEND="${RDEPEND}
 	sys-devel/bison
 	virtual/pkgconfig
 	doc? (
-		 app-text/openjade
-		 dev-libs/libxml2
-		 dev-libs/libxslt
-	 )
+		app-text/openjade
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)
 "
 
 pkg_setup() {
diff --git a/dev-db/pgrouting/Manifest b/dev-db/pgrouting/Manifest
index e601352d4a5d..cdb718391a6c 100644
--- a/dev-db/pgrouting/Manifest
+++ b/dev-db/pgrouting/Manifest
@@ -1,7 +1,7 @@
 DIST pgrouting-3.1.1.tar.gz 6133979 BLAKE2B b7657eeb88773773e6166190cda73d9e657774ff81ce7e9f005333a8dcb9d56587d4a793410356092bb1623ec287549dbc60d814b1d5156ff28301503acee776 SHA512 73285d2d47be844203df136b8a8c13d1672ad8c2dac44a1ff7ce16e4676043692a8f2a60a305542132891da83560c49c5eaeb7712e3e3dd250cd8fd550260d4a
 DIST pgrouting-3.1.2.tar.gz 6063893 BLAKE2B a371fb9c744b14072c65af5ceb1ea73d2cdb69821626be3ac79e08c9dee854272ce8cb3816d1de3eade06d50a7520846dd6bccda06934b9db926f9092719f131 SHA512 3cf3e0a4a726f6f11887d15ad71b789a9067f3bc5a675288f22730215aa12d12b94d75f9bdc8ab3077de8368c45c55c0dc27128d0453c4c30965bfc0cf118dcd
 DIST pgrouting-3.1.3.tar.gz 6057504 BLAKE2B 73bc5d810a2f7bb383ba4fef4ffa52ccb3f21dbc00c68f02665dc459c0e0a2810e0ed10ab73bb3099be5ea6dde86bad884d82039a50c9c4eb423b614845e94b6 SHA512 1051f0a91813ccb3c396c78a059b99839b3352e562372bcc459dfaf289e35ea08bdba8a159032a3df46913548fc717968c187b8c480187497a5b5f7327ca470e
-EBUILD pgrouting-3.1.1.ebuild 1090 BLAKE2B 2a96e7c7baf0b80eb28a2fa633f7c18959f386d4591f07de8e2408fab21b69cce775dd5d8c78c85afc8fb7cf0b52b01d27fcc219a569aa91abff180b28f2a4ac SHA512 fbc6ce99d23055041951490da633ddf8c5467a76b8399e760079a3bf3882dc511104cd6914e99760e39ba7143bc2d545c4af639164ea8aa0040cf9de8bcfacb2
-EBUILD pgrouting-3.1.2.ebuild 1056 BLAKE2B 1fa30057f61f0d7857ddd0e98b577b93321326ef9b6b0a81409c6b5f6d0de621b6f73d7c7c98a61872620ac7fd7d3332421d4f82aeb946f4db0b57af57268606 SHA512 2aeb113d2e83966939215772762645edc9bd607c65735d3edfd54174ed6cca3b9367e7e68cc54a8a33cdb2b3ff5696e372da8e05309b2d35960eb409554a7903
-EBUILD pgrouting-3.1.3.ebuild 1056 BLAKE2B 95aa0b132edde82155508bbb42459bdf2722fa2a94ccee97b672cd10f8e1d302f95bbee007784385ca935f1a2fc1a72f7d153361178f16261d81d88eb73ff783 SHA512 9d0ad46998a26f105d3954cd094d8213f69b599dbd6f232242d213416ac7387fe82960652b64e05d8b86e59004b733322bf16a67757261e0f52f3220787caa84
+EBUILD pgrouting-3.1.1.ebuild 1085 BLAKE2B ade4fe3dd3bab1eeed0895f5eda363d5b545982f1bd10699851e9c90a800c1dcc5bacf83daa3f34c0a8bb1a5add81bf53bd19757ba69c4e7230e4f0087f6f46b SHA512 8a842e74bed495989a66fef076e1b82998b09b7f5dba2830f09e3e725e1bb2aa84bf09f04fe72f7a28e747685a1f42a505d113ed1e386a6e314c9d15928c73e0
+EBUILD pgrouting-3.1.2.ebuild 1051 BLAKE2B 5132e027be076c8cf6d0c67d3cef0498deb10301ff62bf80b21c15450766ffebc902ac9cd379c475792ca4ae029ec26e1b666323d5bde1d29a05986636de17a5 SHA512 cbc8d0993c880442ceaba79281f545fc8112c083f9f9757642b44d892b2eb5cf4989f36e9ff090ad8ed962c47f11fd4e557cc7f41352eda9779b089ca4ffb0a2
+EBUILD pgrouting-3.1.3.ebuild 1051 BLAKE2B ea909d03b8804308c15803d03c1a73741be77232d14ece6071b25253e253a06baf67940e9403020244ff928f0df36c2b64df922e18efccb2be1641086e072ceb SHA512 6904f83a664765fda6b1f18cebf3a3ba31845a316aba8849c7de3769dfcf69649a4687b58b42db6f24538dd94709494b4c511da102532889f6dff2305d4c43c2
 MISC metadata.xml 374 BLAKE2B 2d62d58c72da287624ca59e6c989089f70314154fd9e74d0c0a0a146ca0c2cd5bbe7bf9cf1bffca979fac52c7929c8335685484cb95e6c2b51a35189854ba953 SHA512 f6288ebdda1cad7cc62ee64fa4f6b9efb2e1c754a9573f489778353e294d0bdfafda74ac6dfa553be0088bc56db65e1527930fb3796f8025c7f44a1da983b7c5
diff --git a/dev-db/pgrouting/pgrouting-3.1.1.ebuild b/dev-db/pgrouting/pgrouting-3.1.1.ebuild
index 0c0d27fd5710..9976eb3b0450 100644
--- a/dev-db/pgrouting/pgrouting-3.1.1.ebuild
+++ b/dev-db/pgrouting/pgrouting-3.1.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 CMAKE_BUILD_TYPE="Release"
 #CMAKE_MAKEFILE_GENERATOR=emake
 
-POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_COMPAT=( 9.6 {10..13} )
 POSTGRES_USEDEP="server"
 
 inherit cmake postgres-multi
diff --git a/dev-db/pgrouting/pgrouting-3.1.2.ebuild b/dev-db/pgrouting/pgrouting-3.1.2.ebuild
index addf00e4158a..3dbd84c33373 100644
--- a/dev-db/pgrouting/pgrouting-3.1.2.ebuild
+++ b/dev-db/pgrouting/pgrouting-3.1.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_BUILD_TYPE="Release"
 
-POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_COMPAT=( 9.6 {10..13} )
 POSTGRES_USEDEP="server"
 
 inherit cmake postgres-multi
diff --git a/dev-db/pgrouting/pgrouting-3.1.3.ebuild b/dev-db/pgrouting/pgrouting-3.1.3.ebuild
index 97f11ea503ca..fbeb110ffd18 100644
--- a/dev-db/pgrouting/pgrouting-3.1.3.ebuild
+++ b/dev-db/pgrouting/pgrouting-3.1.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_BUILD_TYPE="Release"
 
-POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_COMPAT=( 9.6 {10..13} )
 POSTGRES_USEDEP="server"
 
 inherit cmake postgres-multi
diff --git a/dev-db/pgtap/Manifest b/dev-db/pgtap/Manifest
index fc6201c09e79..a5012838c816 100644
--- a/dev-db/pgtap/Manifest
+++ b/dev-db/pgtap/Manifest
@@ -1,5 +1,5 @@
 DIST pgtap-0.99.0.zip 275915 BLAKE2B 33499dacc0019ecbe85ff3dc4fcc243b6102e0b7e7018d70b17cda44b8d22d8260229ab732db9900296232e0801070722bf97a752734ea7d389dc8ae57198b6f SHA512 c1b39bf2c041d759006d692229a67af1520b6a3d23fdac43f0781cac9ce69e7714fc854d1e45f1cb3ee188a20dccfb7904bc4dd1513699189fae70f425c13b5f
 DIST pgtap-1.1.0.zip 306590 BLAKE2B efde91e26fafc8300fa39b80d90eef134ebf3a309fca3248f61e2b8beb76b94d83b035d76c789509297f0bec48f35b5947b49e2da211826cd9d828145783607d SHA512 1cade794d738fc6b78d53a0feceff4e6c0e988fbcfe8cd9e8dbf62e2bea25d2e714baac55575e99f6d74ae0b7e5277770a69c8af7dbb5714913ea7435cf493fc
-EBUILD pgtap-0.99.0.ebuild 589 BLAKE2B 9c9a64f61ba3c47eafe05eba813cda3dd2c73e4d192096d89bb075c2bcaf85b7fa7324cd8054503adefc9abc257c31a3246423a6e6f1ab708640099eef88e5a5 SHA512 79319d9dbd3c9dc9cac54fb55f0e087b91fde987fdc844f4ea0ab5adad2cacf433b504aedef0c79bfc05ebcb2675885f619f33453d01eaffc48cb993672c2501
-EBUILD pgtap-1.1.0.ebuild 643 BLAKE2B 04763b0033952d3e725ee8303eb9c7a0c71003e12a7097fcecb95f2f01d4ba28655db5d913426b61e02e9fa15ec9ddef901ea639c5f8fcc4cb4eaf8c46e4e208 SHA512 efaeb58169b02654b6976c32e0167c66acd87f0c533bdbf4f8c30ef26fa584a4df75e88bd79e078885817f4fc2c3e8b01d2abcd5ac3942fbd7c78ca89ea1a1f3
+EBUILD pgtap-0.99.0.ebuild 584 BLAKE2B d50187a368d9a9485183a2a3dc9f23aef3fdc9b4f304f7b01eb4b5da1649ca19fb2c9fe60fa4dfc968153946da1e8457b650f7e67a343e402114df02ce9a324c SHA512 e8b2bfbe1fd3bc012dc7b87d92ebc7c7f026296c4c09881255225f648a6540f2c092580ea351d9f780672db61cf4195cf35c2285ca2b6a58cdf3c5c32536d278
+EBUILD pgtap-1.1.0.ebuild 638 BLAKE2B 1c44e86675592fbbef365d8aec2194c83dfdd0e56dd175159eb77bc3ba5a3ce904af9e149cc385cbeedc9847e656c7d8276dc329d09a654edaece1a224182a2b SHA512 c6f7b1c68c3be187b9f7332794cdc51a08bc6507aa9e530aa1bf302869fd0f69c9ef08092bb23d52eba368963ead74bedca374e9d2a3b36b26479977a9d4ed39
 MISC metadata.xml 628 BLAKE2B 8a671273bb0de6f11d5ea56a3bf38e9eee05c0a70ff8cefe183f0eb798afbead29e96d5a45f764e2afc437cc97d91590e648c6716a8dd8fa7a6cc9f072332e0c SHA512 1c06c14ea5af9248950e6c10ab877b0725c4885082211db94b8a195fdf0dd115dc584a325655b7155895ec4382008e03511aa238d43179310fbe3dc835f5270a
diff --git a/dev-db/pgtap/pgtap-0.99.0.ebuild b/dev-db/pgtap/pgtap-0.99.0.ebuild
index 4e6f68067a89..bc84eefe2478 100644
--- a/dev-db/pgtap/pgtap-0.99.0.ebuild
+++ b/dev-db/pgtap/pgtap-0.99.0.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
 
-POSTGRES_COMPAT=( 9.{5..6} {10..11} )
+POSTGRES_COMPAT=( 9.6 {10..11} )
 
 inherit postgres-multi
 
diff --git a/dev-db/pgtap/pgtap-1.1.0.ebuild b/dev-db/pgtap/pgtap-1.1.0.ebuild
index ca1636c707c5..ada507c7b18a 100644
--- a/dev-db/pgtap/pgtap-1.1.0.ebuild
+++ b/dev-db/pgtap/pgtap-1.1.0.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=7
 
-POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_COMPAT=( 9.6 {10..13} )
 
 inherit postgres-multi
 
diff --git a/dev-db/plr/Manifest b/dev-db/plr/Manifest
index 10e36cf34f9e..1cbad26e2483 100644
--- a/dev-db/plr/Manifest
+++ b/dev-db/plr/Manifest
@@ -1,5 +1,5 @@
 DIST plr-8.3.0.17.tar.gz 74017 BLAKE2B 314b4cfa2c3ca8ed31e80a72233a6dc8cdb9f3811dad6e9f3eb5147c17cdf5a039436598b0fc2b30c6702b02dd3cb2da33543764aee3199c6864aae22be875ce SHA512 d7080c62349d1dcdd17008a7be3643b54678e0f66bf721068df73057394496d025c4fe01e52945c3acf9cc21eb90241512667772ef3fe519a3c9081efe92dd40
 DIST plr-8.4.1.tar.gz 265142 BLAKE2B 859913ba14d3e6876eb5a3d7593346b98ab2e1b6c70d9fd9cc7e1810fe11ecb3c552305485735cf975cc41ce2de6cbd7bcf407c9e373fc4024230be797c9899a SHA512 0db407355271009bad95c21f81e544839322f0fa0a63d2abd8edbf9eab8f61e208a3e4f7083729cc8247411885197ff3569c88264db0a29b34523dc83bbed7ec
-EBUILD plr-8.3.0.17.ebuild 1700 BLAKE2B 441f233545359ab8d171834c88564883acdb1470ffc88e01c8b617cded8af24b2dbce943a23ae4ab7275908f809b805773915e96c9788b1be71ccf9fd65cb07f SHA512 deb87ada7c10d6fd263f0a1261e31444c1034dcfd603ad3ef1287f1f5fb30c040953d64de5ba0a58ef7c7036b38923cfb4beb94518a25e5e363a6dc2bed87563
-EBUILD plr-8.4.1.ebuild 1706 BLAKE2B 9cf57201d0630c2f3f8934b2d64db8c01409cbf1001a0e3ce0949682e01280da700f4a9f14165e5c06fb369136f7cecff8c9b3f8f3465540893dc9f84ebba75c SHA512 45a3d957f45b2d71eff298b9f8931a495fcb6c7f48edf318d21f036a682d899d003fdaf56c4688395d716ce8a8f1eaf4554cfd124b96ac5221e75c7ae7095310
+EBUILD plr-8.3.0.17.ebuild 1695 BLAKE2B 08608beab85ba219a998ae4ce29fad0b69fd076cd4533cf65147f52da2eee7b73cfc8cfb3bbe84940302da826a5c6a71152728aebe54a1a1cf8bd9ca4b22939d SHA512 f46353c5f6089fae5af0de77435dd6c021534b62768f4da05a0e4baaa0ecadb6932428ce7559c1a8ee7a54092d8dbf3f22f439cd8147a90a0476f0c5d4e39cde
+EBUILD plr-8.4.1.ebuild 1701 BLAKE2B cf9af2474f8a6b4a264ec730e0420ebb1c31735f87f258f2cdede5349f7acb93bdd2d5d5bd7d3d438cc23f1d0730ed89030657e06da158ca6a41c64048d24859 SHA512 fee93a9954c81eb42760db12f78ff8405ce435dafc946b347e1c0ee2f2002bf9c062a225b02042309182f799d0aa2e9a9fa3e00a923fe1010ee14cfc2bd340f1
 MISC metadata.xml 398 BLAKE2B fbe9113ea3c7b36b9edf80a645a929aba4c1578ae347b6c3f952de32566fb038e2f8d66e116c209ed9132daff772ddf8609e2fee4d34daa82d7f491d712755d5 SHA512 0a3a915b23606e75f6bca1ce8088912022826dbe336f03b40a9a2988c7518d8c5a61b5c700f60d827465142dae9f2ee1f501a51209d1d3b9c891da1e1d3f847d
diff --git a/dev-db/plr/plr-8.3.0.17.ebuild b/dev-db/plr/plr-8.3.0.17.ebuild
index 01de417db497..1b8acb6f6737 100644
--- a/dev-db/plr/plr-8.3.0.17.ebuild
+++ b/dev-db/plr/plr-8.3.0.17.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
 
-POSTGRES_COMPAT=( 9.{5..6} 10 )
+POSTGRES_COMPAT=( 9.6 10 )
 POSTGRES_USEDEP="server"
 
 inherit postgres-multi
diff --git a/dev-db/plr/plr-8.4.1.ebuild b/dev-db/plr/plr-8.4.1.ebuild
index b78d06bcddf3..5f1fb15e848a 100644
--- a/dev-db/plr/plr-8.4.1.ebuild
+++ b/dev-db/plr/plr-8.4.1.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
 
-POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_COMPAT=( 9.6 {10..13} )
 POSTGRES_USEDEP="server"
 
 inherit postgres-multi
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index e37cc0939894..7be7e07cf7b5 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -7,10 +7,10 @@ DIST postgis-3.1.0.tar.gz 17262134 BLAKE2B dbc6edde826328b84ca7d6cc9329d648c7874
 DIST postgis-3.1.1.tar.gz 17261826 BLAKE2B a14bdce3773f8cc50c72880d9b8158c32b546332884645e91cba539ab9238c3cbcbc9ee60292932c86de67a0134bdab6a2b4e6b1f3c55881afbb36a08d8f138a SHA512 b975d26c1ad01fa6b90b5b3b51fd2b4b33204a380af0f76b98d1bfd6bd95f527d4ac3548f1b822e114be17bb3a133bc88c3d33a17d4effdfa1f90ec0c683e5e5
 DIST postgis-3.1.2.tar.gz 17266501 BLAKE2B acc65e3ab70667c57a71bcb9c7bbfc382f8a6038ceb0e91aac07e36fb6b4cb6365aa968b30af13eda8292410cc1b567d871970e6cb7dfaadb454147224f9b834 SHA512 df9d2fa118987e29acd635912a708e643770ad3df82c098f8129f11ab07a9eafde969302d2d2e59a68fea6fc7312fe768a231dd4cb5de7002c418725da75848a
 DIST postgis-3.1.3.tar.gz 17273487 BLAKE2B 603be66476037fca5e75b00079a26b4beaa50f0af0626f89660f17da398576d929574cb363c4177877d9c8db5459f7eac964b85796cd93b0d0c6ff2462d7ad3f SHA512 525c982de6b5888d1f4a4f6d2cca5dfa945d8899d8038b1d62ce222e0149c4ab26a2a3602bb8c85e89ce22b3d5b20d278fc4f841144f4b0d19e6de4f48d819ad
-EBUILD postgis-3.0.3-r2.ebuild 3378 BLAKE2B f3e6472f482d5326ebf4fc9c849106b2f3b90f6d34589c1fd7903637e018239beeb4f36998b9d6519c98a6a5cfcd809f1d22a6386844da09ec1d977cef1dc410 SHA512 471c3cf76e9b6290f59a52b8a5301ba1835f602aab17915f18067a6b288acd5f47a274d36289451de9f4a555f6e35cddaafee29315a0bdc6d71a8b41a9c950b6
+EBUILD postgis-3.0.3-r2.ebuild 3373 BLAKE2B f343d54a11b140d87d811337aaba6c2224a7822f158285273d83db7fd7e2e34570760e92efcec9a1220e2e938f3af07f525800406925b5acd51fd2317cc95335 SHA512 6a6e2e25b80a8b4dbc5dd342abcf8ca0af46c6b83d0d6f66f9d30ed01213de5664da47c90cd57a6e2f0985eed4a3a06634e78c94a536d5ca8a04e9e70121e62d
 EBUILD postgis-3.1.0.ebuild 3318 BLAKE2B 8433965a9d7536d4909fc18eb09bf74718e94854b272b4ef7d660eb8d5114f28b6aca877c2995f56fb4d3bc0ab71e892f9610bd34dfe9b527338d77ec811f27d SHA512 3e1ddce90bd260bf582844e3464c3a9b926e98d6d584f7b4d52c0351d201c71d71eea87add34b60378ace025f739ed758cc4ea4a75f48a662958ff3ee0d51b7c
 EBUILD postgis-3.1.1.ebuild 3320 BLAKE2B 52426df4505ad116cc33c1122b8b37329a0620d66fda9c8499caaf0571953f775c429a44f8d95a2fbb14b30744e8e761b206a2bd081805b181ffd7716c768351 SHA512 2a02d20a6b63148258cf82936d4d867307c3c527ce8133605e360dfab8166fdf00889b850daff0b7ce0144da2b22b63be792521174ef52967f762bb2352ce487
 EBUILD postgis-3.1.2.ebuild 3320 BLAKE2B 52426df4505ad116cc33c1122b8b37329a0620d66fda9c8499caaf0571953f775c429a44f8d95a2fbb14b30744e8e761b206a2bd081805b181ffd7716c768351 SHA512 2a02d20a6b63148258cf82936d4d867307c3c527ce8133605e360dfab8166fdf00889b850daff0b7ce0144da2b22b63be792521174ef52967f762bb2352ce487
 EBUILD postgis-3.1.3.ebuild 3320 BLAKE2B 52426df4505ad116cc33c1122b8b37329a0620d66fda9c8499caaf0571953f775c429a44f8d95a2fbb14b30744e8e761b206a2bd081805b181ffd7716c768351 SHA512 2a02d20a6b63148258cf82936d4d867307c3c527ce8133605e360dfab8166fdf00889b850daff0b7ce0144da2b22b63be792521174ef52967f762bb2352ce487
-EBUILD postgis-9999.ebuild 3248 BLAKE2B 1b30e9bacc0d108dfba59a6be62b50a1d7a43ce07599b22283e5aaa5aed6cbd8f00a4bbb9f8066f3e0a102a94f1be594bf33bc7c9c6e2deffee9994a76d9da4f SHA512 3f9c275a4729acf275bf19e6b251926a482a6b39f9e63e3fe14cbeca329fc061eed1cea56dd413126302a2fbdf86240c31df4d7e40017061f7f256798bdf3533
+EBUILD postgis-9999.ebuild 3243 BLAKE2B b12d44e623a1d57bc6081b6395b85781dc2751ecaa66b854766329b11122157ceaca8ecb0d95a5924f25daf1b2bc2e28cce3487d98373b3d0e9a508ada0a3c52 SHA512 3faf7598a5f029cffe543371c44d82c0943b6672a04722b47bb4be6c6d6c320138e5a11fef38278e1a12947c9a00aeab68bde1c7e080e5e497540baa5717547e
 MISC metadata.xml 682 BLAKE2B 8ba8b31f48ae367ebfca1e4f34337b806f965f97ec449480d3043cf21a5fa755e92ac1fe2ee914b22819d4fc5cc136bc7f51fea07d962e392eb450793936e0d4 SHA512 b22c968248f19308bc5d4bde3a725810e1d4f0cddfa836825099e7add32a758f7afebe89f73ae4c85f1033830a2e94bd5a0827f899896429ab3f4977f9baa486
diff --git a/dev-db/postgis/postgis-3.0.3-r2.ebuild b/dev-db/postgis/postgis-3.0.3-r2.ebuild
index 24bf24bddc27..9fc6b071313d 100644
--- a/dev-db/postgis/postgis-3.0.3-r2.ebuild
+++ b/dev-db/postgis/postgis-3.0.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_COMPAT=( 9.6 {10..13} )
 POSTGRES_USEDEP="server"
 inherit autotools postgres-multi
 
diff --git a/dev-db/postgis/postgis-9999.ebuild b/dev-db/postgis/postgis-9999.ebuild
index 366152c1f9a6..8325204434e1 100644
--- a/dev-db/postgis/postgis-9999.ebuild
+++ b/dev-db/postgis/postgis-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-POSTGRES_COMPAT=( 9.{5..6} {10..12} )
+POSTGRES_COMPAT=( 9.6 {10..12} )
 POSTGRES_USEDEP="server"
 inherit autotools eapi7-ver postgres-multi
 
diff --git a/dev-db/slony1/Manifest b/dev-db/slony1/Manifest
index a7b458c8f306..336e2a7f9843 100644
--- a/dev-db/slony1/Manifest
+++ b/dev-db/slony1/Manifest
@@ -2,5 +2,5 @@ AUX slony1.conf 249 BLAKE2B ec214fb9a7d51bcaa58dc191d7e943c0d07be85c0f31dadbf199
 AUX slony1.init 615 BLAKE2B f1b3fc27ad3c4087713cceb6c2bb9451004b70e87c0347274c75e1c3ed8d439bb99f51d5e6e904d3957150e62760272312423a47235ff4e76792e0661b683bb3 SHA512 d450bba5f65372509e542f138d297202371bcaf78332ba13de72ddf937fcffe419083dddc5032c7bafd51993fbc677b37262e1b1e938e9e3c927e130c0a7c693
 DIST slony1-2.2.10-docs.tar.bz2 1445193 BLAKE2B 071f5faf2f7cae822b484f13ede6a8ede5278a065c55d2199f38e2dd195922cbc78982633316792978b968295d69e36651ae0367682ad45afab295e61e5329fa SHA512 d603abccc1ec7922fe8025ab178e6d12b28ffc763848be8d1f9fc93519b9928aa65ed6bcc1d678f2ad9f79818de06da39ec1f69d60de61c5e6fe42137c7c3112
 DIST slony1-2.2.10.tar.bz2 1464652 BLAKE2B a07a830501be13f33fc189128851cee02c8d8ca51a8a54f6b97028d65eb17937817c9ab6b5ebbcaa092e96fb00f57959806e5003e016df5e7034583de601084c SHA512 1b41addb7a0be0a130c2efcab1b241e3158d10a5a6e203d83f28353e303dd524e224ab9c04a7e37a0f89cd944237b90feeb8910eb35f717926aa3ad28dbe2d0f
-EBUILD slony1-2.2.10.ebuild 1938 BLAKE2B e47508220871260fa72833a401670f57becbed07747ab94b8e4cb84b0b99d7dec3dc904134125e2b4cb3a218003cbfd905b45c830408be472026249e86e657c5 SHA512 a85caea7734ee11806abaec688dfee2628c7cdfb44ad3e7473cc4e6ebf1feb260ef8d79ca6adb067f80ce82bce08c1666936d1b09730b33e3f0d19c625a40dcb
+EBUILD slony1-2.2.10.ebuild 1933 BLAKE2B ed006819938c953d738fa58b3cb432e1148be2b0a10cf6e85f0ae32030376e1b1d4552ebd012f46668d4ac1fb151199474b4b1abaa13c4b02475c7c0330e2f0a SHA512 37f6b734d3c55799c7b8b62aa401510176df1bb150376cf7e09fa54fbfd4a9560fdcbcb6f936536914c649b1fdae752c04f39fd9e46df7672e49be62038f3d52
 MISC metadata.xml 280 BLAKE2B 75bfaba3095bd67dfa80654885579e51053fd130ae4e3ad61ac75192eebad9fe8d08cbdf63773dad3837ef2805e0594d0823655966fde8876ba5919e01f0e698 SHA512 efb5fb6652ac8cd75fff4eea8b2b044a2c9201cce2faf3bbe13a97565d150e64f9ba0dd8bb691a44a1b6726455306ea8b6c1b121678a721a82e7ea8b6589c94f
diff --git a/dev-db/slony1/slony1-2.2.10.ebuild b/dev-db/slony1/slony1-2.2.10.ebuild
index 944ca9c71151..f78c2c8e6a18 100644
--- a/dev-db/slony1/slony1-2.2.10.ebuild
+++ b/dev-db/slony1/slony1-2.2.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_COMPAT=( 9.6 {10..13} )
 POSTGRES_USEDEP="server,threads"
 
 inherit postgres-multi
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 360be8a2c7c7..ddd3a81e9965 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index 4e9c7afca3f0..ad7e3ebf98d2 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -5,9 +5,9 @@ AUX libftdi-1.5-tests-no-cxx.patch 1017 BLAKE2B ff3e05ae2cc48a023c74142f986159f6
 DIST libftdi-0.20.tar.gz 423570 BLAKE2B f0aa420a704e18c4257b99a4593dbaf46a15806d980b24909fe8678b36e74b568cd5915db1e14f8b904541334fbf3d18f069dc479a0bf66b2ea8e113611cb82b SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7
 DIST libftdi1-1.4.tar.bz2 109521 BLAKE2B 4186342afb2a0118c454230a925ccff2ed0aedd942cdd3afb1ac59519f1cd48db7f04421ecdb5aa6e53993666a903de00ce447fd81d00839806f8cc0d34c6e52 SHA512 dbab74f7bc35ca835b9c6dd5b70a64816948d65da1f73a9ece37a0f0f630bd0df1a676543acc517b02a718bc34ba4f7a30cbc48b6eed1c154c917f8ef0a358fc
 DIST libftdi1-1.5.tar.bz2 116297 BLAKE2B 460ab93026e14a452e31fcc6930d305638fdc0ed06cb44fb9d50ad8f80199b17057d2f48a27b8295b43b956934289c872a2ef1ddb7f93fa93c6816511ef7607d SHA512 c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f
-EBUILD libftdi-0.20-r1.ebuild 1858 BLAKE2B f8ea4cd9ebc1f264a670c934622396061fe3cb092f646d43f5a5c5fb79b1bed10fab359a33be9a2a4d87c5456076d5f595223984d9c0abc1bc068becf5e9355d SHA512 58ed755709fb7082213f94a6a7c7d2977ff03cfb49b6852176c8a339369dd0e704c22f076fb5ca8819856718523b6d8a61efa262aa599a1b0f34721f1ca38880
+EBUILD libftdi-0.20-r1.ebuild 1865 BLAKE2B d8ab414f3cb68b292a278e255539a0d9405f28cec65f9e2dd987977546e165c755ef016bf73cc82f8d3902af8ebdcf96b7f7249f1522a2070f06ce413ea1f30e SHA512 7fb88f7af1926878f39bada106db0027bde6e664b858be06eb76021b7e5ae497e6bd708f0c47a4eee0c966cc9810384312e3f365095b2d2de0016c611b5c7a0a
 EBUILD libftdi-1.4-r1.ebuild 1670 BLAKE2B ea9034c38431f1fae4f2c9dbbeba20fb2f6d32c4d4647478e0db36e312df74a5c5345b9deaf11b6ac63a314d56cadd0c91c0405f98a8aae5a98c2871f2d3248a SHA512 f9db8c7b9684a31d5f4aab93bad3554923ca163773e5cdec69207f358431e5f4234860ba1326723b4d4e083eed03fcf7758febc60c93b5d3682218aa6e5aed8f
 EBUILD libftdi-1.5-r2.ebuild 2114 BLAKE2B dbf8580b54472c409190380262a20411ce7ffa5240378658822e4a6f775d34324af8295487363c06d460d8fb492860b2c58ef6d5cdf0277f82f2e95e212e9c5c SHA512 06e30bf4d68716f18573c4ed2797252dba1cb7bea1341b4541e94477d1e80d3d1afbc5df42455b8c908b7511bf1f3235673a37085f7ec3d6db971c2fcd48e6e6
-EBUILD libftdi-1.5-r3.ebuild 2151 BLAKE2B 14abc5b4d742a65b586954fbdcdcf25ff60c8562063a25c31cadd17c5d0ef34ffc871b923807f41a712d901258c1930d056bd866daaedff3fa0863296cca6ca7 SHA512 f2589ceda823d95b7a22dc0e15501a91fe0e11c2cc9c3d75c12118c580148ae287eb2b644f74e7bae1cd7d05ce6f59f3bb7aa5cf6e169019a87fdf8c14de39ca
+EBUILD libftdi-1.5-r3.ebuild 2158 BLAKE2B 11dd4740ef0def7ce1917f997a33a7d6a442589c2f2a50b18258d8ae8e8cf678e1cb9df4279a24a5dd85274804827ff680ce9f66a1082fa3f79af0a9ed2414e3 SHA512 55b8a61f7c9f4cd2c00952397958d9154c76c128e2ea95a5104de8007d051e5058a1b9b451602d14c600923266b89a94bd393068b385c6742e05b1612c17ba39
 EBUILD libftdi-9999.ebuild 2070 BLAKE2B 24c97c8596fb7dd4679a5f60a510584421bd6a1a1f160f063db8d4faaa0473ffe7a2fe585d75039494795b6c44a33302bb34c2185a9f6d84a6ec227e8999b097 SHA512 28b15aeeb533c9952a2357068500178af2b6019914bf2f2bcba9252bd4e80580c60f8ac0f1bac51357f5d4e24f964c57a7b0c6654f73dec722ba264052c55ec5
 MISC metadata.xml 317 BLAKE2B 4ff2cf3b9259460d23387c23356cbf63e43d31a1b6f78704c3f918b97c1ac7e5ca87ed027d4dccd063b8b60e00b8f080e73b2f40520da0552fd7302c68b1e6d6 SHA512 21fd21d84f507274617bf8c059517c75dbad08bbbb22b4655cfb7f31c824004881c1f8fc615215af05333e97770ce925f5ac0b580283901032f6c6145ffa1aba
diff --git a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
index 3994d14e7bff..ebf844aaa8c5 100644
--- a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
+++ b/dev-embedded/libftdi/libftdi-0.20-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=7
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
 else
 	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv sparc x86"
 fi
 
 DESCRIPTION="Userspace access to FTDI USB interface chips"
diff --git a/dev-embedded/libftdi/libftdi-1.5-r3.ebuild b/dev-embedded/libftdi/libftdi-1.5-r3.ebuild
index 022fba4960dd..82a59aae256a 100644
--- a/dev-embedded/libftdi/libftdi-1.5-r3.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.5-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit cmake python-single-r1
 
 MY_P="${PN}1-${PV}"
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
 else
 	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86"
 fi
 
 DESCRIPTION="Userspace access to FTDI USB interface chips"
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 67a6164f08ea..0d6ac739bd58 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/flatzebra/Manifest b/dev-games/flatzebra/Manifest
index a35c51ab8426..5e3ac7422ccb 100644
--- a/dev-games/flatzebra/Manifest
+++ b/dev-games/flatzebra/Manifest
@@ -1,3 +1,3 @@
 DIST flatzebra-0.1.7.tar.gz 375938 BLAKE2B b84ee2a69c02a7fd519de3e709a81026946b107fa1ddf8f4ee24a490ae9993f2ecf6c8509b9e92d1ab4e11e7f41e41effaaa2b32a7d2e679400f02853602a9bb SHA512 12afbb0ef00dfac21654961da8d2101e9b7b0e6550b9e66bfb4da4faf77cc1dfb7f3da15c8b84c19379eb1ff8bac09324acc694f9282b74ae73a7379686f2374
-EBUILD flatzebra-0.1.7.ebuild 765 BLAKE2B 4db06a829fa620908d9017d2d9bb82ea1e37a66fa4e18fd8c600dc6485f17b51fe9b61415820061839473df64c56f04180f899475191ec6e5fbaebc07f1cd29d SHA512 af05473f3f014fc93bdadbf728647512ebce3d3df705c3f2f828741d4bddd118f9a98316495766061a945e3535ec64dbd08bd677b0ff1abd45f28abb27da565e
+EBUILD flatzebra-0.1.7-r1.ebuild 774 BLAKE2B a1c952508c72cc88055e05316165072975509b49a562dcebde47fb87673b8d1147fdef5a694486c72581d8cf716019c5dc6806157f2286b28ce765d34b52cf40 SHA512 693f6b3c19dc4066fa7092eb158d1c1350925f617109ffca4d908d1dd600d66878001dda4fe7aee0472a3700bf237ed05a4b5f77014a3fe4abf248409b5d9e20
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/dev-games/flatzebra/flatzebra-0.1.7-r1.ebuild b/dev-games/flatzebra/flatzebra-0.1.7-r1.ebuild
new file mode 100644
index 000000000000..89175cf28dff
--- /dev/null
+++ b/dev-games/flatzebra/flatzebra-0.1.7-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Generic game engine for 2D double-buffering animation"
+HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/batrachians.html"
+SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="static-libs"
+
+RDEPEND="media-libs/libsdl[joystick,video]
+	media-libs/sdl-image
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/^doc_DATA =/s/^/NOTHANKS/' \
+		Makefile.in || die
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	if ! use static-libs; then
+		find "${ED}" -type f -name '*.la' -delete || die
+	fi
+}
diff --git a/dev-games/flatzebra/flatzebra-0.1.7.ebuild b/dev-games/flatzebra/flatzebra-0.1.7.ebuild
deleted file mode 100644
index f19989af5497..000000000000
--- a/dev-games/flatzebra/flatzebra-0.1.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Generic game engine for 2D double-buffering animation"
-HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/batrachians.html"
-SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-RDEPEND="media-libs/libsdl[video]
-	media-libs/sdl-image
-	media-libs/sdl-mixer"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/^doc_DATA =/s/^/NOTHANKS/' \
-		Makefile.in || die
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		find "${ED}" -type f -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 299fe02dd2e1..fe7463ae405d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-vfs/Manifest b/dev-java/commons-vfs/Manifest
index cd1283bfc878..c88af179bf97 100644
--- a/dev-java/commons-vfs/Manifest
+++ b/dev-java/commons-vfs/Manifest
@@ -3,5 +3,5 @@ AUX commons-vfs-2.0-incompatibility.patch 2323 BLAKE2B d14a91d06c0b831026260f348
 DIST commons-vfs-1.0-src.tar.gz 278588 BLAKE2B a92be28e02758bd271d7bf76f8b90c741dad0f1c15c71ab3624e16c6c30a47bbe189ef93c99b1f413034c47dbfdefbc155a526abf9897b85cb7352d1a92b4bef SHA512 5826ccd3faf574d7573b22fbab5f7f3ddc83b22504eb0822efbcc4570059db410d1a32811bf411414d275bdeb16ce39fd7cca2150d8537841cd888b1aef2b5a1
 DIST commons-vfs-2.0-src.tar.gz 335255 BLAKE2B 01c8bba3340487672682af5c6b341ab1e8335070a9b711b5c85cca659854d05881a0ff10c4b168497e3a75867a7225740edc6e56019e55c499256401fb0a53c5 SHA512 433828b9eba73df14dbedaa4037e3da1c69bf1892553c1ae4d213ba864e4ee579e0c7799f39e3cb4ec087d7c9223f54442be46de9c4916d7b7ff8a51214d6346
 EBUILD commons-vfs-1.0-r1.ebuild 962 BLAKE2B a14b7e3b69aac36f0c3f99d4b3ef842e48d2997193b74be6610df3e885ff1f4d19a4faa2bd9e69310327a4e20115a7c07d7a91f87e629ecd96ec786fec96cb07 SHA512 02230fc7312f024e751e3873ded62d30c1bde28a36a2ee62f425118b582c3d7cd4cef931f235a8459f0b11975096fe325b7405bd15781f1ef03d2203002b4acd
-EBUILD commons-vfs-2.0-r2.ebuild 1631 BLAKE2B 9febe1a1166ca72b1d0c1804fe4713a265e02482091304f68ae1382141a32e8c1ff68ce8ccc07f2782896516b6bf3e3cdbda4bb3daa9f4bc7ea534b996cfc1a5 SHA512 7c315b76f89ca88c8a3d24f925eb4b6eb33413bc6873aa72b5cbdafacbf1764bba6c2aa06a107995b2f2e08c68071f6c95a13790552ae33745d5db4d54ee8539
+EBUILD commons-vfs-2.0-r2.ebuild 1629 BLAKE2B 7ee466afd98acc3e70d824eb4b3f08890010f6d6fce08c98d3d243239ff12cf05bf9a6460c3fda3ebdbc4662de7985daf59e4d811367a91733907639ad14d68f SHA512 5d1142fbffca0a4afd1d66e515a47f2099507681678a4304f45c74733832d570dcf6e74041194287de1c3d4b0e96a6c399b72e41e8a286e4899d8ea579d9cc8f
 MISC metadata.xml 522 BLAKE2B b4fa8415246b36a13af5f876f6fb75a49d867247d47d39fa26652917f0dc6e0fd48e99518cb7406375ea9b5715a8beb0f798dd9d95825969fa320aded7da50e3 SHA512 1c1c96edc32537d782e66dcf44b14081f2cdd249e5bb398dcc711b4dabac745db15af7fee7ceaaf0d758738b99f3fee8be7b9e1561887426c3ae8988bc1900a1
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
index 8f5598d5645b..b9a712da120d 100644
--- a/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/vfs/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND="
 	dev-java/ant-core:0
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index f03898e5ef8e..4dfd20dcd21b 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -7,5 +7,5 @@ DIST pdfbox-1.8.11-src.zip 11026359 BLAKE2B b3eb1add38e9bd0e5a1fcb116263fdbc372d
 DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
 EBUILD fontbox-1.7.1-r1.ebuild 971 BLAKE2B 5d0a36f8cca1a5793386111563cf793a57c665f903c467c8a244dcfbe6986b59072661fbee1b363d1d0aaff1dc1f921d016c0723a3237a722ae9b05227c1fc0b SHA512 44d237b4a9e505dc45ff2bd0afbd4cbe8452ffc66e7b6155dfe3ecc00dedd1467e8a5870d429ad494cd48d8437461dcedeaa5c68f2fb02f613363c5134abc2d5
 EBUILD fontbox-1.8.11.ebuild 1170 BLAKE2B a483121fdab73f9a92f4e9057114b92a90990f26cb3fbcfb3d28f8424af3b01a836b7eb7a8a2af11ba99dfa5db3e027f21761372d55cb00606b6bf626c79c2ea SHA512 dc7940fd45a410e30a147a7d4669aeabbbdcbbbf7415ffe59cce7c9130263980c375decde18aeab7e1956e78b2826ce6c4866393577ff7686b1b32c277dbd607
-EBUILD fontbox-2.0.24.ebuild 1765 BLAKE2B 602179a3ed887f0201cb62c7596380a486e89e2bc27248c8a1286511133a79ffb04da4326cf145694a13f43f342568cd477232198d75f0ce6509bffb258a225c SHA512 54f58693fe3a152d2cc99c7abc49dce282b44f162d04625c4d785f96ff4d43c0d397b79e370f91cf3118d3a372d6b119ed467c2b651a6cd7992b9261716abd01
+EBUILD fontbox-2.0.24.ebuild 1762 BLAKE2B 483d3d83508a4db99f14ef171c480b4c06d262a913b967922ab223975636e8176165ae65dc38c01c97e3b1c61264d4bd53d367cb63530eeefd542eea9e4cc851 SHA512 72917eac46cbc8be4636a35dbd2b8ccebe3c9fd271895be79e20a309b8ebef3373974dd5fb6cccf5f4d3c45689274497f4d3997615ece8f2680eb0fcad504e1c
 MISC metadata.xml 570 BLAKE2B 80071f93eb72253bed0abd8d049626e10c52327777a440a7325b81ceda3c11f095757c5833b9e572499760b389263824adbc4541787eb99a44faea79f193ecc6 SHA512 66595990acf09fb6e612cca3bffb7f42f3d11df4a08ba998121da77bd877373f36865bfafe43e17f7462a088849046c8c9dd8e1fd6c4e66d9216a2b0a3e8abd4
diff --git a/dev-java/fontbox/fontbox-2.0.24.ebuild b/dev-java/fontbox/fontbox-2.0.24.ebuild
index 36fa75e64718..ee8d0a7099de 100644
--- a/dev-java/fontbox/fontbox-2.0.24.ebuild
+++ b/dev-java/fontbox/fontbox-2.0.24.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pdfbox-${PV}/${PN}/pom.xml
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index c4bfa8863cfd..b45eba7fec8e 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,7 +1,7 @@
 DIST gradle-bin-6.8.3.zip 150631445 BLAKE2B 935a6631167481e289ac5a468b822ffeec204519edf42c8a0f05a911ef716715b706e3c22637763b4a7a0c7cbfa89f163673ef5631c115c025c5634b353fcee6 SHA512 fdd5c347142c2a8e2a1455d8886ddb103531de6e69d41f20d199a488d10165600924876761b452da213759a1dc6d47ed00a069f1a9f8af99fdbf1af3bb2e0564
 DIST gradle-bin-7.1.1.zip 154838841 BLAKE2B 0a0ad08101f0c5fa7c0cb2a4c9ad6e53320cc6214fe1a139f390b73d9aa656ebfaf90c21816d57964f37e9cad51faed21f82f55b7e24fcf0f5a3ffd861c990ad SHA512 95cc2de9b7c3d6019d7780b17238ff8f0db14c9a1e494b391c84d75619eb3064322bb2c56fa9127b0a5681c94b32283090a15b06fefeccdb95a1f8fb9e58c75c
-DIST gradle-bin-7.1.zip 154782196 BLAKE2B 8252b53dd9214f92c2a900a240ee22e1cf98f8dadc07248df8015dd3eda745338198b864aeb1cd0d3b3ec4604fdf01105c74e95fba4b9dde1ef56db7eb5f8dcd SHA512 30aad03b1bd02fef13fbb59ae29ce859dc60f734432207c9a173056bc9e23125233d618c3f4906011f70065dd09c848abdc6dd249421c3b79c28477903b78a01
+DIST gradle-bin-7.2.zip 157058280 BLAKE2B 918213df58ac2afbd075c74588f60676cd7dc99030834828138c621348ac1abd368e0b54c2f6937cbfc9533e55e310b46cf841c92dcb1039b898c6f456032d38 SHA512 6ccc79f08afdc20b3d5abf876c3cabb69114d1ab4285cdb77158cd8c5e09207589edefb6c79f2bcffe4629a38c6b9e2f473de42dab29a24310965bc5816b907d
 EBUILD gradle-bin-6.8.3.ebuild 1109 BLAKE2B 670747ab94b68c37bcee23bd71de58ebdb599794b25227bf56c37a55f3a72ba5f41e0df7afd88c119a26cef7c0953846c6ad797b89d1b60e980c962b2a144bb5 SHA512 e4dba16bfab419d884478c41e8ba6d005d099fa536d436df884c4237d404c9ced6038cffc38fa0727a2e72090627e81af96cbf685bb7029425eca8d13838a56b
 EBUILD gradle-bin-7.1.1.ebuild 1109 BLAKE2B 670747ab94b68c37bcee23bd71de58ebdb599794b25227bf56c37a55f3a72ba5f41e0df7afd88c119a26cef7c0953846c6ad797b89d1b60e980c962b2a144bb5 SHA512 e4dba16bfab419d884478c41e8ba6d005d099fa536d436df884c4237d404c9ced6038cffc38fa0727a2e72090627e81af96cbf685bb7029425eca8d13838a56b
-EBUILD gradle-bin-7.1.ebuild 1109 BLAKE2B 670747ab94b68c37bcee23bd71de58ebdb599794b25227bf56c37a55f3a72ba5f41e0df7afd88c119a26cef7c0953846c6ad797b89d1b60e980c962b2a144bb5 SHA512 e4dba16bfab419d884478c41e8ba6d005d099fa536d436df884c4237d404c9ced6038cffc38fa0727a2e72090627e81af96cbf685bb7029425eca8d13838a56b
+EBUILD gradle-bin-7.2.ebuild 1109 BLAKE2B 670747ab94b68c37bcee23bd71de58ebdb599794b25227bf56c37a55f3a72ba5f41e0df7afd88c119a26cef7c0953846c6ad797b89d1b60e980c962b2a144bb5 SHA512 e4dba16bfab419d884478c41e8ba6d005d099fa536d436df884c4237d404c9ced6038cffc38fa0727a2e72090627e81af96cbf685bb7029425eca8d13838a56b
 MISC metadata.xml 467 BLAKE2B bb2f586cab99d5a2b27ff6c13d1ea88ae50561a7b9d0c57451616d28b9f651b9899be8b6653b508616e6e8adfeaef5ba099f666855b514feb168050f48bd9d29 SHA512 243a28ef037ec2041d0440d624ddb2d9cb7546f048e9b9f0971af542a41af33c30e561eb76ab24803fe541935d983c7b1f52f52bd005490e77c9d6a8d96d2de8
diff --git a/dev-java/gradle-bin/gradle-bin-7.1.ebuild b/dev-java/gradle-bin/gradle-bin-7.2.ebuild
index dfbd1549205b..dfbd1549205b 100644
--- a/dev-java/gradle-bin/gradle-bin-7.1.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-7.2.ebuild
diff --git a/dev-java/jsr101/Manifest b/dev-java/jsr101/Manifest
deleted file mode 100644
index 5e4fb4767fa2..000000000000
--- a/dev-java/jsr101/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jsr101-1.4.tar.bz2 18614 BLAKE2B c181e07db54cdf13ec15c18b8340b4f4bd9befee62aace934fd2ffcc12de386d4749e63d16dd654a7c369795c12f7c71bf4628a7878540f8c486302f65699b6e SHA512 a29cca7e0ed1eb8aff4b70da6d804cb1cd61cdd9a800f420be6794aa927bca6a4146a95d71c8521d4dc16a0da56419f3e82079d942194380dbddb9d44d773317
-EBUILD jsr101-1.4-r3.ebuild 678 BLAKE2B bbec42fb8ce1861effdb9905b7489cd6ac997a45b249c2b80fb74b4894de96375bca91dee00a7357f88817b9589c75313f043fe93ce30f24aa1ea45b0f3c63e3 SHA512 52c3f28f0ef4b71bcba93e18519e59a52d1aba08a3dc38036f1daae557b0bf3f3fb61d60fb38c78c6a514bb3101755c611d2911c05d7b22cd94874dd8c0e1af8
-MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/jsr101/jsr101-1.4-r3.ebuild b/dev-java/jsr101/jsr101-1.4-r3.ebuild
deleted file mode 100644
index c6482614c9f4..000000000000
--- a/dev-java/jsr101/jsr101-1.4-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 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="Java(TM) API for XML-Based RPC Specification Interface Classes"
-HOMEPAGE="http://jcp.org/aboutJava/communityprocess/first/jsr101/"
-SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-	java-virtuals/saaj-api:0
-	java-virtuals/servlet-api:3.0"
-
-RDEPEND="
-	>=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	${CDEPEND}"
-
-JAVA_SRC_DIR="src"
-
-JAVA_GENTOO_CLASSPATH="
-	servlet-api-3.0
-	saaj-api
-"
diff --git a/dev-java/jsr101/metadata.xml b/dev-java/jsr101/metadata.xml
deleted file mode 100644
index 37998bf40746..000000000000
--- a/dev-java/jsr101/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>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 5664ebe34d75..051532da4b0f 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index dc2e9a7c15a9..81f9c0b92daa 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,9 +1,7 @@
 AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315
-DIST go1.16.6.src.tar.gz 20923044 BLAKE2B 7a46d33f947c1d7f2c6f5e0085cba89520fdb8859fc804c8318b85d0b0e888b74ca074affcf3119c2d80157485e8f679e37390cbd58c644b38948f7d15428b7b SHA512 82634763dce636c9e9cba1bbf74a669e8b88e6df095e80672f295edb82cc1fc4b8ffde91a1f56c3470f2c4d9ee0404f65146d7478b645890623f6c463513a61f
 DIST go1.16.7.src.tar.gz 20922206 BLAKE2B 65e53684f66975313caf4661a7c52b178dde8b32ac40f98fe8164fe035c835e1407ef442d41c7cbf907d5093703e440d0e62c398f8ed541bad074b537f6dd6ff SHA512 1aab6f3dcbae71ebfa29a1d9a46613a3aa48de01cee82b48842d92abbb4ee57db019a4d47a3f12af9553c8e2a982e90114a06ee187f908f7c29245d9786b9186
 DIST go1.17.src.tar.gz 22178549 BLAKE2B 86cb84ff782eaee3fc0411b1f31cd985f3fdcda7b2709f3a94cba0fbe827ac13632d0476e1f67deaf06d2352c2ea3ac9217db7d170702dffff6a64beabdb0814 SHA512 bb94d69555faa103bc092ce85b73168954a553a5c72e4b38c39bd99a3eb4db679f352685e66507b0945ed12676eb2a0c51674e456f68a9a5b98c3ec6a948d35b
-EBUILD go-1.16.6.ebuild 4794 BLAKE2B 54a75927b9d5e7fd50a83de625087f34ec4f0abbdaed135ab709b9581e141f0e96b52cc9fd64b797a3092e8e057fd84c9d9db3ad74de9945a72253c23a7d328f SHA512 02ff8dd6f4e225e3c414ef6e3d7792fb6a8e95914e8ef75caf8606c3f931bce72e7e2c77d54d6f350b743bc5de7f441ba405a5b8ff758b5a3be64a7922b2e41c
-EBUILD go-1.16.7.ebuild 4796 BLAKE2B 3748fc2a094b1f8d755948f4e245ec0d1ea73d528d4d067db81ba3c27fb25be85828648901f806e00a3fd79c1f0697632847afea9cc831020873dbfbae17ea12 SHA512 89f922003412c0d064b497dbe2eea3d755121876dcb3ab78a6430d6bbaf4982ac597d93db592bada28a96b9928516ad80d396d5a7b664e5f277858b30d11f076
-EBUILD go-1.17.ebuild 4873 BLAKE2B c22ce3b3a554a8936decdef9d1c58578eccfdb44fe44316bd36c3fe232d14e53766c1e85a616b1758ef992754ef5bcafc045e7b1166ef35c6d8424642442437e SHA512 74b629a6055047dfc58cedc9e0848b76b2544675e20e76d702a0d0e00f64d84644e1df034d5959fccd26b6c4b230cb4a56f526f1d4a19e4172e85ab450d718b1
+EBUILD go-1.16.7.ebuild 4794 BLAKE2B 54a75927b9d5e7fd50a83de625087f34ec4f0abbdaed135ab709b9581e141f0e96b52cc9fd64b797a3092e8e057fd84c9d9db3ad74de9945a72253c23a7d328f SHA512 02ff8dd6f4e225e3c414ef6e3d7792fb6a8e95914e8ef75caf8606c3f931bce72e7e2c77d54d6f350b743bc5de7f441ba405a5b8ff758b5a3be64a7922b2e41c
+EBUILD go-1.17.ebuild 4871 BLAKE2B 33d3dde2df84bc7525235a64af7a96bf6a0bc5928eec2b1cef27e81dc40a7bcc094820c1526ab680dc3c103e002f0f3814362f26baf5b1bac3d64ed58c992021 SHA512 669f73d7584c154977ef6e38284321f5461865bbbaafce07bdc25872dd090f363a521f1463bcfd672b766a8e9417aebb6d6aaa178d8724bc12719d7e100db858
 EBUILD go-9999.ebuild 4873 BLAKE2B c22ce3b3a554a8936decdef9d1c58578eccfdb44fe44316bd36c3fe232d14e53766c1e85a616b1758ef992754ef5bcafc045e7b1166ef35c6d8424642442437e SHA512 74b629a6055047dfc58cedc9e0848b76b2544675e20e76d702a0d0e00f64d84644e1df034d5959fccd26b6c4b230cb4a56f526f1d4a19e4172e85ab450d718b1
 MISC metadata.xml 462 BLAKE2B d9d4280e921286791a55619a7e5557c7041b0de157aa0f8bf6f17cf5041f802df4037270eeb3e8d37263f9fc17939c619a0dd3bce449c5f247279884da10bf67 SHA512 26fa7bfe26f00e8e1766cc0a1052fb8b5352799a33c9eb8f0c4f4523601d3eb5d1da8adc4b731f0d778039788734a9ad483f22e58e4bf1551ec8e9dccbcb87ba
diff --git a/dev-lang/go/go-1.16.6.ebuild b/dev-lang/go/go-1.16.6.ebuild
deleted file mode 100644
index e24025473dc7..000000000000
--- a/dev-lang/go/go-1.16.6.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="cpu_flags_x86_sse2"
-
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# This package triggers "unrecognized elf file(s)" notices on riscv.
-# https://bugs.gentoo.org/794046
-QA_PREBUILT='.*'
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch() {
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		riscv) echo riscv64 ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm() {
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os() {
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple() {
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile() {
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile() {
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="${PWD}"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	use arm && export GOARM=$(go_arm)
-	use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test() {
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install() {
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# The use of cp is deliberate in order to retain permissions
-	# [1] https://golang.org/issue/2775
-	dodir /usr/lib/go
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	einstalldocs
-
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-
-	local bin_path
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	local f x
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-
-	# install the @golang-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/go-sets.conf go.conf
-}
-
-pkg_postinst() {
-	[[ -z ${REPLACING_VERSIONS} ]] && return
-	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
-	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
-	einfo "due to the static linking nature of go."
-	einfo "If this is not done, the packages compiled with the older"
-	einfo "version of the compiler will not be updated until they are"
-	einfo "updated individually, which could mean they will have"
-	einfo "vulnerabilities."
-	einfo "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
-	einfo "See https://bugs.gentoo.org/752153 for more info"
-}
diff --git a/dev-lang/go/go-1.16.7.ebuild b/dev-lang/go/go-1.16.7.ebuild
index 25dde8d11aab..e24025473dc7 100644
--- a/dev-lang/go/go-1.16.7.ebuild
+++ b/dev-lang/go/go-1.16.7.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 ~arm ~arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/go/go-1.17.ebuild b/dev-lang/go/go-1.17.ebuild
index 9fe46e9a8049..0d2f65b9fb56 100644
--- a/dev-lang/go/go-1.17.ebuild
+++ b/dev-lang/go/go-1.17.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0b61a9e8dc06..3fdd9d48c00b 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/argtable/Manifest b/dev-libs/argtable/Manifest
index 5f0cd9394c9d..84b12c9b07f3 100644
--- a/dev-libs/argtable/Manifest
+++ b/dev-libs/argtable/Manifest
@@ -1,3 +1,3 @@
 DIST argtable2-13.tar.gz 3326444 BLAKE2B 8c78d56c2e1a53747cf480808064cb006644db50a2cb38adddd71eff07d4d7f6e5467c54eec4e5cbb729a7f639927b2d3283c6995bde54134d7a85e39788b87c SHA512 3d8303f3ba529e3241d918c0127a16402ece951efb964d14a06a3a7d29a252812ad3c44e96da28798871e9923e73a2cfe7ebc84139c1397817d632cae25c4585
-EBUILD argtable-2.13-r1.ebuild 1014 BLAKE2B fecd51147058471a2a1ca6eda8817d8ecb1b7deb10f31d0cae6b831bb14abf8dca5f35a1d14ad3fed200712bb7363f4d0b26a2ce1b47c67dc401ba218c7e4ab6 SHA512 819dcb354274cf1d4011aa809125c704d71c51294164c8edcd11da07c57eeb3290bfe1724214f5469040465d4c14bf3ecf1db6de94482661b5030a6242bef276
+EBUILD argtable-2.13-r1.ebuild 1021 BLAKE2B b4662cea734a4dfaa81ee1747dc5e0fbac07718493111ad295d72770f587007160be715c9ef5adff2faa628477388c4221c5c5c8c5d7582533d31b0ffb7a8ed5 SHA512 1a5c737fe0fa29945ad5ace6cbe167ed206e313ae320675d58be7310875c7e8df2c98be8549309e03c68221324562a56eb332b8da721ca5eea969b1c7cbfe07a
 MISC metadata.xml 243 BLAKE2B 511d8df17d176cde00906a1632ded7f6c0ec20365b356b94f64c68639c12a17c9c9a8073fc96b1c317b87c7bcfbbf0dd19136207002e810ad8012785f347e1a3 SHA512 16366e8cb41b7dad2327025b380ae289217bfd7dea66e1bf4e37a1c850e566b2485e23b2f06d1d5f5e974fb4910ac6ea5f07767c1dee6bf2621572a7f0639b74
diff --git a/dev-libs/argtable/argtable-2.13-r1.ebuild b/dev-libs/argtable/argtable-2.13-r1.ebuild
index ac169e18b6dd..e8053275362f 100644
--- a/dev-libs/argtable/argtable-2.13-r1.ebuild
+++ b/dev-libs/argtable/argtable-2.13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="doc debug examples static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index e273e69b5a0b..89012d26f17c 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -5,8 +5,9 @@ AUX boost-1.73-boost-mpi-python-PEP-328.patch 396 BLAKE2B 5f08ce2eab46f2d108166a
 AUX boost-1.74-CVE-2012-2677.patch 4965 BLAKE2B 74cef075cd0aa4d4425e75d437a59c19e20325cc33c9c8fb206bdcf87efbafa6d28c6ebcd8b70f88f12e32b68b492ac6b985ccef703c61439661a194983b9ad9 SHA512 c8e6758840b58358b676226ef9f498b9e72cbeedee83cd6c8ea0608a6bc1466bedeba5b7a92d1a608c3a2788cb3c0444203e70995e3b3123198bf68081b477b9
 AUX boost-1.76-boost-numpy.patch 910 BLAKE2B 6f0b8fdf908e7be43556ba61301d0465f0b8464120d342b6ddbd053eecc432bf2c4a60e84eced622bd3fe0da468c5941fa2d5b9592490c453193ef3eaf239a8a SHA512 245cb97c493e85eae3567a720eebac7eb53d1691d22015edc27f7a56e379c9f59f5a89c49889149ec203c28ede2ed1b9853c742e604fa4b60f7a83f8b2698fba
 AUX boost-1.76-sparc-define.patch 1026 BLAKE2B ad88b1c5231c0cbbd6bfb1f01d050ff20fbee145a656a439b2920f23f116693e6a999dce9db6bb0cac94ad2f98580f0669198d026b28c05fe7a82b5887fbadff SHA512 62d63bc3db7352daf6ad47a25bbeef2bed3405e4e43650d4c34ad8535a96ae13f875837b727082c8a5b7671c35a67a20978baf44d59f15a57053308a31827373
+AUX boost-1.77-math-deprecated-include.patch 1676 BLAKE2B 8f709daa0b68cece73487f887f4cfdeae5568f0614752e4223f15d25052caa9ae2718dbc3f4edad94cd4a82c3fba642f4ccff91318cd1d9ce58e2bd6cfc20fb0 SHA512 351b5ff6b3186a888861ad060ff8340412096a3ee369de76a888af0f1c45a07f6a5a62f6b95602b4d733b02b33dfb76f41aedd3d54bc9831c541782a91f08872
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
 DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f
 EBUILD boost-1.76.0-r1.ebuild 10966 BLAKE2B 90d0fdd0d832da9f503999914fec8c8d6c49aeee20ac7bab0d943eaa42ce518fb9193da12877304693d55a2bddc62605ad40c7a61b92a202737b43b751f7e590 SHA512 1910cdf860922e7794ccf2a7a7afe316c96e2ae2a2b4b0ee2f87571ac3b44202aab7d328006f962d5ad970bd295bb0b387d2969578e7f14c23a123a9817256cb
-EBUILD boost-1.77.0.ebuild 10582 BLAKE2B 8a46c7e888963dbac3c8f33ab1915e03d851c908858ba24e88197d890038a3ed7787588de07b539c36a7522c7f2a23b26fd9c9e8e85b07b5fa010e69f97b7e15 SHA512 0174568417b22dfdfa17cfa1559d99aa804b69fd3b5419690678fe99cd5c000efb51fc132f2352adac6f1f7ce1603c10f9899b5065d9f751256c226b2e9ce628
+EBUILD boost-1.77.0-r1.ebuild 10638 BLAKE2B 974853fc7db70ec206f12d41cfd064d404ba726144910b725cca6c6b0f1f65dee6a154bf260d66d1282d1e23ecdde38d6fac28a7d004922603ebf36754fa5cc5 SHA512 b67dce21bdce5b8e4f80b061ef03b72fa9d3c881070720ce76d758b707ab6cc744878b24d8cce330fee4acac4a92613151b401dcb9efed4550fd7d57988867c9
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.77.0-r1.ebuild b/dev-libs/boost/boost-1.77.0-r1.ebuild
new file mode 100644
index 000000000000..9a715e088959
--- /dev/null
+++ b/dev-libs/boost/boost-1.77.0-r1.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
+
+MY_PV="$(ver_rs 1- _)"
+MAJOR_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="https://www.boost.org/"
+SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+S="${WORKDIR}/${PN}_${MY_PV}"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
+# 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 ~x86-winnt"
+IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# the tests will never fail because these are not intended as sanity
+# tests at all. They are more a way for upstream to check their own code
+# on new compilers. Since they would either be completely unreliable
+# (failing for no good reason) or completely useless (never failing)
+# there is no point in having them in the ebuild to begin with.
+RESTRICT="test"
+
+RDEPEND="
+	!app-admin/eselect-boost
+	!dev-libs/boost-numpy
+	!<dev-libs/leatherman-1.12.0-r1
+	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
+	python? (
+		${PYTHON_DEPS}
+		numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	)
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/boost-build-${MAJOR_V}-r2"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
+	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
+	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
+	# Boost.MPI's __init__.py doesn't work on Py3
+	"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
+	"${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch
+	"${FILESDIR}"/${PN}-1.76-sparc-define.patch
+	"${FILESDIR}"/${PN}-1.77-math-deprecated-include.patch
+)
+
+python_bindings_needed() {
+	multilib_is_native_abi && use python
+}
+
+tools_needed() {
+	multilib_is_native_abi && use tools
+}
+
+create_user-config.jam() {
+	local user_config_jam="${BUILD_DIR}"/user-config.jam
+	if [[ -s ${user_config_jam} ]]; then
+		einfo "${user_config_jam} already exists, skipping configuration"
+		return
+	else
+		einfo "Creating configuration in ${user_config_jam}"
+	fi
+
+	local compiler compiler_version compiler_executable="$(tc-getCXX)"
+	if [[ ${CHOST} == *-darwin* ]]; then
+		compiler="darwin"
+		compiler_version="$(gcc-fullversion)"
+	else
+		compiler="gcc"
+		compiler_version="$(gcc-version)"
+	fi
+
+	if use mpi; then
+		local mpi_configuration="using mpi ;"
+	fi
+
+	cat > "${user_config_jam}" <<- __EOF__ || die
+		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
+		${mpi_configuration}
+	__EOF__
+
+	if python_bindings_needed; then
+		append_to_user_config() {
+			local py_config
+			if tc-is-cross-compiler; then
+				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
+			else
+				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
+			fi
+			echo "${py_config}" >> "${user_config_jam}" || die
+		}
+		python_foreach_impl append_to_user_config
+	fi
+
+	if python_bindings_needed && use numpy; then
+		einfo "Enabling support for NumPy extensions in Boost.Python"
+	else
+		einfo "Disabling support for NumPy extensions in Boost.Python"
+
+		# Boost.Build does not allow for disabling of numpy
+		# extensions, thereby leading to automagic numpy
+		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
+		sed \
+			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
+			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
+	fi
+}
+
+pkg_setup() {
+	# Bail out on unsupported build configuration, bug #456792
+	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
+		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
+			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+			eerror "Boost can not be built in such configuration."
+			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
+			die "Unsupported target in ${EROOT}/etc/site-config.jam"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+ejam() {
+	create_user-config.jam
+
+	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
+	if python_bindings_needed; then
+		append_to_b2_opts() {
+			b2_opts+=( python="${EPYTHON#python}" )
+		}
+		python_foreach_impl append_to_b2_opts
+	else
+		b2_opts+=( --without-python )
+	fi
+	b2_opts+=( "$@" )
+
+	echo b2 "${b2_opts[@]}" >&2
+	b2 "${b2_opts[@]}"
+}
+
+src_configure() {
+	# Workaround for too many parallel processes requested, bug #506064
+	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
+
+	OPTIONS=(
+		$(usex debug gentoodebug gentoorelease)
+		"-j$(makeopts_jobs)"
+		-q
+		-d+2
+		pch=off
+		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
+		$(usev !mpi --without-mpi)
+		$(usev !nls --without-locale)
+		$(usev !context '--without-context --without-coroutine --without-fiber')
+		--without-stacktrace
+		--boost-build="${BROOT}"/usr/share/boost-build/src
+		--layout=system
+		# building with threading=single is currently not possible
+		# https://svn.boost.org/trac/boost/ticket/7105
+		threading=multi
+		link=shared
+		# this seems to be the only way to disable compression algorithms
+		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
+		-sNO_BZIP2=$(usex bzip2 0 1)
+		-sNO_LZMA=$(usex lzma 0 1)
+		-sNO_ZLIB=$(usex zlib 0 1)
+		-sNO_ZSTD=$(usex zstd 0 1)
+	)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# We need to add the prefix, and in two cases this exceeds, so prepare
+		# for the largest possible space allocation.
+		append-ldflags -Wl,-headerpad_max_install_names
+	fi
+
+	# Use C++14 globally as of 1.62
+	append-cxxflags -std=c++14
+}
+
+multilib_src_compile() {
+	ejam \
+		--prefix="${EPREFIX}"/usr \
+		"${OPTIONS[@]}" || die
+
+	if tools_needed; then
+		pushd tools >/dev/null || die
+		ejam \
+			--prefix="${EPREFIX}"/usr \
+			"${OPTIONS[@]}" \
+			|| die "Building of Boost tools failed"
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_install() {
+	ejam \
+		--prefix="${ED}"/usr \
+		--includedir="${ED}"/usr/include \
+		--libdir="${ED}"/usr/$(get_libdir) \
+		"${OPTIONS[@]}" install || die "Installation of Boost libraries failed"
+
+	if tools_needed; then
+		dobin dist/bin/*
+
+		insinto /usr/share
+		doins -r dist/share/boostbook
+	fi
+
+	# boost's build system truely sucks for not having a destdir.  Because for
+	# this reason we are forced to build with a prefix that includes the
+	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
+	# but to do it the dirty way of manually setting the right install_names.
+	if [[ ${CHOST} == *-darwin* ]]; then
+		einfo "Working around completely broken build-system(tm)"
+		local d
+		for d in "${ED}"/usr/lib/*.dylib; do
+			if [[ -f ${d} ]]; then
+				# fix the "soname"
+				ebegin "  correcting install_name of ${d#${ED}}"
+				install_name_tool -id "/${d#${D}}" "${d}"
+				eend $?
+				# fix references to other libs
+				refs=$(otool -XL "${d}" | \
+					sed -e '1d' -e 's/^\t//' | \
+					grep "^libboost_" | \
+					cut -f1 -d' ')
+				local r
+				for r in ${refs}; do
+					ebegin "    correcting reference to ${r}"
+					install_name_tool -change \
+						"${r}" \
+						"${EPREFIX}/usr/lib/${r}" \
+						"${d}"
+					eend $?
+				done
+			fi
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	if ! use numpy; then
+		rm -r "${ED}"/usr/include/boost/python/numpy* || die
+	fi
+
+	if use python; then
+		if use mpi; then
+			move_mpi_py_into_sitedir() {
+				python_moduleinto boost
+				python_domodule "${S}"/libs/mpi/build/__init__.py
+
+				python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so
+				rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die
+
+				python_optimize
+			}
+			python_foreach_impl move_mpi_py_into_sitedir
+		else
+			rm -r "${ED}"/usr/include/boost/mpi/python* || die
+		fi
+	else
+		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
+	fi
+
+	if ! use nls; then
+		rm -r "${ED}"/usr/include/boost/locale || die
+	fi
+
+	if ! use context; then
+		rm -r "${ED}"/usr/include/boost/context || die
+		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
+		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
+	fi
+
+	if use doc; then
+		# find extraneous files that shouldn't be installed
+		# as part of the documentation and remove them.
+		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
+		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
+		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
+
+		docinto html
+		dodoc *.{htm,html,png,css}
+		dodoc -r doc libs more tools
+
+		# To avoid broken links
+		dodoc LICENSE_1_0.txt
+
+		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
+	fi
+}
+
+pkg_preinst() {
+	# Yay for having symlinks that are nigh-impossible to remove without
+	# resorting to dirty hacks like these. Removes lingering symlinks
+	# from the slotted versions.
+	local symlink
+	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
+		if [[ -L ${symlink} ]]; then
+			rm -f "${symlink}" || die
+		fi
+	done
+
+	# some ancient installs still have boost cruft lying around
+	# for unknown reasons, causing havoc for reverse dependencies
+	# Bug: 607734
+	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
+}
+
+pkg_postinst() {
+	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
+	elog
+	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
+	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
+	elog
+	elog "Then you need to recompile Boost and all its reverse dependencies"
+	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
+	elog "requires a complete rebuild of the Boost-dependent ecosystem."
+	elog
+	elog "See for instance https://bugs.gentoo.org/638138"
+}
diff --git a/dev-libs/boost/boost-1.77.0.ebuild b/dev-libs/boost/boost-1.77.0.ebuild
deleted file mode 100644
index 407489043019..000000000000
--- a/dev-libs/boost/boost-1.77.0.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
-
-MY_PV="$(ver_rs 1- _)"
-MAJOR_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="https://www.boost.org/"
-SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
-S="${WORKDIR}/${PN}_${MY_PV}"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-# 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 ~x86-winnt"
-IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-RDEPEND="
-	!app-admin/eselect-boost
-	!dev-libs/boost-numpy
-	!<dev-libs/leatherman-1.12.0-r1
-	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
-	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
-	python? (
-		${PYTHON_DEPS}
-		numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	)
-	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/boost-build-${MAJOR_V}-r2"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
-	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
-	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
-	# Boost.MPI's __init__.py doesn't work on Py3
-	"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
-	"${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch
-	"${FILESDIR}"/${PN}-1.76-sparc-define.patch
-)
-
-python_bindings_needed() {
-	multilib_is_native_abi && use python
-}
-
-tools_needed() {
-	multilib_is_native_abi && use tools
-}
-
-create_user-config.jam() {
-	local user_config_jam="${BUILD_DIR}"/user-config.jam
-	if [[ -s ${user_config_jam} ]]; then
-		einfo "${user_config_jam} already exists, skipping configuration"
-		return
-	else
-		einfo "Creating configuration in ${user_config_jam}"
-	fi
-
-	local compiler compiler_version compiler_executable="$(tc-getCXX)"
-	if [[ ${CHOST} == *-darwin* ]]; then
-		compiler="darwin"
-		compiler_version="$(gcc-fullversion)"
-	else
-		compiler="gcc"
-		compiler_version="$(gcc-version)"
-	fi
-
-	if use mpi; then
-		local mpi_configuration="using mpi ;"
-	fi
-
-	cat > "${user_config_jam}" <<- __EOF__ || die
-		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-		${mpi_configuration}
-	__EOF__
-
-	if python_bindings_needed; then
-		append_to_user_config() {
-			local py_config
-			if tc-is-cross-compiler; then
-				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
-			else
-				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
-			fi
-			echo "${py_config}" >> "${user_config_jam}" || die
-		}
-		python_foreach_impl append_to_user_config
-	fi
-
-	if python_bindings_needed && use numpy; then
-		einfo "Enabling support for NumPy extensions in Boost.Python"
-	else
-		einfo "Disabling support for NumPy extensions in Boost.Python"
-
-		# Boost.Build does not allow for disabling of numpy
-		# extensions, thereby leading to automagic numpy
-		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
-		sed \
-			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
-			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
-	fi
-}
-
-pkg_setup() {
-	# Bail out on unsupported build configuration, bug #456792
-	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
-		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
-			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
-			eerror "Boost can not be built in such configuration."
-			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
-			die "Unsupported target in ${EROOT}/etc/site-config.jam"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-ejam() {
-	create_user-config.jam
-
-	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
-	if python_bindings_needed; then
-		append_to_b2_opts() {
-			b2_opts+=( python="${EPYTHON#python}" )
-		}
-		python_foreach_impl append_to_b2_opts
-	else
-		b2_opts+=( --without-python )
-	fi
-	b2_opts+=( "$@" )
-
-	echo b2 "${b2_opts[@]}" >&2
-	b2 "${b2_opts[@]}"
-}
-
-src_configure() {
-	# Workaround for too many parallel processes requested, bug #506064
-	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
-
-	OPTIONS=(
-		$(usex debug gentoodebug gentoorelease)
-		"-j$(makeopts_jobs)"
-		-q
-		-d+2
-		pch=off
-		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
-		$(usev !mpi --without-mpi)
-		$(usev !nls --without-locale)
-		$(usev !context '--without-context --without-coroutine --without-fiber')
-		--without-stacktrace
-		--boost-build="${BROOT}"/usr/share/boost-build/src
-		--layout=system
-		# building with threading=single is currently not possible
-		# https://svn.boost.org/trac/boost/ticket/7105
-		threading=multi
-		link=shared
-		# this seems to be the only way to disable compression algorithms
-		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
-		-sNO_BZIP2=$(usex bzip2 0 1)
-		-sNO_LZMA=$(usex lzma 0 1)
-		-sNO_ZLIB=$(usex zlib 0 1)
-		-sNO_ZSTD=$(usex zstd 0 1)
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# We need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation.
-		append-ldflags -Wl,-headerpad_max_install_names
-	fi
-
-	# Use C++14 globally as of 1.62
-	append-cxxflags -std=c++14
-}
-
-multilib_src_compile() {
-	ejam \
-		--prefix="${EPREFIX}"/usr \
-		"${OPTIONS[@]}" || die
-
-	if tools_needed; then
-		pushd tools >/dev/null || die
-		ejam \
-			--prefix="${EPREFIX}"/usr \
-			"${OPTIONS[@]}" \
-			|| die "Building of Boost tools failed"
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_install() {
-	ejam \
-		--prefix="${ED}"/usr \
-		--includedir="${ED}"/usr/include \
-		--libdir="${ED}"/usr/$(get_libdir) \
-		"${OPTIONS[@]}" install || die "Installation of Boost libraries failed"
-
-	if tools_needed; then
-		dobin dist/bin/*
-
-		insinto /usr/share
-		doins -r dist/share/boostbook
-	fi
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	if [[ ${CHOST} == *-darwin* ]]; then
-		einfo "Working around completely broken build-system(tm)"
-		local d
-		for d in "${ED}"/usr/lib/*.dylib; do
-			if [[ -f ${d} ]]; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				local r
-				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use numpy; then
-		rm -r "${ED}"/usr/include/boost/python/numpy* || die
-	fi
-
-	if use python; then
-		if use mpi; then
-			move_mpi_py_into_sitedir() {
-				python_moduleinto boost
-				python_domodule "${S}"/libs/mpi/build/__init__.py
-
-				python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so
-				rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die
-
-				python_optimize
-			}
-			python_foreach_impl move_mpi_py_into_sitedir
-		else
-			rm -r "${ED}"/usr/include/boost/mpi/python* || die
-		fi
-	else
-		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
-	fi
-
-	if ! use nls; then
-		rm -r "${ED}"/usr/include/boost/locale || die
-	fi
-
-	if ! use context; then
-		rm -r "${ED}"/usr/include/boost/context || die
-		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
-		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
-	fi
-
-	if use doc; then
-		# find extraneous files that shouldn't be installed
-		# as part of the documentation and remove them.
-		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
-		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
-		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
-
-		docinto html
-		dodoc *.{htm,html,png,css}
-		dodoc -r doc libs more tools
-
-		# To avoid broken links
-		dodoc LICENSE_1_0.txt
-
-		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
-	fi
-}
-
-pkg_preinst() {
-	# Yay for having symlinks that are nigh-impossible to remove without
-	# resorting to dirty hacks like these. Removes lingering symlinks
-	# from the slotted versions.
-	local symlink
-	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
-		if [[ -L ${symlink} ]]; then
-			rm -f "${symlink}" || die
-		fi
-	done
-
-	# some ancient installs still have boost cruft lying around
-	# for unknown reasons, causing havoc for reverse dependencies
-	# Bug: 607734
-	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
-}
-
-pkg_postinst() {
-	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
-	elog
-	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
-	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
-	elog
-	elog "Then you need to recompile Boost and all its reverse dependencies"
-	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
-	elog "requires a complete rebuild of the Boost-dependent ecosystem."
-	elog
-	elog "See for instance https://bugs.gentoo.org/638138"
-}
diff --git a/dev-libs/boost/files/boost-1.77-math-deprecated-include.patch b/dev-libs/boost/files/boost-1.77-math-deprecated-include.patch
new file mode 100644
index 000000000000..44943243eaac
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.77-math-deprecated-include.patch
@@ -0,0 +1,40 @@
+https://github.com/boostorg/math/commit/720536a08e4e33639869e1b7a99d9ec923409c0b
+https://github.com/boostorg/math/issues/675
+https://github.com/boostorg/math/pull/676
+
+From 720536a08e4e33639869e1b7a99d9ec923409c0b Mon Sep 17 00:00:00 2001
+From: Matt Borland <matt@mattborland.com>
+Date: Mon, 23 Aug 2021 17:48:28 +0300
+Subject: [PATCH] Fix for issue 675 (#676)
+
+--- a/boost/math/tools/header_deprecated.hpp
++++ a/boost/math/tools/header_deprecated.hpp
+@@ -6,12 +6,22 @@
+ #ifndef BOOST_MATH_TOOLS_HEADER_DEPRECATED
+ #define BOOST_MATH_TOOLS_HEADER_DEPRECATED
+ 
+-#ifdef _MSC_VER
+-// Expands to "This header is deprecated; use expr instead."
+-#define BOOST_MATH_HEADER_DEPRECATED(expr) __pragma("This header is deprecated; use " expr " instead.")
+-#else // GNU, Clang, Intel, IBM, etc.
++#ifndef BOOST_MATH_STANDALONE
++
++#   include <boost/config/header_deprecated.hpp>
++#   define BOOST_MATH_HEADER_DEPRECATED(expr) BOOST_HEADER_DEPRECATED(expr)
++
++#else
++
++#   ifdef _MSC_VER
+ // Expands to "This header is deprecated; use expr instead."
+-#define BOOST_MATH_HEADER_DEPRECATED(expr) _Pragma("This header is deprecated; use " expr " instead.")
+-#endif
++#       define BOOST_MATH_HEADER_DEPRECATED(expr) __pragma("This header is deprecated; use " expr " instead.")
++#   else // GNU, Clang, Intel, IBM, etc.
++// Expands to "This header is deprecated use expr instead"
++#       define BOOST_MATH_HEADER_DEPRECATED_MESSAGE(expr) _Pragma(#expr)
++#       define BOOST_MATH_HEADER_DEPRECATED(expr) BOOST_MATH_HEADER_DEPRECATED_MESSAGE(message "This header is deprecated use " expr " instead")
++#   endif
++
++#endif // BOOST_MATH_STANDALONE
+ 
+ #endif // BOOST_MATH_TOOLS_HEADER_DEPRECATED
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index f82938df3d6d..5b376b71b702 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -2,5 +2,5 @@ DIST Botan-2.17.3.tar.xz 5937596 BLAKE2B 605e71c959889b459bc26f17d310a33f26c9a51
 DIST Botan-2.18.1.tar.xz 5953936 BLAKE2B 82f6a9563377542d059901adec0fc17a41b0184cf59af76084babec2591830314a4d7f8d3308eb393c4910c9b0e6c056625765f0d95b435f47dc94cf4b83b128 SHA512 2f11d1ab703d977a2d64504d2a2489ce56109a2a6c46c0dc7c8db428470ce511bcc0160f70baedad29237abd5e1622f2c155ea58c4dec4d3ae57ee7b350415c3
 DIST Botan-2.18.1.tar.xz.asc 488 BLAKE2B d7e6f18ba969b1fffe5aec27ec28839bb6eefac438b0971bb24293a9a1dc104d4355feaae4f8749ea9ea9a729e9f0c0368782c60c2f1aaed58620624248d09d2 SHA512 0cb24d544e31f347e649661d28fedaad4352cd5096ad41e1513c7915138981c7c099e4ee6025893ed829a65082aaded738a94018a8e0bc079f4f0fb63bbec262
 EBUILD botan-2.17.3-r1.ebuild 3081 BLAKE2B 8f1566d33d79f8c580bfc50ff282a54d1ad779f6394f9f78102f8364c39fe45902f04ebf41f14ff5c91a9c6ffe7c197727c86ecb7ef00b89b6da30a33a365eb6 SHA512 157e5dc7e0e502b06f23bf9c2961f5b3db6b85ca1e118a5035261a19ed11ebbc9105631ee332b1af4d70d83fd90d5806fc7345639b33609c22327413428d8cc2
-EBUILD botan-2.18.1-r1.ebuild 4146 BLAKE2B e3527bb61c9d012807949e8d31fab34fe1a18e18fffcdf779ab486ef54069695f50a20780968be9965465570e8511d0493f3f6a2adf014feb549c5347de914d4 SHA512 769e05bcebd7ef7706f8c04be1ad0b421df29c79682bebc3bd9238c5421b8644fad97d6abcb9ef168b5291eb954aa83aac9d25396da12517e5bb21b58c8d93c5
+EBUILD botan-2.18.1-r1.ebuild 4153 BLAKE2B 2573fb8a14539b3bcccdfa1be03d83565266b0c8e7bf741615ddebca84f59f0b23f3228f61190655a0f9e6268da6ca9ba34fcb128b858f230e1c775e9809ed1e SHA512 79212f1525a920c0a28149f9a1cc81d23c1e99aff1565c3b12dd91e424c9dc5cbb441df7344032d272f00719a2ae2eb2af439c9f3d6f3d030aa428f053f662a0
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.18.1-r1.ebuild b/dev-libs/botan/botan-2.18.1-r1.ebuild
index 0764024db75e..8c5f0701e2f7 100644
--- a/dev-libs/botan/botan-2.18.1-r1.ebuild
+++ b/dev-libs/botan/botan-2.18.1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
 IUSE="bindist doc boost bzip2 lzma python ssl static-libs sqlite zlib"
 
 CPU_USE=(
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index 377adfb4c512..e97f3ed869e6 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -2,5 +2,5 @@ AUX dbus-glib-0.110-config-glib-genmarshal.conf 3281 BLAKE2B 5724ec3aa555d71b267
 DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
 DIST dbus-glib-0.112.tar.gz 715340 BLAKE2B 24e1c222f0116b32c109682816f6c35771647f4c63cab93a6621bd68b71ea4dca62fbf9e6bb360386b8658146dbf34b0d7dc471db7525585412d120340c4c969 SHA512 7c9f393f065dfb3d698f35e6554caf15fe539f5dd52d2b2bb6ed1770e130f5dab8e45379232520301455bae9bb77e25a109faf175153fcd4b9dd11d7de4a546e
 EBUILD dbus-glib-0.110.ebuild 2536 BLAKE2B 0371202a4ec7de8de93db1c50c9d038aa430a5080a79b255c395015b36e81e0df5b11fa83240fc65fdef175944af22b594a84f321f662dfb1f9e4465393c400d SHA512 219d236d22ed666f7d8109c940101b2cc44f86d352a2f2d5d17f4023c941f7c90766ea3e7deef12724f4bbb7a851d9eab134614f3551483e7dc3bb4def5546ea
-EBUILD dbus-glib-0.112.ebuild 2482 BLAKE2B 7e00520bfacac9e50c25013e35a063a5569c3d5d876078f6044e851492d92644672108a52c023456cc47b454e51dc287944b6e403d89ba3a310158e4fd50b854 SHA512 ee519a4ea27097bd44867a27ceb21e2d7a0882166df1e86e89f954787fed70a8bf150dcdd266554b9f4caa75c0ea4f409b3341e7ec19779519517e9357d75008
+EBUILD dbus-glib-0.112.ebuild 2475 BLAKE2B 2eed479d088d98ef3a21538128511a250773aed884a75c3bb3246d2907b23a67ab071c0910291af36508e47b8f234adad1b787c6f19726a66bb6e9ce1cb637a6 SHA512 fb33c3eef0458ab0e79cb163b5a7e9f61e96e834c0472dc54f80be9a96b3f3ef2d1fd1ef8bb258c903e2c690ef32f1846130fad5b9b8da6c49fd8ebef9656d49
 MISC metadata.xml 326 BLAKE2B 83337c958adc4c6e7c8ffe6c166598af211c2688753440bbf3978e3bca37553eb90d3d0c8b0423d422691afcbae51c872b2149c97a76206bd090e379e7fff422 SHA512 65080e75b6d877c594f4f4a1e931d26885b3059f43d567ccd640f089cfc5d7969963cd5d8fa51200dbbafcaf93eddf6faa5cf7d548b60809b808543dcb3c2af6
diff --git a/dev-libs/dbus-glib/dbus-glib-0.112.ebuild b/dev-libs/dbus-glib/dbus-glib-0.112.ebuild
index 91540650ce90..7863a56381a7 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.112.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.112.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 85888e9912f2..d1013e776e55 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,8 +1,10 @@
 DIST ell-0.40.tar.xz 524256 BLAKE2B de7326cfc7d00970fdeb5f19e38b9c68e6443544f5a6397aa031a7dcd0d61c77ab72303ad51d36e8fbc2c34c954631636f7f42bae0c40cd75498882ab78e2c85 SHA512 bc721e300e5b689dc51f794019e731eb252ad74dd199bec7685373ffa32ad42950aae9e36cb74d3b6590016c046589acb3ae8c009c4a14bd89331913392e923e
 DIST ell-0.41.tar.xz 525240 BLAKE2B 80614190c1237fdbb867300418d474d50e163fba7ca15f4c74c3019b4d407da8319b67be5a88886894dd8869620bae1338e91d28993077690e93260ed1dc3cf6 SHA512 bfbc18195126196776a0d00b4ae8bd8358a6cd1d2f8221132fdae1f323172f148a3faad84a951774ca38a3a72e8d96512b9cac84d9ef3a6cddf4b1490b34453e
 DIST ell-0.42.tar.xz 527724 BLAKE2B fee51c2a44afcd5e40ee38f8d0e24fefab6c98ff0b58c842169d7957e1aeaa89bdcb2aecbe14b3558820c3226c5884e6512045e3f1b9bfcf2f77c953d9674936 SHA512 a859cf0b6b2e5e91fcd9718bb0ea8073b819c264d914eca8a2c67b27f170a830df1b2256184df03010d836da3a081020ee1a4fac88d39c0794da88824dc39b71
+DIST ell-0.43.tar.xz 529828 BLAKE2B ead74596f3598cfbab0a03d7c93dd6c9c8ceccaa69ffd4e11bcfcfefd04833cb5438591d9622cc615ddaa28de27333110059c863df9840552c3e32dcd9e20055 SHA512 b26c860446d693e6384007dc5e230fe252a12ec8ada52b67082c68e405ff3ad0cbeb4d72af028473a66018e220b1713275014fd3a62dcb9fcd8c19d8f6ce5b9b
 EBUILD ell-0.40.ebuild 1251 BLAKE2B fdf1de6253dd70eca9a06cf5709a5ace67be4bcac98af27fc731f70938f86af8d421701327750c3c1508302c3736bf28f46f95f60cb1d3422260ea3bb9c237cd SHA512 16244e84cfa811cd8d2e1b81ec4544a2d9618aba9c29b1853ea1512ad065bbdec6daefc176330454e56c4cf9e00156d2f83d1df7a68cd1ed5f940655cf32bfc0
 EBUILD ell-0.41.ebuild 1251 BLAKE2B fdf1de6253dd70eca9a06cf5709a5ace67be4bcac98af27fc731f70938f86af8d421701327750c3c1508302c3736bf28f46f95f60cb1d3422260ea3bb9c237cd SHA512 16244e84cfa811cd8d2e1b81ec4544a2d9618aba9c29b1853ea1512ad065bbdec6daefc176330454e56c4cf9e00156d2f83d1df7a68cd1ed5f940655cf32bfc0
 EBUILD ell-0.42.ebuild 1175 BLAKE2B 38153be8a98441d30ba0299302e0913631abee145ad6c2c212ef6d4c9ef7ba97f4408aa79119f2ee6e2ada5731d8811288fcd9d98385f1660efa89d58dc2c149 SHA512 9572ec6ecf0e0bb036934ca776675d1d14694df5a0efda4bc2045e45c2478b2c8c9c1488b9daa123754f3eed2c14a883dc3d1d64bfbf4085961e3720fac7e46c
+EBUILD ell-0.43.ebuild 1175 BLAKE2B 38153be8a98441d30ba0299302e0913631abee145ad6c2c212ef6d4c9ef7ba97f4408aa79119f2ee6e2ada5731d8811288fcd9d98385f1660efa89d58dc2c149 SHA512 9572ec6ecf0e0bb036934ca776675d1d14694df5a0efda4bc2045e45c2478b2c8c9c1488b9daa123754f3eed2c14a883dc3d1d64bfbf4085961e3720fac7e46c
 EBUILD ell-9999.ebuild 1168 BLAKE2B 229eaef8e41979c42c2a5b5a233cda5701be588f5dc093eb8b288ef3ad05c9216b065cb8e29bf4adc4d8f702331032f9904f443f139ac72936fe776434f32b59 SHA512 e9719214985628d7e6f752df9a69f4576efb2c0e418f9bf44968c0c23ed81ede0483fe9f5f79bf9ef32a18fbaded57fc3c38c582f02bd2e5cd0dacfda5532028
 MISC metadata.xml 336 BLAKE2B 119f1779bc0632481e1053d02f3fc56df9504ad591e057148c5885d595538d5b3d16fe0b76361a2051433f710228b85af866ea0694f695fe0268f8990dd07c15 SHA512 16de07f5cf33c2a9d44817f75a005e035ad51718af1ae4eff6c31519858294dee82286ec5a80ed87b0487c8deb352d1e46f4f53a0ffb06c5a4f9d3f27e704284
diff --git a/dev-libs/ell/ell-0.43.ebuild b/dev-libs/ell/ell-0.43.ebuild
new file mode 100644
index 000000000000..e2a5fd2979c4
--- /dev/null
+++ b/dev-libs/ell/ell-0.43.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="pie test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="test? ( sys-apps/dbus )"
+
+CONFIG_CHECK="
+	~TIMERFD
+	~EVENTFD
+	~CRYPTO_USER_API
+	~CRYPTO_USER_API_HASH
+	~CRYPTO_MD5
+	~CRYPTO_SHA1
+	~KEY_DH_OPERATIONS
+"
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	append-cflags "-fsigned-char" #662694
+	local myeconfargs=(
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	local DOCS=( ChangeLog README )
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/icinga-php-library/Manifest b/dev-libs/icinga-php-library/Manifest
index a246680bc62b..80b06aeadef0 100644
--- a/dev-libs/icinga-php-library/Manifest
+++ b/dev-libs/icinga-php-library/Manifest
@@ -1,3 +1,3 @@
 DIST icinga-php-library-0.6.1.tar.gz 2159137 BLAKE2B 93287845a6c06653faca1850b18c880d023d4bf22c707616a21b92bd252661c811a33c7515fbf19a06936358244c7703bae83cc2e44dee460fe7a46bfa82d345 SHA512 64800727e60630224993bda89494921a3e10f14ccb43b8f57d023b372806ce9253cdf7f6e933df8b494ef0369784714ac857fb288f7f08880c29e8643f25e2ec
-EBUILD icinga-php-library-0.6.1.ebuild 526 BLAKE2B d3ac94c6f447095dc4ce290f35f33d3edc6e7dc2074af3a906110b2fd9b65271c6e1921fa4dcf42820f70176c77c2bb13d0204906c2c1c12f5dc1f1e9717b597 SHA512 e761d049dcbdb77ffa56580ff63f8a55004ba3f893a0ae74bed2924cf73c119d571dee9dd27a5d7ac887f6526cb30409a727aa19ede74e6bce72ba973dc71a58
+EBUILD icinga-php-library-0.6.1-r1.ebuild 525 BLAKE2B 02bff6ecb195fafda49be66fbf0b840f6586510f2674cf5a5b6785216569cbbb9c6942dd9d4827ab0e549e1e56cb70d41b7705cf0a5ca5afbb996879955f5726 SHA512 0be6424d22eed8ff898236739a9de42361350f62cbbcfafcc4efeedfb758bdc62b951c925e952009f17ad168c55b5469e1187baea0ae0ef8adcce039d6b1c0ed
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/dev-libs/icinga-php-library/icinga-php-library-0.6.1-r1.ebuild b/dev-libs/icinga-php-library/icinga-php-library-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..f2df581a5c4b
--- /dev/null
+++ b/dev-libs/icinga-php-library/icinga-php-library-0.6.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Icinga PHP libraries for Icinga Web 2."
+HOMEPAGE="https://github.com/Icinga/icinga-php-library"
+MY_GITHUB_AUTHOR="Icinga"
+SRC_URI="https://github.com/${MY_GITHUB_AUTHOR}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-lang/php:*"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_install() {
+	insinto "/usr/share/icinga-php/ipl"
+	cd "${S}"
+	doins -r *
+}
diff --git a/dev-libs/icinga-php-library/icinga-php-library-0.6.1.ebuild b/dev-libs/icinga-php-library/icinga-php-library-0.6.1.ebuild
deleted file mode 100644
index dd28d6824a35..000000000000
--- a/dev-libs/icinga-php-library/icinga-php-library-0.6.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Icinga PHP libraries for Icinga Web 2."
-HOMEPAGE="https://github.com/Icinga/icinga-php-library"
-MY_GITHUB_AUTHOR="Icinga"
-SRC_URI="https://github.com/${MY_GITHUB_AUTHOR}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-lang/php:*"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_install() {
-	insinto "/usr/share/icinga-php/ipl"
-	doins -r "${S}"/vendor
-}
diff --git a/dev-libs/icinga-php-thirdparty/Manifest b/dev-libs/icinga-php-thirdparty/Manifest
index e31fae9c97e0..a525e6eb9698 100644
--- a/dev-libs/icinga-php-thirdparty/Manifest
+++ b/dev-libs/icinga-php-thirdparty/Manifest
@@ -1,3 +1,3 @@
 DIST icinga-php-thirdparty-0.10.0.tar.gz 576508 BLAKE2B 3e07262415340c413bf79aa3031cf3679f0374c85dad9c41ffed78f65379837fc87df8433ea201b02455bde5c1fee1406f5b149b9d5b39cd726407657bdafb54 SHA512 3f5b6caad23860cecf5f06d165b01211af5284cb3dcb635bdcf4c2118b03c96de40a6d86cd0bccbe0f817ae87cc5d09aa2709ca90f55b948cf975c69dc234e95
-EBUILD icinga-php-thirdparty-0.10.0.ebuild 491 BLAKE2B 6584262b5cf0321290dd514da845fc9f348c1d25372e519fb40e8e5ce1fdbe3ce697d1f3a8b6f09cc9e37f25b1acbe1e747dec402dd322a1c107a30adc2f22d3 SHA512 c02e203a6a188496c09c420134a5f4c0cb040eff6c541ad835cd08694e5383bda0dabd08d89a9be0b5e5f4a4fcd7d0facfad4da8b4dd78bcc284d25a274c6d9f
+EBUILD icinga-php-thirdparty-0.10.0-r1.ebuild 489 BLAKE2B 57c9465ccdc735940d3d922d4a517b4b34647f97171f52db3d40aa0d711e863e3d7306489073bb6234c34fe2c79bcbb56ba02431494e15114668d36302f94649 SHA512 bde6d9c9a486d1fdccb9b4c62356ae903a2562dd8c3d4dd77faebe8c41d40e252f04d0ce5c74bcef33ef878cf4643e2117878382add776c21ac82ecbc4144f6d
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.10.0-r1.ebuild b/dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..3b297eb00730
--- /dev/null
+++ b/dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.10.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Icinga PHP libraries for Icinga Web 2."
+HOMEPAGE="https://github.com/Icinga/icinga-php-library"
+SRC_URI="https://github.com/Icinga/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-lang/php:*"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_install() {
+	insinto "/usr/share/icinga-php/vendor"
+	cd "${S}"
+	doins -r *
+}
diff --git a/dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.10.0.ebuild b/dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.10.0.ebuild
deleted file mode 100644
index 845e00a29bb8..000000000000
--- a/dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.10.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Icinga PHP libraries for Icinga Web 2."
-HOMEPAGE="https://github.com/Icinga/icinga-php-library"
-SRC_URI="https://github.com/Icinga/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-lang/php:*"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_install() {
-	insinto "/usr/share/icinga-php/vendor"
-	doins -r "${S}"/vendor/
-}
diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index 8aaf432d633c..a1cc7697402e 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -5,9 +5,12 @@ DIST intel-neo-20.37.17906.tar.gz 3492080 BLAKE2B e133dde18c67e5b50dc65372faeaf7
 DIST intel-neo-20.44.18297.tar.gz 3586089 BLAKE2B ddaa719db25bb9b57b76a47c438e7a3185a15ce0863665efa7dd205354684773dbc89a05c943a87987588dcc2220683b47e7209ff959b2a8ad596090ff253c15 SHA512 919aba7cde56304c84db7c7ba30c53fabcca72ceab362a2b406f5ecf124e1c024980c29689f19b173b76c903da1cb25a4f1e4b19ba9279bc6ca2ad1d100e046a
 DIST intel-neo-21.31.20514.tar.gz 4434425 BLAKE2B 8fd27547dd487c78b724b0f0a715bf002d81e12ae30f10620329da998412c96e2dd7f94cb5fd84259e36ff3754efdfadd5428160e057040c1aa38727c8f6753e SHA512 0060add6df301ed85bfb2634f0a10e3cccc5d1ac751597e520bda6ae9241638242c784054201ccf8c1f3046501c20362e9942716ab728c6a4717a63278adf7a5
 DIST intel-neo-21.32.20609.tar.gz 4462286 BLAKE2B c3eaab0e40583e994466f213da4d163dfe4bf01fcfe3aa27c8409f46c8ff40e5f07a814d075b173d822ea8be5756385ac3543ff90fb4efa59999ac172290d9d2 SHA512 8e742de324c09a3f912e249c38ab165a3485a67e1185321019ec79fddda7eba442d4ea8c498a404467f3051cf42c50b54a27787914ffc5a2d85cc9b3b0067193
+DIST intel-neo-21.33.20678.tar.gz 4534884 BLAKE2B 9a5e7f962be08701bec1e890eeb5b6208694a33b524872494e428b73d46629b7cde1522c6b7d0b27725cc170f1e65391892b253ca84d988b209e41631548b135 SHA512 278284fafe0e2d340668e1c21188b706ab48439c6ea573885d1b060df458e2016ed40e0a0c65e4076378ddb3ab284eb2cd92b1db5e6bd892babf2275ed600341
 EBUILD intel-neo-20.16.16582.ebuild 1196 BLAKE2B adf17e562863b87567606424df2cd99bc033f558233010185dc62d1d3d6e75c21ae59a46a2da5428512d930491128c64aa51a660e7b4fee22d343822dff7c6d6 SHA512 2957c918f1ff3a84b020b92192eb84177b4002006675499fd9f53a67dd921bce96d8f4c2cad60117aebdde0e2b985c767228c8f8fe3dd1c68c3d91cbfa51e574
 EBUILD intel-neo-20.37.17906.ebuild 1260 BLAKE2B e440657f16549c85761afa6737523733b0b88cb350c49728df98de3da0a6a3149bbc08a4e5191c28462e351872f05fdfff1046322678601139a5aaa70c07b09f SHA512 c78b0525b5a17dc7353620ea3164b6674c1601d0873794fc75c82b8cfb97cf4699dffc37e5bc70f017ab9dd5df51887231999468d34ab886638edc4fa2f863b2
 EBUILD intel-neo-20.44.18297.ebuild 1314 BLAKE2B 3331dd0deadf7f23c93062f4b6b2fccdd8321ed89a088184c39033c7de25a7bb308c38d0e898115ba0536b9cdeabe0080ad693824a8565b79e38ff3b25d97cdf SHA512 5758171c4fd80b1c07c638f4491dc20f253141c45b1ba5366eda8ef048291a47e66d737def616db408b91444a70326688ab62124378bdd824f5c190031ca89d5
 EBUILD intel-neo-21.31.20514.ebuild 1296 BLAKE2B f421aea4ac0384a4160fd00e94714f893e664475f8264e4a7cbe3c5394e06155b36011965fb65eafb6c63f1551c64b5e86f883f5fd0b5186818f5159808f5df0 SHA512 a9739a153e48b6dd39bd2c2c2b3a3ee36ff57da0e716cf5beae1f3ed3cc037985dbe334d3175bfd0129771e8c1ab15788ebc1fc6c8af53f914b553b7c6849efd
 EBUILD intel-neo-21.32.20609.ebuild 1306 BLAKE2B 947c68a04f4c6b21765632d50260c56e2fd57a5b8c87b190fc678a1ea090b7a1216c4a53516b869c964e75c259f062881643d21bee5554e16d3e4fed82630ec6 SHA512 c01d54c33fa297d296d7e0ed16cc774915f5c94d705d2a64a0acfff145113e9d92bf00d9a3f2c164c5c29fed6cde4e1fec333be25e81686d4dee0d1db5a930a7
+EBUILD intel-neo-21.33.20678-r1.ebuild 1380 BLAKE2B e6979a66a3fa123a63ca3e04338b71d343dc6dba32c89a9886f4eb134ab1ccd5fd37da30167cf3589dd9aa405a66ac532f5671e3d240eb35361be52c4c978dc2 SHA512 3e73a35d9d0ae2600e8dfc10284296a0958857dec9f8333702461a27d6f0c230606a9fac834b82f59dbd607d25098f5b55160a9dbb1172e54cfe6930ec67e6b5
+EBUILD intel-neo-21.33.20678.ebuild 1337 BLAKE2B 662a11d33a03d9af663ea1d7e80a63b2aed9a8f8d6ee26748d1d98b9d77c1c10e152ff995ab2b167a8fb3b5649d5a13f94275744621af561c51ac7cfb482ea72 SHA512 36a698c53946ff47138b9bebf2e365eeda365384aaeb10e1f6e4224b9d012543d6332dba3c59a67f78cee7e8d6bbe6dd8b673e70f997572443f20a844dd43e7b
 MISC metadata.xml 1428 BLAKE2B 70e911edf0814476a93e1351fc9a1dbd761ecca27ceefe09106fd0bfbf0cbd2c1701b0356e44da24953c2d90916182e9686aa80bd903fa7e3764c85b15c936a3 SHA512 60b0c69b7590f79840355113e5b3a314c67910f05d4ffa7d4b948eacdd7979b4c8f54b50290f88ba3018e230756effd56817e0576e7e030c913ecce176fd4a52
diff --git a/dev-libs/intel-neo/intel-neo-21.33.20678-r1.ebuild b/dev-libs/intel-neo/intel-neo-21.33.20678-r1.ebuild
new file mode 100644
index 000000000000..4ed6c18c8d06
--- /dev/null
+++ b/dev-libs/intel-neo/intel-neo-21.33.20678-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PN="compute-runtime"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND="
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-compiler-1.0.8365
+	dev-util/intel-graphics-system-controller
+	>=media-libs/gmmlib-21.2.1
+	>=virtual/opencl-3
+	l0? ( >=dev-libs/level-zero-1.4.1 )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		x11-libs/libva
+	)
+"
+
+# for Khronos OpenGL headers
+DEPEND="
+	${RDEPEND}
+	media-libs/mesa
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "FAQ.md" )
+
+PATCHES=( "${FILESDIR}/${PN}-21.31.20514-no_Werror.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_L0="$(usex l0)"
+		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DSKIP_UNIT_TESTS="ON"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/intel-neo/intel-neo-21.33.20678.ebuild b/dev-libs/intel-neo/intel-neo-21.33.20678.ebuild
new file mode 100644
index 000000000000..b68d242d3886
--- /dev/null
+++ b/dev-libs/intel-neo/intel-neo-21.33.20678.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PN="compute-runtime"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND="
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-compiler-1.0.8365
+	>=media-libs/gmmlib-21.2.1
+	>=virtual/opencl-3
+	l0? ( >=dev-libs/level-zero-1.4.1 )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		x11-libs/libva
+	)
+"
+
+# for Khronos OpenGL headers
+DEPEND="
+	${RDEPEND}
+	media-libs/mesa
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "FAQ.md" )
+
+PATCHES=( "${FILESDIR}/${PN}-21.31.20514-no_Werror.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_L0="$(usex l0)"
+		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DSKIP_UNIT_TESTS="ON"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index 9a89d4dec539..cd568cbde7aa 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,3 +1,5 @@
 DIST json-glib-1.6.2.tar.xz 170260 BLAKE2B 8039661c92c0f8d79189fcc2d01fea0615ce13190526960178f727255c8ca5e1cd2f06079782b3513aa6686fe402d45b10ead798af196523552be73912cb54e9 SHA512 8412390a639d368ed11181621739f43bc4900143ac062c3824c7140abec58ca2b09773a415034f03896a4ff63aa3414b492997da532848709238a83c3a068b11
+DIST json-glib-1.6.6.tar.xz 1306232 BLAKE2B 93814dad74ef61ef265e348e9e145ceb63c950f1e9ecda23fbaad24e291a1cbfc690e287ccc8959fd7c056634f80815ef54fa2c75b09ebd3e158f3fa4df1c8e7 SHA512 b9a737e4ba3ecdfb9cb8f5fb751cc74e5b1553664d3088c44a1f9e5396d4037958af214dcd290ddf5af98088f46167e10e371e134e1de5cbb7aec84c5c0fd017
 EBUILD json-glib-1.6.2.ebuild 1375 BLAKE2B 3c0dd469acf28bfda3bd4e5f5bb4586608f7d0f59af216b7f495ecd08a14b511706cb976c61baa90905a2b3608161beda873900d6d5287fc2a1dd3009f1b03f2 SHA512 8a1e9737690d3bd911f75827a0d40669482dc2ef7ac3144ef07c417db9b74fe6d189342e4e10bec9828b8fe07749d24cbff9a0312ca9ea0ae20fc481248dba69
+EBUILD json-glib-1.6.6.ebuild 1382 BLAKE2B 2c563851a557e2471324346e5cdfd2797ffa1ec3349791cf4ecb1249a989ee94e8a3b98c13958cdfa177795c3011e09ba953f94c58824be0aa4532cdc12f9035 SHA512 3567262c840f8c85b8f3bc8c0dc65c87cc1e343aa55eddd8fb12c56c06922306b44b9eb652753fb9852864c5a322cf9d19dead6d18dc6b3c813b2404ab56b4d6
 MISC metadata.xml 1168 BLAKE2B f92f6fe2026abedfcd6f51797df84573b33817b10203e0325aa9790cc9c58ea6c9d69724b122dfe3c9b7b2a34cbf15e5e245c8aa93a1f8802757ac1c2ce61a7d SHA512 9af9dffd8e1d56c9dad5a0c53bdf16f5d54261c8c121cbc9644865340b84101a0bfcafc393bfe0d6b31024b16f1bbe9f9305286bc56a2df20a08984f55cb91e1
diff --git a/dev-libs/json-glib/json-glib-1.6.6.ebuild b/dev-libs/json-glib/json-glib-1.6.6.ebuild
new file mode 100644
index 000000000000..562120a52c5e
--- /dev/null
+++ b/dev-libs/json-glib/json-glib-1.6.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson-multilib xdg-utils
+
+DESCRIPTION="Library providing GLib serialization and deserialization for the JSON format"
+HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="gtk-doc +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.54.0:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}"
+# TODO: Can we use a newer docbook-xml-dtd, or is one needed at all?
+BDEPEND="
+	~app-text/docbook-xml-dtd-4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	# Disable installed-tests; this also indirectly removes build_aux/gen-installed-test.py calls, thus not needing python-any-r1.eclass
+	sed -e 's/install: true/install: false/g' -i json-glib/tests/meson.build || die
+	sed -e '/install_data/d' -i json-glib/tests/meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_use_feature introspection)
+		$(meson_native_use_feature gtk-doc gtk_doc)
+		$(meson_native_true man)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 78014dcb6030..705b5433f980 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -20,6 +20,6 @@ EBUILD libbpf-0.1.0-r1.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2
 EBUILD libbpf-0.1.1.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd
 EBUILD libbpf-0.2.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd
 EBUILD libbpf-0.3.ebuild 1241 BLAKE2B db815a22ebf51f56beeb8a3925f9a36cec7f0d412c110f4011e7efa40c7004ee49d4c80831628ca6db8cd97566ce16c0fa10cf20b2fde92e69aa5a769e0da85e SHA512 257b06cb0de2834d4cd09490607a2184416685ea5f4a4df57c5dc406af49cbf1d0841dff6d764aacf64e1c64c4069179ff4d6870a4145f6136086fe32c0975cc
-EBUILD libbpf-0.4.0.ebuild 1213 BLAKE2B 8498175d8ea5f2c9f08a79ba9cab230b030c5234b79a88e2297b49b486cd0594437e8d04ced114c0ff6340b76c5eee2b7e94f4ae8bdcc93e616a959996281dfa SHA512 2af4aacb9a1c57d50194ed5697afe27c84a1e1140975b4227a5c8150ca08ce247dcc9259ea78eaf8eacabe910807ac58e0dcbe98ef874cd0bc91b34b2591129d
+EBUILD libbpf-0.4.0.ebuild 1219 BLAKE2B 5eefc16a773bfe7b524475b7ec39083fc8c8be20d8819cf6643165ace61f5575a8607638a01b0e75ce669e67472149389ee413fb79729f88b43ee16deb005f5e SHA512 9f5c19d60b98616655777c73fecdfbcb20c04c37934d00b91d91c86597ec6ef1da9e2651df7325f51640e7101152ac04c7376c6b348dc965549e35bbb9dfd036
 EBUILD libbpf-9999.ebuild 1185 BLAKE2B aa1fc95895f35b93f6786514095c05bdf49504aa13ebef41f2fdcd4c929826ccbb87ec2aaeff1ee0ca2c7022fa8c43bc50a396bddf7dd32e6b61275c4649a8e8 SHA512 ebbef537d0dbe3a66172bc10e6c9c7fea2c6b4e295feddbde3570b88a2e43af33258f747d6556f3f77a259a15711990bc2024900665e36f275556cf5712186d8
 MISC metadata.xml 305 BLAKE2B d5a605019f99aa1bb75e405bface00e9006038c60d280bdab31ac9a42e3bcf75e2884b3efc8be4e2a88f7e35769b610f0480ccfba291444e8d4ddaecf73a57f9 SHA512 38df62cf50255dcd59c3ab6961643379e549eb568f2c0d010cd8bf73a93fceb0dbdbb32af7b07f21475b4146f99e684aad6928963e56ea8d6777b8f63f8d8a41
diff --git a/dev-libs/libbpf/libbpf-0.4.0.ebuild b/dev-libs/libbpf/libbpf-0.4.0.ebuild
index fcec1e55ddca..0ef44fea2683 100644
--- a/dev-libs/libbpf/libbpf-0.4.0.ebuild
+++ b/dev-libs/libbpf/libbpf-0.4.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
 else
 	SRC_URI="https://github.com/libbpf/libbpf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 S="${WORKDIR}/${P}/src"
 
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index 5a9a8bf7c5d8..0a37ce53ec66 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,5 +1,3 @@
-DIST libbsd-0.10.0.tar.xz 393576 BLAKE2B 66005a511dae7fb799322c813b8ea058ab460e3b9044756d6efad5de741d8f70270496f09803bbce8cd0000ff37e998f18e092037c850826c3c8e3f47ddfdb28 SHA512 b75529785b16c93d31401187f8a58258fbebe565dac071c8311775c913af989f62cd29d5ce2651af3ea6221cffd31cf04826577d3e546ab9ca14340f297777b9
 DIST libbsd-0.11.3.tar.xz 399712 BLAKE2B 1af04b8fcbc0bfa59fba549639d61a33ac934fe7ee42b506d1b0452e0b836b0bfdd3d8739de90465be46fe6a9d326a2d11bcf72280aa19ccba81db5da6d63d89 SHA512 a7015ea1ffa3766b1a4690526a25231898ad8275149b31fb6801082450172249997c36165626d101ffce53b59767a46676eebc0806426922fe4e773a0376c1f5
-EBUILD libbsd-0.10.0.ebuild 1240 BLAKE2B 8fd9398aff8163c5651bd1ea4edfc1afc6e0a1c0309be8afec21dc719d5259b3931975f713e86e1825af00b2bccfe64b19fa69c7f7958739a0eb966c330ebfd2 SHA512 1ee29cd1a6175d09427a1d56311dad8b341c5094c7a24f8dceaa5e7114941e91ad9dc014153a57009ac79fe5851140def2e9cf0a3a238da654be87fce3640eba
-EBUILD libbsd-0.11.3.ebuild 1263 BLAKE2B bb38dddb088934db7e9f5b90428a3edc957383a7000bd1fc1089d6c531b3808a11cf38a7c34a53c1c4b2582d28ad3c23623ef6a16b71e8415aaa1faf955e29e1 SHA512 ce67b511ea2087e2333c0f93b8b90d4930044d64da961d8342846d78d3b9c1bb830c901136add4abe92e21610155e9ca80b19fb8d56fbd3403131690369bcf6a
+EBUILD libbsd-0.11.3.ebuild 1270 BLAKE2B 1a6903494e8ac67f4146e903dc269ed07c4bacac23672373353f610c7f7bd762ab71133eee1f47675b9a79310b85fc9658afbfb576da60f55cbbef85eed9427c SHA512 5ee355a0f3e168bd62124244d99e9334d218b65d2e3f913983c1e4b2d0aef72a5b11b41062a09bc673c1365cb25f2620ec32d25f9ebcd051bb2283c00c3c0a48
 MISC metadata.xml 362 BLAKE2B 5ffa8ebebcf0fd8d01f49f14b8f6a210a45a057669f88343e77a25907af8b4608f24898f7ad8b0367b1fa162de3ea7f6ae1692d7655ef899f72760d9b156cc1d SHA512 6bf19529af2e728fd1bb249f5f15875726ceeeb98f820c618aa8d8b9db8aebef20019e38486c5490e2808af57e4531f54201083514e6d3e20415ed08dd22e3bc
diff --git a/dev-libs/libbsd/libbsd-0.10.0.ebuild b/dev-libs/libbsd/libbsd-0.10.0.ebuild
deleted file mode 100644
index ba68dc9c223d..000000000000
--- a/dev-libs/libbsd/libbsd-0.10.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib-minimal
-
-DESCRIPTION="An library to provide useful functions commonly found on BSD systems"
-HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
-SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
-
-LICENSE="BSD BSD-2 BSD-4 ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND=">=sys-kernel/linux-headers-3.17"
-RDEPEND=""
-
-pkg_setup() {
-	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
-	local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
-	if ! has_version ${CATEGORY}/${PN}; then
-		if [[ -e ${f} ]]; then
-			eerror "${m}"
-			die "${m}"
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
-	# which is correct, see:
-	# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libbsd/libbsd-0.11.3.ebuild b/dev-libs/libbsd/libbsd-0.11.3.ebuild
index 03bcd0cd22c8..85c772ff612b 100644
--- a/dev-libs/libbsd/libbsd-0.11.3.ebuild
+++ b/dev-libs/libbsd/libbsd-0.11.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="BSD BSD-2 BSD-4 ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~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"
 IUSE="static-libs"
 
 RDEPEND="app-crypt/libmd[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
index fb30da6f7dcb..2c9cb905fcc1 100644
--- a/dev-libs/libcdio-paranoia/Manifest
+++ b/dev-libs/libcdio-paranoia/Manifest
@@ -1,4 +1,4 @@
 AUX libcdio-paranoia-2.0.1-pass-NM.patch 3534 BLAKE2B ba200b7245b7a39a43275968d1b8f9f54e2abf22080a069894468da6a0e2911ad5307f12ae99fb6c60c4db3c316d327c466cc32fe002404e2c1f62c4e8505afa SHA512 e0b263699249e7d873b2040373419d395697cabf02d61fdcf576d162bde9b232caf891354c2d560767d5044c14cea48401453cff069c5f3c33322c25f97101d1
 DIST libcdio-paranoia-10.2+2.0.1.tar.bz2 589075 BLAKE2B 9d2a2d288ccd13ca4ce38a894740085ef099f3e63e68e568d58e9a0609ace21002375431dde862f86352b6aec0c5374f65e64aeb4e39c3d59b406ae14bdee7a9 SHA512 c4a768d11e9f62038ca8081316596c89c7fee6a314229fb42e3999757fae172a5dc167175f60d555c2442266d34fce6ce627f4124e9f3a93d0456adb09ca91f0
-EBUILD libcdio-paranoia-2.0.1.ebuild 1848 BLAKE2B 6582d5bc8c0fa9b6063a2d01a9eadad49fb7752e82bc563c94b176a994691be2cbd99c3da4d2f8188c8ed01da543bf5d538246baeefd64785963b05219f17d31 SHA512 cb0fec9ac541e2c4afb9e0fbb0f5e1769aa687fa8758fda5d5e8531dccadeeb7b1610978ec14d4d25609dc8dfe4f4f53a9a4ef6076b6f15ba66cebe7b97b72cc
+EBUILD libcdio-paranoia-2.0.1.ebuild 1855 BLAKE2B ba79098540828c612aa22172b3ddf4e477fc9df4f77eab3e5c515e494a978e3cc9b5bdb329645d97768303abc79c549e6595a2ddea7b3d2d71c5843677b4af18 SHA512 c03c6eafdc345dfd794a2e2996d8e4cd727b96c85a41c08ecd00c741aaab926d2d47297959e58b5b44cedc415487a5d77b1bbf78d02ec81803d8c33faa934016
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
index 2ceab952939c..2492b4825207 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0/2" # soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 58dc2fb88057..0431746700ce 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,8 +1,9 @@
+AUX libgudev-test-double.patch 923 BLAKE2B e8351510cd918befad8c9059dde42f5ceb6df66028ca38ea7e24db8d357658a1fea00ca66f459731ec8087aeae77092086daa79eb78b6ada62cede12149a7e47 SHA512 4decaa02142dc0c952d1eb8a2d7bd963fc71aa9dcd97e267f464ea64cd9791e64d67507aa1cc0edf3fc30cc40e300dc479a445e2f3af764cf2cc89abff55c64f
 DIST libgudev-234.tar.xz 273244 BLAKE2B c0556988e37d5a5c48ba906b121d3c7a16c6a8ee4d05eb0e51913b9cde51bdc10966dcf8ceeccf62021dd8e47b004c85ed3412942d9d2bd5176d604931745f50 SHA512 cb01906d532b05cf8f69acdf80a8f05fbd4863fd98e88928b491e3657e60844f7ae6ca903ddd773fbea37268ff85d12719de47fd92a2f18b98fa2dbfe85e8151
 DIST libgudev-236.tar.xz 28428 BLAKE2B cee5098f851183131db88812c8a985a3617fec7a2257f3c05ae0f06e423f15efa89801ef0c75cbb6e5ea9fb7a9db3c4d9215a3689e5d1ddb4832ef17442753cf SHA512 b00c30a7d57de8cca92a22f4c4da878c7cce448b1177858cc9ee0b99c5bc4fd0fbd01d8f4f9a9b9ef073af8f51c26533f2e7896c01ed9fed0a2bcfa6b2cfcbc2
 DIST libgudev-237.tar.xz 29060 BLAKE2B 5d39d4d26d8c8b3fa877319c294036294dbda96b340d2d04d7a35449d91b58de876b96b5e3d9423cdf3e1d3e2a94f5a861b1ac1e74a610637e0fc66248c68309 SHA512 2d68981e3ba5c58ee080b6ed5cd5152c1c352b2bdb3ecb5eaf2b91f6800d3369121222a7fe4f82630aabd164069ee7276c52082b2fc2ff5f318481b85b25abc6
 EBUILD libgudev-234.ebuild 1088 BLAKE2B fe5aab5e9c54d398446439680fbe90c11e1d8a4372effb36351b7b756c770591ac2c7526fe1007fb885dd461e761590c02d6c2ee9742ce1defd980d2ae88d3b2 SHA512 4e471b21732297933f8b6e48b658135a5b13f05d866059d0585c6d1b064c9f4a817c4d1c6429900f3191fb98f8ed192405281784c64b907ae36a825881fc88d8
 EBUILD libgudev-236-r1.ebuild 1350 BLAKE2B 6bb2b4de35e799024a415c3dfb2980c2143ec93728b1edce249c5cc697d233896081ea944b965e54af38bc06316c68732676fc0a0287ed2fbe86c058478f5d16 SHA512 a27044187ef37e470922d2ab72015e5bf228bf80ad518973b74607660dca815e4c0959c03f23dfa94502b54c7f4824386dc4ec9fae6760d57308cd37c907905a
 EBUILD libgudev-236.ebuild 1163 BLAKE2B 0ebc090e946fa572c444ec9890155010d417d85027596bda006711dad0cd4afaee9e82bc9737106639ef5f601b1907efa64378538976a2ca58e9fd051ebaa723 SHA512 6830ecc3ef4f78536db37044dd54f8bfe28734fa5fe2f505a0860a52664a8bca87401a6d61e4fc090ee01c0fa36bf29eefd4bf5c2a2b82bbbf611c7cb9bb6778
-EBUILD libgudev-237.ebuild 1201 BLAKE2B ec404724db11e37fcf7a49e03e17d14b1015819064a62ad47c6c998813fc1cb922de24988e44eb17b95987fb66b8b845a5e1c254a964b324605e6cee92651d41 SHA512 a15928a8838f5c802c4f5a16b12f9ad55dd3b7381c7785d86550ec6295083e724f384696a6d6753c77d535d4afbc616cd096e557a0bfe62c421d4a66804f6b49
+EBUILD libgudev-237.ebuild 1319 BLAKE2B 46b7b8f7f8219cc4be52125f755fee00beb8ced80d5981a5faf103c522fe13b2b6f5b060321f0f1c3f177e2a8ae6322e11696e34a5448b103d6e8e3d768fc4c9 SHA512 011f6e8e97cf10ae3a88ae3659776f8b89a8db4cd8b1e8cae74216fcf36e943cac3800c4daa28a6fcf6f88384e40f9534fdf6830aa8f4191b5ac3c4d4dc5e505
 MISC metadata.xml 333 BLAKE2B d9c5a793dcae13a9f6bf016d45306cc7402b897be56e13e0839f1bf93fa49a5cdea3401d2608f7faf432ba735bfd8f43504a875700da8d65ddd5b50d7c2a428d SHA512 d7ecba75c60812ce8456539aa7d50bd38dec20564ef9b51603743143b3cf64d93a997b27fcde8bf9562a1c0e0bf565639db9f82471ad3f75bcfbe7c12d43929b
diff --git a/dev-libs/libgudev/files/libgudev-test-double.patch b/dev-libs/libgudev/files/libgudev-test-double.patch
new file mode 100644
index 000000000000..5d0eb3dab18d
--- /dev/null
+++ b/dev-libs/libgudev/files/libgudev-test-double.patch
@@ -0,0 +1,30 @@
+From 6f0503b1930a0776ef45fa7bc87a87e9dc69dacf Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 21 Aug 2021 15:09:58 -0400
+Subject: [PATCH] Skip test-double if the fr_FR.UTF-8 locale is not available
+
+Bug: https://bugs.gentoo.org/809359
+---
+ tests/test-double.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test-double.c b/tests/test-double.c
+index 0092d8b..7ba3abe 100644
+--- a/tests/test-double.c
++++ b/tests/test-double.c
+@@ -54,7 +54,11 @@ test_double (void)
+ int main(int argc, char **argv)
+ {
+ 	setlocale (LC_ALL, NULL);
+-	setlocale (LC_NUMERIC, "fr_FR.UTF-8");
++	if (!setlocale (LC_NUMERIC, "fr_FR.UTF-8"))
++		/* Skip the test if fr_FR.UTF-8 is not available */
++		/* https://mesonbuild.com/Unit-tests.html#skipped-tests-and-hard-errors */
++		return 77;
++
+ 	g_test_init (&argc, &argv, NULL);
+ 
+ 	g_test_add_func ("/gudev/double", test_double);
+-- 
+2.33.0
+
diff --git a/dev-libs/libgudev/libgudev-237.ebuild b/dev-libs/libgudev/libgudev-237.ebuild
index 6f131f3140bd..ceaf1ef5e86c 100644
--- a/dev-libs/libgudev/libgudev-237.ebuild
+++ b/dev-libs/libgudev/libgudev-237.ebuild
@@ -28,6 +28,11 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	# https://gitlab.gnome.org/GNOME/libgudev/-/merge_requests/19
+	"${FILESDIR}/libgudev-test-double.patch"
+)
+
 multilib_src_configure() {
 	local emesonargs=(
 		$(meson_native_use_feature introspection)
diff --git a/dev-libs/libotf/Manifest b/dev-libs/libotf/Manifest
index f1236e50a8bc..18ffc7c96aa1 100644
--- a/dev-libs/libotf/Manifest
+++ b/dev-libs/libotf/Manifest
@@ -1,5 +1,5 @@
 AUX libotf-0.9.13-build.patch 678 BLAKE2B 59437afb9db0600ce6b3b7fd61f0ee139de11b5f08b7141bb918a81077606fe2860641b00fb562cd26457ab01285385fb4d71c7753715bf7371add9c0cb89366 SHA512 9a0fb4c4cd3c096d4f0a8910de63d594e8ae471543a65e62bcff102d98e25d1b8714eccb91570c8f778dc83659ac8e5e9a1fa3c8e7479153c58d41972661d56d
 AUX libotf-0.9.16-freetype_pkgconfig.patch 1021 BLAKE2B fe4e25b4c90c1b614369158bcdef2babdcb9c44cec81cff9c25b33d33614be99f689b209f0c19722d201c6289ebac3f5c758b9c080c84c1e57aeccb535b95ca3 SHA512 5aaf5fe70f5498859e6913ef274c47f1bbd339ea02d7027ede543a3ef0e88109ac747e03dc852f3a5a22df538a5d04ea7e9ba2bcdec899ee5063738fad57666a
 DIST libotf-0.9.16.tar.gz 423979 BLAKE2B 838e7c855f93ebb30bcccd1d3055f662da1736bb85fa398f9ffe84411249f63e4f66908b55534c2f07446b45ae7912745a92bbf0404f8d62eeb3a9119a604b37 SHA512 0f68c45c1224f02dc0f1a8e9915dd9c1c70d71259b4e2f7bbd4fbec6426e58d4a26e4cbf28dbb8ed051ba6f532f99fc4e74b4ddf97a93ec947fa6260c875d0b4
-EBUILD libotf-0.9.16.ebuild 981 BLAKE2B 6e49a7562feebaf2c01f78accd5eedee7b9f27563114455f3429ea427fe4d125deea355ece3e769fed0735c189cc1c5b1fcdcde7bded5254d500d5cec3f8b5f1 SHA512 30d0348bfab4d007e78d68789ec9c452ae4557568d5b267aef03787eded1e0e423c06b75a552e0a8638013321b0557d0792b8a5a09cbfd304b0f88a942bdbea5
+EBUILD libotf-0.9.16.ebuild 988 BLAKE2B 311fd58087bcf299a2867f623c383f16217826d0846e3c60df100171af342cf91bf2400530a3366ca41b28427ed4326e9fb188ed70fd10a287a4f687f5dbdd0b SHA512 09eaa31c87f38f6feb19f87cd6993e4c4313debc8a019ce02728c430b795dfa241ee8a3432c4958bb0222190e019aced31e1c786519fb2a27b4bff885ed1414a
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/dev-libs/libotf/libotf-0.9.16.ebuild b/dev-libs/libotf/libotf-0.9.16.ebuild
index 0f3d08cc65ba..c73b79eb6f4f 100644
--- a/dev-libs/libotf/libotf-0.9.16.ebuild
+++ b/dev-libs/libotf/libotf-0.9.16.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
@@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 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 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs X"
 
 RDEPEND=">=media-libs/freetype-2.4.9
diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index 208ebcdae766..c60ff77208e1 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -1,5 +1,6 @@
+AUX libowfat-0.32-ar.patch 1564 BLAKE2B 43477182d5ea37327376511ff1f6a4db9ac117a11a6246be1e016b6b6e363432d959d2a986a604cce15a2a6d58558dc4627b0824624aae707f127dbfd43e5da8 SHA512 9945333b6cb9bf68242e6053a8634595e226031557309e190ac9ada860019daac8f11c562a661a60ec1cfd91d0502416006d13e877f8429acb0b653a6cccfa98
 AUX libowfat-0.32-gcc10.patch 633 BLAKE2B fdafa991694156b4c9bd93a6ad1a77b8673c9b176735da0bf525faf2549336121e4ca6a17dd7a35e58292ed6fc66ea176656b7cb97884f1fff3400194de3ef00 SHA512 ba3eef982f8345a96b2612bfbb8a97dc6477b21a58a35cda513ecdcd346b0cbf752574d565003f1d6887cda4467d8efc5777aa4d80fd50f731d35387028cda84
 DIST libowfat-0.32.tar.xz 195820 BLAKE2B 6dc19b947867a9b08eece785378be2493fb7185d1cc334de080ab1c288884fe0b670ece6f3785f051c707cc98afc4d843a262b9761fc9cc68fdf1f1ac8df1eb8 SHA512 c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b
 EBUILD libowfat-0.32-r1.ebuild 1039 BLAKE2B 534907ee194eff327e07f903df0f5dc5728572b013fca29e583aa3df3e852db91c3145f2f2d604b0017963d8423a0c946c2eaeff93da0785f486da939e055047 SHA512 71e1d1a579943fe2b1d53c22ed23c579745ab3d4d058033d7a789563ac0ead400039232472a116ae9abb7ee83df3421d7a43dadbca187567bd8fdac2157b3e86
-EBUILD libowfat-0.32-r3.ebuild 1070 BLAKE2B 09d4b580db801b1edb865a8fde62afab1ed4b1c71927347964b2b606d874b8c25b49c7486c674a302222d50897b1441e869446d65c654facb0a37d62e06355f1 SHA512 dee868478c6106c7a43fee48ae5d57441727ba167646091fa23d92f56cf483bd9ca36a1b78225b086a51f625fec61a3db9697249661c4a0905278f123e7904cb
+EBUILD libowfat-0.32-r4.ebuild 1145 BLAKE2B 9877439631aa915a175f5b330aa72658577fcab6db8743c42213ea1909dfac29b2b2e5e3f2a8608eb386cf7e39140f88af2e2b4f5dc26485b0c2dff3e4373be9 SHA512 8eb2fe2102caa6b92e15a89a46c61befcb4aae36a74ceab5c7d5b42670de640497f41f2484c8aff99ed9ab34d6ba10339eb759fb980201cc38f6d983b2d19c72
 MISC metadata.xml 479 BLAKE2B 166384450dec36385a099401c817ed00304ebab0aef309370dd35a12f0d1cee8b0be21b47248cfb89856add59b1e056aea591ada19950bc53bac8892fc67e9aa SHA512 aa3268660002f53d5b07d1ad9fc537f7613e5b9080fd26a905a9ef1dae0952c92e2140184230283de17d2882674dd4b7fc6efa42f1c09ed341830ecd93e0f32e
diff --git a/dev-libs/libowfat/files/libowfat-0.32-ar.patch b/dev-libs/libowfat/files/libowfat-0.32-ar.patch
new file mode 100644
index 000000000000..c817f35ae7e7
--- /dev/null
+++ b/dev-libs/libowfat/files/libowfat-0.32-ar.patch
@@ -0,0 +1,66 @@
+--- a/Makefile	2021-08-20 08:58:11.523401075 +0200
++++ b/Makefile	2021-08-20 08:58:38.122920942 +0200
+@@ -241,6 +242,8 @@
+ CROSS=
+ #CROSS=i686-mingw-
+ CC?=gcc
++AR?=ar
++RANLIB?=ranlib
+ CCC=$(CROSS)$(CC)
+ WERROR=
+ WARN=-W -Wall -Wextra $(WERROR)
+@@ -1092,8 +1296,8 @@
+ $(IO_OBJS) $(CDB_OBJS) $(CRITBIT_OBJS)
+ 
+ libowfat.a: $(ALL_OBJS)
+-	$(CROSS)ar cru $@ $(ALL_OBJS)
+-	-$(CROSS)ranlib $@
++	$(CROSS)$(AR) cru $@ $(ALL_OBJS)
++	-$(CROSS)$(RANLIB) $@
+ 
+ CFLAGS+=-I.
+ CFLAGS_OPT+=-I.
+@@ -1105,8 +1309,8 @@
+ 	$(DIET) $(CCC) -c $< $(CFLAGS)
+ 
+ %.a:
+-	$(CROSS)ar cru $@ $^
+-	-$(CROSS)ranlib $@
++	$(CROSS)$(AR) cru $@ $^
++	-$(CROSS)$(RANLIB) $@
+ 
+ t.o: t.c fmt.h scan.h str.h uint16.h uint32.h stralloc.h socket.h \
+   buffer.h ip4.h ip6.h byte.h mmap.h open.h textcode.h dns.h iopause.h \
+--- a/GNUmakefile	2021-08-20 08:58:11.523401075 +0200
++++ b/GNUmakefile	2021-08-20 08:58:38.122920942 +0200
+@@ -241,6 +242,8 @@
+ CROSS=
+ #CROSS=i686-mingw-
+ CC?=gcc
++AR?=ar
++RANLIB?=ranlib
+ CCC=$(CROSS)$(CC)
+ WERROR=
+ WARN=-W -Wall -Wextra $(WERROR)
+@@ -1092,8 +1296,8 @@
+ $(IO_OBJS) $(CDB_OBJS) $(CRITBIT_OBJS)
+ 
+ libowfat.a: $(ALL_OBJS)
+-	$(CROSS)ar cru $@ $(ALL_OBJS)
+-	-$(CROSS)ranlib $@
++	$(CROSS)$(AR) cru $@ $(ALL_OBJS)
++	-$(CROSS)$(RANLIB) $@
+ 
+ CFLAGS+=-I.
+ CFLAGS_OPT+=-I.
+@@ -1105,8 +1309,8 @@
+ 	$(DIET) $(CCC) -c $< $(CFLAGS)
+ 
+ %.a:
+-	$(CROSS)ar cru $@ $^
+-	-$(CROSS)ranlib $@
++	$(CROSS)$(AR) cru $@ $^
++	-$(CROSS)$(RANLIB) $@
+ 
+ t.o: t.c fmt.h scan.h str.h uint16.h uint32.h stralloc.h socket.h \
+   buffer.h ip4.h ip6.h byte.h mmap.h open.h textcode.h dns.h iopause.h \
diff --git a/dev-libs/libowfat/libowfat-0.32-r3.ebuild b/dev-libs/libowfat/libowfat-0.32-r3.ebuild
deleted file mode 100644
index a479ad553991..000000000000
--- a/dev-libs/libowfat/libowfat-0.32-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="reimplement libdjb - excellent libraries from Dan Bernstein"
-SRC_URI="https://www.fefe.de/${PN}/${P}.tar.xz"
-HOMEPAGE="https://www.fefe.de/libowfat/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE="diet"
-
-RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc10.patch
-)
-
-pkg_setup() {
-	# Required for mult/umult64.c to be usable
-	append-flags -fomit-frame-pointer
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		CFLAGS="-I. ${CFLAGS}" \
-		DIET="${EPREFIX}/usr/bin/diet -Os" \
-		prefix="${EPREFIX}/usr" \
-		INCLUDEDIR="${EPREFIX}/usr/include" \
-		$( use diet || echo 'DIET=' )
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		MAN3DIR="${EPREFIX}/usr/share/man/man3" \
-		INCLUDEDIR="${EPREFIX}/usr/include" \
-		install
-
-	mv "${ED}"/usr/share/man/man3/{buffer.3,owfat-buffer.3} || die
-}
diff --git a/dev-libs/libowfat/libowfat-0.32-r4.ebuild b/dev-libs/libowfat/libowfat-0.32-r4.ebuild
new file mode 100644
index 000000000000..1d012c474e76
--- /dev/null
+++ b/dev-libs/libowfat/libowfat-0.32-r4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="reimplement libdjb - excellent libraries from Dan Bernstein"
+SRC_URI="https://www.fefe.de/${PN}/${P}.tar.xz"
+HOMEPAGE="https://www.fefe.de/libowfat/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE="diet"
+
+RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc10.patch
+	"${FILESDIR}"/${P}-ar.patch
+)
+
+pkg_setup() {
+	# Required for mult/umult64.c to be usable
+	append-flags -fomit-frame-pointer
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB) \
+		CFLAGS="-I. ${CFLAGS}" \
+		DIET="${EPREFIX}/usr/bin/diet -Os" \
+		prefix="${EPREFIX}/usr" \
+		INCLUDEDIR="${EPREFIX}/usr/include" \
+		$( use diet || echo 'DIET=' )
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		MAN3DIR="${EPREFIX}/usr/share/man/man3" \
+		INCLUDEDIR="${EPREFIX}/usr/include" \
+		install
+
+	mv "${ED}"/usr/share/man/man3/{buffer.3,owfat-buffer.3} || die
+}
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 8b405a02aa01..9dbafd4f2c8e 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -4,4 +4,4 @@ DIST pcre2-10.36.tar.bz2 1722310 BLAKE2B 5c70b7b1b0644edbcc29d3486fc0f3e2d0cb482
 DIST pcre2-10.37.tar.bz2 1729384 BLAKE2B b4e56041010d7f44e84a63a17b35e87329d258107d8b27ccead10f51e7deacc93cbee64a22c71b9f0b8f244920b3a22fa4d9b786ec441a428e0ad0bb8535773e SHA512 69f4bf4736b986e0fc855eedb292efe72a0df2e803bc0e61a6cf47775eed433bb1b2f28d7e641591ef4603d47beb543a64ed0eef9538d00f0746bc3435c143ec
 EBUILD libpcre2-10.36-r1.ebuild 2482 BLAKE2B a569108de5f728ff394048a43b3b2fbe4dd0007da77d0edfa04a5fd973822658e138cbe48ef700a07b8a19b2993e44fce9fb0aefb50cabe285338a63f7b23bc2 SHA512 33af5c3113fadfd29ed6d9d56110be92b85d5cc905e4cbcf69606ef1b797285558106b72135b8abd07e720c0348b1ef7e17dc82ae0243590a5b5ffd314f370a6
 EBUILD libpcre2-10.37-r2.ebuild 2639 BLAKE2B 34947702bc9bf6cef80e0fc6bff9d58a5776197a6d3509d51f092b5fd7b191508a0c0763848c0bcb7950cb6c8efb1e55cda7c083e8012350c897470badf70537 SHA512 12311f8b31c8f2f39fd67334ac74fefb88e7da6fd7c2bc64b1689701cec30f54e293356a312ef51b9fc02a6d18254dbf5c095db6d2127bc745f848783d88da91
-MISC metadata.xml 1140 BLAKE2B 19f0ea04c9613f0c804c76ca74012fa2313ba69b57fe95f31720809a12d5244f78e4ce9c957723b848f0d8c3514ef27fd875f7814d2434c7e50dbcc7325c0a95 SHA512 9b54ed8cdf78e1d3fe737460117cb840280b63c196cca0bfc7b89975ea8102f9729cf5f29628f5cb7b7c1eefd8fd5c67f3c7f5fab64f9d168d6fcdedbd926b51
+MISC metadata.xml 1235 BLAKE2B 6ff15f514d0c4a78fcf7c3c21f204c811e537ee7d4091e453e57e68ab35c1698ef48f7309b7992fec9c764ab091d74a4a816251d418ff43136cbc3341c42a8d9 SHA512 31a165643d0aa4147ff86e786f911c23752068d46d9e30c38bfe7ca1f7aeeb6783a49ffbf059c3d05b705ab2da8863af9f25b6df37e8ee155c1aba7c40a02720
diff --git a/dev-libs/libpcre2/metadata.xml b/dev-libs/libpcre2/metadata.xml
index 1e5257985a69..e7cd73bef01f 100644
--- a/dev-libs/libpcre2/metadata.xml
+++ b/dev-libs/libpcre2/metadata.xml
@@ -25,6 +25,9 @@
 			gzip-compressed files (via <pkg>sys-libs/zlib</pkg>).
 		</flag>
 	</use>
+	<slots>
+		<subslots>Reflects binary compatibility for libpcre2-posix.so.</subslots>
+	</slots>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:pcre:pcre</remote-id>
 		<remote-id type="sourceforge">pcre</remote-id>
diff --git a/dev-libs/libvoikko/Manifest b/dev-libs/libvoikko/Manifest
index 24242f06c942..f66f03495d0b 100644
--- a/dev-libs/libvoikko/Manifest
+++ b/dev-libs/libvoikko/Manifest
@@ -1,5 +1,5 @@
 AUX libvoikko-4.3-disable-wall-werror.patch 1227 BLAKE2B 6c943d0a77465c176109d790e650044227a82b386d43494e0ea19426fa985d732cfd3e3a9ef309c2de38da6693f813c3f87eef58c72ab809ee8f8d6e70396ebf SHA512 40c95ba1c78e854ef97bcecc3b98f16089d5f26c70051a8022a782338c704428cac0f08e87b7b4db495d78245cf191ed0a00406963da77d515c56f1a1fad5d5a
 DIST libvoikko-4.3.1.tar.gz 658079 BLAKE2B 4f52789b5d62991333ba9b979259a631ef2989bc70358b398a4281d56765046209657fd3e41afd47ee7ba1dbafeeb4a34ffd007e55037bca9958fb813e4b7202 SHA512 6677fac7c0cba1289dda23b0c0a4bbe44480ce747189d40634ac57811728c1942a795efd50270e933373fabab9c54e82a8f9fde06d936442820e3f8019574f08
 DIST libvoikko-4.3.1.tar.gz.asc 833 BLAKE2B 4a69ae75da1973e383ab21cb557352be1344dc6e34fef13e28616fbd9e0003b93ef5e3488f1e776eb476a750980281463ee144edc5849ec7e3159badc160ceb7 SHA512 04a5e8899679e1503ec0d378903b8ff17e8065aa105ba61559b584eb4cde2a5a9b622fd39bd0126bb87915c7dcbac8495e874c3cdabf25232b1ae41491275ba0
-EBUILD libvoikko-4.3.1.ebuild 1245 BLAKE2B 689688d92a86832c2bddeaff2ebddfcd6c07d261e65ce08db4e00ff348b647805d384f4ced4a13c6423887c820228e62f81d30877b000bd00e63f6c44ed57ae5 SHA512 efaf7c440248913d2d18308b7348528fc9ff114f2282fb52252ee2a36bf78c8ab339f91dfcb8462f9248b6e2aaae4f34471f3073751b592711c8e216e984c1f3
+EBUILD libvoikko-4.3.1.ebuild 1252 BLAKE2B e33c71dabb256ba92e6fc0b8a29edd70d048e930277fedf64a7e75316aff51d15f740624d84dd28c16b52596f9c20be3679d0d04cdf353a3b0063c6184246d69 SHA512 fe25dc955192ae53ceb6bb233554f17081652a6c65cdce8c2b9e2e0bfdaa071e7c45cdcf8e03f15627c3964fca653e1e444ae96613a647d987bda916bb342c5c
 MISC metadata.xml 419 BLAKE2B af90ea5ea311d4352bbdfd4852f71dc51564f7f34cd088b8b77016b5500a468d37c4ca6c1cf38ba4e091e8adfaeb5a8051955f189c4855963a4fd6c5b4523ef2 SHA512 8b84aa16876a8aad7bd8bcfd588ff4de660dcc4ec9fd5d07f22d513bfde4cac278992cfd619a5d556256adbc4b00bb946448feefa561fa99e07da2181b121a88
diff --git a/dev-libs/libvoikko/libvoikko-4.3.1.ebuild b/dev-libs/libvoikko/libvoikko-4.3.1.ebuild
index 856038cdcd8a..97c542ea96f4 100644
--- a/dev-libs/libvoikko/libvoikko-4.3.1.ebuild
+++ b/dev-libs/libvoikko/libvoikko-4.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-r1 verify-sig
 
@@ -14,7 +14,7 @@ SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 IUSE="+expvfst +hfst verify-sig"
 
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index fadc54c9919b..ece2d5b8acef 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,5 +1,3 @@
 DIST libwacom-1.11.tar.bz2 519285 BLAKE2B fb26190d752316b5d25659d2ae76681bfff1803463360aa138eab91ed7d7ef2d04dfb6bdd4f8c2effc45a495ef3afc312a817d4fd41cd8167172cafd9f5cee9f SHA512 24e8183502dd2b928d53b3d26d8479210e855c94c225649d63ac33062a30615654ff0ab8666a25503fb3253125539cd845ca467fb228a01c608dc3adbbec73b5
-DIST libwacom-1.9.tar.bz2 516223 BLAKE2B 272dd462bee6f152840fb684213d5cdf83cda05b71b95e28a4a307240fa3edcb42b7afb9ef0ac1bd8b470a138e54f3fed9509b02186aff771314fa87ecf3307a SHA512 d62da97038caeaf727800a680a4ef2ef49a56e632844b9a0d6c0eed9c808e033bc1d969aa1c523b4a1724dfb9b8b3665290ecb90fcdcfbf5f50cae2d06c0bffa
-EBUILD libwacom-1.11.ebuild 1363 BLAKE2B 9974c88048df500d46f16c9c3673d7707dc6bacbd56578243865cfe8c37b262d47210fbaa6d10ecc09ccdc562e2ed51d450c4138723ce4f1c82c9e3a01e53697 SHA512 fdbdf358eeb30f9ae844465607894d6288ef74ab72fba76aa16a1c0666a1074ff2404e126f649b3bc1c3a6de17676354e09ad4b5073453c6d4dfbbd20db21c26
-EBUILD libwacom-1.9.ebuild 1362 BLAKE2B 9362fa7a2ad34ac1c6a35dd056e34c5bfd821d92e8cfc1e593352088c3d8be6c0bbfa73e8ea9edd6a4baf5eec109db2cda72c59d366f9f5b463f011c18aa0593 SHA512 d89258d47923070b4b1e40ae689c7f473e28961d9ba068659bb5b5b4985a746b95cbdf0eb4f6c6910b486210b9d0db2ea498f097eb5fdaac1f2b2652c4d2ce3a
+EBUILD libwacom-1.11.ebuild 1361 BLAKE2B 5d1f2961c5b32db01681d9f2c044e89198130c2b9c18c7eab947a5157694d218ca9c8688491315e31cb1f64e703465bc2590bf4101dcffdfec20f06b1616a90f SHA512 43ba7996cd0926bf9ef34b2946f32db8aeed4263ae14377b5ce9f1107f753c04060a1ca9a802abd7ee7415eb62af7268bbf42ce171040cf4b7bdaaa6bf5cd7e2
 MISC metadata.xml 308 BLAKE2B dc6dc477d74ab5e2071a87814f3d21f5347891f8e36e36bbcf1590c253146f65210f28257cd5ec26fe0b69209d19d489ce3c52697423c087321191694561144d SHA512 fc208d84f859f167919179d96eeea91beba8825cc2b4e225bfd86db40ab7e1e9f7c1d5eb9023166bae7d4f784b0e08e04674ab72f75c49d638b6ca5ec52857a5
diff --git a/dev-libs/libwacom/libwacom-1.11.ebuild b/dev-libs/libwacom/libwacom-1.11.ebuild
index 4ddfb0430628..acfda32d8405 100644
--- a/dev-libs/libwacom/libwacom-1.11.ebuild
+++ b/dev-libs/libwacom/libwacom-1.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libwacom/libwacom-1.9.ebuild b/dev-libs/libwacom/libwacom-1.9.ebuild
deleted file mode 100644
index be1415a4cf5a..000000000000
--- a/dev-libs/libwacom/libwacom-1.9.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit meson python-any-r1 toolchain-funcs udev
-
-DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
-HOMEPAGE="https://github.com/linuxwacom/libwacom"
-SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/python-libevdev[${PYTHON_USEDEP}]
-			dev-python/pyudev[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libgudev:=
-"
-DEPEND="${RDEPEND}"
-
-python_check_deps() {
-	has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170
-
-	if use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature doc documentation)
-		$(meson_feature test tests)
-		-Dudev-dir=$(get_udevdir)
-
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libxdg-basedir/Manifest b/dev-libs/libxdg-basedir/Manifest
index 35a9ebae23da..e85064178c89 100644
--- a/dev-libs/libxdg-basedir/Manifest
+++ b/dev-libs/libxdg-basedir/Manifest
@@ -2,5 +2,5 @@ AUX libxdg-basedir-1.2.0-buffer-overflow.patch 898 BLAKE2B 24db3713a2a85901f0b7c
 DIST libxdg-basedir-1.2.0.tar.gz 30159 BLAKE2B cd9eacf6d32e0f27aa4a9092fb919f027fe77905cf8cad2f3d860d93f9784bbcf85336704fd9241d58769e48b2a8a7e4b4ed306ff32328f1ddc7cce7b014dc09 SHA512 8584405d45e0b57e570666b6eab6d99d70411d00f88965826c9ed0292372385668f190157a10ff536f3a5a59fd0031b332ecbb8a38ac64eda1b04a0603997406
 DIST libxdg-basedir-1.2.3.tar.gz 30971 BLAKE2B 63e8197f33db1200573b03cb58e4760ebc9a58f132902f8290822d9235be27e22bc4b763150a526cce23be60d2d535cd8627259180edce4d889a077d4b0de20c SHA512 e672da0d9cd3c27c9113f6053b79127e615e5d84bde81305242f506e930869d8492304aac26a0296528d5a32530e4a743acecb6a25f58372ac597af284429f7c
 EBUILD libxdg-basedir-1.2.0-r1.ebuild 918 BLAKE2B ebe980502ede7623065b0e0e49e7c19d626c7d9bbd623461a287e36b11d32c01cc10c4be7878efbe3c4b4e6ba4e548f111d4bae3e4dc8a19b984d0080fe03acd SHA512 e2cd24b2fe461a425a185797ac12e764728d417a83b96f5ec01e79bb74d0409b85b1cf7fa856945202c9cd6d2178b3a45953bc2ac5b72e79ba6320009d9221dd
-EBUILD libxdg-basedir-1.2.3.ebuild 868 BLAKE2B eb15db9cade4e82c392059649b22b8f40d85da4bcf63607a33fd15126b59b81a8a9629935083919a4a6ed6c26073a270a114488287bf560bdb153fd6fbea874d SHA512 868840bc2c7a1b820d63da2f71555176a871279b9023f6e086120a6132d690e373f854cb09db1c060fa03ae5315b2563859bd0bfdc4b357c2da1444c605e548b
+EBUILD libxdg-basedir-1.2.3.ebuild 875 BLAKE2B ae9acbe8b43c9a92e30df53708fa872c60467f6b6aa718c65010e921f32cbcd026656da126ff1d6c4a37641fc4f8e9169a4c7094149ad73b2c8c30702f4e064f SHA512 8c038489001ba2cfce65258146dddfd9542c8b8cb1a206652ddbce5ca7f8584c5b3c8c371f0ca1107f8cce315063535013f9e15c6c3785d1e320be5fc5981620
 MISC metadata.xml 491 BLAKE2B 6364d3dc52ecdece6bcb1e04f3dd86baa07c3db8a5ca7c3fa031dbd62b86ce8071f272455b3d3bfd7c16ec66fbc1307739b7c177c7994c5e3e7f4b108f773b5a SHA512 4620b473c4c02627e3f75dacd5b47b02f7e57b59f9db78aa9d96ee414f03f7ece916837e821a01ebfcca6a3303c0cc74cbadf41d78eacae0b30fe4c48d799732
diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.3.ebuild b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.3.ebuild
index 0179d9e5b5cc..621aa53496b5 100644
--- a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.3.ebuild
+++ b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos ~x86-solaris"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 1649b3f7fe16..7f3d5622c8a6 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -19,6 +19,6 @@ DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd10
 EBUILD libxml2-2.9.10-r5.ebuild 6644 BLAKE2B ce2df74f087c8f2c44ddfcc7ed98ac916e9441e425d08095dcea55c4cd28e3e8954ae8d700f2668fa942ffda0043d132027c64b736994425a63c5ccb30bfa9d6 SHA512 2219c61e1a9a9ece9e926e40cd924b6a3f8ba53660bee201b0123d439e31ab1190f8de985a1c9f78f56f8fc3d791cdb907a23fab54f0d823581c1e9273de4417
 EBUILD libxml2-2.9.12-r2.ebuild 6952 BLAKE2B 8b347eb9379ba04cb83489e650a92e4f804299e0ca192826883a439c96dfa9a937e03444d1989bc0bf91811138b1d12d2c2d3fc797392af622afcf00d2d299f1 SHA512 8eef89efee52671e92e097cf09355a11cabd85eccbbc85c82e06cf0ccc8d9f7dadcb47463edc9b63a0a4302caceb8751f8abff38ec8e2b461d190945669b7613
 EBUILD libxml2-2.9.12-r3.ebuild 7106 BLAKE2B 18daefbb398537eb56e4f7a206f3969864cb6546407c950f8a96d2ced4f83a8e773d8e19769f5dc4b7822b8e13883aa5c4804ecf93305eb9475bb42c9d467799 SHA512 1372a0ddc39a2c6bf5dd43e0ab4c69c7d7516e8fcd38273ab20cb2ef280cbcb98a11ab3c55f300cb2509e91b27b3daaad7b99bc9813d3523c738f0d0eeb6540a
-EBUILD libxml2-2.9.12-r5.ebuild 7443 BLAKE2B eb473144223ccd21829a63559cb520acfc2df77a2a4506e82c9a6b391cc195831cb47226fb21ddd430572203741cf040380258d0fd6bbb0006537189a72c724b SHA512 750b2a41406364c788d80988db9638f5586e8e804ba6618611aefd6f77504e02a7fda03da78f96df338120764487812d6c3be39b750453373b87f4e50c1fdc21
+EBUILD libxml2-2.9.12-r5.ebuild 7435 BLAKE2B d0a34fcb74475f362650cc46817d6b09d7615c075a4e1e6de7bf532a89d87174787a298f5183a319e3be29fe8b1bdc43521370cb586213170384ec2789d7f860 SHA512 f21094ac0ae883c1d9be05cb38839f8192937bfc7b503f001ff13f3364ba2cea92db12a33da9a967836f62db52368f9df6feffa923e48e99f96edcb1f8830311
 EBUILD libxml2-2.9.12.ebuild 6685 BLAKE2B 1d06e3c9b4223044015ef74bc3a5707fe6f243c5c59f72fb3f9b7caa10ce8f60e43a16a029a2cbdb66d1cfe45cc7efca562137e400c08781642e8cdfdb174292 SHA512 b63076ac9a54870e42094952061641883571d0c35938241b66f2f06fcbd2f72658e47f9d3d2c192a5cb1cc44f3e754cafa9998d3ae8816bffec15fb4533d548a
 MISC metadata.xml 457 BLAKE2B d83c1b1fbb559e371c443c5ddcbf68ad857290b583b1a3129e4c635fea981658614be234879f42111fa02704bab6477fda3bc474ea2831743720c4f368306489 SHA512 4d2640aa0935f0101a4bfee0ee3fef776cb163c9fc7535ed962619f4f319f93eb0fb168518f3e8d38742e9735c9c777292ce4d0e2b165e834bbb04fa3f07cd9a
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r5.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r5.ebuild
index 6b2fbcf8a878..1c305627447e 100644
--- a/dev-libs/libxml2/libxml2-2.9.12-r5.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.12-r5.ebuild
@@ -36,7 +36,7 @@ LICENSE="MIT"
 SLOT="2"
 # Dropped keywords for now because it's a minor LDFLAGS fix, and it will ease upgrades
 # bug #802210
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index 247db847b1ed..2e232a76ae49 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -7,5 +7,5 @@ AUX m17n-lib-pkg-config.patch 465 BLAKE2B 9e66c6cea978acabcafe6b1c8d1bcf58a29987
 DIST m17n-lib-1.7.0.tar.gz 1063169 BLAKE2B 61192d26dec8a8bdb55b6a819c5b1aa5503e4320d57864889065c9490ee6720f5b258fbef10d5944f69f5a9ccbe49ea5494c8b0a10d536592c301f46df6826c5 SHA512 26fc1be02a5e487a2fa5f2f63d991f3c745aa1b78e20d931fe4b265125266501cc8d402aa3cb5c1b71a7d4c0f7a0bf5b2c3b17ec5f4f8e0f5ee3052ad4e205b7
 DIST m17n-lib-1.8.0.tar.gz 1091731 BLAKE2B a4b55fbc3246fe0865dcf1647e91d03de6ead06fb4349ba207613cdea6bb079c0e7623510a6fb046dce4bfefd262f68c41c9174d29a2b4a6f673da298642e1cb SHA512 8aba862888393232172c03cdf52531e29ea969c4327e6f69879ecf7438eafee32782f509ec292b3e1b7cd3202e2764984d7a59e85cdb87a7c8bfcbac5b0ee6fd
 EBUILD m17n-lib-1.7.0.ebuild 1756 BLAKE2B ad352d65c683556e56cf1ddd683a16fc2394603b411ac8a59f1f28c7480e4ff075536e7f74e2cc5faa8608685b80c6ff6973b36b7161e2bf44b144d10390dd8a SHA512 8a94ace6cea383ce15af9249002bf9332372eaef2afb61e51c8b931d25fad2cbc5b905d827fcf859694f062c7b8350095482a69d1a334eeac39c13041a7d4bd1
-EBUILD m17n-lib-1.8.0.ebuild 1840 BLAKE2B 0d84d47d4322331569a9d1be081980f64e975e5b8e0d835cd313a3c1aaf7a723631967e9d898961f8709161c5222869e8b8454bf5d01c314bfcf81129e99c1b5 SHA512 f385a0b6f80f0cd8f688f61a119101b4d4d6619291051aa4c47b313a439e80fcab039142c2b4da8f2b2ebc5fd5f66d92408fea86064250496d6e70db3fbd83d1
+EBUILD m17n-lib-1.8.0.ebuild 1844 BLAKE2B 0031e95011f021f744930a110389a78f18fc71632b46449684f5ac862ba4257695117610603fe3425aaa7826205cc0fba6701f3e2e7c928123f4c01080900527 SHA512 4af68c726dc58bcf3f4af0e4df5f053fdcffe59c57f2351b1c3fe074b0bc909e0a1bed011d322152ce339fd49e12b52cf22f9b0cab382669318b515048012d5a
 MISC metadata.xml 810 BLAKE2B a17dd171386fee0a400c07e5dc5008855e68d15a048380714c35355551fa40aaaf6e0dc8fb4b28f7a89553c9482cbf40b7b13117506aac007cf8e6901dda4acb SHA512 d5530380b5ad05c6dbdeffebf310bd45985301b62b2ab11757727551522bc45c3b00d0e751503d8ead750155fb857125b73f14210df6fd3a2f85af48638f0f88
diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
index 767f8eabe5f1..85dc3818b905 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.8.0.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"
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="X anthy athena bidi fontconfig gd libotf libxml2 spell xft"
 
 RDEPEND="~dev-db/m17n-db-${PV}
diff --git a/dev-libs/metee/Manifest b/dev-libs/metee/Manifest
new file mode 100644
index 000000000000..948dfdc24e9c
--- /dev/null
+++ b/dev-libs/metee/Manifest
@@ -0,0 +1,4 @@
+AUX metee-3.1.0-make-docs-optional.patch 2583 BLAKE2B f95c85a91178e2986dfdc8e98630616c3d1364c533cd10f2b69fa5e04184e719d149a2df46d9aa9296df222b56fdef56cf2b265de5eafcbfbf3d019d8e8ea857 SHA512 d2e84ab41ebdfa1fc4d1905cd9cfeed0826512409832e6c99cd946cb71f6829ef52130146a326868d42538c55b26ac1f866809688bce73415f0ebb19338ca0ff
+DIST metee-3.1.0.tar.gz 70185 BLAKE2B 7f0c595b52b608e1136c77df13244681b73f099e384fae6f5ccd350ccf679f539c8b0bc8ac062f386fa41cec9c9edf3064a6c6a981af4ccdc978629a9ebc0d90 SHA512 a967df238f2a51ecbee6fe3fe8a0d63aa321c35a520f0297688a6dab1d760358bca53a6d3cf3446f1fc9cf7f0a6c13746f5d3aa1e2064e753b1bbdb2bd356e60
+EBUILD metee-3.1.0.ebuild 692 BLAKE2B c2b6bc7dcb2c9a8b458ea70c793c7613395d88a24b1d36965e659dcf0aed04b065df71d482c95bc7e804e7019b68e3e468658d79b7ca4250735209a34e174df5 SHA512 fe305bc31bda6054be0d27cc247c4b36406c0e2c92eb36e99fc6861224619b85bc3ddeca7b6e37a9ce989febc60be45491e385af4a1b7be4334104ef3113f038
+MISC metadata.xml 575 BLAKE2B 1652ae3e008655a1dae0cf5ff1a46b07f277f92cf7e182a4fd293b1bebe37a0cc213cb8fb3acba5fbe2e0fad78879072a0aedcf2ab4c554ff6f173a1e22a20b2 SHA512 b010b8d7b410b4f6862a1d6f76ad9067b9d02144581e96a9a6f6481cee963ae40bd0be644546d728a55f4c3fe04e6a68185cdf53ec0359b3ecba5ff010c405b2
diff --git a/dev-libs/metee/files/metee-3.1.0-make-docs-optional.patch b/dev-libs/metee/files/metee-3.1.0-make-docs-optional.patch
new file mode 100644
index 000000000000..9e4eda27e2d8
--- /dev/null
+++ b/dev-libs/metee/files/metee-3.1.0-make-docs-optional.patch
@@ -0,0 +1,81 @@
+From 95c36b4f09eb3697877610a8a995befe32536b78 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conikost@gentoo.org>
+Date: Sun, 22 Aug 2021 14:16:56 +0200
+Subject: [PATCH] CMakeLists.txt: make docs optional
+
+Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
+---
+ CMakeLists.txt | 51 ++++++++++++++++++++++++++------------------------
+ 1 file changed, 27 insertions(+), 24 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5b2696d..cd56dc3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,6 +3,7 @@
+ cmake_minimum_required(VERSION 3.5)
+ project(metee)
+ 
++option(BUILD_DOCS "Build docs" YES)
+ option(BUILD_TEST "Build self-test" NO)
+ option(BUILD_SAMPLES "Build samples" NO)
+ option(BUILD_MSVC_RUNTIME_STATIC "Build with static runtime libraries on MSVC"
+@@ -43,32 +44,34 @@ install(
+ )
+ 
+ # Documentation
+-find_package(Doxygen)
+-if(DOXYGEN_FOUND)
+-  set(DOXYGEN_INPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+-  set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+-  configure_file(
+-    ${CMAKE_CURRENT_SOURCE_DIR}/include/Doxyfile.in
+-    ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY
+-  )
+-
+-  add_custom_target(
+-    doc ALL
+-    ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-    COMMENT "Generating documentation with Doxygen"
+-    VERBATIM
+-  )
+-
+-  if(UNIX)
+-    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/man3
+-            DESTINATION ${CMAKE_INSTALL_MANDIR}
++if(BUILD_DOCS)
++  find_package(Doxygen)
++  if(DOXYGEN_FOUND)
++    set(DOXYGEN_INPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
++    set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
++    configure_file(
++      ${CMAKE_CURRENT_SOURCE_DIR}/include/Doxyfile.in
++      ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY
+     )
+-    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
+-            DESTINATION ${CMAKE_INSTALL_DOCDIR}
++
++    add_custom_target(
++      doc ALL
++      ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
++      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
++      COMMENT "Generating documentation with Doxygen"
++      VERBATIM
+     )
+-  else()
+-    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION doc)
++
++    if(UNIX)
++      install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/man3
++            DESTINATION ${CMAKE_INSTALL_MANDIR}
++      )
++      install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
++              DESTINATION ${CMAKE_INSTALL_DOCDIR}
++      )
++    else()
++      install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION doc)
++    endif()
+   endif()
+ endif()
+ 
diff --git a/dev-libs/metee/metadata.xml b/dev-libs/metee/metadata.xml
new file mode 100644
index 000000000000..594605d5c892
--- /dev/null
+++ b/dev-libs/metee/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>gentoo@taujhe.de</email>
+		<name>Jan Henke</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">intel/metee</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/metee/metee-3.1.0.ebuild b/dev-libs/metee/metee-3.1.0.ebuild
new file mode 100644
index 000000000000..713c3b7a8cfa
--- /dev/null
+++ b/dev-libs/metee/metee-3.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Cross-platform access library for Intel CSME HECI interface"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}/${PN}-3.1.0-make-docs-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCS="$(usex doc)"
+		-DBUILD_SAMPLES="NO"
+		-DBUILD_SHARED_LIBS="YES"
+		-DBUILD_TEST="NO"
+		-DCONSOLE_OUTPUT="NO"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/nss-pem/Manifest b/dev-libs/nss-pem/Manifest
index eee65bc9d9ea..5bbe4f015abb 100644
--- a/dev-libs/nss-pem/Manifest
+++ b/dev-libs/nss-pem/Manifest
@@ -1,3 +1,5 @@
 DIST nss-pem-1.0.7.tar.xz 36312 BLAKE2B 0ac494c7925c3a3c764c1154e846426d3cdcf21f37bd03dcab40bbe00ae95fe3a1b4a1f6bd2b5fe3c6f1d95877651474a72d7028eafcb143fad5f6263beeb1da SHA512 4762e3ce9e1c77952af3100acb5a043912da7e52af714973f1ce86d18b3d80424f0760e151b7c360c14cea07d86f75be250de14ee47601de46da75583bb3b0d2
+DIST nss-pem-1.0.8.tar.xz 41840 BLAKE2B 6a210517b6f70a6a1a0351970811500c1364c6cbb0159dc4b7b3edeff7c01d3b643a5a4a4946a350a1a49898570141acda1e913fdc79d750339f5021445e61c7 SHA512 9fd1fa9203fd707668506752be6f99d26e53281b8b95d7c3020da33ab8cb287890b66c8a59f1ee952fe8d2a8a350d7c5b4214a523a2e1762e48989f02c408b33
 EBUILD nss-pem-1.0.7.ebuild 709 BLAKE2B be88263a61e86d281777161fdd427bd38b77d25b407713bd076d3a61c1b511186f62a66c71d0a4fe9b8834e858fb93518db686b19438e70000352ad12f8d1b84 SHA512 1fd7d140a2afba6e65671fd0c210b67e829f6ae609695a6bb69e51a0241f0f0b199ced96ee962b995e543fb908841e5c4349ecc041e6a7ca6c69e0cc7b10b05e
+EBUILD nss-pem-1.0.8.ebuild 717 BLAKE2B 69babe83789f83ad5d67ec078d4efa1a8e9ca57bc01e61243383f6ab93298008f85e69175e81f12d815adc2e1c516562971c0779accd5f460bd6401b563d6c03 SHA512 410c940b2abc625ee3a48d65c6e8968bd51a5d892f633640d1fb1dd211aa8a9940a23967dafb149c172942c82aba3cc5092bff7738a412d8f74cbdfbe6cb7462
 MISC metadata.xml 333 BLAKE2B cdd90c0d17983bf6dc3dbed22382259e079792e7294ad84af5b38d07609e184715322d2e8cb57623b13e24c6c5f68a1347cee111b089042b0a5eb11f1ceab2cf SHA512 d7c04e39d92a43fa144ec157c971250bfed9bd16e5334e1c337a3ebc29d79866c8d4832fb5c62766a74577b07b983eec96991a5531a07012fca77b53b705376b
diff --git a/dev-libs/nss-pem/nss-pem-1.0.8.ebuild b/dev-libs/nss-pem/nss-pem-1.0.8.ebuild
new file mode 100644
index 000000000000..f8c08a838631
--- /dev/null
+++ b/dev-libs/nss-pem/nss-pem-1.0.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS="cmake"
+
+inherit cmake-multilib
+
+DESCRIPTION="PEM file reader for Network Security Services (NSS)"
+HOMEPAGE="https://github.com/kdudka/nss-pem"
+SRC_URI="https://github.com/kdudka/${PN}/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
+IUSE=""
+
+BDEPEND=" >=dev-libs/nss-3.50-r1 "
+RDEPEND="${BDEPEND}"
+
+DEPEND="!<=dev-libs/nss-3.50
+	${RDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 1e4076bc7772..086897dae66f 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -6,10 +6,10 @@ DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
 DIST openssl-1.1.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b7ad06f9970d91afa6bfb2c259ab7462b2554be79a1c06759bc7aaeca9948c2f5276bac2c4f42dbc6822669f863444b9913ccd SHA512 1dbb81bcb4cf7e634bb363c7e2bb2590a1fe3fcb6c3b5e377cac3c5241abd116c2a89c516be8e5fd1799ab64375a58052a4df944eeadc87b0b7785da710906d8
 DIST openssl-1.1.1k.tar.gz 9823400 BLAKE2B e9bd90f17bc819c4960d07bbee04346e8a7adb87a764a09d033ef76f1d638c67b180c4f2beb84ec25fbff54ccc9c14c13b9b16a27cac231a5dd22b02635d5cec SHA512 73cd042d4056585e5a9dd7ab68e7c7310a3a4c783eafa07ab0b560e7462b924e4376436a6d38a155c687f6942a881cfc0c1b9394afcde1d8c46bf396e7d51121
-DIST openssl-3.0.0-beta1.tar.gz 14878832 BLAKE2B a2c8d8cbb226803e78ff00fcbee355f41da90275830714e8c0aea532309ef0b98c27f6796119e2942387a9e92afd917d766faac7b5ea65a36326c368790b8055 SHA512 fbb650638a7ca406b0b5d1eafcef0ca431172c8b255adaf7575325d9c1545dfdacf8e9550b8bec4e1ec73759a02c9efbd729a07e9959932564ba81be61238d5d
+DIST openssl-1.1.1l.tar.gz 9834044 BLAKE2B 9e8739015db63a013c05587e3d164d67c3f65f1f6c5fc75e4592bcd038c036cde88a7bc95fbc1f1b4ed876f6124ca4dabcd4f5dbb45d1b84299f2efe1a59431a SHA512 d9611f393e37577cca05004531388d3e0ebbf714894cab9f95f4903909cd4f45c214faab664c0cbc3ad3cca309d500b9e6d0ecbf9a0a0588d1677dc6b047f9e0
 DIST openssl-3.0.0-beta2.tar.gz 14912360 BLAKE2B f1180eee6561f04e778f40d3d6f9fac5645777de09d965662f00c2506da30d3c3cfa0e98a25fc668e2e1fd39b8d700d7f0fd901f80964be048cb3aaa6432a5f5 SHA512 3eb9b472429bc26a7fc5c5837e2ea496706e3c6273ba33f36bbe3dc13bf7dcf7cba08d19ce005ee9b1cecfc63de68ef86cd8d911df28c82873ee44ba5d7e253a
 EBUILD openssl-1.0.2u-r1.ebuild 9933 BLAKE2B 5ad3b7befdf48c6ddaa7c849b3970730b8b693ba722beb012d89d41bb3af98e4037b811587072ec5dd2b70e5eb3683ce5800907d2ae8cc4e03886da15720a627 SHA512 20aa5cecdaf61e66a126125da6d17696b47891f01939c6932d0b9ecd89a211fded135c0fbfa7eaff5d7cf46433c4b356961baf5fb325c698743b8862c7fef284
 EBUILD openssl-1.1.1k-r1.ebuild 10306 BLAKE2B 1c8274fb11aafa6aa78f09df1f7a88ced754d08e5b332fe8bec55152da240617fad12a5489549d967da472ee1cfed10ce93689e0e011a54826c55334c3a3daa2 SHA512 96fb34ba04ffcf7e801365ce95d3ab6062b162524c43bab47543f1826a9c94b849b004a58d3ceb3cac3bbe973410d11455488d1e3c3850bb2acabe68c66b6f68
-EBUILD openssl-3.0.0_beta1-r1.ebuild 8202 BLAKE2B 77d7b31ac7eb5949e4a7561f975a792a21378eabf1877c77b796004d543d2e02a50d0b9ea6770cf775c8a43d7ef3333b0a4a25761553cc7fa276d652348f38d7 SHA512 c4c7d6619a2fda1ec98c51a644d80b1fec321d06384ef3be4cde58831f79769c91107fdecd0532ef59d73a720009e0f2213104100703d0dc826e6a98cb76731d
+EBUILD openssl-1.1.1l.ebuild 10314 BLAKE2B 23dc81c75960daff2eb40c560de198b91499f16ee2d9029e8f49808b365e4a77fbdcf964b4306fff53e7f80e756a711ba046e957fe73766729324aa0b0dd4421 SHA512 ee94a4e31e283f30f1e8ff956828e6db2fa1fbb4658cc9fc2753a11a7ad0e589d4e197e045656a2af6a1c890fa69e568ada530703b9758420c7fe4ef873e69cc
 EBUILD openssl-3.0.0_beta2.ebuild 8202 BLAKE2B 77d7b31ac7eb5949e4a7561f975a792a21378eabf1877c77b796004d543d2e02a50d0b9ea6770cf775c8a43d7ef3333b0a4a25761553cc7fa276d652348f38d7 SHA512 c4c7d6619a2fda1ec98c51a644d80b1fec321d06384ef3be4cde58831f79769c91107fdecd0532ef59d73a720009e0f2213104100703d0dc826e6a98cb76731d
 MISC metadata.xml 1438 BLAKE2B 2a55417670eacb436b450bd2075e6fca79413a6fa16947efed6dd824b465b81b1ab5869ba33e0ea734e644d5c51cd686b3f950b6787b4cdaad5b2e6feb42fab0 SHA512 8031ae2212e7d8217dd4a50be2564a1102f4ea067af07b722a22ca02f779f7973932fde66e69f957f0c1a9ac88b6f868b12c42f2172835e432b6eba9033cb633
diff --git a/dev-libs/openssl/openssl-1.1.1l.ebuild b/dev-libs/openssl/openssl-1.1.1l.ebuild
new file mode 100644
index 000000000000..40abe5cb2d81
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1l.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib-minimal
+
+MY_P=${P/_/-}
+
+# This patch set is based on the following files from Fedora 31,
+# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12) -- MODIFIED
+# - ectest.c (SOURCE13)
+# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.1.1i-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? (
+		mirror://gentoo/${BINDIST_PATCH_SET}
+		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
+	)"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+[[ "${PV}" = *_pre* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla"
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		sys-process/procps
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+# force upgrade to prevent broken login, bug 696950
+RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl don't work with userpriv!
+	if use test && use sctp; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		local known_failing_test
+		for known_failing_test in \
+			30-test_evp_extra.t \
+			80-test_ssl_new.t \
+		; do
+			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
+			rm test/recipes/${known_failing_test} || die
+			eend $?
+		done
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	if use test && use sctp && has network-sandbox ${FEATURES}; then
+		ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
+		rm test/recipes/80-test_ssl_new.t || die
+		eend $?
+	fi
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist sm2) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-compression zlib) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-3.0.0_beta1-r1.ebuild b/dev-libs/openssl/openssl-3.0.0_beta1-r1.ebuild
deleted file mode 100644
index 5005c8fa6602..000000000000
--- a/dev-libs/openssl/openssl-3.0.0_beta1-r1.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic linux-info toolchain-funcs multilib-minimal
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
-HOMEPAGE="https://www.openssl.org/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
-
-	inherit git-r3
-else
-	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0/3" # .so version of libssl/libcrypto
-
-IUSE="+asm cpu_flags_x86_sse2 elibc_musl ktls rfc3779 sctp static-libs test tls-compression vanilla"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=app-misc/c_rehash-1.7-r1
-	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-"
-
-BDEPEND="
-	>=dev-lang/perl-5
-	dev-perl/Text-Template
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-		sys-process/procps
-	)"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}"
-
-PDEPEND="app-misc/ca-certificates"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/openssl/configuration.h
-)
-
-pkg_setup() {
-	if use ktls ; then
-		if kernel_is -lt 4 18 ; then
-			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
-		else
-			CONFIG_CHECK="~TLS ~TLS_DEVICE"
-			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
-			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
-
-			linux-info_pkg_setup
-		fi
-	fi
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# must check in pkg_setup; sysctl don't work with userpriv!
-	if use test && use sctp ; then
-		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-		# if sctp.auth_enable is not enabled.
-		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
-			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
-			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
-		fi
-	fi
-
-	eapply_user
-
-	if use test && use sctp && has network-sandbox ${FEATURES} ; then
-		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
-		rm test/recipes/80-test_ssl_new.t || die
-	fi
-
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	# Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-
-	# Prefixify Configure shebang (#141906)
-	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
-		-i Configure || die
-
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export AR CC CXX RANLIB RC
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	local myeconfargs=(
-		${sslout}
-		$(use cpu_flags_x86_sse2 || echo "no-sse2")
-		enable-camellia
-		enable-ec
-		enable-ec2m
-		enable-sm2
-		enable-srp
-		$(use elibc_musl && echo "no-async")
-		enable-idea
-		enable-mdc2
-		enable-rc5
-		$(use_ssl asm)
-		$(use_ssl ktls)
-		$(use_ssl rfc3779)
-		$(use_ssl sctp)
-		$(use_ssl tls-compression zlib)
-		--prefix="${EPREFIX}"/usr
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
-		--libdir=$(get_libdir)
-		shared
-		threads
-	)
-
-	CFLAGS= LDFLAGS= echoit \
-		./${config} \
-		"${myeconfargs[@]}" \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile \
-		|| die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create $ED/usr on our own to avoid a race condition #665130
-	if [[ ! -d "${ED}/usr" ]] ; then
-		# We can only create this directory once
-		mkdir "${ED}"/usr || die
-	fi
-
-	emake DESTDIR="${D}" install
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	if ! use static-libs ; then
-		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
-
-	# create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-
-		[[ ${m} == openssl.1* ]] && continue
-
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-
-		mv ${d}/{,ssl-}${m} || die
-
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
-		ln -s ssl-${m} ${d}/openssl-${m} || die
-
-		# locate any symlinks that point to this man page ...
-		# we assume that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest
index 6eb3ea62ce3d..78f332c33805 100644
--- a/dev-libs/rocksdb/Manifest
+++ b/dev-libs/rocksdb/Manifest
@@ -3,5 +3,5 @@ DIST rocksdb-6.15.5.tar.gz 6501252 BLAKE2B f85c6b54043019692a7174e41b69625650d07
 DIST rocksdb-6.17.3.tar.gz 6651009 BLAKE2B c032bdf61d93a35e84c65146ad6d1f8639e9f36a323c142fe4131b501051bfb9c4c4edb13b69c86e35740117029996bb4c94887ea690d1957926bdfd347c744a SHA512 085adab94b7eb22859b4119b0356f148231800413571e932a7248967b1866d40a0be4b8265f2a9c6c21c600d3b2254c36e64ce7851171ff7c439a17306a84981
 EBUILD rocksdb-6.14.6-r1.ebuild 1096 BLAKE2B 627a65313bfc642f1fa77f3cc0e20324d7b62b17e9464d9436285b4ebee5d3d932183ef521f43aa545f5ef5bc3b727bd520b373348672025005af75e29c294d3 SHA512 7a43c3752950b3d884c537f3378a823747f366e2ec896478f7a40ae002083cbd8a540e0189f28ba788f1a3cd471014ce579740b4744e2c4039911548fd0f3d3a
 EBUILD rocksdb-6.15.5.ebuild 1095 BLAKE2B d674b9cb7dc1f515a26a8ed904df6bcd562790064c11360bb433782a9972a4826897ba9976a8244ebca498daa882e70ed2cca1738502159b5d5898acfcfd758c SHA512 b6bf539eeb0f902239d9897d216cb60583a4921e68b710aa1e6a87d9c5726b10bff4113a1671c71487ea4b01ed1f439ff712e6f3073d5b9148f97a252d0974f8
-EBUILD rocksdb-6.17.3.ebuild 1095 BLAKE2B d674b9cb7dc1f515a26a8ed904df6bcd562790064c11360bb433782a9972a4826897ba9976a8244ebca498daa882e70ed2cca1738502159b5d5898acfcfd758c SHA512 b6bf539eeb0f902239d9897d216cb60583a4921e68b710aa1e6a87d9c5726b10bff4113a1671c71487ea4b01ed1f439ff712e6f3073d5b9148f97a252d0974f8
+EBUILD rocksdb-6.17.3.ebuild 1102 BLAKE2B 2ba5047f5b99765d8d1e0d9abb85741ca337fdadef66ed99397b3b69ef960da1ab1732c6ff5a00f9353895c29197b291823559943785a897e7f7db28d7e386da SHA512 7543d6a5b04cac6b7ea523538126f19293744f919d83d6e56a6d416580c86cc250bb23b5df7d513e24c7fee020e3aba78c8b4d1e5ad5bfdf6314b36799419d81
 MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-libs/rocksdb/rocksdb-6.17.3.ebuild b/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
index eca7931e3752..e441ef854c8d 100644
--- a/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 -riscv ~x86"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs"
 
 DEPEND="
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 479590361cc1..1eca2f100bd3 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,3 +1,3 @@
 DIST serd-0.30.10.tar.bz2 586386 BLAKE2B 7f84b425a9eed36c5b59b22b8fd2cb9139a3de2bd1a47f92fd9888c433d931dcf83f13c2460d821c04f4244a79aa4330ba973017508ecb5f4564e78ae45b9b9a SHA512 ed7b49abfd3dc3a724b047f5f0cd07b811596330c96d91c0ce90540440f03260e05daee76c3ccccc3d4ca39afbbd4f3d07decbb601730e90c133a09c640c0006
-EBUILD serd-0.30.10.ebuild 1160 BLAKE2B 4064514166996e16e1cb2b76ae1216fc395551a41cc55fd04609f8d8abaf6514633589825d4af6c62ec430e1767783c1b8493f5d12b30357e68483000517fd45 SHA512 dae9b7079a7a8803de4f776d4f7c8b3e319678e6a1cd9826be5c90a845b0a680153a68c1071f78973f2fad55718cad451f077c17ae5b8ffa123f1816aa57a8eb
+EBUILD serd-0.30.10.ebuild 1165 BLAKE2B 8f749c6105e90111f78bce6ffb1913f0c5cebf970d724e9c9365c75009d6cc7dcf752b0a5c3afa9eff4fbc42dadf00349258caf4da91271b340b729f671561cb SHA512 7c0977d9da129ef5c5783c782f9444c1e0581664cf2c333a1127defe93dc10bd65a3084411c38a42318b3fd35d487f7c17991ecc8214dc76281b75815f127d7c
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.30.10.ebuild b/dev-libs/serd/serd-0.30.10.ebuild
index 6ddc6a973c0c..8301a43e480e 100644
--- a/dev-libs/serd/serd-0.30.10.ebuild
+++ b/dev-libs/serd/serd-0.30.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 8fe7217963d7..62f3c36fdd72 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,5 +1,5 @@
 AUX sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch 673 BLAKE2B cec32a83d67d5d8157f13dae4ba0d2e59e32aeba233cfc76811cf3f66f1d1c2e76d439be40f2de4ea8901da88a5f547e699aa57bc989360ebc31e5e1a4b1e099 SHA512 f4d310e31b1ad7075ad0ebb6d7d249dcd2c773093f36434518891b5b44d43851c13c2d20d2fc9b96f7e85f4ca30a27f7b248300a8ad2e21724e8e4bd100508d6
 DIST sord-0.16.8.tar.bz2 525038 BLAKE2B 3ba43b2edb69efec64ac68f139a18f23dc1b92290b054f420c400d2907af74fa550b042596374136c53b7cf0db1b775cfc7edd24c771bbf26d25928845787c7b SHA512 24ed50de8e5bb321e557bac6d3e441b2ed49adabf828bf0e1b33a080c89306dde80443dc8b563098fcc184c4d6e53b7e716b523ddccdf56d08301d1b0120f2b2
-EBUILD sord-0.16.8-r1.ebuild 1262 BLAKE2B 70ded9e298c379e67972315f2c120e3f073f2bcbe22daac77cdea6588506727c6f98fd8a29dd96748bd1543b33513b6765ddc37273e8179a52fbc1235bb22b9d SHA512 3b162883431e52fef892a40a1f7eda518c8cedd3a4d17a1a36b283537a18aa6b9ba308703baf3ec8a367b5b25c3a3dbafa3b5821749616c73c5bad1f41ce933d
+EBUILD sord-0.16.8-r1.ebuild 1267 BLAKE2B aad2745047c6c441f69388f849f95c38e8b01a2bf8e519a74dfdb4bad2ea21af82c3e1cfc37ec2c74e1c44eb353d59535ae1abafa8ff37fdae906e1c48ffedea SHA512 7b5a44d14deb6260aa541143af447be49dfe81a9a2faf5a9aa06097adbc434aecdfa596e2b153b039d378d8fac02a27e4d1bb6f7393758b800fa099fc4de3c06
 EBUILD sord-9999.ebuild 1128 BLAKE2B 77268a5bc22cb33548eb443e14cea7adbf3a1789e05c9b8070e0c59c91d7c315a64aa3ba924d3d21f8bd1c32a6408c3cf66435f38f88df77fd3559c02bdf0a9d SHA512 926eb592bdf596e9d1b64410e391b74a4a39ce97695aeb337bf7adfb6bf457a596a5999753bdce53f1c797dcf6ddd7d4ab919693d9f3ecbceb58abed139c3e65
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.16.8-r1.ebuild b/dev-libs/sord/sord-0.16.8-r1.ebuild
index 1b9950ec3e5e..879b669d4ab6 100644
--- a/dev-libs/sord/sord-0.16.8-r1.ebuild
+++ b/dev-libs/sord/sord-0.16.8-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index cd62a8ca5278..1f396ceaf182 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,8 +1,10 @@
 AUX spdlog-1.8.5-libfmt-8-fix.patch 483 BLAKE2B f0412cf6755ee0a73ec444e5d9bf614e8367f2c71e490af83ee321a242e3eaaed15b77b5da91858a8f90b02cfc1baa43fd89d8472be2d187640fddcfe5f5b6bc SHA512 08c2e0a639eba9b13ef01400d9cf538afc2dc10981b52064e811d89f49c861d29bff12fdb948215581f39a2e868353d478b5c24df8760f3f5d49c50355ff32da
 DIST spdlog-1.8.2.tar.gz 319010 BLAKE2B a17ac7691c74600e435cff9d45495a7f7e8ae5439400a9f0b02c3891daca232aa57b25ba6d619ce19d50bf053b28454a7e4f205ed439ca4345dd044390512a29 SHA512 7a0a2353a10187cc314253b366fc46be8f9fe2480d2cbac3a96a8e6825ee4b62b0a5ebb3add2b22b5d7ca8fe6dddd963926603e5296e3431c0a4f7ac42beda7f
 DIST spdlog-1.8.5.tar.gz 321229 BLAKE2B 2cdc1902a9e6f51da5c1af02b2961914a5437cfefec13aaaca8b996166c0990f602c811f69569a8812d880f995b401af44457ec4255bc5a0f9e46b51266d1b43 SHA512 77cc9df0c40bbdbfe1f3e5818dccf121918bfceac28f2608f39e5bf944968b7e8e24a6fc29f01bc58a9bae41b8892d49cfb59c196935ec9868884320b50f130c
+DIST spdlog-1.9.2.tar.gz 327799 BLAKE2B 8e4cce17887509512c0d3a63485f9271098bdf7f853c2a07adb8d46459c1039d93d16d05cb60963c1bbc754f6af6ba3af1a66c69bc421bf234f676231c8c1315 SHA512 87b12a792cf2d740ef29db4b6055788a487b6d474662b878711b8a5534efea5f0d97b6ac357834500b66cc65e1ba8934446a695e9691fd5d4b95397b6871555c
 EBUILD spdlog-1.8.2.ebuild 937 BLAKE2B a9db146ab6298a6e26f4766688f44698c0481d92fbbbe4dc55d8fa3e9d49f1daa0e8700f57aef54a1058b12a54f4d2e3c1aa043aa564ea40dd341e736c65cc8d SHA512 00b74e07d570faab50f7ddd15b974eeb555da6bd497872d1b29befc141d7c6bb19f31557def0dd45f7d79c11f56a4e6adb71666c3d75b85627013b766b6437de
 EBUILD spdlog-1.8.5-r1.ebuild 994 BLAKE2B 6ef1bcad152f806226fb961fa9b104b1b6eefa6125d32e417fea3897e6d956f4c8db9285f5af0e09fd496015cce771beee8477f5ee53937e19eb2102c3a921cc SHA512 1b2f31d7a7e3318426d6d40a74979bb089ac37a087e213cfa999642166d959e0b50f97acaec467a3991a174dc52253170e27e26164a70e7f005604f6f206afd1
 EBUILD spdlog-1.8.5.ebuild 943 BLAKE2B a71c7a4086fcd802596747a90a598d9c5007c42fbe0fb350217f8695a4f591b254e4108d93ebfe412ffd60586b0e03021eb15c58aadafea889302347899ead5e SHA512 b8a1ea0a002c2e66fe9617d8779c3df8f69820e9380275c91292e2d86a38cdbdcb74a84f411e08997542faa785e17d4727b06a3f5b46bb14f93b6c7e9d4ac43a
+EBUILD spdlog-1.9.2.ebuild 943 BLAKE2B a71c7a4086fcd802596747a90a598d9c5007c42fbe0fb350217f8695a4f591b254e4108d93ebfe412ffd60586b0e03021eb15c58aadafea889302347899ead5e SHA512 b8a1ea0a002c2e66fe9617d8779c3df8f69820e9380275c91292e2d86a38cdbdcb74a84f411e08997542faa785e17d4727b06a3f5b46bb14f93b6c7e9d4ac43a
 EBUILD spdlog-9999.ebuild 943 BLAKE2B c06210194d790813f2c9abcdcabcadcb0366311e0a99e5634ff77ed653aae9652cb043dbcbca81c5f99cada5c37822600b33b6cf6eabda365cd109b6f5265718 SHA512 04d53a75a7b52fffa42ed967d3ab857c27a3469d56033f3c179aee3fb8bc1d7850265371ea28a22c424082d9e59ecc5637a3d909e7388f3fb49230e0d62d5637
 MISC metadata.xml 474 BLAKE2B c66a689b156ede0e146807626045108496b9557afe1c24992f3314d1eba04beeb47e3048286df4c0a029410bd19892eb963910f3a505e3b609010a76a48bf223 SHA512 41ad4b9ee9d6803838d1f090616c4d6d2ecd754c62d6f271815aa77bf157366b659c2c78233a912d0b92dc372ff123b96ea77a6db37660b09783f6c5c2f02f61
diff --git a/dev-libs/spdlog/spdlog-1.9.2.ebuild b/dev-libs/spdlog/spdlog-1.9.2.ebuild
new file mode 100644
index 000000000000..deb8aada3af3
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.9.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Very fast, header only, C++ logging library"
+HOMEPAGE="https://github.com/gabime/spdlog"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gabime/${PN}"
+else
+	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/1"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	>=dev-libs/libfmt-6.1.2:=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSPDLOG_BUILD_BENCH=no
+		-DSPDLOG_BUILD_EXAMPLE=no
+		-DSPDLOG_FMT_EXTERNAL=yes
+		-DSPDLOG_BUILD_SHARED=yes
+		-DSPDLOG_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index 62e85a455319..bd14541cfea3 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -3,5 +3,5 @@ DIST tinyxml2-8.0.0.tar.gz 593833 BLAKE2B afc21220e28a1c139b1abd89e67f8e64980d2b
 DIST tinyxml2-9.0.0.tar.gz 619734 BLAKE2B 9a7bb8b8158417aa505e3d9fcc246b0bede52d6d4d5ff1b5cee891c2b72d1ee43d00ccea001ac24500f52c36320994b3446f3898ab2be1997940dbff526bc78e SHA512 9c5ce8131984690df302ca3e32314573b137180ed522c92fd631692979c942372a28f697fdb3d5e56bcf2d3dc596262b724d088153f3e1d721c9536f2a883367
 EBUILD tinyxml2-7.1.0.ebuild 607 BLAKE2B 503cfd0921e8cdaa93e6455267b4d5ce3b385de81507bb8d8d95562ffe05a23956283f6831af7877649074552eecf81674f0840956e27eca0941ca5cf2359445 SHA512 ab1b4b699b9251bac89c2d416d3d6706468fb1c21f57ebce68231f11737599c435fc6b63df99f7d6140e39b46a6df9232772c89d8402a66e9fd1a56df0c1f4ba
 EBUILD tinyxml2-8.0.0.ebuild 607 BLAKE2B 0a6cd9fddf8c97db19fdad657bf52cb0a8a089e4997d9046c8441486844f83a29c3255401ca4e1df04fb79f9e9e2178f8c71d172776da3ebb4126dc7841e4769 SHA512 55a49d33644a136883bc37e14203fe02a3d3ebb4c0c1ebbe803a97da6f82b90b637b0ab3c787d05385fc9c4487179f20e3cf7c7bbd5db3c2a17f9aaf8d0cfcbc
-EBUILD tinyxml2-9.0.0.ebuild 612 BLAKE2B b86357e9f7b339ce816ea62433c3b4a1c9164bd8acb286639134005149aa56e90acb2f1a72a6a8ca60f8d4615fb78ef9a6d2ab7342c37ccb231604f827d599f0 SHA512 ae9348540ae00beb161354ae13e5cd32c6c4a668d18e8330557c4d298c8ae727fdf35779132ec6e4748bb145f60518994e695893498df83627ebad3ae1bd5150
+EBUILD tinyxml2-9.0.0.ebuild 619 BLAKE2B 513be517bf8c19e0a86cd99553028fc75b8245abcad33f3b5a3a1b80615ee3d831775a14659847e77c8f9df1fba4dbd1c065fcc069396d40ac7498e2f7cba061 SHA512 076c47146b091bacaee921609c0b19b18ce934caafacfeb844f20a22388ba82256207ef8db619ef71ab0f8f277b4f4bc1a128ea9a35e2eddaeed05156a99fdc2
 MISC metadata.xml 354 BLAKE2B cb692d32ecdd37f9399e3170e72c3f171f1e69c5e8515f8e8c3fe762baaabc897835c4f0dc6575c1bd51703fbaf8d12ca5f0aae91fac13ecd97589d153364510 SHA512 33c2fcd747ec03012ae0c132005c59ac90b36f7757a96c442c4409b4a2b5b63f5fdd101537b966624b78becf2feedccff27068129926c2e94bec6f32d66ed3b4
diff --git a/dev-libs/tinyxml2/tinyxml2-9.0.0.ebuild b/dev-libs/tinyxml2/tinyxml2-9.0.0.ebuild
index 7c0082ac47a4..c13a63270a79 100644
--- a/dev-libs/tinyxml2/tinyxml2-9.0.0.ebuild
+++ b/dev-libs/tinyxml2/tinyxml2-9.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="ZLIB"
 SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 357c9497b430..86bed9f831d4 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,7 +1,7 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
 AUX weston-pipewire-0.3.patch 11856 BLAKE2B aebe0f4859a0ac3144d8f631fd8b5e35c02f62217ad94106c138aa6095430a2aff7aedf88d67f95991d32e9c728b6704746fedc9858e41e5d99900722b6617ec SHA512 f3e028df4967672c58e1cac66fc8b7781252f15094439dca399d820d945156a15f1e420a8ed062584dcdd7c9577849127aa52974639877796ce91231123bf50d
 DIST weston-9.0.0.tar.xz 1555212 BLAKE2B 6c5feb3959ebe894861c6dc0817633b23e8518baf1c359c2967f111c071e9d4f166ef1421ad6465b036b3f1c485cab5f442476e7a44e3ec722cff576dea73852 SHA512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90
-EBUILD weston-9.0.0-r1.ebuild 3743 BLAKE2B 1f321af9c9883b192c912097be7a4447c510fd5f3dcdd59c6fc75fe62894cbc54ef412d2351fe86ce2971c697915957e1c8d8282e9364aa2816d738a86df4526 SHA512 d9e42f75a4205ef1fd6fa492649efe2b506dc491736339681f194d2f9091071f303feffc792095bbabcdb76f2073e6e83a73cc33ced7ceb458c237a27e37c931
+EBUILD weston-9.0.0-r1.ebuild 3750 BLAKE2B 4616aa581070d1db8c6b0b2db0b7372bb1694b37fc54d55869a4f3c21f918380dbb83b535808fc64637e5b88279916d8236c760640a74d15bc03299a6705356d SHA512 1c31fd9afa7b8ffaf8e1311981675d49f1befe25d45fa07efcc81cde9393dfaa8caa315699d8e07ac90b18550a05ad508241bfc4dfe107ec55772f8e36c14587
 EBUILD weston-9.0.0.ebuild 3755 BLAKE2B de02e57433e44ccc95ef31d8102cc5b7b324046f55cb429d71f0daf34ad2545c8a6692cf0b9051c34333bc7fb4a90c4063fdcc15ab78a3a40195a1f2a9ba5da4 SHA512 f1d838f5f916d5475d8a0335ddbd1185148e9aebd7882915f6acc7697a0582d16645b9f979a365125d6a8947f19b852aad5f5e4f8ab614ea80d47965ef219cfd
 EBUILD weston-9999.ebuild 3753 BLAKE2B b81df5b4510d1968b7804b6d1eac4f766e3dade595169ee913716602b325d75c595dff3ac108c3494a62a69c83662d304a3d4f4b9715a445ea51f25206a60108 SHA512 7c9bd4fc88c9a8c4f06300cfb9da70c8e7c52dc3cdfc75fbf61b0cdde899c484ed576663b4fbe6b8e9388f9dcad82dea62ec16daffbe69e1c4c719490de93ad1
 MISC metadata.xml 1577 BLAKE2B fd7b5b207ef50215ea220e27557a99700c6115bdae6b74f9176430fc26cd57acd2e52903cea6105ca1425a0c9cd3b0afe2fcb1a56df385480481dbc937d9bcf8 SHA512 b0dc8edf543a5d620e40333fe6abbbc607d317588ca4cbaf336446364208301e842efdfed8532d35e29339be10e6af6e449e9f6d84e301241333b7e81ea7d59a
diff --git a/dev-libs/weston/weston-9.0.0-r1.ebuild b/dev-libs/weston/weston-9.0.0-r1.ebuild
index 5bdba2993815..478d276073fd 100644
--- a/dev-libs/weston/weston-9.0.0-r1.ebuild
+++ b/dev-libs/weston/weston-9.0.0-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index a29e6cd33f9c..8ac8158089a7 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/cstruct/Manifest b/dev-ml/cstruct/Manifest
deleted file mode 100644
index fd7118085513..000000000000
--- a/dev-ml/cstruct/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cstruct-v5.2.0.tbz 227195 BLAKE2B 21eb94d0bbfb6f633f37ed7d6db716f7011765219f98f437d1c4ba4778e5d71fce37db1523d5f940d784779dfae1cccda7c521c5b3a2f46048d136a069d1099e SHA512 4e8cb53801980dacb9c9153bada89557ffcd9afaac262592fe6243bec3e76d5d1cfe3babe133a9a32e35ed00d98a4b54d55403e8505cca6a1328be50fadb5f37
-EBUILD cstruct-5.2.0.ebuild 552 BLAKE2B bfdda4e64f4b381b01f437f44a233cda99e85ee6110ccfa031230d950353413bd62386383059f382f460ebb0ed7d474f54296d1b7046f93c00a320d89de0543e SHA512 43430e01321208a9a20f593e04dad5f07c5ba68907bbc641c954fbb2ca0566f44433ace746c76f8c467629a34d0b19fc821887eb7e90904d74605f01b47b54c0
-MISC metadata.xml 317 BLAKE2B 03ee547f18404aa2ddeffb3e164e9ffae02c2396fa33e183aef554ae959f9b69e4a9487f6bee1da8db2e6ebccbadd949ee949495160a9b5cb3a886e4b68a8d48 SHA512 8fd0f1c9254411a488c543796642eb7c0a0f644a89b13598084c65e5bb0a3acbb121c5b8254a8a41ba31da6238658a04a1d383fa4fc5c71f2582e9d4d088221e
diff --git a/dev-ml/cstruct/cstruct-5.2.0.ebuild b/dev-ml/cstruct/cstruct-5.2.0.ebuild
deleted file mode 100644
index f2b874f5dceb..000000000000
--- a/dev-ml/cstruct/cstruct-5.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-MYP=${PN}-v${PV}
-
-DESCRIPTION="Map OCaml arrays onto C-like structs"
-HOMEPAGE="https://github.com/mirage/ocaml-cstruct https://mirage.io"
-SRC_URI="https://github.com/mirage/ocaml-${PN}/releases/download/v${PV}/${MYP}.tbz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt"
-
-RDEPEND="dev-ml/async_unix:=
-	dev-ml/bigarray-compat:=
-	>=dev-ml/ppx_tools_versioned-5.4.0:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MYP}
diff --git a/dev-ml/cstruct/metadata.xml b/dev-ml/cstruct/metadata.xml
deleted file mode 100644
index 3f974fc39b86..000000000000
--- a/dev-ml/cstruct/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mirage/ocaml-cstruct</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.790.0.ebuild b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.790.0.ebuild
index 1a892b7e802f..4e011eb003cd 100644
--- a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.790.0.ebuild
+++ b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.790.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Parse and Format DateTimes using Strptime"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Format-Strptime/Manifest b/dev-perl/DateTime-Format-Strptime/Manifest
index 47daadb0ffe7..05821b979410 100644
--- a/dev-perl/DateTime-Format-Strptime/Manifest
+++ b/dev-perl/DateTime-Format-Strptime/Manifest
@@ -3,5 +3,5 @@ DIST DateTime-Format-Strptime-1.77.tar.gz 114321 BLAKE2B e942f79b4d54aac70b922f4
 DIST DateTime-Format-Strptime-1.79.tar.gz 119122 BLAKE2B 8125e095d6bc9c14b26278bbf2d7b04b783533f75f441637b13c5d5a117bf248b4db6db8da3e8c72e4c39aa45acc38a00816eba21ee29ab13e953021b84086b6 SHA512 842da603c4314e2506f12de2a8ce5e7bf29b183d6064b7f40b663934fba3612e26073835c49c5f58accc9727f1c1883d48deb69e11ceec28f9f47e776c4e2d7c
 EBUILD DateTime-Format-Strptime-1.740.0.ebuild 920 BLAKE2B 2ee15f4f76e84368f3f8ffe3950268cc418e0c1d7b8ef4936ea72f65b163becdefa7911b85ce384a127e53dd0e377ad7d997b0a409dc340ca2724a0bf83b511d SHA512 fa734702329fe9caf2f6aaaa2d6bcfcdabac27630719311c4f14bb450dd9f0614f4fd0e21f305feb6b5a4c1b3220353a53611e52462cab5487ce2d25ee00ddb2
 EBUILD DateTime-Format-Strptime-1.770.0.ebuild 879 BLAKE2B 0a7b394365c8c728f03c3b1efb6823060d24651deeed05e19a5fcd93ca08f084cf52e6047731310326c3bf7d64285d6bb6d993e5c6b5691d0487e336af5383c9 SHA512 67ac48dcb32edf43dfdd77d96e26b44202925811a3d84b8a4ed464c753906cbe8f0b2384293ab6403bf249ea548f1fa7b312f99b14c126b8e60d234df1ba54e0
-EBUILD DateTime-Format-Strptime-1.790.0.ebuild 878 BLAKE2B e344ddbd65c62cc6e5708c6231a79ef7eb1316bf68416f4eb9c4a535a2e0438608c97dc78eeafe4ac92ee6e071f90ffb934abe6abfda11a7d315cf17f11a107b SHA512 9628a20a9ee6252b6e7bad50f87d31b8512404f462055fa581cdff3893c657fabb78956cacd2433b6c7be0af9c787d20b5dddc541046ff9185200590d021be42
+EBUILD DateTime-Format-Strptime-1.790.0.ebuild 877 BLAKE2B 38a7152ecc8f3537dce3b90aa61e740fa35b5518f3f97516801018cb9d3e2276fa70c01911c90f5e84cee6d0e4dfdeff322011ef840cbcf374b4cefbf7067265 SHA512 51570779b7aea05c428ecca7066743200d4d04ece8d3bdc42677380bee298514204a6e5813faeffeefd6324de0ae1e02d6d5140bc1ed73f06a57936b9c9bcdec
 MISC metadata.xml 501 BLAKE2B 0f79c43ee9cab97c8027a8bceea775c4e2579514e8e6062fb44d95cc04de45d2b60249e62c90c073ff0bd0de5e979d82aea6398e43b35fcd826ae67fe41ea93b SHA512 498bfbf685542fe1e8920f007e004338d06a0d28b88faf8a323370015a3697ba22be57b47b2d77ebcb5620e353dc8079cf6a05b03493c17e28074221895825c5
diff --git a/dev-perl/File-MimeInfo/File-MimeInfo-0.300.0.ebuild b/dev-perl/File-MimeInfo/File-MimeInfo-0.300.0.ebuild
index 240d7cc7c2d9..05c0e4e1dbb2 100644
--- a/dev-perl/File-MimeInfo/File-MimeInfo-0.300.0.ebuild
+++ b/dev-perl/File-MimeInfo/File-MimeInfo-0.300.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Determine file type"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-MimeInfo/Manifest b/dev-perl/File-MimeInfo/Manifest
index 9af5802913b1..a2cfa73e4454 100644
--- a/dev-perl/File-MimeInfo/Manifest
+++ b/dev-perl/File-MimeInfo/Manifest
@@ -3,5 +3,5 @@ DIST File-MimeInfo-0.29.tar.gz 33113 BLAKE2B 5653316aea954cf82ad1c13474b6bb27408
 DIST File-MimeInfo-0.30.tar.gz 36132 BLAKE2B a87f9efe05d6b09cda4f365e9395e5677bf80a2baa5eae6592c01da4e6aac46994f82676f4383f0f538c8bdd6b70a4ba7aa1eed4c038eace6586839f2a9ecbaa SHA512 44030d2e2be66cb67d4329f8f308bf114014c511fe965979600157d62deffd5c2f05fdf883cb02d98f00d5d0b77c56e252cd377a398461ec421fe7491cd544ec
 EBUILD File-MimeInfo-0.280.0.ebuild 705 BLAKE2B a546bf761c39a96cb87c164c28c0401c9f0851e5eff2898d5d239c48b4effc731bd158be62dc88c6ae1468c5adb04117b8591efc35f5569dcb94ac06bf0b62c7 SHA512 c0db3093ae8aec6d3a663f52793a02adb0f45faa13fc8163fca3bd607748fb92c2e22ab3493776155639d09e4628d15422c19501a3304a83499107eb15317d32
 EBUILD File-MimeInfo-0.290.0.ebuild 716 BLAKE2B 7fd424a4ca703a7d57887ab618c4d62d5ee586d33c78bef7f2e94e7e32338479a70eb9c605a4d926a1619338020ee68fa454570cb4bae87272747c66d795be68 SHA512 23d712493fccc8888c4a0e48770917a7d3afda7508e3bab1f1af6c3dac96450421e760fe50a14018cc1d64e80ac521df170f160c7cdb66d0bb41bab8284372f0
-EBUILD File-MimeInfo-0.300.0.ebuild 755 BLAKE2B 3f7eddb33f32bc5043661854288f52cb4c1b493c5930eba77b7b673afb332b5034c9c64f8a4da102d1e0beb378baa92eca8238817995d24d7b35572470368af7 SHA512 4b05cde07376a36fcbca06b0247214f20a803122dd6f1a23c2498a53c0c464317cb5f2e9bcb8a83d2c88869128e371fa0d2d6c8d9897383fd4fc7fa294e918a5
+EBUILD File-MimeInfo-0.300.0.ebuild 750 BLAKE2B 0c90d803cd695e60a951eecf88c5d08097bbdb6f852fb1cf01bdbecad826e19222b3abd0f944150964dc19f5b52977f51014b95c37816e8ccc74f49ec962a10d SHA512 3aa3eec5e2c96e785a1cdcf28cf05255990ebfd460f26ba64c547c59160b7c7581f949c2b8867b52c4b6210b34df732cebdfd305a4e5a2c8567f0ad084b2007e
 MISC metadata.xml 607 BLAKE2B f55da2dfd584d8fcbe2cf7f6130877f24eb882986c95b77c3d9981fb72658add64a5acdd41eb53b2eb215bdf9d50caaba6891462fa666da8c4deb5b165df4645 SHA512 064d2744a58bff1f5c0f092ab1b8c154a2557cd8c2f4ab8d221b0265a38fa15463ec1288466e3175d59f758d145bb4237c33a8b178ca135514c7d58902a7ccf7
diff --git a/dev-perl/IO-AIO/IO-AIO-4.750.0.ebuild b/dev-perl/IO-AIO/IO-AIO-4.750.0.ebuild
index 14d0c5cacab1..6cbff5bbfa82 100644
--- a/dev-perl/IO-AIO/IO-AIO-4.750.0.ebuild
+++ b/dev-perl/IO-AIO/IO-AIO-4.750.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Asynchronous Input/Output"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
 
 RDEPEND="
 	dev-perl/common-sense
diff --git a/dev-perl/IO-AIO/Manifest b/dev-perl/IO-AIO/Manifest
index e14de702ca8a..a08723dde9d1 100644
--- a/dev-perl/IO-AIO/Manifest
+++ b/dev-perl/IO-AIO/Manifest
@@ -1,5 +1,5 @@
 DIST IO-AIO-4.34.tar.gz 156615 BLAKE2B 913e90403bc8172d2376420c3cc3c48e4d694580a71adfa19e59e8f0c7d8d451df736686393423b94f2f916002c153ddae40a1350d05ae20f035f633e8df9c50 SHA512 7b7e05fb01513864321c1aa2a28192444299486831b75461bd57bad5a0370863d46df42c698288096eac55f9972a3492f8af46cb265f13c721da698c9fe3529c
 DIST IO-AIO-4.75.tar.gz 181557 BLAKE2B 842b15d19607eff47bdaee7afd4b823d6333e31a9cc8b5eaf4ad875103b2e37adfb7f1cfbdc1cecc99d4b1375f29101087f26d6e1f85fbf8e026b5985d46ac62 SHA512 3a30b34d6de476accc9b07c0723a3b21c235e5bd2b5951edc3ce3150de22a6b7dab5634d78ec17b799a71f2ede0bc138fead1e02885eed31a4da5cec05dfcaa3
 EBUILD IO-AIO-4.340.0.ebuild 785 BLAKE2B 1e8235879b357e9c8231c3db1b92cdb7fbd81e0564cf6f207d8e30d61a2aa4a8825425744ac8e09acd33f826b4a98e8529aef4db133642d4783b0ff3c9c9fca1 SHA512 7762b18d8d43b069e319f11f4311659dc10ac5696e474781b85009cda080a685a20af4417978b79d0b423511ce93d4b19fa1766126cad74f7647d62724fcd47e
-EBUILD IO-AIO-4.750.0.ebuild 637 BLAKE2B 4f1797c65399e2de21eaf12ca8130c1917edbe2a13797f8e40ce53d2017bc4aa64e5f1f3c42242f55e99afbe67dbc7e28cf14d94d04b41942121fa8fb52ae179 SHA512 0008c56a0e5f2e709e393fd18ffec3362d3308eb1810ec57cf81c2d39473eb7d020bbfff4f32b7e07d40ffb9a9f0ad19cbe2cd57519a327bfe8b46ba031b8ae0
+EBUILD IO-AIO-4.750.0.ebuild 635 BLAKE2B ee49765882228cf1e77aa802337ed4e67fc741e0d272e6e1dafffa9aabfcc1ed0c24f413f41fe8b66bdbd4e9d6570a538513fa23b69f432264b2a615f2f20976 SHA512 eb6f5536034ab68b5fa400d44cf15516fb4d7fb9415a837d625a9b7ed1e5123b1e135c0b502d04898dc11ce3be571c3587caac2067c46b0cb3b83addd63f40b9
 MISC metadata.xml 384 BLAKE2B 1f5e7a27cd47b19cb6bf5ec507d316e39080b1d47b8a770c9ecf0796daa8de4c89e247e0b329be67097c603db6a329fbec5ae5628d9a87a43243774feb5d29eb SHA512 b8b6b875f238a07128ef4a9c41f4cfd00d3b782c595dc79873d49474db057e0d8991f06637905dd8cdbcd78764a0fa55bde44f7ef22f3d08eb0a86cdc8dcc5f3
diff --git a/dev-perl/IO-stringy/IO-stringy-2.113.0.ebuild b/dev-perl/IO-stringy/IO-stringy-2.113.0.ebuild
index 60cb213a9194..90b5ace9d2da 100644
--- a/dev-perl/IO-stringy/IO-stringy-2.113.0.ebuild
+++ b/dev-perl/IO-stringy/IO-stringy-2.113.0.ebuild
@@ -11,4 +11,4 @@ inherit perl-module
 DESCRIPTION="I/O on in-core objects like strings and arrays"
 
 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"
diff --git a/dev-perl/IO-stringy/Manifest b/dev-perl/IO-stringy/Manifest
index a110692492af..5735418d4ad2 100644
--- a/dev-perl/IO-stringy/Manifest
+++ b/dev-perl/IO-stringy/Manifest
@@ -1,5 +1,5 @@
 DIST IO-Stringy-2.113.tar.gz 47755 BLAKE2B 50c35d93a3466d44854ab338812aca849521aceacb0e9568c54f9cf9e00286563292d9d0b7371d36640f59a016d4daef3407523e95464ec5d95bdc5283bb508d SHA512 5af104766c20b4336649dc4a19554ad204506c2476b4bf7d8ad7c2cfab15f0296efadb9019cd57e770a2a3c5f5686f7f010bddbd6efd51d300c54ca36286f094
 DIST IO-stringy-2.111.tar.gz 41515 BLAKE2B fc98766d2375a91f430397943be1462a2be8f1115f5c386da106b46cc2d20a09fbac5b3ed74f3ea509d51746281b3521e46e8610515ef1b3954c96aae7e30969 SHA512 9da8fb03945bc4a59cea3b3b2e22b15d56b133470e581d1cb03920bda2b4953e3c9e4a25d095ed8a384efb5a4c58db437c92cca6a81d583791191f1a37691a4a
 EBUILD IO-stringy-2.111.0.ebuild 520 BLAKE2B cb0324afc79c218403435fb7ddbcb3d577c810f7c6c7e6ca2860ae1b84c949e96bdf0135386a2e12d4c3cf4bef6ff242a9abede249fbe6b779d64481c403ffe0 SHA512 216d5effbc44e636576de9e3e0d16e6060821fd622a3e48c67717dac33451da28d48461c5029423f7972e83654a0f75d60d9d9a33ecfa0cb81896970eb8b27d6
-EBUILD IO-stringy-2.113.0.ebuild 463 BLAKE2B 2a6a26de1e5c63ef060f7cdb5aae8ceda297bc11989311e78e1f602f9826b88bfe029d7e7c0c5619ffb79c44ed82d0a5cd63a4ab465e94037f0676b7be58fef7 SHA512 951194dbdbacae68ade2efaeda1cb12925953585fde60a10b1a67589fbcd8061455661056168ca5c2c2e1b010df482285a834f69a143114c0f159125e614c66a
+EBUILD IO-stringy-2.113.0.ebuild 458 BLAKE2B 4c8e77e9ff4caf1c2ea7dd9354a43378fd6fc9630bd58a4f9a73914ca883ed8c050655426f4de54beb377dd793563af696e1b024d15624ebd101d7aac823267a SHA512 c4e518be9d0c510c8bb5fb9d7210be8e01e4e1d00ec9ee70e98cda06aad1fb1f1cb39615e6f65c79654ccbe4039a71bab55f663c61bc17845bca52b171be66da
 MISC metadata.xml 989 BLAKE2B 108e776e58b6cc4d29280d4464382505de453567ab2a8db34867bc0e560b804dfeb90b28c18d06f4de5d61bcd7475cc5ff6be3b2c754697f43b7ae72bae7fb14 SHA512 59eaca17d8160900b45d600184d029ce8afa81db73174a4c4c237a50c8f344ddb0686d5991b80c73e8df572bdd67a4dfc72feb9ecb79f8103f83fef1e6b0b7cb
diff --git a/dev-perl/Inline-C/Inline-C-0.810.0.ebuild b/dev-perl/Inline-C/Inline-C-0.810.0.ebuild
index 964d6c7994b5..9f98dabfb60c 100644
--- a/dev-perl/Inline-C/Inline-C-0.810.0.ebuild
+++ b/dev-perl/Inline-C/Inline-C-0.810.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="C Language Support for Inline"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Inline-C/Manifest b/dev-perl/Inline-C/Manifest
index 47068ea6f0f4..cac07dda2fe7 100644
--- a/dev-perl/Inline-C/Manifest
+++ b/dev-perl/Inline-C/Manifest
@@ -1,5 +1,5 @@
 DIST Inline-C-0.78.tar.gz 73695 BLAKE2B 79ec1ffaf7a35d2386bf774d153f79b1eee53c0be6deefbbe896fafce7083808251c5e2300e2fd19a78e559f9dc274e1546a86b763af996d4374d60ceba7f9a2 SHA512 368e68dfb9f1700534d9b391090e340172e3adde5fe15576f883e9341047fec35cea8660751883b27e128ad91dda363d513547368097a989457d669bbbdc8ce4
 DIST Inline-C-0.81.tar.gz 76855 BLAKE2B 04686ca513760bdf75a2ba4dabe723de9797ac348b2d6552dea93c8c84c590bc02d7255e56bb26a2e504c8bbabed47fd6f764d7dbdd402cc39c9cda344575462 SHA512 c3d0d669c26017b4b63cc101377d067438c31fc5d1e6187d01194f70158049e386683b792716aad58772eae839512ecaefd4b3ac7a2377dd1404a651c24b2277
 EBUILD Inline-C-0.780.0.ebuild 1004 BLAKE2B f6ec5c5b873d28ec003f911939a139e4f48ebcb5d65f09934364e159527e80bbb0c13edb7bf34460c58f945b0ce9b39792c44db2deeccfc0ba1a6a9d816bef78 SHA512 b992464f6dbdcf19269effb18efcad01e5f5e98128d56b81bb19f11f6e36b9e37d39012a309aa86da2e2c116213a6ca76c3fc3803b8d4a07c531ee6dabae0572
-EBUILD Inline-C-0.810.0.ebuild 1010 BLAKE2B 8d46e0330840d76ff7583adeb5332b5c9cf46b117efaaf24240b02bf80bcfcc12b7a5d06230d195e8ce3ee497dd6ef449f1ec43811f03532299612614b398f97 SHA512 c69b67e0de32fb60a633012127c94abf12d25973bda206ccb3f981a78d6759dad5e21c4d3b1afc6dbecf905416784dc575d5ba8a9092be47623804d192dab013
+EBUILD Inline-C-0.810.0.ebuild 1007 BLAKE2B a05a4acb2ef37793ce6d2602a915ed80ae7eee5b2e94bea6478d49c00b75c7dbab8f5d0a689d935b1e22bb9c77e4086a8d3bbbbc33f381e1f7cb04806a05749a SHA512 9df1bb4c4e4b8ffb496202465247bbdc3f61e5439b9f83fee3c89c207b656e57ed504b8939f0a10f0490b282fc3018525ba420bc0e6d2535fdce9ccb024ea8ec
 MISC metadata.xml 388 BLAKE2B 1779d2509ba695421ec128b7cf2411c76018cc1d3e8de9cbd81e84b1a015afc4b812bb33f4a409b2bde6f93635515d4f9144a59c3aac4eb9f8ed9efb10c1ec21 SHA512 2fe7fdca3f78057fc5287ce5bb7b135b7e0b56a3785994d54c8b206fd9b069c189ef0bd172b6c398277b702b669a3d92f43d4232dd93b5e6fecbdef048af7124
diff --git a/dev-perl/JSON-Parse/JSON-Parse-0.610.0.ebuild b/dev-perl/JSON-Parse/JSON-Parse-0.610.0.ebuild
index eaf702d55531..3b433cb3d7e6 100644
--- a/dev-perl/JSON-Parse/JSON-Parse-0.610.0.ebuild
+++ b/dev-perl/JSON-Parse/JSON-Parse-0.610.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Read JSON into a Perl Variable"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~ppc64 x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/JSON-Parse/Manifest b/dev-perl/JSON-Parse/Manifest
index 6aa6a9544412..511006a4b176 100644
--- a/dev-perl/JSON-Parse/Manifest
+++ b/dev-perl/JSON-Parse/Manifest
@@ -1,5 +1,5 @@
 DIST JSON-Parse-0.55.tar.gz 77591 BLAKE2B 76389224c1993973a6b8ee60fa5e1c0bc032f5a370831193d4c54e0bc7b443155cf3b8dc9034d51c8683ec5da65ae5c3c090e1664c4ac0a7f08b95cbd94c2249 SHA512 adb4bbf61e7aa73098bbfb03c1b3eaac6f56905cb05b7baa3a3a9047f47a24ba9dadd0dc7fd34aeaeca2a393bc577c3b85345c5ca740d2e9553c0554c39bd36c
 DIST JSON-Parse-0.61.tar.gz 88431 BLAKE2B 2f178915c89dc7eebfda67a0d3be8fe4207c0c7d68cc9b010e0af1840450ed91fa2758bbad0e4871db33de9115c52c83269570238596f7a9e6db0aba1a5ebac2 SHA512 3bf06ca12006ecef8a2d1692fe79c749cfe7eecf3d52140081ac8c46b1a1ef046bcf4f3b4072e8067d8c39f0f2987c5aca24597e58ad28a009c6a94055333e07
 EBUILD JSON-Parse-0.550.0.ebuild 480 BLAKE2B acf394e781728bfc765431fa442000249d22c01a8a1239fed74005b8d8b32a2d69b857e80cc4317d91f30ba37ad57255e03e5960cd2f94947f82704745d2df5b SHA512 63a8fcf62b58f7861381e6a8349053c50b92bb7b2c7e068c8d648bff73001733febee60c7473cbb22beb30cc179527702d9203bc677c6538180b1fd4770eedf4
-EBUILD JSON-Parse-0.610.0.ebuild 474 BLAKE2B 9fc02e03daa3f80de953132974f8f1e1886989f00e36b8b4943df4a9d43f323ed2e8eba4feadbae7f626cddd4af5778d627dc8a6f163a17d1d81e37c907f3570 SHA512 2ff653c41c365ad54ef5049ec6cc1f576c9ae3e41eaa9013edd5de1f5609271f9a84a94b7934f4be412a0ffb4a183bb573b6f6978683c90ddd504019f0e4b6f4
+EBUILD JSON-Parse-0.610.0.ebuild 471 BLAKE2B 3f03ff616ac027db088c8e7c5d6055986291dd32ca865f5349aa799c1ce1911a0ab84b30c29d7bd088bead77c41175031d4a2b6c80d546d921b8d16eb1b0a567 SHA512 02f0e4ef947e3cf699fd8e4326244e3217d20f5e415a2929e2dc595c5dbb15c411409cab4c69cd6d91caa0f22f00dcb5af65f359aac82962825e2fce556fe7ce
 MISC metadata.xml 453 BLAKE2B 44f97a2e244ad56df26f1ea7b47dc199622647338fa91865b99afaffb67fd502c34ab26bfcc4f9d24ada378553e3f80e0c8557b3d316b7b69a14e43af0c339fe SHA512 d1e4b31d3245b4e2a0f478c38121f50d30f06960679c7b5b2261303f346c9d45667696c9d415fdba826407e6d596d7d63d4a65a4b9bc863f0bda3b1275b4a22f
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index c39729934c92..8331a37467d9 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Module-ScanDeps/Manifest b/dev-perl/Module-ScanDeps/Manifest
index 1e6b4b020aaf..31e778d9cbd6 100644
--- a/dev-perl/Module-ScanDeps/Manifest
+++ b/dev-perl/Module-ScanDeps/Manifest
@@ -1,5 +1,5 @@
 DIST Module-ScanDeps-1.24.tar.gz 55262 BLAKE2B ea7f69d0a4b1de3b42826e4b50fc827d8728ab4dea68e0bc76c7d1efedb4f753dd4ceb4042c092b26ae22bea096d768210d9fb0c6bdae240a28dc7b8fcced17e SHA512 7f3d9821aa863d8ebc78fb5fb3c7172ce133169ec54ed91b90e05ba50654b4bd0282b3a760adfc8b6bd553dda4116dbf51972bb2af94b59f6f04daeba996e889
 DIST Module-ScanDeps-1.31.tar.gz 56164 BLAKE2B 61d7438359d035d847fefdfa1427b4e444935c8207d41b7e4994a3704fb4c6fb48d7fac169214abed3d71212fd372f478b01cb91d8876c0fdb68962c791101ba SHA512 c7164d768b6401a0d01516f5a09ddf2a0399355738ff17d04757aeb235b47f8d973083d0425ca53757588916c7fb2959d8c042361055a0e8eab7bf6d4c31d6fd
 EBUILD Module-ScanDeps-1.240.0.ebuild 796 BLAKE2B 93b32e9b5fc3d5c6301cf76fd51ab206d7dce5a02d31eeed128d1d3688c7933205ccd35e1fc7662980fd496bad55307fd1d219fb528fa9831839cb3a4d8e2f68 SHA512 958eeee27c234b927957ad5918fd99da698a7e0dec15fc414d222d71933a899ef198fe368a3d640b1cb0ec84d9c2ce1d9ac147d268b90d32c1811f44ad8fdf82
-EBUILD Module-ScanDeps-1.310.0.ebuild 728 BLAKE2B 6baebe5784cef2232d5736fe94433d9873be13b6a7631c6484435cf551bd22ed1d0387415c4dc93f26bbd0f91c784430d82b6321096dee3be752019402eca62b SHA512 21642ed5662731f90abb40a218b4e7cfa2a4c4eb0208cff56737ec7349a34817f0363c192155021815c41ff9d3d5b34460674ed2fe268c9d14a5ec0270ddef1a
+EBUILD Module-ScanDeps-1.310.0.ebuild 724 BLAKE2B e5c657d3430f63fa35c7a85bf1be6bf85ad9c60bdab35a105e45ccca2bc1852302853b318cf9717faeb0236ea115b08aa2e7027c154f24daa8c4aaa74bb17509 SHA512 e513bc4f4d650b32c27e3d0b784cdf318b0fe2e7fcb6da8380ec3ffa916b5dfe73f7862b17d9a53ac3dce67066c93a85d80d4242bc2ed52ccaf55e0dd81611db
 MISC metadata.xml 472 BLAKE2B cffb135ca483f1cfb58eee15f3abb506e2da903d7badf08f89bdad475224aeb23c1f0bd90c2898763b2070f58eef8021ee4800bfff1d164f88f715488a9f24da SHA512 e9a4023964406aee368220851dab6b8e9c72f29b67694f914b7a0de7001b6e025054654a14ae51547b82c621f008c249652a17b57807e32d18f6c55b9addce37
diff --git a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.310.0.ebuild b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.310.0.ebuild
index 59f6a5f7574b..041beec57b60 100644
--- a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.310.0.ebuild
+++ b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.310.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Recursively scan Perl code for dependencies"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/Module-Signature/Manifest b/dev-perl/Module-Signature/Manifest
index c66ffcabd03f..fe48947fda1e 100644
--- a/dev-perl/Module-Signature/Manifest
+++ b/dev-perl/Module-Signature/Manifest
@@ -1,5 +1,5 @@
 DIST Module-Signature-0.81.tar.gz 93181 BLAKE2B f1ebc27c10473b2f5ad2591f2ac78ed4f1576a6045292cc2e533c1347ed9bbab995825a805d547e5a9340465b889c385f28ac8aaac38700a10d7f3ebcf433653 SHA512 b91f14f1c581dda760e8049924f5c9cb4f969b2d03092e774e022bd28d12ca59192ffc510c53b8d7200d2df2b445341a0b7617771aeef90ef235a460da81dc63
 DIST Module-Signature-0.87.tar.gz 97211 BLAKE2B 8a6d460cf8e58b5068bc8938a98b7c5060b2ebb0939f5236b5458aba797ea59c08010802b33fede69dc14fbfe796dfb225b0e1e9e405928657d7dc9b4477662a SHA512 d0afeab528d0b8a46b8a6a1f9714ab7efefb386f5b93113e733fa18b23b38c98c6a13f10e9091c0cbf392956cd02484d09482d31cd9146ed6de11adb7cd81124
 EBUILD Module-Signature-0.810.0.ebuild 688 BLAKE2B 57dc971c27632f6af6c3be8b97286a438017bd62e60e766e627211402181019d1f2826b573a01f7a1a6dad496f024a1814914fdf414e57dc952c269e09b2f870 SHA512 16be1b777a62b172916cca7cd3f04f1d6a4a6bbeab46be778a4527831c0ef035b50126b0782e4f4be25e56fc9f91f3c32b2335fa0692f99a40c6e473d45fc27d
-EBUILD Module-Signature-0.870.0.ebuild 469 BLAKE2B d2eb32e34b58064838a06b52ad7d9861a12d9ea7813e685a41fdd0ee6f0a25b15dcd3301f413d1b703456fca67328789f0476e9a24a45b00fadeae1155042d44 SHA512 87e279747d564d009a3e08736fee6c500709f64fb43d042d29379816064f1b5348eb966cd797abbeb5049a614704cedac41d93afb0f25fd2ed01e143df077d6a
+EBUILD Module-Signature-0.870.0.ebuild 468 BLAKE2B 94a40ee082b8771554504416834673bde936a0b7246cea0c39b24403f382fccdf676625803d35ea7cd1f1de8f87a974723cd2caf2c294430ac30a8e016a68df4 SHA512 1adb52b1e5f0a8fecc76297ab502151d90a35ffbacb110dcadad6b542c0165fd5ee670c7068fe5f714cce4375e1a6572c54ee212230b704c50428925371c924c
 MISC metadata.xml 404 BLAKE2B 84ab29dd023e46c209c64ba20ee46ebb5460b791434c4f5db615bab4eab6c2e3ac64272a76d9c8a122539383ae48a56f587186de937c40014844213423492993 SHA512 5458d20ea85e9a097ea073a1285febdf2a8d274bfbc0a112e3c7739eea9248a33abb6c249eff24703bea421a4396837e388b2344125dedaf25f6241f71302050
diff --git a/dev-perl/Module-Signature/Module-Signature-0.870.0.ebuild b/dev-perl/Module-Signature/Module-Signature-0.870.0.ebuild
index 5d791b6ec31e..c15d912f2115 100644
--- a/dev-perl/Module-Signature/Module-Signature-0.870.0.ebuild
+++ b/dev-perl/Module-Signature/Module-Signature-0.870.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Module signature file manipulation"
 
 LICENSE="CC0-1.0 || ( Artistic GPL-2+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	dev-perl/Crypt-OpenPGP
diff --git a/dev-perl/Mojolicious/Manifest b/dev-perl/Mojolicious/Manifest
index ea243ce99e86..2f282d32f65b 100644
--- a/dev-perl/Mojolicious/Manifest
+++ b/dev-perl/Mojolicious/Manifest
@@ -3,5 +3,5 @@ DIST Mojolicious-8.58.tar.gz 778040 BLAKE2B 80e36b370a89fc3712332e8322a4ef3083a8
 DIST Mojolicious-9.19.tar.gz 841263 BLAKE2B 7510b268c1a5793ba78d8717f5683c3ca53fa95c0af8b374b5767ff4a7c532481a788c08ac66c88295e55307fbf164784547568ce1edbc35b3b03f340ed60336 SHA512 14c29473f040548de2efef8bf5cd5676554f9f518b52e0ee03ed30415942fbeff5f5f2a6dd7592798e433e3e83653ce815697d4614e4680c9a6b8c699b0a171a
 EBUILD Mojolicious-7.570.0.ebuild 682 BLAKE2B a4a1d51ba9c0184478d978dd4da94bcef00fa9481f24a13ac810339721ddd5c43bdc775f2e1a796b4bc11e04162298874338ddd5fa6b6c32f5e1570ee3cacfc6 SHA512 0efb15c91fe8ac2d491b1afd5f93b6e0b79f3ca62cc77aadcac4facad648255850b0f42b786963db09d0331156074f5aaa7954c55fe78a211bfec10be56dc261
 EBUILD Mojolicious-8.580.0.ebuild 651 BLAKE2B 7d9f83846149a2c058c6a5989f86db7aa40acde89e3468d665c35b21eafdd458273ab4dbb6e0edf946ad91f23721053fefa31275f337ea8b4d5129311a224ad6 SHA512 ca239abe42ff3386b557cdf0b22eeca5d3562c51d3a2e897b25af6d502d27b3299b5b0eb150b516d41c3b6418cccb7ef6174a4e5b23fd5c362fda75a5d5920c8
-EBUILD Mojolicious-9.190.0.ebuild 626 BLAKE2B 899e93c772c5b29f270af48f9d8864a5fae5d6367e22244502beb80f6835acbbc1c7fdf414c4436dfd94165563dba3e2e429e9d1fb3b051bdaa763a6b9060a33 SHA512 b4d12211c5ab8840f29f4cea489d5c1cddb393923043a1f414b71cd95c2f594870a5be77700129e2160319e14e7294075c500e260914f30b1d3a0114acd40851
+EBUILD Mojolicious-9.190.0.ebuild 622 BLAKE2B c4a5be66fde54049820ab63752d874a7f3093654f3c61d13b284fd72c7d79bd3282a00c18fa04016b0096e26e17a8bcb68401145c91b9eb27de4bdaf2fd5af98 SHA512 b4d6115d72942f3530ceb8890e6e485c4dc3c57b0c0d51217f8f4666aba4b12cc9148a3362676ca401266c43e3468776be766f874ea1ca32f14edc460c197a28
 MISC metadata.xml 7807 BLAKE2B a7a3908fdaa74e3a1ddda4fe5ecb619ea104a97f8ba5c7e97a877eff762191abe47931e218c122f72fc375f2f3dbf21dfe78162d391871f724d0dbc151b4cac0 SHA512 944b54c0b0990a8d87bdc995041375da2831aefd927bb006aafa03fc71d87f6110b43eb9ad1239c2d6d2f1cdb802454f0ad3df81530d4d343bb3520e87ae026e
diff --git a/dev-perl/Mojolicious/Mojolicious-9.190.0.ebuild b/dev-perl/Mojolicious/Mojolicious-9.190.0.ebuild
index d8eba0bbdd95..d2989591e701 100644
--- a/dev-perl/Mojolicious/Mojolicious-9.190.0.ebuild
+++ b/dev-perl/Mojolicious/Mojolicious-9.190.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 LICENSE="Artistic-2"
 DESCRIPTION="Real-time web framework"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Moo/Manifest b/dev-perl/Moo/Manifest
index 1e0089298c11..7befb0b6bad9 100644
--- a/dev-perl/Moo/Manifest
+++ b/dev-perl/Moo/Manifest
@@ -1,5 +1,5 @@
 DIST Moo-2.003003.tar.gz 97527 BLAKE2B c23975f64aae881e6e17ce899b7a2f393d52e598e0d46cd199633f9ebacde81864899ed5cf1a429ddc7811a06f97f93ae537f82a22683d9409148f084113a49e SHA512 f1b2aa2f3dee8749cd2c772b65b8c48dbf67358e62dff856d980422e87c74751013376f82488bff7e8b8b0a707c54cedce8e0da873904b712138cba2c9a7f1c7
 DIST Moo-2.005004.tar.gz 108339 BLAKE2B 9b61a0a4867e72e277b56f684ec4b723c264cd5b87e7f38018788871870d36fc37b11e112138a762823c6aba68fc2c96d6fd6ead26c8a8f22ac432a06e8e58c4 SHA512 a1335d180cd19dc7189bc1663efd5a05650d579c5e5d049fc4059a382d1eeb882fdd9cd2b107fdd40499e22a5c6196fc47c1334145101def531e5f5fd3cd0edf
 EBUILD Moo-2.3.3.ebuild 834 BLAKE2B d13e0f7feb8676b93fc5620f32005bb6975d5e4607f235b58e7f9ac9c87ebbf4ed08520813adfc755f868411c53ccf74f10306434a93a47f1aec520fcb9fdf7f SHA512 c068de896494993d19d6691cdc531c026e5890fdb91617142fb32f5b3a66c39120e7aa9ffc9041a15e6fa656b1b7e84292164c82960f4ab87ddb06ba25ef7189
-EBUILD Moo-2.5.4.ebuild 737 BLAKE2B f39f1ecaae881e8e8cbdf9fa6e690d3f5cf6015acbccf303f92e3d6b69f8b4a95869cdceb127cde2048ea9060a7f2583dad1e746ed98b6d53450d38c8f2df12d SHA512 062acfabcab8ba92261588f8d0a41e86c996002a989d46c010bdb60dea06fc505d261030f474ef753985ea80af9e2b71b03e74940e3b4baaebbc3af01ee5ddcc
+EBUILD Moo-2.5.4.ebuild 732 BLAKE2B 39adf6989a1c1c284a71a3487fb538f3aa4f9a51fbbecd195935df9e5cb268a582102ee5a9c4502a5c5275cf327c839d0cd074983af21af29995d1bf31becd15 SHA512 d620a939205c10247af0383796b735f6f3c6ac8dfd9595458bfd8fe826c3d4aee7d2ec554d800bf8a80fcfe77dcca0b79165d73de27abf77705f1c5220073abc
 MISC metadata.xml 1197 BLAKE2B 7611199f57b617634c1aaeca3184d66f3f445bb700fae40ca5880aa8e654f7fd1f90f03fcdbef60ec200cd6e3a5da0f6b385628c15a1098219b6bdd9458eadec SHA512 1baccf32ca49e459aa24ad83ccd3206630462181219ad5981787b42f70591254103231e26065848716b52e579c2b09f471b559dd54925750e80adb9494c06a28
diff --git a/dev-perl/Moo/Moo-2.5.4.ebuild b/dev-perl/Moo/Moo-2.5.4.ebuild
index 4f860dd63f5f..0f741da9823c 100644
--- a/dev-perl/Moo/Moo-2.5.4.ebuild
+++ b/dev-perl/Moo/Moo-2.5.4.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Minimalist Object Orientation (with Moose compatiblity)"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/MooX-HandlesVia/Manifest b/dev-perl/MooX-HandlesVia/Manifest
index bde3ffe71fc3..699ffb433863 100644
--- a/dev-perl/MooX-HandlesVia/Manifest
+++ b/dev-perl/MooX-HandlesVia/Manifest
@@ -1,5 +1,5 @@
 DIST MooX-HandlesVia-0.001008.tar.gz 24385 BLAKE2B 9d6a72a9b9bc3bd99a145904e4148bb2c4bce6150b67431402d409ddb81b732a57a11935a10f2ddf2184b0fb8a93d57f6482fdde61508f73b8867fbc92e24c4f SHA512 ad5dd6c5a05d6f44788e31a74d595c3a6c1b8bf62f51d59bab2d65f6963c2995205ad64f6930b103026d3497d3d2a83bd192b7566228c31bf944265e060703c0
 DIST MooX-HandlesVia-0.001009.tar.gz 24754 BLAKE2B 965da8297cb22e266b43c8bb79248db7122fca51e2ab98f6ef038463919b0e6128f0328cc3b02245031dbe3a3805963e3bf231c3ee5e959108fa8e821d500b4a SHA512 ea3521bf04c52db09068d4fa7cedd3642fd54fc40b5c88cde9340f0a3bb0da03f2aabbe22788a4f33ffedc628fc510c4fb57bdf3f7c9ce1b9316dd1408c2dd40
 EBUILD MooX-HandlesVia-0.1.8.ebuild 685 BLAKE2B 8cbae54fec3a7152cc4b76a7af49496be4a001cc1b34a519b8ebc5ab7fc4c46cc5d8866590261b702441a84f28eb7f49d40a4f7e43455c1086e9006e112657d7 SHA512 9c7c826087b078f445be81d6862ca8df8874858966f4a3a3ae3ebd19dad590be7a0c67a9db352c63bce7a8f4bf71d2de887be7fe7c1e28e6eb0dc69f5d3f3ddc
-EBUILD MooX-HandlesVia-0.1.9.ebuild 652 BLAKE2B 1e20d1e8cc3268ccc490019870aeeafd8e012d3e37350ef0e6253eff42f3f7cba881af2b370836d34eab7bc0977889b2201e11b4c18b87e558dad4b9bf091744 SHA512 bbdcd23027aed3b3ddfe2afaf850d05df7f5761d56efb7d042f52e3d69005a3dd807cd4144df542de6c9e4009f03316f843f21678b3bb4ef74f63dbe7e64b681
+EBUILD MooX-HandlesVia-0.1.9.ebuild 651 BLAKE2B a40d76dca281308a1965a4d04b23804c6d6d1a05590f7ae09a788c2cdfa5b8eb9f75c9cd465069cb6cbefc368f5f971fe1ce0a21fb5d5d21e7eb9def4a4fb91c SHA512 ffe0384f597291ff294542305f5d69a9dc4626a61a647fb1ffc5ec458b03d1aba4de0e9fb2f88a680da6ca2320ba63b4ea334ebb74e1ea0b0e4d79ef41570827
 MISC metadata.xml 779 BLAKE2B a46185d754c6fb63bd6fc231ed630854cea599f20f878cda3fc01823188262f0c619f85fc3b24df7414aec0bb87dbe7bd154d974ec2005913b3845a5cec1d0f6 SHA512 085ffc9c359ba33c796376932cf3e74318e7c75df09b8e8b8ef792e2887562aa5dc9bff2a79cb8251f22ddbd2eaa465fd28c8ff66b0782b121d0cded684b5d68
diff --git a/dev-perl/MooX-HandlesVia/MooX-HandlesVia-0.1.9.ebuild b/dev-perl/MooX-HandlesVia/MooX-HandlesVia-0.1.9.ebuild
index 04f4f5a2c504..3998941236da 100644
--- a/dev-perl/MooX-HandlesVia/MooX-HandlesVia-0.1.9.ebuild
+++ b/dev-perl/MooX-HandlesVia/MooX-HandlesVia-0.1.9.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="NativeTrait-like behavior for Moo"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 RDEPEND="
 	dev-perl/Class-Method-Modifiers
diff --git a/dev-perl/Moose/Manifest b/dev-perl/Moose/Manifest
index 4f9367fbd02c..e960c2e974d5 100644
--- a/dev-perl/Moose/Manifest
+++ b/dev-perl/Moose/Manifest
@@ -3,5 +3,5 @@ DIST Moose-2.2014.tar.gz 899094 BLAKE2B 38b6f25808ea2bfdc0a275a5d95278dacae98bf0
 DIST Moose-2.2015.tar.gz 899314 BLAKE2B 6dc0d75d96d81c3c0ec9ef1678510879cdeacd36989d79ee830ce46f049072aea858c4933008da7e50edcb955b5461e8b973c2329bed271936f5766292936492 SHA512 162a0cd5f96f943cfd9f4a7f9fdc3f86341805045ecab418e1420e3b5e90b216d243515f073274bdb83846fddad78169ef5a2a6c41849466bb36a24c71a38b1b
 EBUILD Moose-2.200.700.ebuild 4157 BLAKE2B f2de1b4d3354addd7585b2b2a8827ede708193f0c027bbc7091c8bd06c655f04643752fc7325c1d66f885c0dd8549ecfb5d65950a8eda4c1546134dd9844276b SHA512 2053dafde49422d841630ebdbbc39d44d901f44cd079ba3e56d40960c3972c4d88d306ff5d341c51cca63f7aed76ff8db014fe0de7a21abf36700fcba9e895ac
 EBUILD Moose-2.201.400.ebuild 4187 BLAKE2B 37302bf8cf8907fe137601241c5652de898cc05b9591c4ca0939b0d50ba42ae363590adb527e9eb27df1e9da2bf9ac52bf0d62f461ee0ac88b1f0a682dce1ad7 SHA512 cdeee2754778a4ab782d3f8f8500c2fa463ae1dc1947613c9f240a84f85d7942d95ca2ad8abf69e44159184a680feb3bbcdc1a626363a2f31c150b60f7dd32c8
-EBUILD Moose-2.201.500.ebuild 4104 BLAKE2B 5087672dc2c4300db476d6672470ae1915be8693cf88d6f32f36717a8778131db3d0075ea770c6327de1cbcb985a9dca1b8514795c2724080f5cf7fab49b7441 SHA512 fa24c2c6bf4b6f88064352b44638857a4b83aee8c39e98a9d7454a519c38d0e38980a25c24ce7bedab0075b604e3e56536017e262a9d818a3941b2cff59ef9bc
+EBUILD Moose-2.201.500.ebuild 4101 BLAKE2B 69703e26476cea0012edfd3fd00b1e80a36e824f33a0701b8ef156ef07506a112f2d0d8b55b219ae50c66782bfc46334358c0d7c5e61f6c494caada5f00b1833 SHA512 a7eff8bd5ef8f4c636a99fc8e8704071529ca291a89794b55c05fbccd28e1c511e638573ae17631ce714ad21187ac162ea05fc8c099754d9a027fcfb7859d5ef
 MISC metadata.xml 35448 BLAKE2B f6c44e9aedab6ac47f51848cc9ea2d3518f2854e59ef1742866394e2ab4cd7de18275e27da82c885df7d1865ae1ad8f397979f9a175dd10599290d4c566c4f8e SHA512 5d7a51806b0278fc5dd7cd1d487c0f211aefa638dbe6839eb5aeaf5219b03d97d7d0765bcfd603a9add64ea3f72ef770ffc9b39578cd728467e066f1abc12579
diff --git a/dev-perl/Moose/Moose-2.201.500.ebuild b/dev-perl/Moose/Moose-2.201.500.ebuild
index b400ea7037aa..43de18662702 100644
--- a/dev-perl/Moose/Moose-2.201.500.ebuild
+++ b/dev-perl/Moose/Moose-2.201.500.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="A postmodern object system for Perl 5"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 CONFLICTS="
 	!<=dev-perl/Catalyst-5.900.499.990
diff --git a/dev-perl/Net-CIDR/Manifest b/dev-perl/Net-CIDR/Manifest
index 814bc66f9c7f..e8c9933b1af4 100644
--- a/dev-perl/Net-CIDR/Manifest
+++ b/dev-perl/Net-CIDR/Manifest
@@ -1,5 +1,5 @@
 DIST Net-CIDR-0.18.tar.gz 10761 BLAKE2B 83d79a5f93251ee71b909ad7bc25186cc63c8da1e676356e96ab21ecaf2f1b84e1471f1414d6bee11b72f9d0b81b833347b5ef9277a348123f170492b6a56e97 SHA512 26a8fd1fdb16b03f72c456edbd7dd0f158e6fcd76847be7634c470049eeabd1d41bf328d32e528aa26b7f34179b38904c65ba511ca3347acb0442fe93748bc63
 DIST Net-CIDR-0.21.tar.gz 11593 BLAKE2B 9105070324def35bf9302f622e62e97f1d0004a1947ffef21869f71fe18317ccbdbc4adeb71afbb3a25035bbc96efc17e7a2ad2441caea65fee884d5b05bb21f SHA512 28e7c808173d87a403ab6d924763bdeeef61801775167a11b02bf352d70808821f896f7e3dbb1fd3cd2b42c937f9c6175d1522daddf38c53ee9d242d1a3b5fd1
 EBUILD Net-CIDR-0.180.0.ebuild 387 BLAKE2B 9ac4acfad3830162f9e22e3dbf12766b7a735d69672f3f5f01f47f8c8cf0f2634a8df51a5d93edf1e690c7b559864e0b46f9d7851769e9fa943e9e5321a892b3 SHA512 87a7b53b4f9b1e590f34ca95173aa3bc71361ceb102a0fa97cae4107c69f2ef6266006507b7811df354bb29356acad7038dc783a9b66560114ce42e5c26b6df0
-EBUILD Net-CIDR-0.210.0.ebuild 383 BLAKE2B 0f9216901af0e47918e1d932c514cdc2b3c90f7d66976ca0d752ed50b4aa6e02bfdfaeb4d4eb7d14950cc0aac30a93216807e594695bafa58d2cdc99734ff316 SHA512 8a8c563fbbedf31d2bc644cbf79e1d707ab24d0b0397ab2aea16db4b42129415e7e1dc15ddce05d16ec121c6c165e230edc3bbadb8207fb324bf9d8a468073c1
+EBUILD Net-CIDR-0.210.0.ebuild 380 BLAKE2B 79ea596535174c2f9e890981fe7b9c98dd8cbcb7b15c9762f2dfd8f55e8e2995eff345e26b8e2bca26f25421d3237bfd5e5808171e55e69a201083baae398e64 SHA512 2a35efd0e23f6c9ab0a9ee939208bd178fb77bb8566ff069aeead854754644ba8e0f04feaf453637c55d8f0db096f6801c46692d980cab1c6a696a8930d04229
 MISC metadata.xml 388 BLAKE2B 6f07ff01f9685b30367f61b997b4efcc7f0bf580a9380f94503a4fc3f9b64ce1eb4395fefee13ed5ab8b333037419005ace9ecf902788f01338adf7f2717bbed SHA512 53d646cfde19bed4a607cedea44cffdbe882991a329c885b53bec99f2b433a8b61361787b9ecf7fc38bca0497f8c6375a950516fad3322ccb012708bf781541b
diff --git a/dev-perl/Net-CIDR/Net-CIDR-0.210.0.ebuild b/dev-perl/Net-CIDR/Net-CIDR-0.210.0.ebuild
index 1073c533132c..c1cccce65cbb 100644
--- a/dev-perl/Net-CIDR/Net-CIDR-0.210.0.ebuild
+++ b/dev-perl/Net-CIDR/Net-CIDR-0.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Manipulate netblock lists in CIDR notation"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Net-DBus/Manifest b/dev-perl/Net-DBus/Manifest
index 02b391b78339..b70113ca761e 100644
--- a/dev-perl/Net-DBus/Manifest
+++ b/dev-perl/Net-DBus/Manifest
@@ -2,5 +2,5 @@ DIST Net-DBus-1.1.0.tar.gz 2075154 BLAKE2B e5f75f63678b72d2d80406af76430802c715c
 DIST Net-DBus-1.2.0.tar.gz 108296 BLAKE2B c5c4fadfe1c04f5f6dcc73f7d3ccb2a91555809209229f51a326494e73b5a0ccc83a89f427c19c73a82b9608decf85cd19ad469a635cf176d5b1dc42bdec98a0 SHA512 9dc95288ae81037985020e18db33331de6908b1280fc3b0ca898c183a5b577d21d240f4f1045393f9459a9be6e3425feffa9ea581e6af2bcf165cdf48348b255
 EBUILD Net-DBus-1.1.0-r1.ebuild 672 BLAKE2B 6a4c177b35eb0ce21d884f9c825810485fd2032848f58f26a70b0a0c71135b4f312f76eb4e96034b1db602b104b8d8f38d6722a2cf53c8704460d9755e7b3923 SHA512 7d6b7b66043cf8d06869e4d9150631b1ab9bf4b6825ff74aa91072782555a1db3e190756a183e3694685458fbae5ba4fa885f5f7bb50fe97b5da633bcee3c9f0
 EBUILD Net-DBus-1.1.0.ebuild 645 BLAKE2B 4758bda53d3d92f6aa8b2bd773167b6a1c002c3a502164859d58a4454f462c27b497f5f0c87ed3f2f997f10eba0f52f9def094117031bd185b18c6ff995e7a2d SHA512 ddf525f9022fe3478915eb5c7fb704a5e7b6a28b166134ea525d81902477d04e012feb7bd7960cfeb7b0d06d79e41416316e9d4873a716a90939ee81bd2d596c
-EBUILD Net-DBus-1.2.0.ebuild 613 BLAKE2B 2b9c68aeb4076ccce75f4e70ff57382c26be0ae4db121f6e9a6a13ddf9f14cb4fb09019575e7a2b0da198de53ad7180523b6d4f86c3ac1c78012a6fac868268d SHA512 47d63170546ca2f2b216c492f62152a014e23fe25e5ff38454db71d2a23ed695eb6305307f9df4c1547cce8c4dbcc8e81318426f56924fd3ef7a529a2e75e2d5
+EBUILD Net-DBus-1.2.0.ebuild 608 BLAKE2B f8b5e5c2a97a704445c9faedf75c424e9f3bea952e728cb91b6c23df2f1b64aa7a63f0e66565e9b4f5b45dd922d9aca0cdfc4e501527f7cca4ad8351a53bddb5 SHA512 b6070ca6e159cc181270cdb70aca63f613033ba62aa1f70796663470795488be66ed434c31b3ff5ccdd43d0ff3e011919f7513b7aad49d92531a9b153b8560d5
 MISC metadata.xml 2428 BLAKE2B 0ed3b699ea865b088921855030debc8a323d80d18a656f5e7a132b18ddccf34a926e1bf081bc779bc7583715c75a58dd4e79b04aa5c557a9cb42a26874bffa45 SHA512 ec204108cdc58e7a0c59d4f8ea88e04eb29e47ac52f83600bedd2279608cccb09c60840883f477be475ccea923e7a8344196b6053aefd7d8315dd8d628560f44
diff --git a/dev-perl/Net-DBus/Net-DBus-1.2.0.ebuild b/dev-perl/Net-DBus/Net-DBus-1.2.0.ebuild
index 78e711e40aeb..be50b74274cf 100644
--- a/dev-perl/Net-DBus/Net-DBus-1.2.0.ebuild
+++ b/dev-perl/Net-DBus/Net-DBus-1.2.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for the DBus message system"
 
 SLOT="0"
-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"
 
 RDEPEND="
 	sys-apps/dbus
diff --git a/dev-perl/Net-DNS-Resolver-Mock/Manifest b/dev-perl/Net-DNS-Resolver-Mock/Manifest
index 1acc3cb79104..4c62175a3d3a 100644
--- a/dev-perl/Net-DNS-Resolver-Mock/Manifest
+++ b/dev-perl/Net-DNS-Resolver-Mock/Manifest
@@ -1,5 +1,5 @@
 DIST Net-DNS-Resolver-Mock-1.20171031.tar.gz 10124 BLAKE2B 4574c138849213569b0d920bf2325d34642676038863c896297026d9deb49306a729ee249c0a8cea4e3894ebee9a4e40525ae918bb111249e64ae7dcff3a30e9 SHA512 458d4fe521cd650f91ba95b8a9bedf10e03fb08d9c5fd8dabb3df435e8264f44837a1718ecfe6d3ff68badedfe240286c051981e668675af277260b6401d0a16
 DIST Net-DNS-Resolver-Mock-1.20200215.tar.gz 10961 BLAKE2B 38b6f2e4b4f7f9dac9e545e288ae7ed6d211ec482d444cc00740591cc3de2f616e782f0a7db38f2114f18143a188ec7693e2ff0e6d127a762c0e5e81ab74b4fc SHA512 92ac244dc2a7b939b1e8e8c71eb9ce65fdf1494dd08c62e6fc3720ffa82acc7c354bd7dcb8c77d9e52ee132773864b4b3ba869303af7363001ff5e9125c06802
 EBUILD Net-DNS-Resolver-Mock-1.201.710.310.ebuild 643 BLAKE2B 82f40b69915a8e2aa888301ad13cb5e5b84bf79a460793baae57c82b2e75d5fc2008bd0c7ac74dd4d430e911ac168e66f0741c9d7b159d125f5404d8cc654505 SHA512 ed8154ca12c5251cd53e7eebcc192c6d4fe3ceaaaa5bc47975982c098b8712e6706e492712870e03b223a71b65b1b243108d152d17411c19444b2445b6d7df30
-EBUILD Net-DNS-Resolver-Mock-1.202.2.150.ebuild 642 BLAKE2B 4aeedff761acfefbf78ecb01dfa8d527162b92e71979278206897845fe8c8f7f58cf2a9da2ea1f8197d65a1895152f5ad1f18f98ff1e3add786090d99bca1f20 SHA512 20eb3e4154f742f9fb27278f71ba8aa81bc102ea113287efffd4c2306cb5d329ace40c44f12d1b01fe02387f3893002444db89ce687aac6850164b21fab87e54
+EBUILD Net-DNS-Resolver-Mock-1.202.2.150.ebuild 637 BLAKE2B 0ae56ba9f02a2e99e04f69a17d6a75923624fed2b1d0c2df84b9d983c871d14be77836c13b11c14f49dcc7a5686eb9a8ba9fa29a3bd3f591db088b2fe177cb61 SHA512 a0504d33753fa3fa2fb51edb1f7cb20f8339805531f62c536ac3ab6d5a8c6457d93ff7c4302606a255086b702c500afee1eb375035652bb484a880560e12bec4
 MISC metadata.xml 416 BLAKE2B 54b5fabf81de1de409644f6302eff11ee0e63edc8f5b0ba86e29d6331bb941840955c749fbf48290ab09d960c0ca19ddc81058822e827f498c22fe36e53738af SHA512 40949dcbf20357cf6c4885004bd445537e0d13399bed31e05df4d2bef15b64dced9583a871c35d4a3034597df07332f2425006731a3bc5ff5436b47e720ca9b5
diff --git a/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.202.2.150.ebuild b/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.202.2.150.ebuild
index e351105efd0b..a521fcc558ef 100644
--- a/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.202.2.150.ebuild
+++ b/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.202.2.150.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Mock a DNS Resolver object for testing"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-perl/Net-DNS
diff --git a/dev-perl/Net-DNS-SEC/Manifest b/dev-perl/Net-DNS-SEC/Manifest
index d0c5b7eebd2d..2574ce2fcc5c 100644
--- a/dev-perl/Net-DNS-SEC/Manifest
+++ b/dev-perl/Net-DNS-SEC/Manifest
@@ -2,6 +2,6 @@ DIST Net-DNS-SEC-1.03.tar.gz 35605 BLAKE2B 8d7ab450986b4cc4f7d31ae50f3efdeb56e6a
 DIST Net-DNS-SEC-1.16.tar.gz 46603 BLAKE2B 3f248ebe62b21c68ba06b13a13bab2b8507df4cefd10f87de88191590b05b4ed48cc04b228a78768bf3ff907d319c38eeae46d3e407180eb9722f5eb5ccf2b24 SHA512 47eaaaabfc76666a4c7da89fd9eb189fa065c7e0b60f5c166420c76226a0df938e95e5abfa83e6a1a49b92593aee078883b1a170d39426c84fdef22a2fc50ef0
 DIST Net-DNS-SEC-1.18.tar.gz 46301 BLAKE2B 9f943cf1391b8b1a07b361a837fd7b88b712372885024bb862b4ed606231b69c083e75dc2675a518452dae28873b867fc256a7a0f8f90c9900d80e8f6c5b25b6 SHA512 44f1bbcd9b5c8759ccbb8a9c40efb3d0533a991d6d9aec63ec8b1347a4cbf314470efebe4e5bc59fb19427405a4b8d41682c5231427783cace8f9779bccdc893
 EBUILD Net-DNS-SEC-1.160.0.ebuild 713 BLAKE2B 5bdb6dc994545d767fcfeafc027a73a9539b057f716d7016e4ce3953e7032362a139f671f6a2516031f3431354c435e9d8d9432b47dda7c698cf642b7656acb1 SHA512 dc8273816526ce25fc3cdeb39ab0271300aeda25be1d54a3bb1aee397bfb3d08572d5b25d80fd4bbae1cc857ccc727f6cef184f22312ac56c05eb5b57aaa7780
-EBUILD Net-DNS-SEC-1.180.0.ebuild 706 BLAKE2B fb083c101f1651c3e5a1eb04e50c32f5b73644a11a2edc7acfbeb98ab5692b17b36553b31ef6ffffc35e8f450e509159102f17cea29a06be9f03b691bfe5803a SHA512 56a30349cd29777e191b33fb46641172dfa1a49e984cc3513579c56d70538b103e75dad17cefe97810613057e4600b2495ae381fa72f8efdfc68ab781238c324
+EBUILD Net-DNS-SEC-1.180.0.ebuild 701 BLAKE2B 26dca3ad1ded48bd9ca0ca82bcb150bdda3675bb20cfb07318aed4139f693e519d9d120765ad0b8c3b35ee7171c0c5abd5140ed73d88c1d2547d441c92c62074 SHA512 2c754de227b8caedb6d5691bd21e93624725b0473f959def396d47af8416a65647ba502b79bf40879ff7b297687ee9bbf63f2fe21a38440255554b274ab3910c
 EBUILD Net-DNS-SEC-1.30.0.ebuild 2135 BLAKE2B b2f708f5079020496832455d214b5221086a297955b39a638c198e17d48cd108f0dc7a5919f414e1fad7bf75b6181085ead83aca5f01d6b09779efe137f030c4 SHA512 7c0ebf283c320b42d469effb5c71dafba128b9ed0c62f7a942905ac5fc0733628bf15a5b0a1a8956b96d5ecee297441aa96402aa211c36d931ff84ce596c86b0
 MISC metadata.xml 905 BLAKE2B eff2615e97186ac69154cb936b332c72472f0d87f670a22d0d7d11f8a2edbc798d9ec389d9f9762961b419a1d0a4b8d4fb93d7bd5c7c5250ca1e65dd9bf9cdd8 SHA512 62a66ba1f0d23791fbca7ff707e3a076053049e17cffc7c2c3435a117881ae02563e85a7a9c91e50b6d11ef18cc7246897a9886a2227c6e9ba67a093dd9e7638
diff --git a/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.180.0.ebuild b/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.180.0.ebuild
index 1e01c8d99f3f..f995af1d83c6 100644
--- a/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.180.0.ebuild
+++ b/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.180.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="DNSSEC extensions to Net::DNS"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=virtual/perl-Carp-1.100.0
diff --git a/dev-perl/Net-DNS/Manifest b/dev-perl/Net-DNS/Manifest
index 1128acf1e966..82043a5bcb9d 100644
--- a/dev-perl/Net-DNS/Manifest
+++ b/dev-perl/Net-DNS/Manifest
@@ -3,5 +3,5 @@ DIST Net-DNS-1.23.tar.gz 257796 BLAKE2B 974ad41111af557e4c066403c93606ca924a900e
 DIST Net-DNS-1.31.tar.gz 249299 BLAKE2B d8456453240e388476ef918cc7731b9d790b8163885e18658182d927c2a594cb74a7983d33607d495c75b7638efd7bd2bb6368e1b5ec80e4eca9e809ba6bc97c SHA512 f406bc192f18b0a07171f3e81209ca705b9fa5fa8104533cbece1678bb08220636b438aa3a4a6a5f2d03a3a3166503a9fa8c5c16f92b1b3e8f8e2e2fdf0f8ddb
 EBUILD Net-DNS-1.130.0.ebuild 1720 BLAKE2B 3b332978e5e1f2600864a42785c5afe671457283a00577301a981b4d29120ea301552d50da0238efadb0220e1db23dbff367139b04a81691e3537ac03f15e3f6 SHA512 f3a309a3752e93bf9c98b107ddde669481d4e98e1d781efc6f963b390deddec894d6bfbb2e9734b89fa63075386177c0c2ec76c2eabb759a5ca3d3f47f7bb4e6
 EBUILD Net-DNS-1.230.0.ebuild 1651 BLAKE2B 554f758a1483dfaa65e826c934a3a18ea30cf230eb1c34f0e1674a4e2643c7a350ffbbe5d013cca2fde4c54bb38f632d7db12c92b517dbd4d87302d7268cc027 SHA512 920c016da6d924d30e84f9ea1d59ee255c15ec55387297c9ff1ffcf18770a9d9aec93782d324bdec771a47c298deacff37aa4e824b7749cc5c13d6bfeba889f0
-EBUILD Net-DNS-1.310.0.ebuild 1764 BLAKE2B 687d1ba7ae3248d054efee08b293b4d452c537057b41fef5e212c79edd10a52141ba31eb83164c7c94f48dc22987025fd660a8e1d83bee3191e0bed009fcd1da SHA512 1413eaadfba0d66a3e8fe7d466b51f712809cf9d7d8df7cceecaa7ecb9fb0ca7172d50560398cca2316707b7033aa047d4f2098ae520cb7a00d70c80932344ef
+EBUILD Net-DNS-1.310.0.ebuild 1759 BLAKE2B 79f188e1362bd5c6387648f5398326e6c074c5d9711068854a7e1b31ab0c853af002bc9e917a736379679352baeff4269211f90295533953880db34bc1d9c10f SHA512 e3684bab2ceb6b93ecb010465ee8091634f7790be945d1fdf3a5c02d40a7de494f8df29bef38a166f24723a6be4bb0cf88c8221a9634bd1b31d5cabb6f3e2136
 MISC metadata.xml 6047 BLAKE2B 84bf9581ba0861246ac5b879897686a27ea1203dfca0eef52d05bd2c2ad528263220a14850d9e7c1343738fada5783d371a21944092d762b3a421eb0d8ed5c31 SHA512 0c1dc9d990d691135ef183cfb51158d6d26b2d40b908ca7f0f8596813276fa5dc1352eb2fa8c83bbea4a62219dc071f83045c7f504c5f99e3ea807848d64b5d4
diff --git a/dev-perl/Net-DNS/Net-DNS-1.310.0.ebuild b/dev-perl/Net-DNS/Net-DNS-1.310.0.ebuild
index eb0d4416254e..f84c2ef45134 100644
--- a/dev-perl/Net-DNS/Net-DNS-1.310.0.ebuild
+++ b/dev-perl/Net-DNS/Net-DNS-1.310.0.ebuild
@@ -11,7 +11,7 @@ inherit toolchain-funcs perl-module
 DESCRIPTION="Perl Interface to the Domain Name System"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="minimal"
 
 PDEPEND="!minimal? ( >=dev-perl/Net-DNS-SEC-1.30.0 )"
diff --git a/dev-perl/Net-Daemon/Manifest b/dev-perl/Net-Daemon/Manifest
index 2da0ebc1153b..a43054c68ca2 100644
--- a/dev-perl/Net-Daemon/Manifest
+++ b/dev-perl/Net-Daemon/Manifest
@@ -2,5 +2,5 @@ AUX Net-Daemon-0.480.0-perl526.patch 941 BLAKE2B 04ef7335f9ddf52c4ddb3f0e3d9b0ec
 DIST Net-Daemon-0.48.tar.gz 29513 BLAKE2B a5fe8eeb01a463ebfd7b274dea2d0b9a8e633588e35576ad24b5e40a4b06ff5f1321bc01bbfb63ceac8d8e5c9e85d15807dde3c5cb18b21e53da6d84ca24a999 SHA512 85bc280adc0de6be8ebd64771732f83299018edd06441cf96c438914a16c3805918805cde07bae4fe92caa86475ad35cabfc1edfccff117dcce7f5dc8b137bba
 DIST Net-Daemon-0.49.tar.gz 31853 BLAKE2B 75d1b3591a5a242f33680644da0fb355a9a2221c1ca75d8868921878d3890bc1f24a5683217cfebaa568ad86a997a1fb60c9893c7edf6df9b907b7622597a1fa SHA512 8b2797757c98c2cc9821866817ea4e28a8aa120f7614c17e32417e75990d425055d406581c3b554e8e4d2f9cc7bf4fba1244773d92b1b98bc3bc02b50300c131
 EBUILD Net-Daemon-0.480.0-r2.ebuild 601 BLAKE2B f4f5f6412b76c415afd0b2d975ed9aabf23760c76dc1bdf600c2d3792c6530d8843635c5206f4f4f40cd4e8945666c8dde2e4d30ddd659cf54c24206f6a57d9b SHA512 a7e47928f83ba7220c26c71c6109cd2e547e3ac53cbc20d8e595e98c725306fa385a1b20e102d3752b69877624aaa5ccbd46898873a1200d30088d713fc7e745
-EBUILD Net-Daemon-0.490.0.ebuild 548 BLAKE2B ed9fb01d8765041a92cf7a9852a96b4f53ec7b33af211989f0f82fa8707548de4c854aa9f1c0e3b536396e83b662a83d91368c7b4ebc3eb71a100cf480ca61cd SHA512 039d0b650906a8beffcc384c58e299327b375ddccece4ca6156f7cd8e6d89e705a7a9f5a2c4db1d416cf616f41a7ff7a18ca049a3cda1d0bb213e7e65b039cf0
+EBUILD Net-Daemon-0.490.0.ebuild 543 BLAKE2B a8060150b9549a474cd70a80cd6fb455912b11c4c9ab8d8cdf8f05218cabfedcb30fade0505b095824cfa02f4df04e94cd94b417f1f6f0473fbe24987fa084b2 SHA512 02a7019cbc99963bf18ecf57110629963f9e2df16c820830063d9b841388454d69e8c37c66efddbe3e766e06ba50cbd30ac53cee8e5cab124e47755df7bd6159
 MISC metadata.xml 660 BLAKE2B 89b846cf8d8e9eefa29886106ee0708ed034e7135f43c621e76d25f860c36c34dffc5348a9af7badf3114e93e331596f93113b8d1a8f09586f29630440d5f735 SHA512 abb2535a1bed81484e691e65d2282bcd2243ba65d5b7d09592397a88e32a98bb255e1b822ba91e0fe4109be6aa7d7036af2db731d8119ebeabbeae5e4e9d78e2
diff --git a/dev-perl/Net-Daemon/Net-Daemon-0.490.0.ebuild b/dev-perl/Net-Daemon/Net-Daemon-0.490.0.ebuild
index f5e49aac71da..5a43cfe324e8 100644
--- a/dev-perl/Net-Daemon/Net-Daemon-0.490.0.ebuild
+++ b/dev-perl/Net-Daemon/Net-Daemon-0.490.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for portable daemons"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # loop-t and loop-child-t race-condition
 # due to Net::Daemon::Test writing
diff --git a/dev-perl/Net-Ident/Manifest b/dev-perl/Net-Ident/Manifest
index d3acbeb3c232..e6cc6a6dabea 100644
--- a/dev-perl/Net-Ident/Manifest
+++ b/dev-perl/Net-Ident/Manifest
@@ -1,5 +1,5 @@
 DIST Net-Ident-1.24.tar.gz 26691 BLAKE2B f3133efbd32d568d333351111e36eb0d1cf2be88d5babc78465152a82e77f3e56d47a0f7e945719ea64233086a85add1c9c8645292d959e63cd5a3f2a186fbf4 SHA512 877a2699964323b009dbdbab134bb329acf71758e48165f4d19bb8e49d0c02786f58ab32bb1bc2ff6c4d375d4b64128207cbbf3c858a6db2e30bd2733474d740
 DIST Net-Ident-1.25.tar.gz 31423 BLAKE2B 99f4106a7bd8c47ac05dd0fdd1e6f1c627695db72391542ca61bd34d3f74014db1527b68f43dc76122c7582f47c1f5fd285293d1790d7099e22a66a95d8ab8ce SHA512 bc9e41d653380215e85908b87cac8858b4d50487f4c9e539de66a1c4d788a78250d3223d1edbf2c7dc475186db087dcf65d382c0ddb08a792c2f5f808f71dea5
 EBUILD Net-Ident-1.240.0-r1.ebuild 565 BLAKE2B 5b18eed211c78b3886fee93ac31952a7bfeb303282d436bad90e4591f2cdcb043a9a1ac6b87aa90014cac2ce03fe091e2570965f98b12480942b6fc1ec57fd76 SHA512 240bfa2196e958911ac7e3862b2475b8836c0ee05548a94b6fa970b861fc128f994bfce36ada1bb07be91f327ccefd478fce2c95f2832d137cb245cf77a735ab
-EBUILD Net-Ident-1.250.0.ebuild 532 BLAKE2B ad39d496993819061c9f418c75b4f109cdf65f7d05b791f259679a880fabbc2d368bfd2c92d854f7edb79980ec7b2a8bd3fd743348238485af06c4081193e301 SHA512 81f5b40de8c482eb6ed3dad041f3aa4bdf4aeeed0f7beba607c05bebb02d6ad64aedb0c29810800dd53ff21deca30d8abbbbc3368bf96da290f2afb49d61dadb
+EBUILD Net-Ident-1.250.0.ebuild 527 BLAKE2B 8680f2f51b8d19e7ab29cb11b3ed6c269ef1a5cf83cb7f707f2d2ab6d4836394fe12f3bd0e99a841b2ad9419083699f1082bcef1231b8087edb222ad4a918c5c SHA512 a77d57038cd0e0309bac2b05a74e28148e123fe1f9cdd36a49bfbe29759fa2feacc72bac21f6c78a89a9d700feec15d827f9c6ea0d115b16f6ec5b2dc4af5472
 MISC metadata.xml 390 BLAKE2B 5f3c71d090e39e5df3de9680b722396ad15c50ce7e16374000255aba2a237e0488409741dae7d9c24265bfd45a0a513f9c9a76ab62bf9bd0d670917dc5b38c3e SHA512 8cf5e0f58fbc82f98d9dd82acc2925b36c13f79325a7b7f38eaa6b298d0ae19e4667198dbcd2a0fc94eb6af159fa0e434fa8dbe8ae27656b1297303186d56c14
diff --git a/dev-perl/Net-Ident/Net-Ident-1.250.0.ebuild b/dev-perl/Net-Ident/Net-Ident-1.250.0.ebuild
index 54169ff11e69..eef03f6c20c7 100644
--- a/dev-perl/Net-Ident/Net-Ident-1.250.0.ebuild
+++ b/dev-perl/Net-Ident/Net-Ident-1.250.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="lookup the username on the remote end of a TCP/IP connection"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Net-LibIDN2/Manifest b/dev-perl/Net-LibIDN2/Manifest
index 519a4d70fa26..a432402beae8 100644
--- a/dev-perl/Net-LibIDN2/Manifest
+++ b/dev-perl/Net-LibIDN2/Manifest
@@ -2,5 +2,5 @@ AUX Net-LibIDN2-1.0.0-libidn-2.0.5.patch 3614 BLAKE2B 06197281422b373e4456cfe487
 DIST Net-LibIDN2-1.00.tar.gz 23603 BLAKE2B 61d16265263e934c45cbed9427636e73a2abae8f41f7294d4b682b0129c2a7bb2c316f522b5ee36988a0d860b53514f6c44d360c12479f26887a0d2873741993 SHA512 0b0c3bba9b2c8e748fd416ba465e6b4eb76fbdad1ee2d3459be032b7d5bdb0706da97e8ebb9de57a92acae06ce84aed357f5baa516ad40268797abda6d7fb38e
 DIST Net-LibIDN2-1.01.tar.gz 24496 BLAKE2B 7373448c9085834301b23c4b16a653624b91b443d240d8a608e2bb9d3e51472508f43a89ea78aa26b47480a60c8055a6879ce7390a222b74d469e6a2e01d1f98 SHA512 b3eb430c99a458e9e5fbd16fb6b059bd660a995be7ebe806b44b46160db7a5502806d503ec03667ef9865634f403db2e665c3dcad58f4e221e918ef4d78eabd0
 EBUILD Net-LibIDN2-1.0.0-r2.ebuild 903 BLAKE2B 02d537207a60658ef6c67d6a9bef8f5169eee18c9532995e9e8b8b1676aca6a9aa1a0f1a8f4c44909e51d2139b09859f70fd462deb7cea0bfab9b64750d2adfc SHA512 ac64eca139ba8dafd578ae20ccde8e7f367953879d99f2a2c2f048f1976b7357d60523cee25fd96aa45a0a5e15349e671eb99edee1a2c57704b22e41e1299283
-EBUILD Net-LibIDN2-1.10.0.ebuild 818 BLAKE2B 381bf1358b1045a19af3b140455b675fe3c59965ac5a48e6507177ffc637b9c6fa503a3e8fc93c6685bf55765bc2979aaaf056781c68aa815face99fc4a27ce2 SHA512 ef6421bf5b4e32f9f34211de5187356f05be2184f09af418971cf1a2abc6df9d5a5ccda2d6e9da6783eabb3f07e1558bfaccdf88ddad5d9592c31b61bf729bff
+EBUILD Net-LibIDN2-1.10.0.ebuild 813 BLAKE2B a01a04223c8af39c09a0d65a4139e0371771671681aec9a59f8ae0d05a0bf4a055e747ca635dc5c6c2d5398818efab87f8ea7560d8c9488c1d8cbcf748ab9006 SHA512 100fef8f98afb90e7da2d123ac5e37326a05f92db4ac4fd55a2a48060edfd1a0494bc8ac332249dcc6a6f6d2343e9f44050f21a62a2ba41e32d906f8bc4c21cb
 MISC metadata.xml 394 BLAKE2B 0e04894c656ca9bb0623be50369ef992244fd627478f8e23232fe937123df5e8f136247e6d2708dcaa1e9e475e6967466a756dae6c1b39d243b7777a36eaa81d SHA512 66adec760ee1638b405b6f14878ed1239a4efa0dc3708ae88c6a623138bcf765175cfd8a0a2a7a63ad606cf249e35496371a56e1bc257f7325dffc9fa62cd4a0
diff --git a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.10.0.ebuild b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.10.0.ebuild
index bb17b04b2334..1070543b3124 100644
--- a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.10.0.ebuild
+++ b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.10.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Perl bindings for GNU Libidn2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="net-dns/libidn2:="
 DEPEND="net-dns/libidn2:="
diff --git a/dev-perl/Net-SFTP-Foreign/Manifest b/dev-perl/Net-SFTP-Foreign/Manifest
index 2e7a7cfd54cd..014618640b43 100644
--- a/dev-perl/Net-SFTP-Foreign/Manifest
+++ b/dev-perl/Net-SFTP-Foreign/Manifest
@@ -1,5 +1,5 @@
 DIST Net-SFTP-Foreign-1.87.tar.gz 169840 BLAKE2B 469d66192dfacbae16e348980b0d718983382546600a8daef3bcf2caa9e32ec7355f3aca948af652632668d9f9d78aca1ff28a26b5e88cb0d1cb9a398371ebe6 SHA512 c121053ee4b5442b91d4c98b7c331b3a0f0b6eaa8d2292cbb7246884751effa76c5afa797bd3f4c5b7125b0cc5bf9bfcddfed7b0453e938284b89e679042af02
 DIST Net-SFTP-Foreign-1.93.tar.gz 170310 BLAKE2B f072158bbf6222274608e28b96946f7f748ccf44520b07e0d058f229f56cb7a37622cd2f712f460e698b83f7fb7f0bd9c40a2dd807eeb9cc2372bc8d8b1d4f47 SHA512 9ce362525b5323eb253241a3dc833da1206252696b903ded4343d0678f4dc426246cd6192ed6dec033d168604a8fbfdb033a626cba8ce6d3a5f34fef7fcbe909
 EBUILD Net-SFTP-Foreign-1.870.0.ebuild 504 BLAKE2B 4a6075d6301821dd995972fd277c4f5fa56427a74add193fc1489a9a769475a06f6863469f704b942fc2e6dab0ef2ba7d3982522118129d4e828fa4c91b99b49 SHA512 47760df13d30d131f51114a360e9134f1817d7432d59f973c1b1990f78ab29d679b22fac0ad04b789105cab60a1a2f088631649f9879564f77509a4b7dd059c0
-EBUILD Net-SFTP-Foreign-1.930.0.ebuild 475 BLAKE2B dabfda7bfb23e9ad537750dc35be28b38fddf182c9f0c428559d0d0b298b47eb7ee55d90c870febaf3d3bb82ec058b390eb74d9cf26a752f6ac203cd60df9d80 SHA512 e392ea2b61bb96afc6d8acf55dba88c489e5dbc6adfd2e734e30fbaeea91c9444af3fb713dc325325445a0b13d010071a86da3afdeced9100c3633fe08d0e4ae
+EBUILD Net-SFTP-Foreign-1.930.0.ebuild 473 BLAKE2B 50edb8f8ecdc19dcbc85dd13776b265eb1db58098f954dc862bdb283b40a63f8b64a9d9d2a6f530dea0026a98f2c32ef007b5d6d04cad5bb5dfb9a0e6b72c6e9 SHA512 37fa4d5735cddc57c8100ebd25249377e1719d5c7424a337e51879c249c8f099e0a6c2c0807ff8872c6d79eb1985e87239c2cd3a7a4ae407b0a73fe39c5c7832
 MISC metadata.xml 1397 BLAKE2B 9fec5b80e8475b36e5d8d3652697eec4bd6ad1cc5ba30594b26a1cbc2a5918455863f16cb10a2a6a1b0b43eab483a747e6140a3674c1bdf685fb6905cc106c22 SHA512 575148d6cd1614c51aa1d5b1c320c6716ba57ae748480a4b1a5193e3401e12debfb604ec005a2e53476e7384cdc7889760f8ae3bbc8c1a44a246b474eddf096d
diff --git a/dev-perl/Net-SFTP-Foreign/Net-SFTP-Foreign-1.930.0.ebuild b/dev-perl/Net-SFTP-Foreign/Net-SFTP-Foreign-1.930.0.ebuild
index c31858f2d4a9..c9a833106528 100644
--- a/dev-perl/Net-SFTP-Foreign/Net-SFTP-Foreign-1.930.0.ebuild
+++ b/dev-perl/Net-SFTP-Foreign/Net-SFTP-Foreign-1.930.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="SSH File Transfer Protocol client"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
index d3d411f671ad..58a5cd1663d7 100644
--- a/dev-perl/Net-SSLeay/Manifest
+++ b/dev-perl/Net-SSLeay/Manifest
@@ -3,5 +3,5 @@ AUX Net-SSLeay-1.88-fix-network-tests.patch 600 BLAKE2B aac7cfbf6770d56df1af455b
 DIST Net-SSLeay-1.88.tar.gz 436215 BLAKE2B 1a58296693cf41c464ac67a7f630598ccbf261ed0374a5381e3f718361b66418d13b5357bf7a49267a9e3bcd8d423fdedccd6b60d34aa60c975a5e3d1b0688e7 SHA512 37fc32ec003337f3dc18bf928139079a3127628c6fa0fccaed0c27b6bf3b216c2c5338ed1aaf9408b0add3be549df3218d3c5a6d6299793c1329d8a0813a1682
 DIST Net-SSLeay-1.90.tar.gz 534246 BLAKE2B 2510fa886db8b7c5f185aa1145ae1b50b7c4101a9bd80e17c8c1d77718765f288c9180464d831775c35aa94b5a6f6c8f717ecaeb4974f7280829b63f10567f22 SHA512 8a5f251b5ef1d8c2d619d984594a7a22ddeed2e5e726fe683a45f299d7878f4ca8ffab00480ebf5ef7a94ae1fcf6be05dfdaa68b8bfe2ad68443150765adb891
 EBUILD Net-SSLeay-1.880.0-r1.ebuild 1441 BLAKE2B a690275a48d732f9e3cca820b5381b38140f5679eeaf8a6f5790fa3745fb8ab311041ed27077ee3ca70a1f81dae2260ccd65a89b733a0866bb17cbdf1d1f0725 SHA512 f84c15e1b45864e0169e9f3bad8a86fd1f862893b49781b01505272896f0de35d3b6e75780577008b78a1f3d1675f877f34012b85562bb4fa8759ea68cbe2097
-EBUILD Net-SSLeay-1.900.0.ebuild 1419 BLAKE2B 6f4344e03aae690a603199ee21e6564bcc08b27c359597b70a02836c9d6403baccca727fa2906e8aeb4347130477ec9d4748d41324938f655eec8aa9d5518dc7 SHA512 2dfdee73d6586400476a6cdde52e5f496a45754918e6098d5eead4fcb2a82ce92929712d872042adc04ad8c858617425bfe78cab64931bcca4c26c82fea0ac5c
+EBUILD Net-SSLeay-1.900.0.ebuild 1414 BLAKE2B f65f2c7be68c5e962297fd4e4eb8a74aff2db039cadc5895874094d7ff3ec56abeadf331f9e34699eebaed8385a814aeb3167a0f7982ee2190fd46796f7b90c8 SHA512 59f089849b92fe63c69299cf89fbfabcf87807797873a66096c85dbb58aa7bc8ade193fea73e597be6dce4f66f9287d08e1063c8d70d0d007b1760620f245142
 MISC metadata.xml 458 BLAKE2B a1f463c2ae637ac0ce9708d85768747073cb613831fad5454e72801618889ce2a96a5b6393aa06df0d0a34a05ef3ddb3aaad00fa1647ec8bde8a5aa1b65a6e90 SHA512 1502d6c58c7345b12fca3555c3bde82403f0a7bdff6d253a31c4b5b82bc981127fb2bab9e03d47d50963c3cf70533ec8ceebc025b71fe9127bdc294f092d955b
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild
index a4ebfbce2ba6..a3cd3dc7e9b4 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for using OpenSSL"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="minimal examples"
 
 RDEPEND="
diff --git a/dev-perl/Net-Server/Manifest b/dev-perl/Net-Server/Manifest
index ae7fb5a1d274..2d55245c3643 100644
--- a/dev-perl/Net-Server/Manifest
+++ b/dev-perl/Net-Server/Manifest
@@ -1,5 +1,5 @@
 DIST Net-Server-2.009.tar.gz 146781 BLAKE2B 64c0040790531dd79740bb320223e6a0e1dae07fabeeeedf8e91da523701020a8f5f7c798868d5451a022f2ef53e3fce927e5389b0ca669f01ca6de9b1d780f4 SHA512 36409f8d2478877c68cbfcbe9c08045b0c24a926b64f022faf3de8f4b4369ff417d5c41ff1e9800553c38da29c6d72ef301119c956cb26439f6b6366ff4b459c
 DIST Net-Server-2.010.tar.gz 145901 BLAKE2B 2b2339064e1e2a6d3296a19a497635fb4fafb7884e15cc04f3328df349086cbea561247c9d53a140e3c43a25be366fec566133a0e51dec1a4bec0d83f0950665 SHA512 b4c1a85263e81c4ad6f32e28acb5176002ad591a1140dca060b706901758f48d3c63c4077606d772540e18fc6fa6772e71d213d0a4940e903c597b0e0f844365
-EBUILD Net-Server-2.10.0.ebuild 595 BLAKE2B 7b6734af931190df87af47cbe53cb171f577da9834947d569a6167abd6d9392da63d800304574c9f8bd7306071ce81c916a0b27a6d191573044cd34b9a77d310 SHA512 0fb462b21ec35e5eac1040cb322f8b1c2fcf992b4e89b45dc28a1ad15eb1fe3e7c7814a3bafcdcb45122734bf90af873d84c52e8728f4686ce287821c0ba7100
+EBUILD Net-Server-2.10.0.ebuild 590 BLAKE2B 649dfd7624ab9b85d309c732f4dd974b735f330888ee1b2c88e4e25ec58eb5f75b9d384f8b56ba25ddea0346bb67aed83f258a029aed323d9ea176fa12e392a9 SHA512 80a370c493131d6f20eb7be47d3eed13b6bd662c6ca5f9c4e3236e9b7da61e6d45dc873c70014e2cdf44e3748b9467643a0c408f32970dc677ceff53a55e45f9
 EBUILD Net-Server-2.9.0.ebuild 522 BLAKE2B b38491c5b16e13d383cdfbd26df8397a814cbeb17fe29497841c84e204c3e8db0497db5514cccf001f5cfbb10353fa5e742e5ec7c40d065b12e44d846df33861 SHA512 6d6394657623d7d8407ead77909baa7ccbb1c414b7297d89d918b3b8d087451d09f37e9267334f1a8ee3b035fac5050bfdfba075e5481557f50fe3a80dcc99ea
 MISC metadata.xml 1989 BLAKE2B 86de38764702f73faaaef141c87d38b424183676402d77618940f0cc3e9f8f7a435d19c8430877c64c0fc924a2c0d2f1e46a153789b65fb40fc2c424fdf39666 SHA512 547744a9e859be23a32c7776267bd5bfea1e8333e46c09ab2d80061b70df1a7becd26866a219ed5fc201bd5be0374f5e46041361afc4be2c25e9c39db5baafcd
diff --git a/dev-perl/Net-Server/Net-Server-2.10.0.ebuild b/dev-perl/Net-Server/Net-Server-2.10.0.ebuild
index 1a022ac828ae..d76bd969fa1b 100644
--- a/dev-perl/Net-Server/Net-Server-2.10.0.ebuild
+++ b/dev-perl/Net-Server/Net-Server-2.10.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Extensible, general Perl server engine"
 
 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="ipv6"
 
 RDEPEND="
diff --git a/dev-perl/Net-Telnet-Cisco/Manifest b/dev-perl/Net-Telnet-Cisco/Manifest
index 8d8c785edf89..5858ff77082a 100644
--- a/dev-perl/Net-Telnet-Cisco/Manifest
+++ b/dev-perl/Net-Telnet-Cisco/Manifest
@@ -2,5 +2,5 @@ AUX Net-Telnet-Cisco-1.11-no-interactive-test.patch 3561 BLAKE2B 32e91eb50abf5bb
 DIST Net-Telnet-Cisco-1.11.tar.gz 19282 BLAKE2B 39925b96a8d709f58012c12ec368c48a54549a324ae0fbcdc4cf97daed034b6cb76639b3fda1c3b77824e5c702f6b8e5abc4093558888788ce6cac19342575c4 SHA512 b12da84517df470d40d56a54e8d8c7b331bed87c3c330da7fc1efb7d078805e6f7348f0b52971d3c1b4e3d39014d76bbe7535c40ad3afa7efcf567521ddf0c4b
 DIST Net-Telnet-Cisco-1.12.tar.gz 19338 BLAKE2B d2b03706942df56ef48e6946241e3805676cf895732ecec03a01b0ae1a4e76b2b811c3120b1017fdc57c9b0ed58baaf42dc7f04baac4605b9c43aa367ae7500c SHA512 c4bc41839d4314610ed3659add2c50a95fbfd46fcc71ed50b16490a7d2acd3e480696de15a2f56fdb9bbad43fc8fea1bb4d1c19bc35140239a192027d85803a9
 EBUILD Net-Telnet-Cisco-1.110.0.ebuild 865 BLAKE2B 8ea5a464950e5da3d220731b88d785e39d93b75f71c9174ea91a645995fd16768e3f22ca97159762e849fdb405594acd255ed7c8d47f3a8d669174833ad1a574 SHA512 041bfb170ce67b59e4abfd9d6bc5bc9f1f3cc97619fd07dc7877ef058eb507237a05a624dab0312e225168e3094dfc8bff0e5375bcdb5ec32c05cbe4345b0887
-EBUILD Net-Telnet-Cisco-1.120.0.ebuild 563 BLAKE2B a71eaaa7e49bbeb48f3b3f42afa548e1302376bb6b29a2caa7923cf84552b61dc21564b6b703c6bbf89982e9b7b340b93e42aadefdfa5d25baf2ad848e922407 SHA512 1e743cfe1e03d7e89079d276006601eb25364ed0ca1b1e2b73b8f0401852e5fa6fe8f9560a8c33395fd52b7979b5b3cb474e7de8e61cf5b47df319313c53e529
+EBUILD Net-Telnet-Cisco-1.120.0.ebuild 559 BLAKE2B f9b6cee59e4c060cca49a92217816ab8b6834300f7baf0ff7b1297124d5c7905dca1e97617213e41038f1adc9d5fc3d97ce8bd4d60b96a029cb6e31d450cdb5a SHA512 ad60093605ca1a4d8281b833f14946f88e45251499554d06cee4fd39f7b6daf3c8d24f873d3d5b9286f3ca1e9fc8320e40bb08b9657aa4782d6800082a91e157
 MISC metadata.xml 405 BLAKE2B 69bc843b13f3d936e191bc1a233e73d7e53567a18e272199fe14b5959d594158835de317f754c2edd20031e1987ab1a67385e7a8f68f72e5059c76418da05bb8 SHA512 8d84c7d06d47dc52c1a9a8f5fa64bf013283a1dad3b3e112d3ed0c8a16d367e04eb5c12326f97448771ac9b340863ad5a11f51b6a427271d15f2f62029787c75
diff --git a/dev-perl/Net-Telnet-Cisco/Net-Telnet-Cisco-1.120.0.ebuild b/dev-perl/Net-Telnet-Cisco/Net-Telnet-Cisco-1.120.0.ebuild
index 1a5b2ce7f66e..19a835db65c6 100644
--- a/dev-perl/Net-Telnet-Cisco/Net-Telnet-Cisco-1.120.0.ebuild
+++ b/dev-perl/Net-Telnet-Cisco/Net-Telnet-Cisco-1.120.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Automate telnet sessions w/ routers&switches"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-perl/Net-Telnet-3.20.0
diff --git a/dev-perl/Net-Telnet/Manifest b/dev-perl/Net-Telnet/Manifest
index 2286fcd6d990..1ec921642a54 100644
--- a/dev-perl/Net-Telnet/Manifest
+++ b/dev-perl/Net-Telnet/Manifest
@@ -1,5 +1,5 @@
 DIST Net-Telnet-3.04.tar.gz 40731 BLAKE2B 4967d03713e06dc49af883b143f67682ee33e3bee05686060cca30852f6c848d0f817b67c30efca44f5a9df769e0934adc042a8336eca88a4f9ee4d0a2f226f0 SHA512 1df68f55ad94d42e5e2be5e0669c2ecd0bc916f4ed929453ee2d136141ce413ff84b883d488c2f815c2c43132f7c3b36178177072fc5172c292e7bc39351dbdc
 DIST Net-Telnet-3.05.tar.gz 42553 BLAKE2B f77717498345010a5d1345e91998830cfa57be055fd335987e95b3a633980a593a239ec5f4220bfbeceb3e192f5cca1701f9e046c28cf1de1842d8bd5b65eadc SHA512 3864e2e6f2fb314d2d80c37597dddc0f4fe6b50c3ec96be3d823667929852fadefd0572945b3b442afe8da451fb279ad335762eeb7d328ad7f8777d3bd8e5a74
 EBUILD Net-Telnet-3.40.0.ebuild 474 BLAKE2B 53203effd95d56452f2e616a3f0077fd5a8e67ec285e1c82182f15fdabad5346797993332e1b1385f4c836f9c9c9e7f7b29b8efe33cc5d38189ac68cf0f000f0 SHA512 6ff59b82dd5884c7addbb3f3142af7533b3cb19bf51dead2239fee4a4440227bda6b8f32ef80d5ab84bedf742570a2824f62ab2d7742aa11a923486989f1b5f7
-EBUILD Net-Telnet-3.50.0.ebuild 472 BLAKE2B 8dee20edd99a2d60af1b6d1a139c329e07e3211dadfdd1ddd638aa0470687ee7abf65d86094ebce4d0f8f3aa7630cde7e0bfaba8e7c233ea169ee2a604f528a1 SHA512 68df46c88410b8702d17b7a27397483b2571e778bcbaed2388bc096f529a334deeab288a5b922e2cadeef9e89813b7d41435eb7bd6deb322cccf0800b1dfd2a9
+EBUILD Net-Telnet-3.50.0.ebuild 467 BLAKE2B c8e9cdfb8ab66025240378eaf921f49af06475b31105f7edd650279e1ac22cb8236c8d16d09869227e18817761204c53b0120e72328efd43a079e3887b331282 SHA512 7c7baafaf5ce548eef659f3e4302d0e21fe608c84fc7a6ca6dbb7b30855d80fc1ef1ba21b446940d617be755c89202ec1207e3a5ffe577a7be8df8091e542fd7
 MISC metadata.xml 392 BLAKE2B c796a42a64667bb07eafed7abc3d7e5e9d46e22040da6a7a268a4ed60ab08d0a84f641c5224b60dba727d40fe7df943725f224fb31cd3c3f2bf372b9a72a5e12 SHA512 2eba3ef6ece516e572449b8d392efea1efaece9e209ac50387af1156eda499b474101ac1a65e53b5cecb9c4b46337aa754a040ace72290136c8f868b3cf98248
diff --git a/dev-perl/Net-Telnet/Net-Telnet-3.50.0.ebuild b/dev-perl/Net-Telnet/Net-Telnet-3.50.0.ebuild
index 39cb096666b6..fcbde9783dc8 100644
--- a/dev-perl/Net-Telnet/Net-Telnet-3.50.0.ebuild
+++ b/dev-perl/Net-Telnet/Net-Telnet-3.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="interact with TELNET port or other TCP ports in Perl"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND=">=virtual/perl-libnet-1.70.300"
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Net-UPnP/Manifest b/dev-perl/Net-UPnP/Manifest
index 576e951d599e..a2c3f271362c 100644
--- a/dev-perl/Net-UPnP/Manifest
+++ b/dev-perl/Net-UPnP/Manifest
@@ -1,5 +1,5 @@
 DIST Net-UPnP-1.4.3.tar.gz 19169 BLAKE2B efb6145e0d39b111568cc452a8f707e747ec75a91cc0ddb3ed48420550822dced164904ae716f72d7ce0b43cca38202cb424ec3c2b77f44da2e97eac557528ab SHA512 72c8733402a7fec1ca24523dbf4b9d7baf0c1bcae44a36bc8ba2193cb40396f6285584c6fc11a961003477a9abbf0a4e2da9e1876e341ddc52da7850540fff8f
 DIST Net-UPnP-1.4.6.tar.gz 19614 BLAKE2B 40499451b7fdbb1d95d275234b717692c7b0eeeb9af67af7b6c3895c1f22186fd05f7945fc6e1715184106eab01a7463b67f6f361634a0727931eabc013d285d SHA512 0cc31576b867420cc7ba684147224daceef3a900066194ca6fc507a8ac309dc2186d02ecd46a4d18e50cd2cb9e6074c31e4fa6b55406657c057c80481f691055
 EBUILD Net-UPnP-1.4.3.ebuild 650 BLAKE2B f5248f92508cba2fe161e178792fed7eaa0495013f56c7ca2137d7e8c66bc55e05966830bab3e1e0ab32f95b93da6ec3ac2dd075c8fb265e93b22214654f46e0 SHA512 6bb043a661f76198c5ada500ecb920ad9884c59dd89db82b76771d9b03ff1ff42844c8181e396c214621554f174546f6206c49656565b7f25a9a195030883040
-EBUILD Net-UPnP-1.4.6.ebuild 594 BLAKE2B 2f24908a420c0ebde4042d7196952103c6cd05fb8777f69c60c877810edf75c50ec59e10a3ae4e1e80afe9f08628eb9cad8b315081a620ed2a9b5abb9b45febf SHA512 a17fc5d43a4c27f8096550da280f63e062ee7ab37eea11bb939908377b65d7be60b530ec178961e2ac862c8d2dc39ec430554a9cd29a189274cf8bd21526e62c
+EBUILD Net-UPnP-1.4.6.ebuild 591 BLAKE2B c181ee62ba7be2e64b3348ed659f0dfb01ac450507d45918163ebad9acd8b0d5fa661401b1d7894fa246e78316a6578c377f4182ae6e3c33018ed2517c5adf9b SHA512 2d5bc885fe18bac4c610daca9e3a9ff2884eb58cee0f71be18bfdab8327997c9ad1c9cd9416b160b4d562e89e312861c81c84edb52f68d6242314c0097a5ffa3
 MISC metadata.xml 1285 BLAKE2B 975e7e3cebbdb9d9c10bad3097661110f9deaa086f06789904d19b746b024f48c447d2be935ff748b9d814f0783dcf05903bfada7c0427aeccbddcea6021c23e SHA512 d413c2c506ec14491115b0c9c85abd922e0879772a0eda6676263adcc0e615f176afd77e22e538517c32234a20ea9ebf0f4532f5e9f15f1d2c8ed88a8d48b04b
diff --git a/dev-perl/Net-UPnP/Net-UPnP-1.4.6.ebuild b/dev-perl/Net-UPnP/Net-UPnP-1.4.6.ebuild
index 676dac267268..0cf8f66f328a 100644
--- a/dev-perl/Net-UPnP/Net-UPnP-1.4.6.ebuild
+++ b/dev-perl/Net-UPnP/Net-UPnP-1.4.6.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Perl extension for UPnP"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-solaris"
+KEYWORDS="amd64 ppc x86 ~x86-solaris"
 
 IUSE="examples"
 
diff --git a/dev-perl/NetPacket/Manifest b/dev-perl/NetPacket/Manifest
index 5d2ec11f1b29..7fa31653d7b3 100644
--- a/dev-perl/NetPacket/Manifest
+++ b/dev-perl/NetPacket/Manifest
@@ -1,5 +1,5 @@
 DIST NetPacket-1.6.0.tar.gz 36685 BLAKE2B d612ff6209bcf6be67c23643cdb8a11a6884ef0c25a795e34482283d2f8664b2730586326b0f3560f67798f741c7645fc5a62d6f8c53738f269b11720ef11d4d SHA512 9482b35294177fbf0c67474f0b14c87b3d8fb61497cef2c65fb942ff9472dc527d24a68fa8656ca71a0ddd73edb4a02240341177a36c4ed0e9b832b20b120349
 DIST NetPacket-1.7.2.tar.gz 47544 BLAKE2B d0ee3567875bb363534a01526e962a0194383f169be01c3532f5b1f80b702bd846321c614dec0c73488624b32aa1e876c55ef9515c5f2c7a291f7beb016bc9c9 SHA512 94fb9b99f8d5443cce76c943ab562b44ee07448b0fbdd86bea35e0dc1aeabbce3871d7115f68c8ca013ad71390c51f2d5233a8f4ad71d796920c3f286cecf4c5
 EBUILD NetPacket-1.6.0.ebuild 541 BLAKE2B 0090f25b311ff5abc95182defeb623339d2754ef58e880abd76f16d8e8d18ad47e75c6e103665445e060a3f305900f789788d8959a5a33abcffe5b75715a6162 SHA512 2e6fa826c51178659125db3799bae11a4623a52d57ea320e7c518ea89a2f1dd0354f21d1ce28d0c48553eed863a66e6d1f8fd09a6c327a9711deaecb07979835
-EBUILD NetPacket-1.7.2.ebuild 479 BLAKE2B 743124ce525b763673a82dda6bbcf1d49eaabd3e9d9204b20308abc31998af4fd72310c4814846adad08ab28ab6136501e7f9f65d470a8666491bedbf7ac2201 SHA512 62e46b9d2c5545f445da6fcf582a56fb1849171a508cb73eddce416df2c80b7d29a1172920c6a15d4a06dfd208e43bcddba6e34358f39204557a3e106deda2a5
+EBUILD NetPacket-1.7.2.ebuild 476 BLAKE2B c2c27380dd711644c0cde2c9fc650f728bcd098f2b14987a53dfb597b9ad1d1bc92ef8e4ea09e8be83999412831f0b3d7977e1efe65ce475797c588c7246d6b8 SHA512 72a7b309eb0c4d171b0dd09d0cec386c047677b1a1b214d340687ced9f961a570d6bb29abb699e081b5641778489c1244260864184778fe16e0ca0dc698161a2
 MISC metadata.xml 822 BLAKE2B 548e7c05840f95d51cc2299780210107b1d98891fd2c00a6476c65c626ecfdc23f86440947e8355f935290d1a9fbaca293514f3647485e4891e07f23c1e7caf1 SHA512 1e1fc3f126a68716b196041e9c972544338ba7b9b94910d6d263d803fcbd5ff4425e46bccc60faaca30cf768dd3630e650b77114309d2b09f6d8b5bc6a0c46e8
diff --git a/dev-perl/NetPacket/NetPacket-1.7.2.ebuild b/dev-perl/NetPacket/NetPacket-1.7.2.ebuild
index 8c554fd08884..56a12e53eb1a 100644
--- a/dev-perl/NetPacket/NetPacket-1.7.2.ebuild
+++ b/dev-perl/NetPacket/NetPacket-1.7.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Assemble / disassemble network packets at the protocol level"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Object-Realize-Later/Manifest b/dev-perl/Object-Realize-Later/Manifest
index e8aa5aea596b..3abafcbf084a 100644
--- a/dev-perl/Object-Realize-Later/Manifest
+++ b/dev-perl/Object-Realize-Later/Manifest
@@ -1,5 +1,5 @@
 DIST Object-Realize-Later-0.19.tar.gz 11013 BLAKE2B 1b4cbcb8f9ffa8dfafc8c9e9669b2632fa3d56034935fe113178a0ae334c76bf509423728762f5109c6ec3f56e1a721dd61cabd21a3d3a62f2b46ceed746f04d SHA512 4e4d57e17600ab553b8c209aac815e64d3b7164d38afd27db2676da774ee95910a00eea09688d49a53734c07c60922901c2bcec46dc6aada9a3b76f3392b0ffd
 DIST Object-Realize-Later-0.21.tar.gz 12375 BLAKE2B 4ca6cf76fa147a662ea15f61f3f96ce8e16db9199307deddb8601ab0313361071ac18dfdefdea398991527f0a1ac7dd814ffa899d3605bb43bfbbbbbefeb260b SHA512 006b54dc97f4464d434f4dd423546f078eb815c4eecba8cf54e292d4b98b679b6c8e8011aab808582553b245ee25013583b8d430762de6e30c3136a87858c21d
 EBUILD Object-Realize-Later-0.190.0.ebuild 459 BLAKE2B 6028f48851d0571b74112d046ceabbd1e963ac038463938f4e1db1601a6f9050b26495e9a85615d65b434de30b48940378c7f5df17172e35563437a1b7bfa9dd SHA512 3c9a1278e9c5c2bcfff58f4252d8dbdd2474632aac76985fd446bae99e514bf4fa9a97b3c17a0fdbb2ddc93b8e78f233839922158f44c0d33244ac4f0db5f279
-EBUILD Object-Realize-Later-0.210.0.ebuild 408 BLAKE2B 42aeadc983ee77fb2db808ba8140aa3f95cdeb692dc07fe01c70615c24fdf6660f1c03a8ae54c2c2829a855b380bf911d6f37e07d9c71ac874b0689a72feaf16 SHA512 b5283d40f2ccebfe9a9e3c30369719d585a0dbaa27c90886a1c6e5c5a1a884599467774890f1190d44cbea037d1cb98407d670bc081bdb09d11ddbac3d746973
+EBUILD Object-Realize-Later-0.210.0.ebuild 405 BLAKE2B 4dccb7bbcb4a1b07fe6455479bd71b2efec331d25ef4e4398b24a794c34c5127458327b9d62ac2658c1892f467d7bb4baedfd39237a8de89a70c5266b8d41518 SHA512 559710807aef7d550db706ab4af0d2473c6eee3f64a7c5cee437a5f92933a99bc7f38a59707d89788383840f92b04e028563a32792531f446cecf82909226068
 MISC metadata.xml 413 BLAKE2B 7de2584d18e3ea0b12f1becfd32acc6f28793288351808ac210d1c4c94a20c6bde880b28e3ff1d0b095b12f6b90ea795de7d77ee0e0772e0f9b555f4a558384d SHA512 b7e535a3dc5be979b51b0d8fee9c5837ef7a778b460a1eb933f9a90bc7ffa7b9f919a7c15571067bee10c3393f1c791d5ce49a973baafb3841e9edb84aa48130
diff --git a/dev-perl/Object-Realize-Later/Object-Realize-Later-0.210.0.ebuild b/dev-perl/Object-Realize-Later/Object-Realize-Later-0.210.0.ebuild
index 62c69511fe06..6720701e69e5 100644
--- a/dev-perl/Object-Realize-Later/Object-Realize-Later-0.210.0.ebuild
+++ b/dev-perl/Object-Realize-Later/Object-Realize-Later-0.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Delayed creation of objects"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc64 x86"
 
 RDEPEND="
 	virtual/perl-Scalar-List-Utils
diff --git a/dev-perl/Ogg-Vorbis-Header-PurePerl/Manifest b/dev-perl/Ogg-Vorbis-Header-PurePerl/Manifest
index 5b2c8a1b7766..7f5f7c8b1973 100644
--- a/dev-perl/Ogg-Vorbis-Header-PurePerl/Manifest
+++ b/dev-perl/Ogg-Vorbis-Header-PurePerl/Manifest
@@ -3,5 +3,5 @@ AUX Ogg-Vorbis-Header-PurePerl-1.0-test-array-ref.patch 1186 BLAKE2B 3f3529aeab5
 DIST Ogg-Vorbis-Header-PurePerl-1.0.tar.gz 16370 BLAKE2B 2b3f09e5875104fe1509b748eb4777a6f41545162f52e1a95c4da149e08efc4d8c518db4030c30edd14aa1c25068552f22c511a4db6f58f5e9fe0175c44cce93 SHA512 897cf8033f38219b1292cbf68e4a84a709d69aa76fd513c72a471c042c7b14aff0ab7c23ca780492e3735450d00b37eec28f62a3f65ffe916710b8d1f224e612
 DIST Ogg-Vorbis-Header-PurePerl-1.05.tar.gz 69433 BLAKE2B 14bca96be5d828ce15408d69faf47a227630df31a86ce2d1ecd450f35c27e627b2da489654e19d55aa304f8d6a624fe61c0baa48ec409f6b946a96e53b3c848c SHA512 46d040ad8cd7d51187ca06b4d8968ad9009a8f4e2b5a164cb5318b8ec126adba787b0d70ace6feda810eaea37e63761dc25dbaa399d86c8fd1a13fe0fc07296f
 EBUILD Ogg-Vorbis-Header-PurePerl-1.0.0-r2.ebuild 497 BLAKE2B f5c72ada6842b1443867ba68e0cdd28c3ec74d64d9419f7da62df90a16e49aaf52f81599e4d9cd7d2afc01dc9404087d19fa2966ad8951bce97fb13fc96c5eab SHA512 d271eb0c35c03f8374d8fca8602d31508a4bae6f2518d453ee56ffc23472815168d76e6f11fec7b941d3330b74f52d42c8f4f054e25c6e50ff1243871f8e59d2
-EBUILD Ogg-Vorbis-Header-PurePerl-1.50.0.ebuild 388 BLAKE2B f10078e30ec90c11f3f012eb4b612c466a85ae5a7970d6be2b39340c6aad50fad9a9f3eddecf8f57f0eeefd39aad31ca111cd6bba4869a3a8ce59bd268bb86f3 SHA512 96d98e3f6f813a4472a96d8c97ce3906183b73102b345f4a1ce527430cad9a32840d84ff99ec267a2f238d1866a7dade35e6bd62f36ed700755d8235e7f2f30d
+EBUILD Ogg-Vorbis-Header-PurePerl-1.50.0.ebuild 384 BLAKE2B 3131a16e3876032d725389d13d9341f1021b6637037cb5cdab9734fcc636d43ddd76523de388b9661c63d1f45740d59c8c46332004793420f6438cd23e0e4434 SHA512 c11e303fb059e0a331e14399dddc385cfc3188f7283daa2fae2a53218f2c3718786ec40d70a4706c22da71310a01c1ed2546e3387a3b767480b7d180c8e6b5b4
 MISC metadata.xml 426 BLAKE2B 9b49f90aa0fe959864ebf29365e7296281f9ae33bc7444780d59ec16bd2db7be80dcfc4721df1e791323522d38d016dbdbf69779eb9b6279388ecf643821ae71 SHA512 c30b9598bcb384713325273aca00cb513224ec8b674a99419b44629d40b4e99b32830225ca86b3aed3584641bcda38229a79c29d61b62388f7e2fca4c7c5814a
diff --git a/dev-perl/Ogg-Vorbis-Header-PurePerl/Ogg-Vorbis-Header-PurePerl-1.50.0.ebuild b/dev-perl/Ogg-Vorbis-Header-PurePerl/Ogg-Vorbis-Header-PurePerl-1.50.0.ebuild
index 78eeac7b4c5e..56920f085660 100644
--- a/dev-perl/Ogg-Vorbis-Header-PurePerl/Ogg-Vorbis-Header-PurePerl-1.50.0.ebuild
+++ b/dev-perl/Ogg-Vorbis-Header-PurePerl/Ogg-Vorbis-Header-PurePerl-1.50.0.ebuild
@@ -12,4 +12,4 @@ DESCRIPTION="Object-oriented interface to Ogg Vorbis information and comment fie
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
diff --git a/dev-perl/Ogg-Vorbis-Header/Manifest b/dev-perl/Ogg-Vorbis-Header/Manifest
index 65a3d165075c..cc73b8a6508b 100644
--- a/dev-perl/Ogg-Vorbis-Header/Manifest
+++ b/dev-perl/Ogg-Vorbis-Header/Manifest
@@ -1,5 +1,5 @@
 DIST Ogg-Vorbis-Header-0.05.tar.gz 39332 BLAKE2B aa20d304ec67facd32ed69c5c5104e05f5a0893ab061720f647a7a36f8054b2e80a3c693bb545ad5579b66b91934071425cf56ea6a9336eea50c8cb960bbdfdb SHA512 dceb4895453bcaccb83f0820e36af08f96525f011603dbad59135dacf84236e9c9dab388256e8518d4e6851765bd4808c616a8ce89d7c95191cced03832eba72
 DIST Ogg-Vorbis-Header-0.11.tar.gz 33652 BLAKE2B 52832de17a22b869596f1eec6ae4bc9cf6780945b683b23c6e1222a2875ecee7a1c6e625120c8d76615efdd2afb3eb5fd1d29e50c3046efd1c99449c6f326e45 SHA512 edef27bcb7d737a655c6f3c6dc4311442bb97f9cdebd14d930a0443fc56f073d47ec73fe2fddbe5d4b00670f8cc833ae6263796f0017d846b43a6dba44866b2b
-EBUILD Ogg-Vorbis-Header-0.110.0.ebuild 499 BLAKE2B ccfa0986e84004e5a75bc6d35ceda2169f2b2e195d45b27c7d1366c2cd3818d68477ebc1cd6d9e10ba9ca7c3502e25bfaf8d005b11d0aa22ca082f61e476a32d SHA512 fb1747b18763829d54ab4fb602fc4590604c0331c1c0a7f682e15811ae1c5faef7279e392a0e4a956d11f9733477e620bfadb0d0e6c0b3a0c127225012ffda15
+EBUILD Ogg-Vorbis-Header-0.110.0.ebuild 497 BLAKE2B a78e2c28ca0fea7c08ff683078684a814f3e4e677b783033982a1776cc7a1c9d523b72e3ab09e45fb20bceb13629c99eff8d1a0c50d9a7cb612da416bcd5bc05 SHA512 71abb41d6a758bb312db987bf8909e4db5f6b4efb77bd2f1708d1792e40d8b1786b5c63766306cfe4ec7459d7ac45873b7acc9508110621b7dd6a5b2997e8698
 EBUILD Ogg-Vorbis-Header-0.50.0-r1.ebuild 477 BLAKE2B c5dcfefff74ca51c165dce0f83e070265813845bc73bfea08942c6196634357dc14b394d747581bc1130f6ee6981fb8f5bf6bdf82355da56391d1842207b39c6 SHA512 3435ad317468857d79a7b0a892061366029a1beb90aaeef503a978f0a5971ff219ec171b4ce5ebe0fb02bfeffd8eec96a58385826b1e90baa8b20472e31c99ba
 MISC metadata.xml 407 BLAKE2B b4cac766447299366c1c58d30cd77a3e798c074654197c1356241310d778adbc229fe7ef0172cca63b2131832dd0adc7c46f6aee43a6e32e10225e95629634da SHA512 02d6977e0c6773a5f59e1ac2fb81c3fef07c636882427dcfab947f32af4b8d3c75bc7deac38579231e58b32893ba4c614aa3dad09b39e7430144d17f92873c30
diff --git a/dev-perl/Ogg-Vorbis-Header/Ogg-Vorbis-Header-0.110.0.ebuild b/dev-perl/Ogg-Vorbis-Header/Ogg-Vorbis-Header-0.110.0.ebuild
index 93c870bd9de8..40d22ef56c1b 100644
--- a/dev-perl/Ogg-Vorbis-Header/Ogg-Vorbis-Header-0.110.0.ebuild
+++ b/dev-perl/Ogg-Vorbis-Header/Ogg-Vorbis-Header-0.110.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="An object-oriented interface to Ogg Vorbis information and comment
 
 SLOT="0"
 LICENSE="GPL-2+ LGPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc x86"
 
 RDEPEND="
 	>=dev-perl/Inline-0.440.0
diff --git a/dev-perl/PAR-Dist/Manifest b/dev-perl/PAR-Dist/Manifest
index a6e94e0f33f8..cec69fc445e0 100644
--- a/dev-perl/PAR-Dist/Manifest
+++ b/dev-perl/PAR-Dist/Manifest
@@ -1,5 +1,5 @@
 DIST PAR-Dist-0.49.tar.gz 36682 BLAKE2B a58bf1a63782ae08af3ac3d5426818013eb63a45cb795be0d7662446110019b10c7b042c428639e75aa0f8372d5359f71562095b538b83ae926cff21e247ec67 SHA512 5b0b69e9436d49ab47c4bca8d48790bbc04fec526eeec96a75c768b13f318cf3a0fb2b1a3ab9f835fb4326af2d1339f85257ec5e96f4dfe0efd77c9a36a89acc
 DIST PAR-Dist-0.51.tar.gz 42492 BLAKE2B c01e9e23e574559184555cc5d64c767046189e9af984e34f44cc7d860218d744a4dc597b543ad0020927d8075ff73b6d6ea36b2854a738adbc53c51e2abede2b SHA512 4c06ff54dfa8f3dc4766b60c45337b3cf80b32ec6bcc49d7e5a4786e0533e495f6215b257100fa5aae50f12e01a8b3d7144254d8706019c50ff115915f0fcb41
 EBUILD PAR-Dist-0.490.0-r1.ebuild 574 BLAKE2B 7e45b245f1c020a6012a9f82ed395553d5d140d7c620727d5b47b2b101a3a0a80cac4f010b4b1b9f7297c7dd17133fbf9e59756ecdce7366c4248e33929cfc7f SHA512 456881eb836b2b7ebadd4f33c5412347c2696f8a061253085e5ace1bb384041d8ffb04b49b084f0995c0d3914c9db47c56aebe9c2e2a8568a9872fea65df3ad4
-EBUILD PAR-Dist-0.510.0.ebuild 497 BLAKE2B 14e24f9244cc6aa793e52e4790c93234c62c3dbed10452e6b315d86095fdab440d51e44932e27f674fae3796e44966d14435724005b85ded81fae25a40ff476c SHA512 63c090dc65e33b5152b23eff1045c855551ccdebb878ab6b45a08d23837b1b5ed319382daf843158175568ad031bb6852310179598d11037e282d2e1a9e6b188
+EBUILD PAR-Dist-0.510.0.ebuild 494 BLAKE2B 93afc7eebc440d4bb49b1c09f01aedf76468bf31fb02d37f73d7444bc0dc4d3cf62fd8c759b805b82f3968339660d584e6352f39be8efb215636efa9983c85b9 SHA512 5ea1457ce6b8aa317e9bc422317e57e9a0214f6c57c99c2333edad88d45b360f776e688275fcc24fd3037c147f46a6ed1dcfd9e0b85690856bcebfcd8e00d301
 MISC metadata.xml 388 BLAKE2B 7b9b282e1e85bca25d1abbc60faf3bc545a863addfc149ff8fc9e44c5e0e04c73474fa43da6f6d1e74440ff7d778f613148114e487f7893c28010efe08b98d4a SHA512 c73c40230b94b2823ecd02a83dd6e14475c0f0fa70eb3ee72ce60c5e9e14221554263ae6f1c4409cb6f7f2e7260dbe377c8a0eb2414ee73e419c18ccbab3eaf7
diff --git a/dev-perl/PAR-Dist/PAR-Dist-0.510.0.ebuild b/dev-perl/PAR-Dist/PAR-Dist-0.510.0.ebuild
index e2b889e4c4e2..333cdbb229bf 100644
--- a/dev-perl/PAR-Dist/PAR-Dist-0.510.0.ebuild
+++ b/dev-perl/PAR-Dist/PAR-Dist-0.510.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Create and manipulate PAR distributions"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/PAR/Manifest b/dev-perl/PAR/Manifest
index 5cc5da5f6b1c..5047b299ed94 100644
--- a/dev-perl/PAR/Manifest
+++ b/dev-perl/PAR/Manifest
@@ -1,5 +1,5 @@
 DIST PAR-1.015.tar.gz 65748 BLAKE2B 1d5bb6dffb1ba10132af09187106406d2bc982fef6258be7b27fe6ca1e600986af8d0050f9011a4d301a11ebd05440be2cb0e17c5d1247ba460474d84add9a81 SHA512 411048cb6517364b04cb46c179574b4baf2dc0788efecedc1e5fe2283a203d25157f1e74411761b8dd3019f50b651b0f40bf7d50131cf40077c4372571aa62b7
 DIST PAR-1.017.tar.gz 65942 BLAKE2B 99acabab41bff84b9445c38dbceffe5731a20afb16cecef20a6d6fa48babfebdba42d675fd813c91cde59b4b932fff00571957bcebb1001c194e90dbc59648ea SHA512 74f7f0645ff7de8fbb4cd930e0be496401821efa6b34578acba6c567ab3126ef221fd0ab45bd4e6e1118099aed1a48bdd572f2c743dff5e919d8d22796da0145
 EBUILD PAR-1.15.0.ebuild 662 BLAKE2B 4c9b8ac24a5ec1a4512db6c6e7b8368bddec8971271ba5bc23d0d6bb523615a1d0fa12492b6c0ac44014a8ae4065fe2780587e806a4387847103f0257a7c91ef SHA512 14e7a1e12c3d98761c5765bdca0c1eabef06c43786a469e770e00424fbb7c8a25d1d38740b104b57761edc8adb212c0bb1390edb5495102c962f345f4043d5a2
-EBUILD PAR-1.17.0.ebuild 593 BLAKE2B 02e611305a33615f7829a6d940cb423b85708bef3bce929b8d46633f8f24e9ebadf4f3fa366dc9746ebf18f9750b48150385e66da6468a7a001854b448321a26 SHA512 8fd4994c1749f3c496e0bc29b68133c4e3a6b363b4d27c576d569a694e37958b46ece4a9984bf031454e5f6daa04c7110624c808e02894fc195012e3800eb478
+EBUILD PAR-1.17.0.ebuild 592 BLAKE2B 256f15a0c8e96201d67a45cb7815ae6228a2ad23338a0b7e657050a048128ff33f474be1774edbd51b9624b3af8ae9c2750a0fd90b530b2898388e9bf3bb6b59 SHA512 0c3db194a95fbd70d1a456139f9ef15444b60877f9d7138fae6f8f8f1ef7bb8eb35da5f1559503f999adbb11f9e8808db1e405ad49e89df7b8e9a880dd356b01
 MISC metadata.xml 560 BLAKE2B ffa951edd39e3094a54207c600c906a860fba38c6a4682868f8d88e83695242ab2fc61d6cd4ff43795c1a844e39b3cda5ba86d2824aa2ddeba4fc859b3738bd6 SHA512 aac26afceb2fc5d3aa63fc913f52cd199b3907a1be0478144cab744a3ce23ca57457e10b13b82c0abfdbc7d485bf385ad4b3f88c20bdb455d39fdd7bbb548379
diff --git a/dev-perl/PAR/PAR-1.17.0.ebuild b/dev-perl/PAR/PAR-1.17.0.ebuild
index 83ebe8254146..1b1f789ff0c9 100644
--- a/dev-perl/PAR/PAR-1.17.0.ebuild
+++ b/dev-perl/PAR/PAR-1.17.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl Archive Toolkit"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-solaris"
+KEYWORDS="~amd64 ppc ~x86 ~x86-solaris"
 
 RDEPEND="
 	>=dev-perl/Archive-Zip-1.0.0
diff --git a/dev-perl/PDF-API2/Manifest b/dev-perl/PDF-API2/Manifest
index b36e2a206198..ed5425342be0 100644
--- a/dev-perl/PDF-API2/Manifest
+++ b/dev-perl/PDF-API2/Manifest
@@ -1,5 +1,5 @@
 DIST PDF-API2-2.033.tar.gz 3533753 BLAKE2B 4a99cb7e01b69e07f8d3f3968f8a1d8e388707dc35e034cb862a3d587d91b5701acf724842b55c6bc010754103ceee3f90e8ce625ff1d7ee850f0bb63720ff03 SHA512 8579114492c8b8fcd8ad7b837e8dea1f7157803b2519883308696f78ce1597688bf5f3b06d13971b5a8302eb03636557de3a7092b8386a6e177748c4b3748ea5
 DIST PDF-API2-2.040.tar.gz 3564742 BLAKE2B 16a33cf2f4cc700fe28ae73b3e01f7215adf22949b5d71c70c08d256c11ce2d007ea3106f9ccf6d89686448996c1ad24edd1259ef621a3056ba1040bde876020 SHA512 4b60e50bfded7c58be5e086db245b59e6f4fa08a9aa52e52f2c67036c27f5411c05ddc3980349ffe30ee20af8ea4f67eb67ec84724fc408e69de5e6da9cebdfa
 EBUILD PDF-API2-2.33.0.ebuild 632 BLAKE2B c19ad1260c5e76bf1dc5fd8dc886e1c7f2f4ee04a030486f72bfcd2fb6d77418d44c40bf1c45be170333a5289b0cbfc883b3b439763122244085727cf3733b6e SHA512 8b4c648ab8dcf51f3c98fd240ff1352b7384998da4659de0706fc248eb8b985d7ee14d7a2dd164738b2dddb523269053b2f55ac8d0853dc0dc0af1db9a91344b
-EBUILD PDF-API2-2.40.0.ebuild 590 BLAKE2B 03a01d8f40a1568beee468f9e81cedd4884aaedadb415d4dc574b1094c9a3cd8041a7952f9a390cd7f629c0fe91a491c99a4652c45b0c08d9709f89f67535094 SHA512 f7a4e63296e5850be65ca327e6ecda0f8645b2adc0647ba7b3746a5386d4bd49d5747acddd497293c29d2038cbed73a3a168d5ab76b76f520665ba138e300405
+EBUILD PDF-API2-2.40.0.ebuild 588 BLAKE2B 6ed0d9901d7f5e6c0d8ce75caa5ebd343a8d3b632cfe3231073f2b686ab242d92eb825891055a64c14c121bd94e7b350f74e9eba92c449ec8606d2edf4851f22 SHA512 63f9f5535224a2578c0cb7708de22068ad6616e62ac2639ba01553d6dc457d1271788d583fcd456ad6111e4104538efa37588843db0100def9f688067cde0235
 MISC metadata.xml 9026 BLAKE2B d18a38e83cd0f8cd899a900f0d6fa339b4df4ba63ea5b7e2102b2b6209eaf2d0fad62ded1e264b32e6f12169ce2245b4b264480c66d247d4d600fe1b4501a6e5 SHA512 f47971b72632b83bb7cff3c4cd1b611d7a7fd3c748293b30aa9acd2c4aad122ee259d8a5b6a04d211872dc9b169c83d7df82d079d9bc1142c261513a383e1075
diff --git a/dev-perl/PDF-API2/PDF-API2-2.40.0.ebuild b/dev-perl/PDF-API2/PDF-API2-2.40.0.ebuild
index cbec55bad2d9..89341089f0d7 100644
--- a/dev-perl/PDF-API2/PDF-API2-2.40.0.ebuild
+++ b/dev-perl/PDF-API2/PDF-API2-2.40.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Facilitates the creation and modification of PDF files"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=virtual/perl-IO-Compress-1.0.0
diff --git a/dev-perl/PDF-Create/Manifest b/dev-perl/PDF-Create/Manifest
index 13265be21be8..e406224699e7 100644
--- a/dev-perl/PDF-Create/Manifest
+++ b/dev-perl/PDF-Create/Manifest
@@ -1,5 +1,5 @@
 DIST PDF-Create-1.43.tar.gz 120986 BLAKE2B 5345f5931e71a7b84f2691ee07493427ff424d98fa282b94e3f85155e908e7dbd8355040d3a2f6250db760c30b540dbd5a91e5a436d29d76eec8337b6dc76a61 SHA512 f63e50ad925459469c9c5bc8f716a0a76d9331702d4da5544f9e179cb6358c4b0550a7ac740bce502ad05cdde24fb6f992496d99f23f3b6b1e41081a1d6bce5d
 DIST PDF-Create-1.46.tar.gz 119051 BLAKE2B ef1336a74a1c428ac9235125647da2ec18579a48f41570f6cb48e10783581678781cd4c2d175cb6215dfdeac4d67db5f739f58cfbf4b0613bf2b9b657dca4df7 SHA512 023dd20ada37f07538f36f60bb9892d3774ae8ef43f003f894bbbf639df3c1194627874e1fc846e00259988168c4c74712f758c0f0e2541e8fbba7d10e9acf57
 EBUILD PDF-Create-1.430.0.ebuild 793 BLAKE2B 4d578197f4c5dc27523509526d848dd4b9cfa45936ef3188f904fe1005e4dc81dd50c044d8e1a790d5adf448e7edefc8de23b0dfaba69f29036ec038f13763ad SHA512 f1ec7e4f67ed2d6eef743ef755eb62c1efe85fbd9090aed8f1bbb7e3c4dfc0621a3e0d08681209796a34bcc7541faa2ef1793848fd5ebbd0d32f76c9cdecf317
-EBUILD PDF-Create-1.460.0.ebuild 629 BLAKE2B 5b8e2ed5420d89b6d8aa83f61adf06cfddd721099f64807d7625fbbd7fb7daf4f104e6df3380ff0f795a2ddab800446f21a2f0a6dbd95f79ca882d6fdc22235a SHA512 269819d12c0829fcaf88b8506ea8897570c89929b3fc1c6ff0751a730693a02994b7834c85f1af9ef0e575c8afc23b08e58fe658a7bb46cffa1ee448a9ffcc4b
+EBUILD PDF-Create-1.460.0.ebuild 627 BLAKE2B e721082dac42c37996ba01f07224c59b55c68888eb345c63a11332d3430b488788e5e6d8e27fb9bbe6c884392b849aae2cb158ba238150a64178e7c926a8e17f SHA512 bdaf5a6b4a0b92302440136df2216c75293223d0f0a84c52ad39ed48b4f3761efd4272bb28348377786a9e8d44be840d0b3784cee46e1a74bd224e3415de16c8
 MISC metadata.xml 704 BLAKE2B 9698c19769c37da58ebc5ad0585e70b9ecce90574908a89dd2ae6142f8e090b0fa9aa50a8230e6d600fea49b182c2f284a87fe3c31e8b5e3577e82270840923e SHA512 b632974f5f4f55b4b5bffe25eb74014a5de8afaf4be8f2139c1bf95ce6360ed1e984e9efb6354a3a060fa52c878eb08036657084039f2aa1595218c1ef77e651
diff --git a/dev-perl/PDF-Create/PDF-Create-1.460.0.ebuild b/dev-perl/PDF-Create/PDF-Create-1.460.0.ebuild
index 2c8283d4551e..a3f56b87f5bd 100644
--- a/dev-perl/PDF-Create/PDF-Create-1.460.0.ebuild
+++ b/dev-perl/PDF-Create/PDF-Create-1.460.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Create PDF documents in Perl"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ppc sparc ~x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Package-Stash-XS/Manifest b/dev-perl/Package-Stash-XS/Manifest
index 25c44b1e878b..a032faf0347f 100644
--- a/dev-perl/Package-Stash-XS/Manifest
+++ b/dev-perl/Package-Stash-XS/Manifest
@@ -1,5 +1,5 @@
 DIST Package-Stash-XS-0.28.tar.gz 74161 BLAKE2B d4e0361ff62ace98116cfca1d8ea057cf6f641b5ca2c88a753b2db0724b96a210900201e3070723811e99f9dafafa7f1dec47595703f832db4962789c9c758c7 SHA512 409e884998bf063f438335067ff8f702aa1f12fc686c1912ad532f6536a711273e52c140d9c407c47b7ba4ccacedec480c1542437a90dd76367dc0f732c0db38
 DIST Package-Stash-XS-0.29.tar.gz 87491 BLAKE2B 330ac0d41da990666f70e813acc83c68bf110923610c61f5a39079a79ed9e13d84ddc532d6aa9192ae1ec09d1d40a6a90dbd35ae6ff9bac75bb6d4ce2394d82c SHA512 f7afcf1a67915d9990a8d63e418ebc6b6b48947b90a72a454b8197656233d8cc976f72d44e4179621628e52fa7ab9a9a74f18f95ad1999d3f45181531ed44849
 EBUILD Package-Stash-XS-0.280.0.ebuild 635 BLAKE2B bcf5068a5892b026d8f37c93dee6767c59f5f258211b9f8656a275137b2fe36f8c6aeb5b7b244b99b4ef2b6f132bca5b5d632501dfe5c5bf75a3fcc8a3f6bf64 SHA512 83cbde3893066f1c6c8756884cf7fde56ce6892524436c34cf98c1971147f3719fd639d29e352acf111768c42980793f276b36fca767a25d88e2357bb893f360
-EBUILD Package-Stash-XS-0.290.0.ebuild 589 BLAKE2B 4c2e22c084c65d455091fa77606d81d38263432cfa68d31f73b5476401a77796c87f1e2a992bfc3a6e3c5df0a301350a5369a3aeaaaa6c8c739990c97a9cdc23 SHA512 64c9a9926afa19f9cee04735e9de101fa60fa38f2b44c6830b400b9b5a7491fda12817fa9e3e7658c37a90df4a31a1fd3e0577f7942bfa6f3c741011607ba3a6
+EBUILD Package-Stash-XS-0.290.0.ebuild 584 BLAKE2B d1bfdc59a0f915a7b00972657dc13c59a1525db022177bda48ef63ea6c2d5309db23800313c4944a3b4f9d004e6194f4015042f6051798580cbdf63d6f7aada5 SHA512 916ba171df8cd76e0048a430b52c53cb896f9a31f8d5167f92e501016faf03760981493ea3666cb3db9a93dc79ef3c360443be62b541552a837f44127341188a
 MISC metadata.xml 405 BLAKE2B e257711d919dea89cf86f1b361af4a1cea58d22f0eb575ac52d56993ca8c27ffc7a1d326addc6f274f98b8f20079ed1fea9d9f3766f26ec31cf302727b7687e9 SHA512 eed17fb737efbdb196d2e2d50ba117f11c61c2180dcd0f13e7b98d8a7773d72162403e73e5ebaf65531792d157d9a6b3f1a614743d4838b684e1a8da04d0a0be
diff --git a/dev-perl/Package-Stash-XS/Package-Stash-XS-0.290.0.ebuild b/dev-perl/Package-Stash-XS/Package-Stash-XS-0.290.0.ebuild
index 7a6e03fa726e..c3abfef46680 100644
--- a/dev-perl/Package-Stash-XS/Package-Stash-XS-0.290.0.ebuild
+++ b/dev-perl/Package-Stash-XS/Package-Stash-XS-0.290.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Faster and more correct implementation of the Package::Stash API"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/PadWalker/Manifest b/dev-perl/PadWalker/Manifest
index 23084a3009a5..0a0835f3e41a 100644
--- a/dev-perl/PadWalker/Manifest
+++ b/dev-perl/PadWalker/Manifest
@@ -1,5 +1,5 @@
 DIST PadWalker-2.3.tar.gz 16177 BLAKE2B b809448751e907083cde30ab95ab6229d47089044ac20695968b3488f7a45beda3b1567ac96d7d76a49c06399307419088a6d3d727a537dcca0859efe6d73843 SHA512 0a222dc2ed26825bc031b0e4b4b78660fe9d1a5a5d98552f30e730aa4c8e5c38577da9a960669258a11cfd712f6e3827bafa23162aa1101f01b47b08e303b4b0
 DIST PadWalker-2.5.tar.gz 16342 BLAKE2B a72f0841fdc7e308c3dcac246821fdf321c25c75f5019396d4b09a7b9461289fd1db8e4cc9c970f37834e06440cedc13c47bddca4ab117eef80549429e3c4e15 SHA512 b0ed680be4a06e5f621b09e57fa02a6516ceca89dca6922bd134f0433f699584a535c0b1155ee54c1a8d857fb989a944dec5013ccb84c41447cac47e12593b90
 EBUILD PadWalker-2.300.0.ebuild 480 BLAKE2B 6f5e805706fff3a0a7bd0d1a5934ba1698a331fd4b2b10424fe59f302a24399c67982aa30d3aac07ec513e99b0e4106e062aa1757be336e461e46903ea6c98b8 SHA512 5da98853c60179482659f79c17d22efd961af219246baafa7b785b44e94293672e2f51a1fed235abea74c89844bba48b17b9ba4097586e8221451d129d83a265
-EBUILD PadWalker-2.500.0.ebuild 438 BLAKE2B 5f1125f64e24457e52dabf7bc085d0d193df1600bfa938c8eb93c54d7098b12dca993079fabfe7e3c48e0db9d40fa600ac7c4cbc7be07848a56d84eafab79c9c SHA512 d4c26aef4091c740c610806b13561a241e17dae12338297795220f2eb70266464b2e4189c13dc99b24c9bc9b762ed61365400887672b950ec63dac564756b722
+EBUILD PadWalker-2.500.0.ebuild 433 BLAKE2B 6c69ef49e0de9cb8714096107c1c6db3e7fe7e6ac01f7c63fb395ebdf4f5daed40c4469310a8dd100e519dafd08f50de0a646560bd3a63eec6d247f19ca284d1 SHA512 df3a4f83e120e3cc4a3a9f1f2920f2c5633fdd12281580539e5dcf074ced0edf8c64105337a51d497ca8d7d9bad04ce7a4030ed883e7089a3052bc271631115e
 MISC metadata.xml 389 BLAKE2B 7c98c1fe323f72769d7d734e454c205631e44cba76754b44cba8dcd3ee863c90719e0d9aed5f9579fee035931066b728ce7fcd46e0559cb5728e6c9bb7a8e869 SHA512 a85027bbaa6c174e996335493d2959a26edeb8147dc2ff5fb89a4580c9d13c590cca322a94e24e1ba1ab19129dcbc298802a4cb26b57e0c421c12f006c5b5432
diff --git a/dev-perl/PadWalker/PadWalker-2.500.0.ebuild b/dev-perl/PadWalker/PadWalker-2.500.0.ebuild
index 834bd7b5107e..fb0bdbfa0ea0 100644
--- a/dev-perl/PadWalker/PadWalker-2.500.0.ebuild
+++ b/dev-perl/PadWalker/PadWalker-2.500.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="play with other peoples' lexical variables"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-perl/Parallel-ForkManager/Manifest b/dev-perl/Parallel-ForkManager/Manifest
index 78c0dcb028dd..34e00b670be2 100644
--- a/dev-perl/Parallel-ForkManager/Manifest
+++ b/dev-perl/Parallel-ForkManager/Manifest
@@ -1,5 +1,5 @@
 DIST Parallel-ForkManager-1.19.tar.gz 24381 BLAKE2B fbd92bdbf69012337419e7d28678dbde291a819ce310fdcd47d05fd150f57a65da3e9e582946adeb95a85b3539447dd315a17746ea9dfa346222ff5a14106e87 SHA512 fdd076de153a09e1e8fb681cadc6c36a05f4c8a6718df61937eb5d26729108a6f2f322a7fb9d4bf6166bbfe52cb857e3ea6cab8368c7b5959500018cc01747c6
 DIST Parallel-ForkManager-2.02.tar.gz 33457 BLAKE2B 7da8a88fc8b9314d5e3e27c50267171f0503c773921ca9cbf512d5ea69d3e244fab6f4e4415c80f3aa169478492ff4f45b82c3ab317ee836d8c5f3feb8056c9e SHA512 2b390ec8f252e7bf2b6be8d602b231b1fd347bc5256bf7f16a6d56f67256938f3d96b7a28c92c662d8b91441b7fa4cb5922c655e64a7a4a9332eb58f19b6bcfb
 EBUILD Parallel-ForkManager-1.190.0.ebuild 703 BLAKE2B fd036c5803289bfde76348f3b968ed84907f31d17e79b0dfa33e35f1e0d88788e5e00cb5ab87658f894671b7de634c4a7f025ebcf1b758e5b05473adb1a8ceb9 SHA512 f6993f9080e492813cbfbc39eb3df91041b9fd7faf5f759ecdb231e3aba402924d7d8b675b7432aa00611fe74455bbc171c77b7d7d1ca835758c727bcd3dc193
-EBUILD Parallel-ForkManager-2.20.0.ebuild 713 BLAKE2B 76737aaa050ff59283f4287d9d238159d31f42e26c150d70761a778d70e78e47e362fe46a60d0fb1d16a7f1688c2b476df815cc809ffcf152af4cb7bd717198c SHA512 9dbfc604ad76f3dee3669f9183e543e147baacf1f5b0a193a7c4a8d65a6646c0f13fb80a63100c7eabccbeeadfe79c31970c949dfc35ee887e1b9da97a1a781e
+EBUILD Parallel-ForkManager-2.20.0.ebuild 710 BLAKE2B d503935d1e1b3662398d7ca6eea71c4c3f8bb60703b94338acbfe5d8c8e313c0d94d0291bb07af01ff2c4a9baa8d0a7bcb83cb2098ac1e476a88453437cde3c2 SHA512 47b92453350dc42548f111aa432174c83d34d396332283b6ade4b6acecc147acd737df6430ac8a999f74c5fd15563556fe146184dd1ec72fd9f3ddba25328c1f
 MISC metadata.xml 412 BLAKE2B f9685f233ad57dc03a506dad17ed7ca7db47574c9c86066925fb083917fee2d75de7b889a50be75a1a0497088b4ec87f8f0a44c3ba1c8cecad5320d10ced06f3 SHA512 3ece8329d77002aa4b494d3546d98dc46561326302daefbb46791da19e1ec0c6d9de654655ca434282202a3772baac665ea2cf4f47ce75464b2d17b5050c250e
diff --git a/dev-perl/Parallel-ForkManager/Parallel-ForkManager-2.20.0.ebuild b/dev-perl/Parallel-ForkManager/Parallel-ForkManager-2.20.0.ebuild
index 93569aa4fcce..407ce44fa640 100644
--- a/dev-perl/Parallel-ForkManager/Parallel-ForkManager-2.20.0.ebuild
+++ b/dev-perl/Parallel-ForkManager/Parallel-ForkManager-2.20.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A simple parallel processing fork manager"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~sparc-solaris ~x86-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Params-ValidationCompiler/Manifest b/dev-perl/Params-ValidationCompiler/Manifest
index a95079e47853..47aa5c0f7d14 100644
--- a/dev-perl/Params-ValidationCompiler/Manifest
+++ b/dev-perl/Params-ValidationCompiler/Manifest
@@ -1,5 +1,5 @@
 DIST Params-ValidationCompiler-0.26.tar.gz 44588 BLAKE2B 8dc61a15e7a559ead00f6e9a4c05c0eb17f14cebfc29ad69db2c0c4814eab9ee84312cfa98c4683b9b7c6487af5c47afa47cf33600a1209195cb8e7b016dc657 SHA512 f393b1cf063ea4e504ddbc863b4f478924b071810431b7817bf6faeb1fe632cbd493bc2e96033dccc99c4ecb5fdba072044f90387c92f262b54cf8f0b0386c0b
 DIST Params-ValidationCompiler-0.30.tar.gz 49796 BLAKE2B d6a50a1b8c457a961677586e364f43ab039b8df26c8349befa37e77c565dd4b24b5d88e0c54697c66d8ff69776b6bf69ab810a6f3ab78a9565163c5371bcf80d SHA512 5911f9317f0b72e17c72435420a3b6b9f36780ab70715510c46e847970094e730169b9b3085f29cb23ee0aca2e78f7f9edd0d093859a1062869f35c90172bf05
 EBUILD Params-ValidationCompiler-0.260.0.ebuild 899 BLAKE2B 7b2b6bf7f3164b4a67d46a54fa667cb4a71e978b43b8d0eac3c6a0f70325f224895294a0a5eeba8673178dfa82efa5f26a0b234c6510e1a865272ae15732fcfb SHA512 404d147ed0db5be6973b7a9a6078c96860bf3e603885897c2275a79043271070aa0eb6b1875a4c7d7fc21184dd6553ac43e88ccc2a1e4fe195f1fa623ae81b64
-EBUILD Params-ValidationCompiler-0.300.0.ebuild 870 BLAKE2B f982c70e93986e542eb7b844591b3ec2a182b992f6a9e369c293209ea048ad5489457708b2d7d0b1a8c58c45c188997776e769e27c740eb4007de9a47554cb44 SHA512 fe5fa1f470f86edbb125e1795fa39e3fa0c3e95d5808ad42f9bd0e678c2b473db1295281d364186283ca3fe132992c7c22b36b2622dc093c14a79d8c6ca60156
+EBUILD Params-ValidationCompiler-0.300.0.ebuild 865 BLAKE2B b66b1994e32f77c67774a652e9d885d51c8ee94d738b357dde451b2729df5bff0990d8af3fcfc36e50cba4595295a7a42c8a2f664d3d7fedd19a5247b4e4a0ab SHA512 f6f65d42ffca3c43b289fb3887fb3f0e39c76174d765dc78f31c642d49b84aeb843c88779ccf84dedb1335303e85aa55b7b80bbc78f0ef30ddb9bd2d5da09fdb
 MISC metadata.xml 590 BLAKE2B 7caf050225ba76929c61e7782f322517105fd429fdfb301ecc58fae55347d8c1f0da4155c951986c4f113c885e8939ac120b7b2478bde6d6d8f4c3dc0cc4f284 SHA512 9635b89b9c2297a9d33d30b89b393e4b0968432d9f99467a8d7844f3a0d046285937ca9713d662d02d0f2b46e502fdf1936960b2d2ee8db519a654221dc83890
diff --git a/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.300.0.ebuild b/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.300.0.ebuild
index 27dbdbea7cf1..49794c9f3d12 100644
--- a/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.300.0.ebuild
+++ b/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.300.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Build an optimized subroutine parameter validator once, use it forever"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 LICENSE="Artistic-2"
 
 RDEPEND="
diff --git a/dev-perl/Path-Tiny/Manifest b/dev-perl/Path-Tiny/Manifest
index 07e503dd80d8..045e980d5b28 100644
--- a/dev-perl/Path-Tiny/Manifest
+++ b/dev-perl/Path-Tiny/Manifest
@@ -1,5 +1,5 @@
 DIST Path-Tiny-0.104.tar.gz 93011 BLAKE2B 6492f651d1b5aa82309d0caf32a97bc890d8952b0fb37429babbba4c66beab24dd3e6bb2e36aedd1098b98828b367e43d25b6fc7529ae897358ea60373797200 SHA512 6574e48645ebb4f61d45c1365e8b63cfaac6423394ba08363cfd62d3d98d163bd333d997bf5f7fd0e37ff94fcb3a3e19871eb7499b295399f048fd6a4bd3c78c
 DIST Path-Tiny-0.118.tar.gz 92950 BLAKE2B 4521765cc5486266d6d8cdded83cd73b3bbc302afa60d96c8ba0f025c9c949a3cd3839ce20fe91b7f64698013306951c184d76f53c510183560cd2d75b76b7c0 SHA512 cca91e7fcb099aa7aec73135d295f3f32366ca4bec17201183d3e5cb69cf7e58f2554e162318bc34dc787689bab338286937c0e83065d8aff4d4862aa53efc61
 EBUILD Path-Tiny-0.104.0.ebuild 999 BLAKE2B 98fcc98f9d755ffe8fccf79df53629bdb000c30ab9f51806e0584c4e22572d898924c3e9c0b65dae9b803628808979b5c355213c3efc1003c3c8587876a53188 SHA512 3bdf802b8fdd20e3c110de231293a2cec616d55224b957014ad35fbe4c6d32586a54d3881f13462068ec98e45ef5f91bc1b2f6e22901758c69a3b9182a957f18
-EBUILD Path-Tiny-0.118.0.ebuild 998 BLAKE2B 852416a4c9e7ad608d3298ffc083c0bdf22a57f78d1223559d5f735c7b45fdedea1a0afa262bf513a946a55cad71a0216e099ed12ac75b7ad634ab52ede8be32 SHA512 b49ed780c639430816dca93a3b34cb7efc483f0eb9571b4ef64a9493eaf8bb9a60df79b6c6a1c45664298b601b3523f0de673afbf4112cf95b7393e1fb165f80
+EBUILD Path-Tiny-0.118.0.ebuild 993 BLAKE2B 6020e7350fcd250e8b50873aeb436014f45ef33c001a22040a4a56af7c065c41301194158a66806455318464f208a0649abe455d4384422d874195119d7feb51 SHA512 5033b83c32fde065761ff4b0486f1d3dab364c5f975c57f1ce849f69f087aa19b0aff237af7cac30d711a22a14d1d5775c0b616a2ec293d07d7cb2bcc11b87ce
 MISC metadata.xml 454 BLAKE2B 14146a711440cfdc26ceda88d069c2cd4a8873fb00cd498c4602221c09acf8b6458e4b58a59ef64a04460fba994193e1e6766f4d1e77e59edc6d5f2c6bac0132 SHA512 95e88429a9f4309e146db578b6be913fe804e18249c10bdafc93d8ea98b50e0aa9106d655f80ed11010769db0c5d579cec164fc3f68adca300a09045f79c159a
diff --git a/dev-perl/Path-Tiny/Path-Tiny-0.118.0.ebuild b/dev-perl/Path-Tiny/Path-Tiny-0.118.0.ebuild
index ad24d06e1308..1a94534d2bcc 100644
--- a/dev-perl/Path-Tiny/Path-Tiny-0.118.0.ebuild
+++ b/dev-perl/Path-Tiny/Path-Tiny-0.118.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="File path utility"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Type-Tiny-XS/Manifest b/dev-perl/Type-Tiny-XS/Manifest
index 806c0ed17d4a..7e4d41637457 100644
--- a/dev-perl/Type-Tiny-XS/Manifest
+++ b/dev-perl/Type-Tiny-XS/Manifest
@@ -1,5 +1,5 @@
 DIST Type-Tiny-XS-0.012.tar.gz 77259 BLAKE2B 6443598a77bcb3d630ff048d649f46659ffd8ecffb968b597d64a245d19dafaea3217c7a63c2bedba551f6d21ff1dbb02c005461dff282955838ca1c4dc75785 SHA512 488925d913872f1f5bf73d8b165b1e04bd8f86bda44d594819120760f79c877d4b1be9f2924712ceabaead8822710bd8851f8ff5bb79f91b07fa253ce9ef7a33
 DIST Type-Tiny-XS-0.022.tar.gz 81002 BLAKE2B c2d2feb551ddb4dd4cf558732692a8026923cc0da184d19b9263bb86a948dea8a7ba521598cedb00a26989ef2bf14340f975ce57bfff09997cb16d55f4bc88ab SHA512 6774980289ceaa7aa8517681cb2d4638a0020b4eb584d6e281d22edcfff829131f2472a4982c1d044e8aa96baf71381bed78d02a096507c7bba3ca137e63dbbc
 EBUILD Type-Tiny-XS-0.12.0.ebuild 606 BLAKE2B ed32195dd79ff0198c8a44081d8c9462f7fd1487c4b2ed8d7de54f470d453434baf2006f4477f2d6c1e2d944032d567fdfe7f45033f797ba4b3beabdc359bcdf SHA512 a91412a1216a70697351bf0e7a34a15051a0f46152299d5b0240f7a90e336e3a40b792b74a9faa457379d564be7dfd4bff778568358bbf367b028fdbf98acf81
-EBUILD Type-Tiny-XS-0.22.0.ebuild 619 BLAKE2B 221e7acb047dd8a74131b081df9f90b32024c2015024bfe0c23dbf2d77f4842a281ebad3838420aa8fa91e58210bfd3d85f641f5d83c86ee19292e7e6d6e4742 SHA512 ebaea9fffa0649bca6285c5aeb3ce89c11051b8bce57a9f9edc37849e42bc04263b6a87a2354105f6dc0e44f4c47455d579c3a20598fc05afee9a0c19c71ebde
+EBUILD Type-Tiny-XS-0.22.0.ebuild 617 BLAKE2B dadec66a025234a7f7fe859c82b4dadd79956cdcc0de78667561c544b79d43ab2da634b062d2b513c532dc3a1fa27ac084f929ce5bd6f935bdca41809829fc2d SHA512 e5cbf22a5c3182a1715941f8d1e41499bfb648d54d608182b9d4c45755fdee00aa0a1d676635d9b098685c4717219d7cc77ebec9780e94f69e7bb235f9cbda13
 MISC metadata.xml 450 BLAKE2B b5851e50574255cf3e6d9c25181c511c14770acf1ac669ecf24d6bc8fde7e7926b2621f0f47d01bf2dcfc0bbef01e400725d28bae1a4200e049d7a122187b8c1 SHA512 0f3d348a16193d537d1e693556b5400a9ef9001e435b638beae8a87c4c23ec416cd1310a6fc56378dc0565a9e133a57343260bc5d445097b932868bb92510ac5
diff --git a/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.22.0.ebuild b/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.22.0.ebuild
index 1f40a7b1c032..539fca803b73 100644
--- a/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.22.0.ebuild
+++ b/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.22.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="provides an XS boost for some of Type::Tiny's built-in type constraints"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/glib-perl/Manifest b/dev-perl/glib-perl/Manifest
index 044a5c2e6874..6710a69f59a5 100644
--- a/dev-perl/glib-perl/Manifest
+++ b/dev-perl/glib-perl/Manifest
@@ -1,5 +1,5 @@
 DIST Glib-1.3291.tar.gz 301944 BLAKE2B 75ecded774ec2654a464594693315003c9805efcb444c4b3cd1f495afffc011a294217c3f8e91c0870707a56b6a8fa1f04a694088b0ada939703fe7e73f8c312 SHA512 5c596e29c3e2ef72908668ddf1f260cf217b64d73732e90ef0fdef007f98b29efcd0620f01e0a39b5f2a0b368d4a05926543c9db0593bfa5a027e86af95fddba
 DIST Glib-1.3293.tar.gz 302831 BLAKE2B f2554db363d4966e90f34439c2b014a30ec1fd13add587ac4d72558c2601796e53d8b89de052daea2d5e2a900d2b7928b9005fb9e197e167767b2fe1ff4c4dbf SHA512 139033e207ba9b12eb8701ea9e6e363f6d36e68320cb1a8b4d5943722fe80330594e42fd6d8061794d97dbdb06fdcdd48efea480a254a1e8981ea70e933346d4
 EBUILD glib-perl-1.329.100.ebuild 866 BLAKE2B e5b89cbe33299336797010991196a91966bf773661559836c63440406acf89e6e29c7edbc33b35c8d6042291496cfb77bb073d4ca8f365975b74ac471e260169 SHA512 678a6a631e53444e462fd334b16f009d883576a5174e8ea1eceac0063c1315174aca13e009254f716d5cb97489903c768dc4d077300e781ce26dc30764ac9b21
-EBUILD glib-perl-1.329.300.ebuild 896 BLAKE2B a16a9846db1504bd6d2ee98160f7827f9a6469c85dcf4565425f633424cae6f6752dbe17cb5479754b9cddcf6e14cc1064d78cb0e34f4ff45d4a1a0c81e28c5e SHA512 ad483d442ac52317660cceaeef097a5365f352526ad19e3c9a734b555198288f8eb13da4653caf2e8319a49f488adb817eb717ef40be970fa85180ce786662cc
+EBUILD glib-perl-1.329.300.ebuild 891 BLAKE2B 7fc0cedecd642789bc351f8b95a68e384fa55f297bdc1100798d6f135b31437e0c31aa0c20a5adc8892493c96a897647dc3e2d7e316f4c6f3c75cd381a2250ff SHA512 5605b274c959e256655405696f5c37f627f6dfe562d6063bf2a11c6a4fe9efb93fe55abe6df557d0350f3943ee56887f77e3039bf208797b691af88d798b0913
 MISC metadata.xml 1365 BLAKE2B 4d2fd978585574009f27a294d7b5129203884d61d4da4b7283a5ecdae0f16c625223f2db26b6ac210a38e6d1307dd64e912d9acb4d3b2038a4ac7611ae0be095 SHA512 0432b79471db1629a75a8d8cbdec17adf89388466e213f1525cb571504d97bb844edc5191c8695d8616d659e8f99619dd0357d86d00206ae345045feff3cad5e
diff --git a/dev-perl/glib-perl/glib-perl-1.329.300.ebuild b/dev-perl/glib-perl/glib-perl-1.329.300.ebuild
index 5942e7eddbaa..8c19b32acc2c 100644
--- a/dev-perl/glib-perl/glib-perl-1.329.300.ebuild
+++ b/dev-perl/glib-perl/glib-perl-1.329.300.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Glib"
 
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/gnome2-canvas/Manifest b/dev-perl/gnome2-canvas/Manifest
index 47520f5499ba..a481e8117439 100644
--- a/dev-perl/gnome2-canvas/Manifest
+++ b/dev-perl/gnome2-canvas/Manifest
@@ -1,5 +1,5 @@
 DIST Gnome2-Canvas-1.002.tar.gz 62040 BLAKE2B a172b5b23eee3016fa955aabefe715127f5797d6626f37dd59fea14f51d52cf672b9f13413f7b64098d83dc5858f6a9d8fd27c5b3165988063907cbeaf4dd178 SHA512 9ad7e5b5a29b1b90cecca56c63165b92ad607a6f6e260810c597081a77a282910e85d372271d2f4e299e8e0728b79733f39439e3927237a92b16251d7004db89
 DIST Gnome2-Canvas-1.006.tar.gz 63156 BLAKE2B da080e18b75ae275f32dc61421a1d069456ea79c362616d47f4a89e5efe64a9a196f6a7ae5e547d2fc2c40d358adf2ddf8385a4f57ba6264754f5d5e7b95439e SHA512 1de13983f6e64880ebf202ecc6017414882e5f30da2f4de64534bbc9b06c846e60b07a8f61157c547093edc748a5b0d1cd44562401e8cec0d7f429fb5c5e754b
 EBUILD gnome2-canvas-1.2.0-r2.ebuild 629 BLAKE2B 09d290c8081392864e8d847841a7170f25f1df14fe3ed842ba0efe9417af8f2bc8bf8590441984a9495c33158da77186f55b5db8c0c96937c2509bd83a017580 SHA512 c7b88fc8e90c1466e584cec1394682d508a099cfdfffb8f36c5e5c7bd8b7896c8740f7f52488471b0a840f0b7dd329022410c4a0a31744113749c71f233e4fe7
-EBUILD gnome2-canvas-1.6.0.ebuild 654 BLAKE2B fe330c1e4fd28a2a389772a7cb8826f745ae8f5c8b6783adc5bb1b8a845757d6909817f3d60c61d9839c2045cbaac5488d73aca58b0151e2f04af1e45b3168f9 SHA512 00499e7263d8ffd41f83a4993aeaed62d2f6f8131539e9241ad64f2dadb9e39f2378772aa00db368bb6b39c262a7a282adb7e32f796f8ea09a043f178fb35003
+EBUILD gnome2-canvas-1.6.0.ebuild 651 BLAKE2B bd8fdba5ad5ab9e8a55f64096b237c17cb804005c0b86bba0654347378a8ea15bb294b0a6b99d68603fe0a7779747e0706bc639d2dcdbaf1e31131a329d7e621 SHA512 736f35765d3fb6e96807a6d00bebd21240c5b7944b319960c40503fde60d8c0d0b23c6f39299a96f8147a75da7b75c20e81cb34697ff0b88a172f76b301f3ba3
 MISC metadata.xml 398 BLAKE2B 2ec6508f9f53f353ffc81bbc16ee3b155d7df7e7db01d08d0ee6aa01ef33e7cf1d0abe8bb55fbd3c6db64e56d094a63407872c49c48c415f055232fdbf040edf SHA512 2b1cb0e49c2443443b77970bf702000a9fa02199a3da13968f5bda7385dfa529ced38df17b125f448ce1741d15085254d77c2ab9438818dddcbaa6b1cbb6968d
diff --git a/dev-perl/gnome2-canvas/gnome2-canvas-1.6.0.ebuild b/dev-perl/gnome2-canvas/gnome2-canvas-1.6.0.ebuild
index 0f8a521e0527..681834f65372 100644
--- a/dev-perl/gnome2-canvas/gnome2-canvas-1.6.0.ebuild
+++ b/dev-perl/gnome2-canvas/gnome2-canvas-1.6.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Perl interface to the Gnome Canvas"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc sparc x86"
 
 RDEPEND="x11-libs/gtk+:2
 	>=gnome-base/libgnomecanvas-2
diff --git a/dev-perl/gnome2-wnck/Manifest b/dev-perl/gnome2-wnck/Manifest
index bb18274fa8cb..a243a3d89f52 100644
--- a/dev-perl/gnome2-wnck/Manifest
+++ b/dev-perl/gnome2-wnck/Manifest
@@ -1,5 +1,5 @@
 DIST Gnome2-Wnck-0.16.tar.gz 24865 BLAKE2B 05012a21a3eb0531ecbaaa51db880783b9bb2d58a0eea2d43a5bb9c6b12d71dfac1f62dce7f45cf0c96194b313b3cfddcfec6d609d897b43e91c6796565625bf SHA512 d8ed39cd19ccaeb5995d97b392d1cc97fe0c9bb66781efb70d6160f50a212e263be3bb89c33ca1ff0ed3da3c55fd9968fa4026abcf8593996760831164acd00a
 DIST Gnome2-Wnck-0.18.tar.gz 27130 BLAKE2B 18ad7853a421ef11e57de10226af672470f2ea34c936ea7b3a5a6224ca089edce07afbe5fc228796fd18475027ab34908bf151bfb51acbda3690ce71c4039636 SHA512 acf1b4213070a7696426e04246ed01f2ce2ae2b196a62e3e69feab782b590a495a482b8dee866d788eebe8cc5eae81db9171d72fb9ddd7509707090380a09a89
 EBUILD gnome2-wnck-0.160.0-r2.ebuild 672 BLAKE2B 324c04772fd448c995298d425e2d634d916d75992361b6a32b48e1bcde43acec6af04fda7aa88305ae47c05c35e0fd0748b26ce61be842a1fcb23a416b31f6ac SHA512 9618f27fe6c9830b1c2d60407f4c11021b23f734b073d5525efaf701ca7814559332f29ac25123584790cef23ff3e7f8c53826ec5227ccac3f7e5d2c2de5cc3b
-EBUILD gnome2-wnck-0.180.0.ebuild 672 BLAKE2B c4ee1c7da46d0e04e5e586be2745bff6b3b3ba7663383c3e9c1a6612a96db23ce773551ef24c6ee5b801e7ea642772814cf419bc67d3598882b7797d2d406986 SHA512 e2561a0632d38aa89077b99a09a33168db8318d52202733381532f615a19d21d12a4447b88bd2ff4ce61621c53ea1b9965cbceb89eef612265ec1ea4800f8f65
+EBUILD gnome2-wnck-0.180.0.ebuild 670 BLAKE2B c592fcbfaa76c9d6e48dd8ef1d68e380b218412236857aa7baf8e0d3ffa763df942ec1ce7e10377d1c07e11ad5078bd09ba738404a91b0ab86aad6ef41c00a75 SHA512 6ba569a357e516ec8b07e59cc985e0812d1b45be7cd3ee1165f65f49805b9df91a8fc90b3f18bfcd4435f5a1b4179a714980a2797c60705e2270c5176cc894d4
 MISC metadata.xml 450 BLAKE2B 6e0684bbf9d51749219b6389b378d2eaa334404f69d6bc39d5922d2fd0a0b7e959ed26ec6fb2fb6d46f0257526c1fc15083c2a33e86d3e12288c22318a23fe97 SHA512 d4c40c7e5d46352fcffb3c1816df6675816f4469b39281648621526bc45ce47bc2de25eb0416f31eabe29ae4509253eb22fc83d7c18a68a5b2b75da6649840aa
diff --git a/dev-perl/gnome2-wnck/gnome2-wnck-0.180.0.ebuild b/dev-perl/gnome2-wnck/gnome2-wnck-0.180.0.ebuild
index c7fe4f1d7402..96d5ac2788e8 100644
--- a/dev-perl/gnome2-wnck/gnome2-wnck-0.180.0.ebuild
+++ b/dev-perl/gnome2-wnck/gnome2-wnck-0.180.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://gtk2-perl.sourceforge.net/ https://metacpan.org/release/Gnome2-
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=dev-perl/glib-perl-1.180.0
 	>=dev-perl/Gtk2-1.42.0
diff --git a/dev-perl/gtk2-gladexml/Manifest b/dev-perl/gtk2-gladexml/Manifest
index edbcacd6c1fb..2b26989eff19 100644
--- a/dev-perl/gtk2-gladexml/Manifest
+++ b/dev-perl/gtk2-gladexml/Manifest
@@ -1,5 +1,5 @@
 DIST Gtk2-GladeXML-1.007.tar.gz 38496 BLAKE2B 2a9dbd9fec4dcc40edb311a64d013de726e567bd7dd4218ed169479e2ee20fed1f8ae41cd413aff77917033fa8e25d5a87c29deb9152d00631a07564a869b525 SHA512 e40b859e76f99c5c9497e0c123679c916b3f5615aaeb208f56a9a4758a2a8a5d5078d4bf7b441ffc6080162a04bb146739457bbd71e4a443a2d092ddbb1ed94f
 DIST Gtk2-GladeXML-1.008.tar.gz 39653 BLAKE2B 0441417b50c531e2df2871b7b04a719a1e866799512a26cbf2040faf00757c12eb1d9deff8936ee9cd528b7bab2a59e64521dbe5d26e587a4d57f4fd144738c7 SHA512 bb95bf1ca2d8da6007338d5d1630620405fed4fba84670f3b5e8115aff80a4f5cd367d4b0bb2958fbbb8d8815002b0a7bb2ee9de3550e56ba9782a531f70ab6a
 EBUILD gtk2-gladexml-1.7.0-r2.ebuild 678 BLAKE2B 3298a05aa7eb1dba94b40679dd01b0da93186ae4b197d414e8932d78a9ff2696ab8c598f738fe7c5fb0b259aad4a559bb88cc1878eac9a9e515beede42db7dd3 SHA512 41bedc793a00fa0d6c167d14f2264d1fb82dddfb731deb5db6a7afdcb41f4adfe10faa80e7b7155246ab45492ea88f28293622f831c0392ac8fb2e8296a9c5e9
-EBUILD gtk2-gladexml-1.8.0.ebuild 674 BLAKE2B b0b19e29d7b5a0d060476d4ba4e3f234eb73129b7b6ce264c00fae4a4840d6048c687b217eb08684bef9e095aa518bb7fcb03cf1c9c25dc8255376739fdd49a8 SHA512 ffca77453b0443caee2f0f4025fee0efa48dbfa4281f30d04d5b254be2e0c634693decd62cb0e05103a2d8683a6a18043ac11f5f0d42f42a1b71722ae1eda962
+EBUILD gtk2-gladexml-1.8.0.ebuild 671 BLAKE2B c4e8201adf6a85cc092ee431d01e174cac7602505eb5257327648fb886335c02f5cc17661fcfe8980b0295543a434698c5eaa614e1bbc1503766599fc9bd9aa0 SHA512 5e6600299e2c857aa1598203576b1862acb99c5c5ab61a69318961f9381bf019b795e44128d878e03446824e311db3fb5a8b485efba5a289ab3e3a099fdfe590
 MISC metadata.xml 398 BLAKE2B 956641fe1b96ad91cc19984b4dd0243916e840ef627fd0e945b66bda33d9dd8a062d2886c8d047428f23fb411b7dab8b5139766aecb1a7adc1383f957fe0bc0d SHA512 f2a4335f43f2e5e6951f79ed31bcedacd0b4728670a0b223705cc78a95c9c2e984b314c6af14c8642ee2de86d1f9d67468aafe7410b8b3b1b126ad97bf2e5bc5
diff --git a/dev-perl/gtk2-gladexml/gtk2-gladexml-1.8.0.ebuild b/dev-perl/gtk2-gladexml/gtk2-gladexml-1.8.0.ebuild
index 30133c486870..26d4fe1452ca 100644
--- a/dev-perl/gtk2-gladexml/gtk2-gladexml-1.8.0.ebuild
+++ b/dev-perl/gtk2-gladexml/gtk2-gladexml-1.8.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-GladeXML"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ppc64 x86"
 
 RDEPEND="x11-libs/gtk+:2
 	gnome-base/libglade:2.0
diff --git a/dev-perl/indirect/Manifest b/dev-perl/indirect/Manifest
index 09ecd00914c7..35fbe0eddb32 100644
--- a/dev-perl/indirect/Manifest
+++ b/dev-perl/indirect/Manifest
@@ -1,5 +1,5 @@
 DIST indirect-0.37.tar.gz 54892 BLAKE2B 28ccc890a61eb6c6ad0c164d408580f2959b4b41cdbd2231a34a136ed16b0af33f90d300b1146c68ca0cf14b2b6aa056e1e3a55e9bf1c290b3e5e737a454f668 SHA512 8d46ff62c86b23519b030474155f7d8aa4872a9a4a2bb1e3199ac506aee60343b4c572eae8fa41dc5148c115de3c80bcb7f21900ad30822dc9eb437033defe09
 DIST indirect-0.39.tar.gz 52231 BLAKE2B 8e2f9765ece6c2878e77eec2da0807b6e28c46868de213b99208bc5952443829a18083452abb806b37e4272029c16aa5db371bc757d944edb6b8f7710c06fcb2 SHA512 d3275a2cab2eeceef61756e08947d3072c0ce5cea2e8b70870c5fcbd9c63e56cf70568395002b7d02060cad3482f7f56723b1ad85fcf0a4c4ee2568b5035816c
 EBUILD indirect-0.370.0.ebuild 628 BLAKE2B 747a8415bcbe1e5b7b9314aa6c9adee79e07a8eac0e01cfd6ebda0bc6c1baa0fbf7a05aca25405f5c4505336e09279f25d02e3b8ac6a951046efc544f3494685 SHA512 95aaf62ba971bf93de81dad6beb4c07f7e26e938e5b40d67b5cb46885df0f458d93c497d9591302d57f52d3cc2fe1c577ff987b1036fcca0f10cdac1efb2bc22
-EBUILD indirect-0.390.0.ebuild 602 BLAKE2B efc8dcd5fa4b9b266d2e6244b31e124ec82e01ea0698033d32eb84c1c1e275f8588bbee21f69603064f834d4a44fded2db1934f7f922c7cd365886d4e8e06f5b SHA512 81137dd764f82ed44c57cdecd5f1772017b7c30d85decd8b88cb5e3348013c4b8403521e8d9514f07028471ee97c7e9567b1882ba6f52d0cc75346fd0dba955d
+EBUILD indirect-0.390.0.ebuild 597 BLAKE2B 01c596459d67aad26bdc6fdd4f5094fa4992bd097ed076e50a9d29d5b310475ee6fdac9c063aacdb4f3071d0f52be24e7d72060e97c49c6c4a03049e640b450d SHA512 5be62dae5f9f4ccd73e54a092562f2b4fcccf5b76e90721aec0a472d7b82d3897d221ae8228467a09cc2f8bbb58b94b4468bbaefafe8a3834cef2844ff3bbe11
 MISC metadata.xml 375 BLAKE2B e64e10776f8d36ac7082e4e29a8366449422117463193cc5308f4832da92f67a43cb91925fa9aae2f287a1aaf81dfa2eda1ec5e3467e467a02af762e0757b08c SHA512 7237dd49000e3cffe04121f726aa9453e0ef709b7f43d1d4c583bcd363c0732415fa79a49ab1e7cb864e35563480a20e750782719ff1f897ab8d57e80644b33d
diff --git a/dev-perl/indirect/indirect-0.390.0.ebuild b/dev-perl/indirect/indirect-0.390.0.ebuild
index aae1bee3914f..5be98cc43f01 100644
--- a/dev-perl/indirect/indirect-0.390.0.ebuild
+++ b/dev-perl/indirect/indirect-0.390.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Lexically warn about using the indirect method call syntax"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/libintl-perl/Manifest b/dev-perl/libintl-perl/Manifest
index 199019e06ad8..4c2cf42743de 100644
--- a/dev-perl/libintl-perl/Manifest
+++ b/dev-perl/libintl-perl/Manifest
@@ -2,5 +2,5 @@ AUX libintl-perl-1.280.0-sanity-2.patch 2085 BLAKE2B a36355f8cec583a6daac07ad9cb
 DIST libintl-perl-1.31.tar.gz 598187 BLAKE2B 6ce30e51cb001993d6ee3727c69010a3d8d9014334df8749704760734486e50296cdf019e185b463d4ccb3aac660526b440d4217aa5b304f749c5ecf43d18ca3 SHA512 9e22af95ecb8ae1c115114ce5d4f80bb8b1a83e4072d274a55f5946267ac29b98e9da4c01e05d0aa0051fef34a41b6297dbb44f51b8d602f3ef3786a59a6a04a
 DIST libintl-perl-1.32.tar.gz 598209 BLAKE2B 1aa9ef3e2d4c1c15eb5301880e2141864d53e3e8620656276ceb07f0946612d56801021bc78bb132fee910f3ce3e55e3a092cd0305831680a9adcd731249c680 SHA512 fca6c8863dfd36c7604bc80a401e825eb707bc75016521c09006c34c170a41b009d30ec93d7e2a7f61caa1dbdf0333511c3d515d4fdc0fea32242eca68a7e35d
 EBUILD libintl-perl-1.310.0.ebuild 817 BLAKE2B 5c627fa8eaca89d350209a63bd8d22b2e6ed53d415449d69f40fea6e3d202c952def1cd9a0135b3789ed69c3a1591621ed1fc2ddd6d87c4cc9c081ca5b5bd007 SHA512 78295a10cdae0c92edf019fb349e8ef92c68c16eade0f4d2a154a13a5b9b69a7a1fde18a9c3d1fd4d51513e453b2fc63112a4511f69a30bdbb4791eda6690d88
-EBUILD libintl-perl-1.320.0.ebuild 847 BLAKE2B 22fdb024e4e268e88b1b855bc03bd27cee7104e476e8883af5914b3158da60e6edbcee9cff644abde78aa621a3ae52ac8b50879d931894f1ea6f102a838b7dae SHA512 b071f0a3c71dbe724fab1859fe1d289845d348f91532fa9f92662f6776bc9c818870bab22d47ef7362bbfc67fc131401b290c3e3ad28d1fa20b2028e2d723853
+EBUILD libintl-perl-1.320.0.ebuild 844 BLAKE2B dd1acfeefbe675dd1828d0aaafc9426dc7d5a0d7a9a3d746066e426247d479bc83815166c9843e6f0c7f20773fa797d76cfa5fda67d82c644a7569efc5a3176f SHA512 c8658a55a47e65e7a95ab8f1478e4a49925897eea3fbb3f0fe154d05c2318974a4a6c2865f8826bcd8b7e40f6194139e0e951f4a7c6ae8598daab9794309c9e8
 MISC metadata.xml 11484 BLAKE2B 6d4b9ed8ddbab8219bf47d61bf1985895f7c78753943039e4ba178b01bb907a5216f0704f77e1c501d76e50401e5b3f4e7fd29e8a193bd65a3fc54c6e0e4029a SHA512 264a3f0d04a6eef4b8c730634af0de431798057d6a8fe9b802a999ff446ffbba53cc9fe2746f128002808a8e72f575387107784aff2c8707999c1c068bbc3b4d
diff --git a/dev-perl/libintl-perl/libintl-perl-1.320.0.ebuild b/dev-perl/libintl-perl/libintl-perl-1.320.0.ebuild
index 47b0b9db6861..058a54311823 100644
--- a/dev-perl/libintl-perl/libintl-perl-1.320.0.ebuild
+++ b/dev-perl/libintl-perl/libintl-perl-1.320.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://guido-flohr.net/projects/libintl-perl https://metacpan.org/rele
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/libwww-perl/Manifest b/dev-perl/libwww-perl/Manifest
index ac9426df17d7..a55284252598 100644
--- a/dev-perl/libwww-perl/Manifest
+++ b/dev-perl/libwww-perl/Manifest
@@ -3,5 +3,5 @@ DIST libwww-perl-6.53.tar.gz 177561 BLAKE2B 254b9c7c02baf339d9d63c00c4cca229575e
 DIST libwww-perl-6.55.tar.gz 177842 BLAKE2B 5952f311024357f8601e0e5583ae4cf9e18167aefc20a9901a090df7dd0b7f61266784fe3ca3a64d317cb089b0f8aa61e5fce61727ba7b43eaec555d131c98d2 SHA512 4a26bbcea343af513cc7d22761b7b9412da864bc7ff5e6d8cc6494978ceb829f001d1e221482a215e363e7f7857002120dbd12fda14b1b5778b1f437a5e338eb
 EBUILD libwww-perl-6.270.0.ebuild 1901 BLAKE2B 5ed99a37fa6b6c57faeb1900a1523d73bfb9caca49ee49a7a79def70506c508fbad373353ab5a6219b5f5bb9a2babe136f898c3720f33a8c8a0e58ce6395cee6 SHA512 31e0f15796ba09815a67b9481d002f33ecd4ce5818d44aaba592f457e21d4477ef70d0a06f518b32bdf0402b96e8efae87521f08062cddac04450370117bd1ed
 EBUILD libwww-perl-6.530.0.ebuild 2017 BLAKE2B 942ae8e2018b8d7ecb0a7186833ec364a3304556ee52c9e02000f053262a4c582854dccc2c07cf984f5b39cef7985c1c83edb6823df58f3b4f8076cf4c04437f SHA512 5f12103a313d5fb37c853f353f2a0ee79421482d59223a4eaa174b18753c935aaceac4630221990a0b088608676d905ad013f2487e7bbf5cdbc38b0a96793c1d
-EBUILD libwww-perl-6.550.0.ebuild 1994 BLAKE2B a31f8d278e7aa56c45b0c20325b5ab942ddfc30ad792d054350603b8ddea7cb776205a838c6a7605e40d1386b45cc76a8424668192ee5edc143f2580fbd30248 SHA512 953f8cdc9348d69925db7ab7e35657540b6de3c602c98f8270d64005a32eb697c8466f9a301aaf7198143b1d0edc3fe8db8efc93b4998b00372659408a1a82ed
+EBUILD libwww-perl-6.550.0.ebuild 1989 BLAKE2B 21045cb357facd5a2c232b2081c8058221c10d3cfc2ece91b0125d5806fde85779db9be4f5e10978c443fc3b45e9d27634a48a9a8a796d2641bee175b9de6ef6 SHA512 e0dc3d8ced141de3fc8579af1e86b75132d95c14e10e08efa0b0e8b7eb26331ab8849e0bc3a07bef68cebb0a4626e4436de06b673804c1a915840b39374bf390
 MISC metadata.xml 1921 BLAKE2B 22c228aa757f00263a1f331482e24e83acdd93186747ad53aedf289f9a1fa97642a21a43ba97f64a508f023e27dcb0a8e78d2d4ba20ec296e6851e6f7370f5f4 SHA512 77a8184ec9d8248afd05f6cfaf8d69f26f85eff2ab95180cf763f9b2334e7fbb83ffa072cc5c9cdbb99a592db860ac4f7e3b21c29104a460f5e4a2f44e3251ee
diff --git a/dev-perl/libwww-perl/libwww-perl-6.550.0.ebuild b/dev-perl/libwww-perl/libwww-perl-6.550.0.ebuild
index 63e38c0e77e2..5e3487a2a71c 100644
--- a/dev-perl/libwww-perl/libwww-perl-6.550.0.ebuild
+++ b/dev-perl/libwww-perl/libwww-perl-6.550.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A collection of Perl Modules for the WWW"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="ssl"
 
 RDEPEND="
diff --git a/dev-perl/multidimensional/Manifest b/dev-perl/multidimensional/Manifest
index 5b323bb6e9f9..e1935956a8b1 100644
--- a/dev-perl/multidimensional/Manifest
+++ b/dev-perl/multidimensional/Manifest
@@ -1,5 +1,5 @@
 DIST multidimensional-0.013.tar.gz 67528 BLAKE2B 8167da19e5bc0f28547277580cefa871031b7dc129fc6eae521ecc4e5e5714b38b5c5b32446dc41123b6d79c93fd7399e6cd4f33d244d85e937deaa5831ffa2c SHA512 9abc93efd0060042f16c9e89c37a11a08c781ab2d095964701661a17f4adfeaf7cf3cb134db9c91a366b5ddda482716eda5d3b002fdb38fa4694d7e24dbc76f6
 DIST multidimensional-0.014.tar.gz 66968 BLAKE2B 0496081f7ea4b0c33e5805b85213fa582d58218d7e50614ae0a8660b1d28f823eeed3023f2fd10bb9055e89e38d365f4c1e9741fdaba0d6bc5fe1f67d7a8c461 SHA512 94c9dabb3023165a8dd140ef791e4aab980e3b604eae06ed0e29290aab67a9302f2cde4c8b394de0b4c55c5f78ce4510db902d615d665bf60b12ec409f341043
 EBUILD multidimensional-0.13.0.ebuild 730 BLAKE2B 29f92908055d710585a73dfd31382168862b349418e4e33f510ba03e9aed6986d6f8bd46399fec26f0c9c61e9788bd6bbd913e76f76a17641cde51956214204e SHA512 fa2f287a452c01dfa14c40bdf09cb2e431cf84a1dfc43bdbc56cf6111b73bc7df7619cbaa14e3ce1b49cbabe54008bca6589aff00f02d3ad0b6ca26da11838df
-EBUILD multidimensional-0.14.0.ebuild 661 BLAKE2B 3eec230d193b0a9e783023dccb7e2a8ae9d4f2e7c7d1afc2a3dedc3a85ba9eabaf0e58f7daba03183d63b7db188b680818431bd27d21b060d8747fe2d48687d2 SHA512 14e8cc40a55b793c3a29271d06c419a47cfc8bd542428605f3c8aa1cdb1db12558c680b8992ed9413c5875cb088bd94d4e5fdadbd835c7680eabc6a02e2f9ffa
+EBUILD multidimensional-0.14.0.ebuild 656 BLAKE2B c049b06b97be68378d72c5dd212f244ac909df7f72c92cf39baf46053ec4bb0b4ef3dcc7b67ec1d6cbd999ef464351dccaa1da6a026719ea30df390c55cf06e1 SHA512 e91740f0992a7dc11fa98f4e5cfa80487b863fbfc97dbd336051f580408126c51879ec2f1c6b0dd830d3ba22a68669f344dcbeec8abe1bdcf404841c35608746
 MISC metadata.xml 403 BLAKE2B 870297fd97515f9de1863ee0feff9176340b423acfe8033eab27041d366cbfcef1494bcc15446838693e6c8b61c6815ea62ee6f6c5c949d2d590254e2b92b5b3 SHA512 0e28ef2915fe99d06a068e221fcd34c9cb388ef1afe5f9750e88370f84bda19fe3083523bacbed95204c1cc1a2ac598e38e872c23b07069d42cc2b26998558b8
diff --git a/dev-perl/multidimensional/multidimensional-0.14.0.ebuild b/dev-perl/multidimensional/multidimensional-0.14.0.ebuild
index 7e04f6a07615..151e4932c016 100644
--- a/dev-perl/multidimensional/multidimensional-0.14.0.ebuild
+++ b/dev-perl/multidimensional/multidimensional-0.14.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="disables multidimensional array emulation"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-perl/B-Hooks-OP-Check-0.190.0
diff --git a/dev-perl/namespace-autoclean/Manifest b/dev-perl/namespace-autoclean/Manifest
index 38aedc64f4e4..2390e201d394 100644
--- a/dev-perl/namespace-autoclean/Manifest
+++ b/dev-perl/namespace-autoclean/Manifest
@@ -1,5 +1,5 @@
 DIST namespace-autoclean-0.28.tar.gz 36130 BLAKE2B ecbc71cec5256087799f91b337c98d87bbc8be7d670b03b74533f01724a7251cc592f26669756756413dc52d7d25478f22d683e72a9df67a687a862a09819bf0 SHA512 2541f69862b334fcfe30059d025668175de1b182a5c8ee8f2619bf1d661c316a38fe2014f274bb23e887cd36959f98abb297154ac8ceb600e2e93cbd4a75e28d
 DIST namespace-autoclean-0.29.tar.gz 38791 BLAKE2B 7d35dce524f8a5f9ab757f24802f8abb3972f8c3176a5ff2ff516b6a88f547978a47bce0c6be61d91a4d0f72caa5d14b6af2e83ead92608edfc339fabc36e99a SHA512 64dee8009c8ab587c1aef504c0b429248a9069e6cfbfcb4062b83ddf56c82121be66f821013f3251e6863935429e0663aec82202352904983db600a79348732c
 EBUILD namespace-autoclean-0.280.0.ebuild 800 BLAKE2B 17d642d0bddce8bf4ebd8fb97bc9fdbc15e76c18e3704f0c4bb706ea1e7fbb36b47289e2e14d5e7fc10a76d3f1a452a6ab320c75c3502210a0c84d0c8f868dfc SHA512 fed6e40d528438e9727494e66883fa0c6234e3388325141fb336e2594b8101d35f6b188fd48a885b286b393a10c0b1aa071747a5ed158f03c2a41b0f5c76c4c7
-EBUILD namespace-autoclean-0.290.0.ebuild 767 BLAKE2B 5fcae5c2e94f918aca13da9e28fffb46b9148ff582203dcc9e2b4981bdc294d00af151641218d28e252de9b6c4feafd64e96d6169cdac35bd5178145b1ec554c SHA512 51303fdc0b002e485d9a454c58e1ae87cef3792c542b774715b5147d109615ef2b00136a82926b9596dd2c615897fffce742003bf529567e0ce0ad4c9669a8fd
+EBUILD namespace-autoclean-0.290.0.ebuild 762 BLAKE2B 1d3c50e04f925f278437f02dd1795b29d910167cccef99d4d787b243de3c64e8d220774aa244caa620d8c304512df6ad379d59809b9f2a4c95200f487c44466c SHA512 751f2b3b175d7c2053d147d4be3eb1072cc2ac110c867f4f5b3defb27e836a73b016c4d24f717dd1d782b177b62fec2fa4e6a2ec019f4ab96477800180fd88b6
 MISC metadata.xml 410 BLAKE2B 253c1f1b727fa4b6f8e336806756909de12d17a2f75880fedb0dd4abc7c84e096b5b03e4b2bbd493a67a18ec462a7885b12ed50c0db11373eabb6247d3c6b3f8 SHA512 27e0bffb8b96ab0449bbb16249ed023a836f3bc7b803cf03b761baec7582df30ae0e3881ee8b5b120dc68193c1a06aca5ab2f292b8e1f0f464d127c0f72ce692
diff --git a/dev-perl/namespace-autoclean/namespace-autoclean-0.290.0.ebuild b/dev-perl/namespace-autoclean/namespace-autoclean-0.290.0.ebuild
index 4fb67242cf8d..68f8ae3a1334 100644
--- a/dev-perl/namespace-autoclean/namespace-autoclean-0.290.0.ebuild
+++ b/dev-perl/namespace-autoclean/namespace-autoclean-0.290.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Keep imports out of your namespace"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-perl/B-Hooks-EndOfScope-0.120.0
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index ea0f68f54f78..41731753394e 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest
index 404854685efb..03d625f88f13 100644
--- a/dev-php/PHPMailer/Manifest
+++ b/dev-php/PHPMailer/Manifest
@@ -1,3 +1,5 @@
 DIST PHPMailer-6.5.0.tar.gz 99073 BLAKE2B dcb917233da29ab45305f7cf0405f9bb384bd4f98f062a74d94a168868d0cd92017e555bf8e7139130dd669e0a04917e3789c548b5165112d591aa403bfd56b8 SHA512 0632ec8b80c30393b00aebbadde7dd032eb2553232a100a74d69b6ed6465adf1eb3a4acca0aaf040665a978e7507aee9350b092336056ccb5306fbaea4640376
+DIST PHPMailer-6.5.1.tar.gz 99913 BLAKE2B bf51e2caa0ff1d113d6f96f5c1ee055bacd40f8a251302452eb2ebbe06d1f926935b5d85c1b9e85d115180473b76077f753f0c8af04aa86c86db3431c8a412f2 SHA512 0f8e9e3368edfdb67c701a0f42c548379c9528a90bc016444ebdc9614967ca421fa706b5f1b2de89a91fa98f7e535fb67da578ac6ba1b73f673ba7b45a198f0e
 EBUILD PHPMailer-6.5.0.ebuild 2195 BLAKE2B 54fd8e6fb8cf1e7907a2055e2e8b035638c46c8c0136be68b5889b1dbcfe82206575b02f1302a5a22dca3171d9b79a03cb71ebbfe9565aaf7c298eca4ec47b20 SHA512 71791e9219d29b6006e0092fa82f646770b8703891be17bc6559f8c0ce4441c3efa37ec2619d807ee51185a54da259919261e94b2d38372a766c57624cca6600
+EBUILD PHPMailer-6.5.1.ebuild 2195 BLAKE2B 54fd8e6fb8cf1e7907a2055e2e8b035638c46c8c0136be68b5889b1dbcfe82206575b02f1302a5a22dca3171d9b79a03cb71ebbfe9565aaf7c298eca4ec47b20 SHA512 71791e9219d29b6006e0092fa82f646770b8703891be17bc6559f8c0ce4441c3efa37ec2619d807ee51185a54da259919261e94b2d38372a766c57624cca6600
 MISC metadata.xml 446 BLAKE2B 178ea98081e664641c7a8632a1c7dac9b5cac8992b0b945208f5ef654633340daced2473bbdc342b70d8b168ac2206ba132f7ab9601f61b5436f3eb3e0441ca1 SHA512 3dfce858cb0e00b526f04a5764a6173d4711db4f21f52b6d827b82f1cddea4e33f533e645dae95d0bb6a69699b00520a414f2e322c76b56aee1e4ea047bb4bb5
diff --git a/dev-php/PHPMailer/PHPMailer-6.5.1.ebuild b/dev-php/PHPMailer/PHPMailer-6.5.1.ebuild
new file mode 100644
index 000000000000..48dc349297f3
--- /dev/null
+++ b/dev-php/PHPMailer/PHPMailer-6.5.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Full-featured email creation and transfer class for PHP"
+HOMEPAGE="https://github.com/PHPMailer/PHPMailer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# To help out the Composer children, the tests and examples are missing
+# from the release tarballs.
+IUSE="doc idn ssl"
+
+# The ctype and filter extensions get used unconditionally, with no
+# fallback and no "extension missing" exception. All of the other
+# extensions are technically optional, depending on how you use
+# PHPMailer and whether or not you're willing to settle for fallback
+# implementations.
+#
+# The insane dependency string is to prevent the ctype and filter
+# extensions from being provided by one version (i.e. slot) of PHP,
+# while intl and unicode are provided by another.
+RDEPEND="
+	ssl? (
+		idn?  ( dev-lang/php:*[ctype,filter,intl,ssl,unicode] )
+		!idn? ( dev-lang/php:*[ctype,filter,ssl] )
+	)
+	!ssl? (
+		idn?  ( dev-lang/php:*[ctype,filter,intl,unicode] )
+		!idn? ( dev-lang/php:*[ctype,filter] )
+	)"
+BDEPEND="doc? ( dev-php/phpDocumentor )"
+
+src_prepare() {
+	default
+
+	# OAuth.php relies on a (now non-nonexistent) autoloader. We remove
+	# it early so that we don't generate documentation for it later on.
+	rm src/OAuth.php || die 'failed to remove src/OAuth.php'
+}
+
+src_compile() {
+	if use doc; then
+		phpdoc --filename="src/*.php" \
+			--target="./html" \
+			--cache-folder="${T}" \
+			--title="${PN}" \
+			--sourcecode \
+			--force \
+			--progressbar \
+			|| die "failed to generate API documentation"
+	fi
+}
+
+src_install() {
+	# The PHPMailer class loads its language files
+	# using a relative path, so we need to keep the "src" here.
+	insinto "/usr/share/php/${PN}"
+	doins -r language src
+
+	dodoc README.md SECURITY.md
+	use doc && dodoc -r html/*
+}
+
+pkg_postinst() {
+	elog "${PN} has been installed in /usr/share/php/${PN}/."
+	elog "Upstream no longer provides an autoloader, so you will need"
+	elog "to include each source file (for example: PHPMailer.php,"
+	elog "Exception.php,...) that you need."
+}
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index e76ac49f9572..8cb21fde74fa 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -7,6 +7,7 @@ DIST composer-2.1.1.tar.gz 513391 BLAKE2B 9177eb7d1acfb3557dde0382e0d0b6fd367a16
 DIST composer-2.1.2.tar.gz 513790 BLAKE2B cc1c807ae4d69537541acf3ec384dbad64bf3196067c5ad016b03903e9b47460a6757c0fe692600f3042650c030b323f0a0b5ef4c3933049899843cbdc8266dc SHA512 1835daeb943af2ff58e5f5b3966b59356c14ac740689779c05fa0021174a7d0ac2a45aae7f54fade0695ca7eedf59f7ac4c9c14ae4aa1e4a5fbfb1650aae8ca9
 DIST composer-2.1.3.tar.gz 514147 BLAKE2B 3abf64aceea5b95b72419b60fc74d23e42c652036690c2e31b4250eb4a0e3607a1b4080745642fb085be75dd1174073164f9a8a1422745b4bff5887df694fd99 SHA512 d3214f39651e323b419979ed150d5239f992a6b643048a73a777ece0a1b3d5e3dc2c58a5084b3e825834acc258c18947b0c6461c47960a10552617c8f541df86
 DIST composer-2.1.5.tar.gz 515243 BLAKE2B 078b14727aba1d6278e046e0a1a7b90edae6532ae5874093824db39bb10a0f663543944fe0bb17ddad3dbf40736eef1bb1a8049f5e4dd557f6f01e0d854c213b SHA512 cd4f166d3d1ca7edc8b473ac47775caca98dc2a8bc758b34e6fdd4669ffbe0aa71f900a366e40ff73f830aa602377a5ef3f40022006138e216f0127c75120b96
+DIST composer-2.1.6.tar.gz 517576 BLAKE2B 27a7c76d36a0c86110c2e39ba5977b7ea04bd10897dda4b563edad9cdf2b7e134d3545e5efa5eeb1518f1f0d5366c29de7fb1d6e9032b567195676de121bedbd SHA512 244d64c3c1eadb58ea945e8d448c3fdcf83a6bb3c09eede63c36a6e11f7b2131a797a9ca10c5447bf868ea3439681f9f9079933e26953b5387b7e0c3333480e2
 EBUILD composer-1.10.22.ebuild 1233 BLAKE2B 8ca659735c9256070bdf634a96eb790a23ef4a5f6e9bc1c4d488d2082d97d87a043b8becc944f9e33479516b40c29b2ddd93c7fe4219c1a3b143c333464b160d SHA512 5cf952c3bda93befd1a77ed5330905f3be8bddb254cdb3d52c6ea6c24eba0bfd32cb936fbbbe18e18dcdf1362b5e423b45f47346f1fd5e5192753c66f51e00e6
 EBUILD composer-2.0.13.ebuild 2228 BLAKE2B f12244d8bada90f5ebd47e5c4d4b706c48153e6f56948103bf17e6ebd6fdbc44056e97ad67bd4fd423bcce9fba03584369c9025d3ed936f8ba1c1bca14a79b7a SHA512 8eee72c7edfd358f0dbb69c334d3df62dd3e0c1d74ac17ef49ca53655934ef5ae6e6c1a4d2263e766afcb0204eb72cd886ca9f1a0ad5e825d41a7eb38243d344
 EBUILD composer-2.0.14.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
@@ -14,4 +15,5 @@ EBUILD composer-2.1.1.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535c
 EBUILD composer-2.1.2.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
 EBUILD composer-2.1.3.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
 EBUILD composer-2.1.5.ebuild 2228 BLAKE2B a0655fea3563734d657745a9fa9c8f785cf234d879033f43a4e98d333dfe51d011401db8fb7d16cad3191c86bb330ddaad759a3600c6dd8668bc4963c0adb253 SHA512 e5490a298b4a5ca5133ace4bf3ca317ea1b35b212b2574d0e8fd1dcc22226cdd32849f57c0a26f0be03586c602c9d3f4b70442bb1b9316984276aaaac120b635
+EBUILD composer-2.1.6.ebuild 2228 BLAKE2B a0655fea3563734d657745a9fa9c8f785cf234d879033f43a4e98d333dfe51d011401db8fb7d16cad3191c86bb330ddaad759a3600c6dd8668bc4963c0adb253 SHA512 e5490a298b4a5ca5133ace4bf3ca317ea1b35b212b2574d0e8fd1dcc22226cdd32849f57c0a26f0be03586c602c9d3f4b70442bb1b9316984276aaaac120b635
 MISC metadata.xml 804 BLAKE2B 7d5f809e3017ddb3836c494f03798eabd9f604ba6987ee1c0b6a21b0b6697e7142557f03b066e7b236c9330cf8505a87c906591fd571545294b70f3b70f2377f SHA512 cada8e3b771827502011a1f074082ef7193b014b7ac2e1efe3f17e6fc126d712e64afa0ec6177e8c0d37681d5d57daa04637e89cb10a783c6278c58606e12ab5
diff --git a/dev-php/composer/composer-2.1.6.ebuild b/dev-php/composer/composer-2.1.6.ebuild
new file mode 100644
index 000000000000..1dd769c75b17
--- /dev/null
+++ b/dev-php/composer/composer-2.1.6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.0
+	dev-php/fedora-autoloader
+	>=dev-php/jsonlint-1.4
+	>=dev-php/json-schema-5.2.11
+	>=dev-php/metadata-minifier-1.0
+	>=dev-php/phar-utils-1.0
+	>=dev-php/psr-log-1.0
+	>=dev-php/reactphp-promise-2.7
+	>=dev-php/semver-3.0
+	>=dev-php/spdx-licenses-1.2
+	>=dev-php/symfony-console-2.8.52
+	>=dev-php/symfony-filesystem-2.8.52
+	>=dev-php/symfony-finder-2.8.52
+	>=dev-php/symfony-process-2.8.52
+	>=dev-php/xdebug-handler-2"
+
+src_prepare() {
+	default
+
+	mkdir vendor || die
+
+	phpab \
+		--output vendor/autoload.php \
+		--template "${FILESDIR}"/autoload.php.tpl \
+		--basedir src \
+		src \
+		|| die
+
+	cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	'/usr/share/php/Composer/CaBundle/autoload.php',
+	'/usr/share/php/Composer/MetadataMinifier/autoload.php',
+	'/usr/share/php/Composer/Semver/autoload.php',
+	'/usr/share/php/Composer/Spdx/autoload.php',
+	'/usr/share/php/Composer/XdebugHandler/autoload.php',
+	'/usr/share/php/JsonSchema/autoload.php',
+	'/usr/share/php/Psr/Log/autoload.php',
+	'/usr/share/php/Seld/JsonLint/autoload.php',
+	'/usr/share/php/Seld/PharUtils/autoload.php',
+	'/usr/share/php/Symfony/Component/Console/autoload.php',
+	'/usr/share/php/Symfony/Component/Filesystem/autoload.php',
+	'/usr/share/php/Symfony/Component/Finder/autoload.php',
+	'/usr/share/php/Symfony/Component/Process/autoload.php',
+	'/usr/share/php/React/Promise/autoload.php'
+]);
+EOF
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r LICENSE res src vendor
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index 9ba86279b93a..18ad350ede5c 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -3,10 +3,12 @@ DIST igbinary-3.1.6.tar.gz 220415 BLAKE2B 62bc77d5b3ecbccb9e928e30f33a598630d3ee
 DIST igbinary-3.2.1.tar.gz 227265 BLAKE2B 4eda60b49a2f1e3e822a0fbff8f23cd546517a51193f0f4f2d4646f99888552aad1877f80a67f0d655e0a51771c539efe5b0d8b5c8ce7d88c8403305dc7570df SHA512 fdab404eb6ab8e64c0d3b92c1c12e796a182a90084acc78a31a31dece62075d310d298c545d149d10b188f0467108a0429ee750747e073fa7fba752162b64eb4
 DIST igbinary-3.2.2.tar.gz 242955 BLAKE2B 479f1b79c84b3979659a1d596f78345e6c75e9444971b547e8f1a3fe9b4aec3ba321d7a325b734f069fb1d4cb0b5c4ea5ae6586d5e50026698dc6aaa2e972bbd SHA512 d9fd460e6d62c8ca86de0e99681714ae45b2f7c66ff76279cd376582f9e8e932e8fa0ee37c25fde82390643a543fefc3ba5cbf181d5ffa31a3ab8301c092e0ff
 DIST igbinary-3.2.4.tar.gz 245458 BLAKE2B f52f01ace2c24b9bc0c64b3421609ff390e10c1825e09b2bc7a294e902975988e4e9c658e87404f496d63701fc98c7aa2626ce3bb88871f429d7cda6b96092b9 SHA512 0f1d482f4615f8ec9b269d74e48f6b74b0e276b237a190e40ffc643afd6129d9e01be3375864e6e0be1b9666a75ca0e2a6a2dbf571384bfdffe497316168da78
+DIST igbinary-3.2.6.tar.gz 245899 BLAKE2B 05fd24a640ab9e1f2402645bf322b0a959be69c068ff203552f2806240d8504f1ff3c7b209d9b050ba7815a90bcec2aab823a24a2a2a1cc149da90d25166f18a SHA512 b6c9e7b68716052d93a8535af4666fa3d5b4071bc181819cdc0ecd7f8e1c099001905ff2134eec6343daa77102a423ad0903f8800808c30806d3cb7faa4c7a06
 EBUILD igbinary-3.1.5.ebuild 597 BLAKE2B 8f09f317dfc74612c30bdf35905411ad3c26077c02579b8fafedf2cd79d0aaf95ef275e0396dace13d0ae733d7cdf5b29cd9f5c419845c942ee49df44e9a2470 SHA512 b352c8647cf6faa2c7fc223d5b78514225bf04c308cf4e802f6c6305fe4b4470db33af634a34fbc3c67849ba933aad9b4ac77113eac940e4a7eff40e55ce7225
 EBUILD igbinary-3.1.6-r1.ebuild 599 BLAKE2B 7052c71b8fb7bafc0e694c75104487c988f73cc30ecd5dbf9f0c72354a11239b4c66927522a01b2e726aa722f4892c91fbd63ca854f0452fb9d47bb896a8cca6 SHA512 d181b6f2524d497af0216da5c26b58fa2af4c6c057eeab8f9a4820d18db21b6596820fab7cf405dfd6008e4d3ee15c591f934a2f6bf92dacb0dbb1df362a317e
 EBUILD igbinary-3.1.6.ebuild 595 BLAKE2B 5cd27a7fec301252289616350fb56f599fa9f1d5e660fb8cf140be2e3c737b1151bb66f857fa7e47c942742441f65cc3e63a4a76f0d5061e29da3592f9e207a8 SHA512 4c1636cd05f1d1eb86a136cf044138029e7c3124c67ab8089b388bd07aca1ea801d4b7cb4914d61fe17b3ad2fe0c03f5574c2d588f1a8a8b1edad2de1ef45e4a
 EBUILD igbinary-3.2.1.ebuild 559 BLAKE2B bb66e2fb19636f4cd24c24643a629968af03f77b2444543997cef0c3576438ac2538e5880617a24ff0e57bb611a92fb797d305441877ebde4753ba144740e1de SHA512 65ae0c5964423f647d9b31515bf6377187352c6a77490eda0937a97771023d76cad304544dc7898003040bec6322484004f52a2c1ef20f85ef533c6144218df2
 EBUILD igbinary-3.2.2.ebuild 559 BLAKE2B 4c897036852ccc6c0b1528044f8a753ca2a25f5c637d593caea0c8312e4de75b36e5839445ff4bb9da111aa3292fcefe449648eaf6e5ac33250107094f080f41 SHA512 db78195cf2749499f0f6f38bc578175b7fc4a0612e99e331db7f0ac575804515b1a9ee067a04e8bfcd05cd844efaf76c7a7b11a0d7fa211861cfa4cd5a6a0aad
 EBUILD igbinary-3.2.4.ebuild 559 BLAKE2B 4c897036852ccc6c0b1528044f8a753ca2a25f5c637d593caea0c8312e4de75b36e5839445ff4bb9da111aa3292fcefe449648eaf6e5ac33250107094f080f41 SHA512 db78195cf2749499f0f6f38bc578175b7fc4a0612e99e331db7f0ac575804515b1a9ee067a04e8bfcd05cd844efaf76c7a7b11a0d7fa211861cfa4cd5a6a0aad
+EBUILD igbinary-3.2.6.ebuild 559 BLAKE2B 4c897036852ccc6c0b1528044f8a753ca2a25f5c637d593caea0c8312e4de75b36e5839445ff4bb9da111aa3292fcefe449648eaf6e5ac33250107094f080f41 SHA512 db78195cf2749499f0f6f38bc578175b7fc4a0612e99e331db7f0ac575804515b1a9ee067a04e8bfcd05cd844efaf76c7a7b11a0d7fa211861cfa4cd5a6a0aad
 MISC metadata.xml 331 BLAKE2B 4187300236aa128879679c7cb4a8ddfa19dfd512a76466e835224c30323f2fafd55189228bdced507ababd5b90f561f6bb44c1554392eb0682b6ba5c7a20b681 SHA512 86f467f549b36915940e45a4e151742f2925293106dd3da2958e6153aaa8fed378b2eb563bf69da0d38101409858a4abe308f608bd94de6b4517daf9da092405
diff --git a/dev-php/igbinary/igbinary-3.2.6.ebuild b/dev-php/igbinary/igbinary-3.2.6.ebuild
new file mode 100644
index 000000000000..a4b536d340b9
--- /dev/null
+++ b/dev-php/igbinary/igbinary-3.2.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PHP_EXT_NAME="${PN}"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS NEWS README.md )
+PHP_EXT_ECONF_ARGS=( --enable-${PN} )
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
+HOMEPAGE="https://github.com/igbinary/igbinary"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
diff --git a/dev-python/Faker/Faker-8.10.0.ebuild b/dev-python/Faker/Faker-8.10.0.ebuild
deleted file mode 100644
index ada44c6701ce..000000000000
--- a/dev-python/Faker/Faker-8.10.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.10.1.ebuild b/dev-python/Faker/Faker-8.10.1.ebuild
deleted file mode 100644
index ada44c6701ce..000000000000
--- a/dev-python/Faker/Faker-8.10.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.10.2.ebuild b/dev-python/Faker/Faker-8.10.2.ebuild
deleted file mode 100644
index ada44c6701ce..000000000000
--- a/dev-python/Faker/Faker-8.10.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.10.3.ebuild b/dev-python/Faker/Faker-8.10.3.ebuild
deleted file mode 100644
index ada44c6701ce..000000000000
--- a/dev-python/Faker/Faker-8.10.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.11.0.ebuild b/dev-python/Faker/Faker-8.11.0.ebuild
deleted file mode 100644
index ada44c6701ce..000000000000
--- a/dev-python/Faker/Faker-8.11.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.12.1.ebuild b/dev-python/Faker/Faker-8.12.1.ebuild
new file mode 100644
index 000000000000..12e618b6e887
--- /dev/null
+++ b/dev-python/Faker/Faker-8.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.8.2.ebuild b/dev-python/Faker/Faker-8.8.2.ebuild
deleted file mode 100644
index 53094317ba83..000000000000
--- a/dev-python/Faker/Faker-8.8.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.9.0.ebuild b/dev-python/Faker/Faker-8.9.0.ebuild
deleted file mode 100644
index ada44c6701ce..000000000000
--- a/dev-python/Faker/Faker-8.9.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.9.1.ebuild b/dev-python/Faker/Faker-8.9.1.ebuild
deleted file mode 100644
index ada44c6701ce..000000000000
--- a/dev-python/Faker/Faker-8.9.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 558b86285173..216edeb69cc9 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,19 +1,5 @@
-DIST Faker-8.10.0.tar.gz 1149474 BLAKE2B 2a5304acb1ce88230660a468756ee79abc7ae0b6aeb850e3d05bb694cb9e5b596b1d9de4c8f1e82c208a3281efc026a290b6d96cd17bc6c523d22fcd61eaf756 SHA512 0d035663677bea9ef4a66c6f0cf5fb1e648e948deb4db07b352a8b8881f5774a9432524bef10e60f28d5d586ac66f0e207c3ad218edffd6071fa6ac614ac950b
-DIST Faker-8.10.1.tar.gz 1144158 BLAKE2B 7463566a8bf2f510ab89b7fd67ee3aea80ce65725063f83798a6f7ce959a1e5c4eef82504adc124add6ff028d6e248871123d0992f715d46485daa6d64d4179b SHA512 c5bb3b376757fe025255de67a184dfae959c834e937825515eaae083a2ce931f2c00ed1ade7ccba49adf182570cf533526e583e6a45c4fa08b41e22544139227
-DIST Faker-8.10.2.tar.gz 1150102 BLAKE2B 5ca744d201a7822cbe35791757a73628d3c12f6521ca55bc2d340c974cb6e76362f87395cbc858e4681738440cf676e9f9bf7a8002b908ff564dc6703ef794e0 SHA512 5a148327df7c34623c0d8c154e6181a183a0aa484659e5872013f0b9c510418690278550ebbed6eb984c87cef588fd862b213295a379b5be3433afe312181103
-DIST Faker-8.10.3.tar.gz 1149954 BLAKE2B 665ed95be11f734ed2ae9b593a4e287cc53b041521ab223efc045f061133e983de500ef12a858d7420342a500926297565b7c50674fe5533b985a00816251031 SHA512 a5969f04dd96660b3e62ece20ce4d92de9c781faa1742e45404b0a6f04dc7521c9532c519df06c4b3e9a815dde43837b7ab7628ef25ed3b60bda49c927b8ace7
-DIST Faker-8.11.0.tar.gz 1150354 BLAKE2B 9799163239afef521d352dea601a63f2702536380891182c72f856bf442441ed654412ba035dd4964ea9ca3f2c19e0737e0225a58178a2edffcc52b06047e2f1 SHA512 5a42ea5c843272f9f70edc88e405f0b309f6e6ae5c061d1f1ca7ed01f40688539371a1bce5084a0de3e424f3eb50443430ff1fafd1ef0a035d385d80b16cae2c
 DIST Faker-8.12.0.tar.gz 1151218 BLAKE2B b55d1b1bac6a580c51fdd3f87919cbcea107aff309bce4d2092ec77046dc40c67650f3c53d176147b6b433008e7487dae9e096eb9ba6c8722ec54ce5d6d39449 SHA512 5df90c0976cb8b5e96f4c6645a984e813130fd22f25b5fb99b7cd28b6e079eec54b19f8ca643b795be15f41b9f5b677e89db1379615479983f0b5519a6dd56b4
-DIST Faker-8.8.2.tar.gz 1148529 BLAKE2B 279984479ad4f790dc7acd74b5ccd1cf5f32689b8b1ccf2152d7dfaa6fc7b4699d9827c16f83bb86e298723b6906a5cc40c2fa7f75439b5af5fc78c1af99a3f6 SHA512 4273008bf9ab693a40da2f93ff1fe40e9e7b102a2d5439f09096b6754b82dc26310666da65723b363f628365c97d44dd290e1e7065b7a9d862130baa292325b7
-DIST Faker-8.9.0.tar.gz 1148829 BLAKE2B b24a7fa87886cb38850808de2ffe1ceafab3c548c694af30d53b1f415d329264fe7e53f33f46b913d16310dd83d95fe591689a308bb7d4c653254e39defaa24b SHA512 d2e26ae140c30ae8069f8e0fd75bb9bf54aa00a7271b327e37dd248520256e137d192082071bc36a584fc864c54c050107ddecb40624288636c6b41caf1ea574
-DIST Faker-8.9.1.tar.gz 1148890 BLAKE2B 2cab6461bf6067d9dfd8872c19c8c11fa25ffef82b61b7e7676ffc187346d228703424a73278678f19263423716c74ecd47cfc1c17bf54d38bba712e456650b8 SHA512 f7016b320c7394b0eccc06e833a80e227cdbad9c0f34eb9f8f4413f56a4743f58bbd7ec5eac3b8c0642e7764c6c5986707d493f0c84daa75575a12061631c9c5
-EBUILD Faker-8.10.0.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
-EBUILD Faker-8.10.1.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
-EBUILD Faker-8.10.2.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
-EBUILD Faker-8.10.3.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
-EBUILD Faker-8.11.0.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
+DIST Faker-8.12.1.tar.gz 1151131 BLAKE2B fd59a337ed95429b34b2f9c1530a9db6ef4ec921d1c194e90e794ea6316fd8c79b8f2aa416ad8806cd2f4c31cca8d1d2cf60209a6bb4a75a708345a0bfb0a572 SHA512 e359b015d4908130b12ca6dd8c7e4801011de383eececb62f3ac76cb621cad1c9a873c5de989932405f7a30b33aef8969fb9788a331620db3d6c3ad1e5a657c4
 EBUILD Faker-8.12.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
-EBUILD Faker-8.8.2.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
-EBUILD Faker-8.9.0.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
-EBUILD Faker-8.9.1.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
+EBUILD Faker-8.12.1.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
 MISC metadata.xml 473 BLAKE2B 339c0263dce223547f0a5267983079a02f885abc66023578dd24a602c11dfda07faffb43b78f7805fcf31804de10568baeabff695bfbd64d85863a392056436a SHA512 414f9ce994c58c60b8f58e0531208d189698c932d18b25dae03dfb0eef181452532ff57ff9b40707acc896184742a36dc3793a92217257969bb92bb886e8b67d
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 72b21baadcdc..2b60133dafa8 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
index d407e7d5d9bf..22590ec028cc 100644
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@@ -1,3 +1,4 @@
+AUX PyContracts-1.8.14-fix-py3.10.patch 5460 BLAKE2B 4c30458b9a731788055b1a5cd21ff973800e1aa82dedd613d3ebb7e3fe92f6d5264d7ecfb8bcb2ba6c67e5cfc495e894a66ab40e3d22ec818da923daafbc353e SHA512 3c6bafd95ef86c77e05ddf7c3c54bbbcf49f7275edd7f0d8a9bcbb04d95c4070e32f4b1bb1bd251351e970caf5eb469d110a9cd10cfd78ed4ad8967c8c8caae3
 DIST PyContracts-1.8.14.tar.gz 92346 BLAKE2B 507fdfb313347d6650f21326b6b70b73f17cd702f25d06d97e5d84f84c9bf7f23cceb48d918727158d02081115344a4194e307caed59510265dacbf267774ab4 SHA512 95f8c76e35cc7549fefa069d9c354fc1d4a55dcab0f3fd322cb86aed92c7bfa75a06eabb7540ff991d590a90cdec781906b856291002a82ee5ab0072cdcf6ccd
-EBUILD PyContracts-1.8.14-r1.ebuild 834 BLAKE2B 2d1592a0f24d75139917f11a1e1cc7c63c036979c946d9095c47ed2e4826e838330e779f579d935afa623c3861b0716667ad517ae64de6cab56f84c1a50c7ed8 SHA512 36eca8efa4204122931709887fa845f570ef951f4d109c7aeaf07dc520c0e97e5680f84935bd2907f219279a1e91a8e92e3f5fd4b5c1ae1178cae1901444e516
+EBUILD PyContracts-1.8.14-r1.ebuild 1042 BLAKE2B 65b5f77488099baff5ff8d0f106bc808964cbed5b3d24898062a336a8f15a5135ac593fe3f88ca843af633fbb60b3219b3032954e5569b7c0523a4d96595b960 SHA512 583e3400dfa47124d9f966b29426663bee1649954360868dc3c282d70e2a89b830708f847aa0a1164ac568d3c5c4bcd0af4a2f5104fdd0d8f53a0713e99ed802
 MISC metadata.xml 412 BLAKE2B 168aead3c24da61c3e95e4d178546b196b07f4a1f5a51f3f5fe893222e209608e4f4d570a673c617085839756fbc3107e8544fa5db631429b596b6d7748eef9f SHA512 58a8491f4d6b1f1dca9c59036a0f3ecf20b71811d5696fa886452ebf5217f70ebc94615b86f16e130ad520ff39860128a801ed6c5566ac55a548985a56654267
diff --git a/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild b/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
index 4158f29912c4..92c510898e87 100644
--- a/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Declare constraints on function parameters and return values"
-HOMEPAGE="https://andreacensi.github.com/contracts/ https://pypi.org/project/PyContracts/"
+HOMEPAGE="https://andreacensi.github.io/contracts/ https://pypi.org/project/PyContracts/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
@@ -22,5 +21,19 @@ RDEPEND="
 	dev-python/pyparsing[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	test? ( $(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		' 'python*' )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
 
 distutils_enable_tests nose
+
+pkg_postinst() {
+	optfeature "constraints on numpy arrays" dev-python/numpy
+}
diff --git a/dev-python/PyContracts/files/PyContracts-1.8.14-fix-py3.10.patch b/dev-python/PyContracts/files/PyContracts-1.8.14-fix-py3.10.patch
new file mode 100644
index 000000000000..754b40efabd8
--- /dev/null
+++ b/dev-python/PyContracts/files/PyContracts-1.8.14-fix-py3.10.patch
@@ -0,0 +1,150 @@
+From d23ee2902e9e9aeffec86cbdb7a392d71be70861 Mon Sep 17 00:00:00 2001
+From: slorg1 <slorg1@gmail.com>
+Date: Tue, 16 Apr 2019 14:13:52 -0400
+Subject: [PATCH] + upgrade to use collections.abc as needed for python 3.6+
+
+--- a/src/contracts/library/map.py
++++ b/src/contracts/library/map.py
+@@ -1,7 +1,11 @@
+ from ..interface import Contract, ContractNotRespected
+ from ..syntax import (W, contract_expression, O, S, add_contract, add_keyword,
+     Keyword)
+-import collections
++
++try:
++    import collections.abc as collectionsAbc  # python 3.6+
++except ImportError:
++    import collections as collectionsAbc
+ 
+ 
+ class Map(Contract):
+@@ -13,7 +17,7 @@ def __init__(self, length=None, key_c=None, value_c=None, where=None):
+         self.value_c = value_c
+ 
+     def check_contract(self, context, value, silent):
+-        if not isinstance(value, collections.Mapping):
++        if not isinstance(value, collectionsAbc.Mapping):
+             error = 'Expected a Mapping, got %r.' % value.__class__.__name__
+             raise ContractNotRespected(contract=self, error=error,
+                                        value=value, context=context)
+--- a/src/contracts/library/miscellaneous_aliases.py
++++ b/src/contracts/library/miscellaneous_aliases.py
+@@ -1,12 +1,16 @@
+-import collections
+-
++try:
++    import collections.abc as collectionsAbc  # python 3.6+
++except ImportError:
++    import collections as collectionsAbc
+ 
+ 
+ def ist(C):
++
+     def f(x):
+         f.__name__ = 'isinstance_of_%s' % C.__name__
+         if not isinstance(x, C):
+             raise ValueError('Value is not an instance of %s.' % C.__name__)
++
+     return f
+ 
+ 
+@@ -14,33 +18,32 @@ def m_new_contract(name, f):
+     from contracts.library.extensions import CheckCallable
+     from contracts.library.extensions import Extension
+     Extension.registrar[name] = CheckCallable(f)
+-    
+ 
+-m_new_contract('Container', ist(collections.Container))
+-# todo: Iterable(x)
+-m_new_contract('Iterable', ist(collections.Iterable))
+-
+-m_new_contract('Hashable', ist(collections.Hashable))
+ 
++m_new_contract('Container', ist(collectionsAbc.Container))
++# todo: Iterable(x)
++m_new_contract('Iterable', ist(collectionsAbc.Iterable))
+ 
++m_new_contract('Hashable', ist(collectionsAbc.Hashable))
+ 
+-m_new_contract('Iterator', ist(collections.Iterator))
+-m_new_contract('Sized', ist(collections.Sized))
+-m_new_contract('Callable', ist(collections.Callable))
+-m_new_contract('Sequence', ist(collections.Sequence))
+-m_new_contract('Set', ist(collections.Set))
+-m_new_contract('MutableSequence', ist(collections.MutableSequence))
+-m_new_contract('MutableSet', ist(collections.MutableSet))
+-m_new_contract('Mapping', ist(collections.Mapping))
+-m_new_contract('MutableMapping', ist(collections.MutableMapping))
+-#new_contract('MappingView', ist(collections.MappingView))
+-#new_contract('ItemsView', ist(collections.ItemsView))
+-#new_contract('ValuesView', ist(collections.ValuesView))
++m_new_contract('Iterator', ist(collectionsAbc.Iterator))
++m_new_contract('Sized', ist(collectionsAbc.Sized))
++m_new_contract('Callable', ist(collectionsAbc.Callable))
++m_new_contract('Sequence', ist(collectionsAbc.Sequence))
++m_new_contract('Set', ist(collectionsAbc.Set))
++m_new_contract('MutableSequence', ist(collectionsAbc.MutableSequence))
++m_new_contract('MutableSet', ist(collectionsAbc.MutableSet))
++m_new_contract('Mapping', ist(collectionsAbc.Mapping))
++m_new_contract('MutableMapping', ist(collectionsAbc.MutableMapping))
++# new_contract('MappingView', ist(collections.MappingView))
++# new_contract('ItemsView', ist(collections.ItemsView))
++# new_contract('ValuesView', ist(collections.ValuesView))
+ 
+ 
+ # Not a lambda to have better messages
+-def is_None(x): 
++def is_None(x):
+     return x is None
+ 
++
+ m_new_contract('None', is_None)
+ m_new_contract('NoneType', is_None)
+--- a/src/contracts/library/seq.py
++++ b/src/contracts/library/seq.py
+@@ -1,7 +1,12 @@
+ from ..interface import Contract, ContractNotRespected
+ from ..syntax import (add_contract, W, contract_expression, O, S, add_keyword,
+     Keyword)
+-import collections
++
++try:
++    import collections.abc as collectionsAbc  # python 3.6+
++except ImportError:
++    import collections as collectionsAbc
++
+ from past.builtins import xrange
+ 
+ try:
+@@ -38,7 +43,7 @@ def check_contract(self, context, value, silent):
+ 
+             return
+ 
+-        if not isinstance(value, collections.Sequence):
++        if not isinstance(value, collectionsAbc.Sequence):
+             error = 'Expected a Sequence, got %r.' % value.__class__.__name__
+             raise ContractNotRespected(self, error, value, context)
+ 
+--- a/src/contracts/library/sets.py
++++ b/src/contracts/library/sets.py
+@@ -1,7 +1,10 @@
+ from ..interface import Contract, ContractNotRespected, describe_type
+ from ..syntax import (Keyword, O, S, W, add_contract, add_keyword,
+     contract_expression)
+-import collections
++try:
++    import collections.abc as collectionsAbc  # python 3.6+
++except ImportError:
++    import collections as collectionsAbc
+ 
+ 
+ class ASet(Contract):
+@@ -13,7 +16,7 @@ def __init__(self, length_contract=None,
+         self.elements_contract = elements_contract
+ 
+     def check_contract(self, context, value, silent):
+-        if not isinstance(value, collections.Set):
++        if not isinstance(value, collectionsAbc.Set):
+             error = 'Expected a set, got %r.' % describe_type(value)
+             raise ContractNotRespected(self, error, value, context)
+ 
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index f7a70b380952..c85a579627ed 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -2,8 +2,10 @@ DIST aesara-rel-2.0.12.tar.gz 8154749 BLAKE2B 0e39102e985e9f9ed49f65c76389d76702
 DIST aesara-rel-2.1.2.tar.gz 8167162 BLAKE2B 727bdf6fb9765c8b60da585595ed7203071490c1dfc0895428ae3efe4a1e74a14bbdf2a76128a6840dedeabdfc997fd297dec23ff517247452433cbdc9449b9a SHA512 22ebd1290a0727f2cf1e106770c872d5f1d785c6946b8e4debcc29a34fddceccb11f0ec81850fd93dbff556aa300bf2ec1bd6eef1297d93e194ff832b442c453
 DIST aesara-rel-2.1.3.tar.gz 8170822 BLAKE2B dbbc4a453c5d7f9cd4ab2c925dd9293e835db23100686a8d7ab2c47182b1bc05f883eeb60d6f47f8f34e4187f3ac07b632cde43fe82a99e2145a2f699a2b3582 SHA512 52d1724eb7b3c9bae4bdbf1735db9ef96cdfa94f3e2281b255201d0baba260fe31f78c00719a53ce3c59ea9c66ff218d8acd7bc012b386942f29806c07ffc466
 DIST aesara-rel-2.2.0.tar.gz 8164714 BLAKE2B 766f1adee8ae036782ec4fab4dd96bf7d99a6e6b45ed0fd6e55ed2e8c257fb6796bc1789a5a6760131a7098ea4dfa70e68a0a096cae1bd0d544d73c2fb10c7f7 SHA512 0683c80dc786e92f5d5077f658d1acf3c57317aac402517e87aa2c08762361685cfb76c21869af10bd58c4c79fc6b1551f50edead0d72717b04396f33faf5535
+DIST aesara-rel-2.2.1.tar.gz 8166022 BLAKE2B af3c17029dacb3d365bf49eb01d4d03b5a4f770f66d3e5eba2c4576ef156056bc1aca3571442c1cb7352c358978b47faa7af70ca0da2a2168d8c9bfd47b17138 SHA512 f7bab8ca80e8d13ef7698c1efa56ff37c561786330bf756c7a00c54ae1f131810d68bfd6e328b0705d45788759bd984d42306d2c545d2de6b9a3592b5c021ad8
 EBUILD aesara-2.0.12.ebuild 2101 BLAKE2B 7915fe29cb13d9c8dcaa0706ecd3ebc4dee7f8935d42af424cc33e1beee829de6fe05a92f0f700859d8923c6d76560b57299fff452ad177337e484819a7f16e6 SHA512 3916aba60e456a40dadad9afe223e125c6ef945d966d4c270627144603a74e2596819acb3e38086c7a38bc1c30232b5d0e45431d87b032064eae1f7b6b2e2715
 EBUILD aesara-2.1.2.ebuild 2113 BLAKE2B 280d980e33e61684f389e943c945877d440b23718da623db4b4ddba48232e41e1e8ba06501fa0d4ca8325fa261fb80a0976f775c363f9754c0ae6e85fc6de2b9 SHA512 231cee60373079e993267910bfdd210da6db3c3b45f0367aa6ff1d5c4f248f6631d9e8122b6d86e9e44672b33356c0a01eff219dcd5d08c4d622618a5e7e27ea
 EBUILD aesara-2.1.3.ebuild 2113 BLAKE2B 280d980e33e61684f389e943c945877d440b23718da623db4b4ddba48232e41e1e8ba06501fa0d4ca8325fa261fb80a0976f775c363f9754c0ae6e85fc6de2b9 SHA512 231cee60373079e993267910bfdd210da6db3c3b45f0367aa6ff1d5c4f248f6631d9e8122b6d86e9e44672b33356c0a01eff219dcd5d08c4d622618a5e7e27ea
 EBUILD aesara-2.2.0.ebuild 2113 BLAKE2B 4bb3fbf4c4f4205d8ac7dec2d4504a2d275e8a170068bc76a7da0fae4a6fc184378d2f5c12ccb8c4cee272e7ed1316b7b4244370ee1a2181508d75fb3854ec04 SHA512 55248fa3a37161ccc82e3e8ed088677d4281f813e10e817c0ab6f8c95d67ab3930912d913b920abc231796cf6c94d17dfa9a9851d69b077f0983b65aa7a73e44
+EBUILD aesara-2.2.1.ebuild 2113 BLAKE2B 4bb3fbf4c4f4205d8ac7dec2d4504a2d275e8a170068bc76a7da0fae4a6fc184378d2f5c12ccb8c4cee272e7ed1316b7b4244370ee1a2181508d75fb3854ec04 SHA512 55248fa3a37161ccc82e3e8ed088677d4281f813e10e817c0ab6f8c95d67ab3930912d913b920abc231796cf6c94d17dfa9a9851d69b077f0983b65aa7a73e44
 MISC metadata.xml 404 BLAKE2B 5f15a3e7f8771f0d8b95097374c87fb6793089f1a0e000c433a8f644be3cb7d945128d0b164b608405070b976c932c77738ed930bf4734129ba37f4feda667b3 SHA512 f7afb5e2c8053cbf8ace61197d234869ed86a06bf066652eac3ad800c7251d18113dfd2e3115281c10f016c56e845d9d34915e2eddbeac4e3a2f414a8e858148
diff --git a/dev-python/aesara/aesara-2.2.1.ebuild b/dev-python/aesara/aesara-2.2.1.ebuild
new file mode 100644
index 000000000000..3148f85f3cf9
--- /dev/null
+++ b/dev-python/aesara/aesara-2.2.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/aesara-devs/aesara"
+SRC_URI="https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+
+	distutils_install_for_testing
+	# we do not package numba
+	epytest ${exclude[@]/#/--deselect } \
+		--ignore tests/link/test_numba.py \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
+python_install() {
+	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
index 6b89b1c6b0ae..114c7d6198ef 100644
--- a/dev-python/aiohttp-cors/Manifest
+++ b/dev-python/aiohttp-cors/Manifest
@@ -1,5 +1,5 @@
 AUX aiohttp-cors-0.7.0-py3_7.patch 991 BLAKE2B e2a08dab701bd31e4a9008c8f89ae97508fb6b99b89db69a05b731849e09c6f04e8b148d82d38f2093e00bb9bee03e45f230cfc8eff4b71ca7797a95524732e2 SHA512 efe7c488d9f30da7eebbe355d86c603657bddc75c88f5cd1bb4b0e76b17f26f5827cc2f42ab8766767a4ad16c08fa636a4f61e50a8c478e7f32eb2567e26427c
 AUX aiohttp-cors-0.7.0-tests.patch 2422 BLAKE2B 4660be793987dd0cd5c945703aa4d6d4b499ba0ab1c305b80e26bac9cc87d811131f6ab179e402821740f193bbfc86a384b58e35aaa453fdfd5d4db3bcc44b23 SHA512 b3fa463b87a112529443f516fe1c37ffda092e8a0133a6d37f407519e32842f65773c87e939082591edb969ee243170be3a4828896ec5ffc1150c3f43aedd9d5
 DIST aiohttp-cors-0.7.0.tar.gz 39728 BLAKE2B 747499856272f551cf8e2e0911ff7cbb2c7cb8a1f3159327dd8f0d40cabbbd9713a1a9e30ef9c99f3f9642567c99025e049db837c89f907d6698a27005ac2632 SHA512 72e0b365b952c08a02c1123d7672cfea01063e2ff01743a71e10f804d22178edc0f1c6b7f87b7ed484ca7c24e89a32de90d0d279f2f5c060427319182f9bdd3b
-EBUILD aiohttp-cors-0.7.0-r1.ebuild 962 BLAKE2B 8fb1c8cd02cb0393ef4466b6210746f482ec35830359e9f6e60a6c06e087a89d117e2ddf7fec323eb672a041a31001d7eb6f37465a697802b57d5a810512b126 SHA512 1d43f1db7f13edb45d8ce0aff5ced1491247285395d43a02ad179480278c0f17f8d8f3829deb56e37ae0fd069485027b9f106aa66788192232a2a446182a83dd
+EBUILD aiohttp-cors-0.7.0-r1.ebuild 963 BLAKE2B dea2e0726ae2d2f0abb75ea370bc146b75e4d342d52dbc7a44667100e9d652db54dd38f16be805908195cbe556b1820dd199ad941b18960fe71df10cf2d91a9f SHA512 26f76f287a57abc4dd1ff6e8a29be8f938508274c7f39b5ced5009a4fc3c297b11d81d4d80a800642d91841ac91957ecac84fa60f5e3bd0574a568e810a21c13
 MISC metadata.xml 557 BLAKE2B 21b5e820005b6104d5472c1b04df6fd7233eec1787448f8f63a8779d68619d42b8198d114320d42d2ef104320c210fc337512fc764c48e2a53f27f0fb0598be8 SHA512 739012d38b824fd06c8f720e8cb8f715d5c9ce31e41387e40d8f417b52f1eb21ebfc9614108eedd511020a7dabf508e7072f620e03a880a222a525c283aac795
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
index 52babaa5ce55..502919c6a8bd 100644
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.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=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiohttp-jinja2/Manifest b/dev-python/aiohttp-jinja2/Manifest
index a3f2d46dc3f4..72f857d6ece4 100644
--- a/dev-python/aiohttp-jinja2/Manifest
+++ b/dev-python/aiohttp-jinja2/Manifest
@@ -1,3 +1,5 @@
 DIST aiohttp-jinja2-1.4.2.tar.gz 54328 BLAKE2B 3d6aaeb03bbb89516a92fa877ee95a2fd27ab83666a03ca12e78f1744b82797faf2547bf55118618cbd979d80779a9571dfcfe9036bc84142563ede55cfbc1a1 SHA512 7bdaee97efe90a0009cd78a4e46dc80cfeb661c2d5561fdb1b1a1ff098abba8667260bb908e3227edd6601c2412812d0311461942568a8aabf07a164ea2f290e
+DIST aiohttp-jinja2-1.5.tar.gz 54608 BLAKE2B 3271e159f1022023b3d9f96b0f534b04898e0774d6ceefa19bf8958a835d499a1598fd12cabab8206448a0e89a107816577d596bff0c45a4947fcb7289c35e5b SHA512 230fec6e54fa55e22be3bc09ae1896cd12834eda5721c1d698c8482f9529b443ccf13a4db24bd9ccd179c36b9cdc90abbb848f287e7ed79e621d6a2976b1fa32
 EBUILD aiohttp-jinja2-1.4.2.ebuild 841 BLAKE2B 25f59019b996241edc0740c400c7ba158c2db205cbbe2a415d7531b0151cb8261e8786321adf84070476c0c4b2d3a45c103180958992d4bd6b7cb1278fa24b7c SHA512 53fd56354bfb1d76fcf8019822f1aa63e10838ec5441c02754696715e74e0a9b76416fec6b6876bfac4eef909ad3ee08080f212bec504da9968535b7783bab86
+EBUILD aiohttp-jinja2-1.5.ebuild 837 BLAKE2B 740d658be6187f8c392c3af00da6e3e1d12d7099e88a28d4c2bd44b8c144d0e3e448613adadf73ea09d840ba034d64a9831024ea52cd61811e2643ae83685c96 SHA512 991159512eae0b51b42780d8c1bd5f6f2aa60faff0646645cd853f21acbdce99e88dfb11c0bc15d81576d3588380dc3eaebfe7e392ce4b7f89d5758b6f6dcce6
 MISC metadata.xml 408 BLAKE2B 916a837821dc02a0eda9ed9c5baa16d70426f4d3979a51b68d4516bc1c87cdc9b097528d4c31540513ecefe056031673a75e3ef6a73c27559dc10675d0b19651 SHA512 16235d6f61135b0caeceaf161cf98e700ac13cc136edeb501280b60bc4dfff6734f80523baaab0982cfef3a84c7a34734e4020ac31a028095967953f04291275
diff --git a/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.5.ebuild b/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.5.ebuild
new file mode 100644
index 000000000000..81fd748378fe
--- /dev/null
+++ b/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="jinja2 template renderer for aiohttp.web"
+HOMEPAGE="https://github.com/aio-libs/aiohttp-jinja2"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/aiohttp-2.3.9[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( >=dev-python/pytest-aiohttp-0.3.0[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/alabaster
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:--cov=aiohttp_jinja2 --cov-report xml --cov-report html --cov-report term::' \
+		setup.cfg || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index bc7d825fdc11..caf99badd610 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,3 +1,3 @@
 DIST argcomplete-1.12.3.tar.gz 76128 BLAKE2B 6924e53af37e4ea614dde4c76f44e5c2b777f8daa8fa8db53d6cbe06f56f2ce3edd11a9baad6fb2571e701fb74e02fbb8eed8ce1067c599fbb156ebd8289cccd SHA512 b302d2b1250b7159177a8491b2595c2166a2b96ac4d98cf45202282541f7da53c9f272ec778133d1734a22a07d490652b9d4c956af727397b2f6767a9a445b63
-EBUILD argcomplete-1.12.3.ebuild 1006 BLAKE2B 87d4c1fda4b3911a6e15ecfef13aef1fa03534e84186f80c7910bd4c4bbcfc9e1de29d933f2903308d2aa4f3048392d2a936dfa75062b21b22f7a472d371d617 SHA512 b0cace6380f1dbfc1880d099ce3217b9d14d5baf3f154fad13076b62d761b6febb91a354f967e34a098a1c0565d3a0a7d45e9fe3d896582dbc08e748c9a37a0c
+EBUILD argcomplete-1.12.3.ebuild 1012 BLAKE2B b86a00280cee6732e38ae9ca4ac009726d3df7120490503e7e7ceba962b7b1b09dd96350e590ea421ace2b87f580ab60060271366f51136c8a06e6055ded5396 SHA512 2d870403b4023ce24bbb65a9b6fb76677828f97dbf1ab47e5e66d878cf09e8b1139384454da42e45f6dddd5ae64f201be6bf1d8184415cb8cab0fd3e7edcf6d2
 MISC metadata.xml 410 BLAKE2B 5cc57d8d5fce195e6c050674f8626a6b2a884a956306c668a40fb81c3bed51d9dd8a23c4b69cca5ece9facdd6d459341abc2e5fd4454b1f3614b5866b3501682 SHA512 9a04c26c63f40f33ed3f5d004e5a0478dcaa5f90c363f1364ee14f309433d65e3db5809b3fa8b504c4d4f961b79a8ae39efbd6b3af1fe1cf681ad1f4f9a89fc3
diff --git a/dev-python/argcomplete/argcomplete-1.12.3.ebuild b/dev-python/argcomplete/argcomplete-1.12.3.ebuild
index 24a8a72ae2f4..34edef4a4723 100644
--- a/dev-python/argcomplete/argcomplete-1.12.3.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.12.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/astor/Manifest b/dev-python/astor/Manifest
index 6fb724f7bed8..6dc974cbd8fe 100644
--- a/dev-python/astor/Manifest
+++ b/dev-python/astor/Manifest
@@ -1,3 +1,3 @@
 DIST astor-0.8.1.tar.gz 35090 BLAKE2B 11e5e77d4f8a8617d0330d3091a1571744bb5773df926f41b10208e1c5beb7e82ad8961a460dd326e9130591dade495c77a36456618a97a5c22e41237805a4ce SHA512 cfc69a21fcbc9842bc26fbe8372e5c700d9957cc0c3c62de415155d2036163951f0ece88557829afd7c4dabba8a8e238a2335994ddfc020cb3db913eed5b6f28
-EBUILD astor-0.8.1.ebuild 623 BLAKE2B a20e6993be30cbcc57ec1d91b97b7f0e38a1152eedd40586a05836d64d0b64beef5d4f8de440554b8008e120dd780008f6f693a84a544b4dbd18af67dfdc2e1e SHA512 d42032845996e0d309da7b00d1fe8b903754ed147c39cd0d857147297fa13b7d906e4f6826c9278ecafa9a00a5ac0776530c979f1959a5f1b347b5165a9c979b
+EBUILD astor-0.8.1.ebuild 629 BLAKE2B 3afc4786e24e4c8eb81ea9867d07219892c02a02b5a1987d08006579993c988bd80feeda4105dcd56887fed54c1e16dad088355e32f8c986225ac6f2e0d5258b SHA512 cf488466135374cdb70a3191c309f64dd332ee9530be38a53ad0c8a93cd0d3d6789538435b3c1d45f526bf2f6615f2f955b6946f22f6b57b91a6d37c33b2987a
 MISC metadata.xml 308 BLAKE2B 4eb385f663046756ae848b87d82301e3d2ddf388eae73431024dbf4758c5d4787f879ad167eda72ae011ab41cebc48718fc40a5ed86f3d382dea6165baf1a3cc SHA512 86cbc23c8c077f9849004214ba32c5096e64ea8092ff1940f3fb4c9bf4fd420f2883aed76a7b96774f639cb98ef14429a9e55993db07173443ee16b3ac393aab
diff --git a/dev-python/astor/astor-0.8.1.ebuild b/dev-python/astor/astor-0.8.1.ebuild
index 720b0abadd8e..d3cba04651ba 100644
--- a/dev-python/astor/astor-0.8.1.ebuild
+++ b/dev-python/astor/astor-0.8.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pypi.org/project/astor/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 distutils_enable_tests pytest
diff --git a/dev-python/bashate/Manifest b/dev-python/bashate/Manifest
index d98a4f643842..bca6ee0d13e9 100644
--- a/dev-python/bashate/Manifest
+++ b/dev-python/bashate/Manifest
@@ -2,4 +2,4 @@ DIST bashate-0.6.0.tar.gz 30980 BLAKE2B 5b210edaa44a0652a03f30a641a072dba1482e1c
 DIST bashate-2.0.0.tar.gz 29579 BLAKE2B 35cd827a9b5846d0319e6de8fc4bdffbace6b0f669e496aaffa12c44349cc5947a14baecf3b21c3bc4f424796f12b38e273f273f4862949bbae11dfc4b787464 SHA512 f6bacddcad1077d034df0de4313b13aa24ba4c60baa456912d1f40511830a58ca118a72193d4cac358963870e097bee4b0e2ae5a7f7aec42f0ba1663180eb401
 EBUILD bashate-0.6.0.ebuild 687 BLAKE2B 75232f40208f77702288a4446f71ef861e13d0cdf7ebbcdf875a979eaa6ecea39f0f803bd24eff961e14503030bb95029fd821d47bb6ebc8cdf0f9e865261289 SHA512 148d86f3328788b5eaa1f9bce5f7575b9a495cf14dfc6ebeda67f82af2ce3d9a585e343d458440814350185c99a8459fb7fe996690a2a7ff0f7e5122bf856182
 EBUILD bashate-2.0.0.ebuild 640 BLAKE2B 7bc8faa88127536c4de91094474cd2af6dd2afee30bcae758f4fdb95ab50c3624053fe56d3cc1918e4d0664d82db1599529fdf996e7d06de7057c773446b6ec8 SHA512 1e42a9824eeac074eaca2f9f693ec46057ac9a086ee08f3c578bf12d2613e369700fde10f4bcf2c6cba2fa6c568476fd699e040c02e3cbc333d9e6e62443cd27
-MISC metadata.xml 532 BLAKE2B 64f75a70a9ea98ba69589deff0b3bd704d60aaaee33c74d7868f9ba5b5683aa9be7c0fd43c1a794e6c3d9833f7dfd041203da2508b9cfd4d199ad2b61b7cd51a SHA512 726c60d1467e810c1dd95afdf018bef0770dcab865634734bc82c8575efb3cd934a2d0088471f64e3207f90e6f049a359b163fb16def13b06df1a7827dbd8466
+MISC metadata.xml 556 BLAKE2B 02dfbe31f15ffebbcb8a5818eeaa8162d189753d20afd851a8a6bd295d2acdf28df8f3da1f20ae4b1ada6e47f9600097d95b6ec3c92c97de18dea8d0ab1e4203 SHA512 337b37b30a5f1d9aa6fd470a046811dc06ad1b423a5ea6edb976014a07a9311f46f2309e25fcd6368c56aec2cee8cf8b942ff2283fab24c728de044327e50f44
diff --git a/dev-python/bashate/metadata.xml b/dev-python/bashate/metadata.xml
index 5f8b7c035d7c..07ad5476c90a 100644
--- a/dev-python/bashate/metadata.xml
+++ b/dev-python/bashate/metadata.xml
@@ -13,6 +13,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">bashate</remote-id>
 	</upstream>
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 448a6874b777..536315278388 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -2,8 +2,10 @@ DIST bitarray-2.2.2.tar.gz 78273 BLAKE2B 1c9b9c4011b1b11481209aba6958aa3c58dc2c1
 DIST bitarray-2.2.5.tar.gz 82954 BLAKE2B 2841f7bd3627e3f057e9f7fa39b25172d36b77e32a70f982f970a19f7102326860f2ccc268298263a2e8869e708b3e746ca06d3182394c9500f5473e44d4f2f6 SHA512 c611d4e3cb0e0a5353789a87d0a0c643015bb607756e07318e8f41ac8d43ff7c0d53785cfaa4ebd8f84634d374611e0d5553a4847f166e9cb68fd79e0fd62eb0
 DIST bitarray-2.3.0.tar.gz 87119 BLAKE2B 0a402783e1abe7c9cfb8f70040eef9ee50763b77a73e7223b1816717cc5160960715d1f9d00b2bc538002577653468d09b8aa03753271963916a811b8f9dc9cd SHA512 def184d941d86812b38d8f8f11e131b5c33b7b652136a55acac7d915a6eac6c9a25e90b506d6f6668027cfa96eeb9248fde910e796e0750db53e809c72a1d45a
 DIST bitarray-2.3.1.tar.gz 87554 BLAKE2B 763317dd0aea2f4f41ba4809a041d8a2238d78889e840a348bdeed9137d5b9c885dc64e5a8b341db4270eb69eb33144ec49d3a5c95aa3f9e87469ad2765fde1e SHA512 68748f7b912668ad495e70c00a3054086534dde3fda4838a0eac1dda2ce8649252c433cd8a0570303e13d275d98e7e59d95822436c0269e91e1b76b5d7e0d8f0
+DIST bitarray-2.3.2.tar.gz 88480 BLAKE2B 0baff242d0450e76d40b6616f394a7c6ab8151c32c65b859e264fc5ddd13c808558ff6cb79723c29d6b33703f474fcd4cb583d62688ec44e9792f1a0f4ae9f13 SHA512 fa615bf411101eb26f3e6317d9b695602f65cd20d7d4037f9520ded8203b8b3cbfc749b95d29e5e21c6aea0b34cfc9dea688ef8e87f3d6ea837197d0965c3fe1
 EBUILD bitarray-2.2.2.ebuild 554 BLAKE2B d4d380693ac4207efd7d9f3a1de6cd09cb4ee3ec03465adb3613d298da5947e9822534cfe1fa3d5bab1e9c886e2a57813551359be719f01f247e440641144f60 SHA512 95ee6a48997190a986a0e97f8b94c38afb8fadc78c18e22629377bd4b2e83ba096278f8af1617a5952cce7db6e9736fe8c30255713ae3e9662c923bd9ec0250d
 EBUILD bitarray-2.2.5.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
 EBUILD bitarray-2.3.0.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
 EBUILD bitarray-2.3.1.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
+EBUILD bitarray-2.3.2.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-2.3.2.ebuild b/dev-python/bitarray/bitarray-2.3.2.ebuild
new file mode 100644
index 000000000000..2db993517908
--- /dev/null
+++ b/dev-python/bitarray/bitarray-2.3.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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/black/Manifest b/dev-python/black/Manifest
index 1558fa4079e6..d12baa98bd99 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -4,5 +4,5 @@ DIST black-21.6b0.tar.gz 1149421 BLAKE2B a9935d9ef3c9530d127cc2d06e2d64b48e6f2a5
 DIST black-21.7b0.tar.gz 1148431 BLAKE2B 34dcd2fd45b914433d6290c10bb07b44277cb490ef884c44ec00cb5495fadd2e649099dd356c4063d0fff5a6477609b11db73e1dc94d88106c56a3ca9b087c90 SHA512 7e6ee4e185080802c9dfc6eeb73b52b2489283c4bcbc086366f50ffb8ea3e0f4bdfedac9a5906be6ec119e65050741c71591c394f0c361a1d75b3ff4061945c1
 EBUILD black-20.8_beta1.ebuild 2242 BLAKE2B cdcf87b20f7d169425bf851b68dc8f393a7fa60837cce59f2ef9445189609291f5e53561c6411587e0b1343075e5bdf84fdda3771db629f856ce94a15adbafc0 SHA512 4a9fd8f011f4d10ef2dd21cb142065d568fd5d3486a00d4932c1f270aec46fe6f9e097667db0356d5c791dc7fad1ff9d88792292d281da69db3ec68dd5b1f14c
 EBUILD black-21.6_beta0.ebuild 1567 BLAKE2B b9ebf689ad0d2cf8a38fa296977ac10afe2626d90cf0cc0a0ceb8b26364a514d1536b34d21983984363af17262e4adfa6fb1d59721dc6a901cc65c7daf6971c5 SHA512 228058c935b77d23dd2dd26d42d3aef199e492255f39898dc57093b7ff81ad45d83020b7d981eb97811a29c3ba826a826858296894c2bcbedfd5c9202055983d
-EBUILD black-21.7_beta0.ebuild 1422 BLAKE2B ae1785bc5e8a449491bbcf784897c68debda63e3043d060a1ad1ccc6ad494e72d56ec7cb1ca03b38bca99536a6b6127a370142a2ab37ad92ff61e6f4b1d227a5 SHA512 79cdf32d05cc4e60612829cbf5d637200fec4aa30d418368f6a2bfa5b51a9ae36ca9a77b781d62661e9a2b87bbec8d7af33da3550509051a6052f3abd8534cbb
+EBUILD black-21.7_beta0.ebuild 1434 BLAKE2B 0fe181667639dd725c9d9a662b7b469921845d991715ad97b634e5546e5de67eeb40cbd23bb80065b8f7b1b67e31551523c089acc89c6a9e085208f6b31ed710 SHA512 0e519b66bbfcf72f30fa92fb2a5c479af2621bb180694883ad1226dedad96da1580bcc23e9d130cbe682f5bcd2b69deec2bed7dadec5c7f84e2abf6c24c7536d
 MISC metadata.xml 396 BLAKE2B d65402ff00389ead3359ab2afe53d33e88a5c0a6aedfd83f6a3fe946f4005e1edbd77683b2fc1097a7963383da492bad8889c2f30dd0408a4c8fb9fea6d508f3 SHA512 33aeaaa8cbcfbd0323075ebc06e4ff2dae2988ac88fe067a3fd51eae6b5ebb6ebaf9bc874d7275acc0ab6d36ac5b6ed9cb32d8e10e3e0bc3aaf75c70a5041c8d
diff --git a/dev-python/black/black-21.7_beta0.ebuild b/dev-python/black/black-21.7_beta0.ebuild
index fac1ef34357d..432285b3ef8f 100644
--- a/dev-python/black/black-21.7_beta0.ebuild
+++ b/dev-python/black/black-21.7_beta0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 optfeature
 
 MY_PV="${PV//_beta/b}"
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 398b7bec494e..cc263a1bf6e2 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,12 +3,16 @@ DIST boto3-1.18.21.tar.gz 402611 BLAKE2B 39974c66ed5ad0697be6df04dbb141ce28e9a09
 DIST boto3-1.18.24.tar.gz 404333 BLAKE2B fd0857a3462485a8cb633888ad6cae1578f32f7ef80ca5195e4b4953d2a4767baa41ce824eda5cb71211675529eb54b7d8d3ad42f1ec79a0b2cef847b13cdaee SHA512 c3e67c62bdf24d177c27d187eacb1118a7f221cb0143c72c6307af489bf9fe5358e2bde9f7d5f03ef9782a50faa17f31e57832ebc2f5dc73d1278c3eefc6cc3b
 DIST boto3-1.18.25.tar.gz 404826 BLAKE2B 629a7c76ec4125c93a57f5e103d0b6e5fe360038bfc73a87369a035b321b6b143cc61fb2092f70f2dc6b07f6444180e64cafeb2e31a8f1e73b195abe06979c52 SHA512 a8f2c1a6248a75f67848bf75970535c71c098bb326ab9e344d7ab53e02562383be7acb0b41a18bc031459e0751e62bf29c3db17242ea4ebf0d7f88636251872a
 DIST boto3-1.18.26.tar.gz 405107 BLAKE2B b851a4358fb2b7cc6a6468f09690ebf91e0348e7bbc878fbe403d8eadf023601673673aa62841a94045e55fac353bc632e419afd2483e124798477e0325a86a6 SHA512 941f41639c551b9ea140a003d215c87e209e0933031cdef717bba406a6957266447e8532aef00069c3e5e482b999c094eb89c9f2df084ad7154724b6d3ab3158
+DIST boto3-1.18.27.tar.gz 405813 BLAKE2B d3da4db8133c9ad7b979a6a765f0f6d7d72e558b31753b4cef376123dcbc3964a315303fe7205d382abd6ce42bb3afb10e867908e9567c36703c94ec0c44c027 SHA512 5e29a58e898b5d6a3b0e20669c4a18bef788b8856041d0c8e8fcaa603de167c7301db1eabcc11d326f0d33fd7b7ab8b408b804cf763667d6313df1e71d0210e4
+DIST boto3-1.18.28.tar.gz 406268 BLAKE2B 1379f65f46f287a541b098b3ae183bc7d0a6c40a58f6241d97ce39ffdde4f0655e755fe56890fda767b57c6cf7bd565d95745dbbeb80f42f729f561f6e8d9a82 SHA512 98c0d94dd4971f833677947dbfbdcd495a26fda60592130842cf2f22b8929c6f72f971294d9ddc4923372706bf7f37d3d4cb0ede32afc6955d8253c19ddab63f
 DIST boto3-1.18.7.tar.gz 395640 BLAKE2B 6a9fa1dd55644806fe93271805f35fbe0c4cb65d1de08dded2d2f57fcefa96e32c4ebe7b60743c52c0898222bc06d33dbd03d304bbef327b88022450a7943e2c SHA512 20e7fedab7d061ab02f391e9baf36cb554e7f194f38d24d5a75f76715b2acf1b51b6adce5d8cf5a2a0d29df73566db00b8813a219d45a194d9a8eb93d0dab570
 EBUILD boto3-1.18.15.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.21.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.24.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.25.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.26.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.27.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.28.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.7.ebuild 1338 BLAKE2B a69e92de424ab1fa0084c97696548757d540cce9caf96a613b072b1932cf1420aafea0b870d1c09fbc597c804fd19faba2079ad018337658663bff714acef154 SHA512 6471431e033a9d8e2f88394b59444503d8c726f31fa550295f6954a5ac4a6ee69e967b6b07216e468c24a518e0f01d7244f9e99ad4ebed010979dec3199e2043
 EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 MISC metadata.xml 605 BLAKE2B cb7041ecfae68d44cc4c533600c9527f901b3b57b4ac6b7877b489f849e1257f3ea157c901bb67dd44ef06296f02564b6b9e341bfd1d102b68512f7a40b48ede SHA512 2f9630e0d4396ae6f3a7a0aa328440fba250d330d4cb5e4a9cc68caaf0ffc133960294ca4fdd0bae150a212555ebdff07208e909c6f7207857a3b7774178dfc8
diff --git a/dev-python/boto3/boto3-1.18.27.ebuild b/dev-python/boto3/boto3-1.18.27.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.27.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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/boto3/boto3-1.18.28.ebuild b/dev-python/boto3/boto3-1.18.28.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.28.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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 3488542d64bc..3543a93c1254 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,12 +4,16 @@ DIST botocore-1.21.21.tar.gz 8042971 BLAKE2B 888abb929e1d66c293bff9d3d25682590e0
 DIST botocore-1.21.24.tar.gz 8048949 BLAKE2B 2948da75d445114d5489d3f7cef1d8bef9324da8699f69092eeb4c65a9be0fd82aae4ee97498f09d7cac05e33bc53fbd6720849a309c5edad96eba5450b45cd0 SHA512 6c205a0c27f9602580de7fbacee476b2855599bdd017f3c010f07b8f48a2ffd6acbce48f661d22ef0ebe30baba9db1ae65b1bea6afa3ae1a1c3add92abbd1478
 DIST botocore-1.21.25.tar.gz 8063998 BLAKE2B b3e4563cd36825468b6c7755fa101d13260519240b856fa26166d5bb034352431a29e816dc9e7d60f4c10e9d3b5fd152342749cc19a75a9c35ba228023da3f48 SHA512 cf91fc16047d0168d743db5bd95003a2ae06dc72ca586c622690e8c7be546bca050ba81eaf49fd860eb42e3a0046ef99e3927772b6893ddfdaf57a1071489714
 DIST botocore-1.21.26.tar.gz 8065456 BLAKE2B d6cd96e35ae31e6c440abad2a76f23d2ce6e2e0d5ecbe275fc0404cebaaf0a14245735adc39cc6d7fe5feb9530120cfa403f061af3c188623f6ba1ad01cd8d12 SHA512 3b57a6bcbdb018f0bc20afec8844f07f7135658b29329d0ed4d5579db1a8cc05e5725335560f5786b77c2f7590879ed7dcf6c043e0efd3f16960689c64f1b061
+DIST botocore-1.21.27.tar.gz 8076120 BLAKE2B e7928438ec4b100ef00d202899fae47c7bba4a351206172598718fa042c61c3d84a7559e45fe41ef4e736639faa538220b22d74c8652d980b4c339489129d793 SHA512 32f03f274329741096f3c82181dfbf6c337189e04db0890baf834364a6aedc09b33c1a0936fe53c6e51197d0f2385269dc2f3f8f75e62f260a11dba970ee6d0d
+DIST botocore-1.21.28.tar.gz 8079306 BLAKE2B 26dce445746a9da1b0cf62b622597396f9b4e735701f9260fd9863410b28b884e70e41b446b8349df39c81696b64632450f4ebb3e3f7865175e538f1b465898c SHA512 29534e51465bc7ac7b6f2e2c48472768c26caa5089f4c7f4a23cc2411fd55fde473388ad181a0b5a36650a6c1252ecb3e2b65e30510adc40f6edd6ce0c89f484
 DIST botocore-1.21.7.tar.gz 7977343 BLAKE2B 19c5bf5de40ab131585e30bb85486fcffc3428808811b312b33578174ce31a691f4f4d955462120f05d2aad2cd5e5772789704eee641760fb67099aa3cddc9b5 SHA512 db1bb36faa6857a1cc717e5d591954415bb948178ee2be90ab9c32c11b1fb45c5b5aff87dfacd907c2f11bc7cdd2cd4de2ee9c847fa8cda4e5f0814a828b1019
 EBUILD botocore-1.21.15.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.21.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.24.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.25.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.26.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.27.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.28.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.7.ebuild 1509 BLAKE2B 216976965e11900e4463d04fee34937d1da17543d2d8e8c79bd929fb96b81fd4e9ffcad094b5a7f3ce2c6e3924a26979247a20e9d5e5b7ff87b4dcb22290d4a9 SHA512 9f67abdc284f20ffaee6d7552b71da64b5e0dd3237fb52e938f99e9e248351f78affd8ebeee2798663965d25bf34adb444790903f04131fa46285f51aafc5acb
 EBUILD botocore-9999.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
 MISC metadata.xml 611 BLAKE2B 03764517dd63550373d7be154fef3a5e3a7e55abebc6ad58011b707d1e331c362dc6e13f6f1a6831827f8bf68dae027870abea885d8c5b3d8a64fcca4ae61fd0 SHA512 3532135859fe085e3fec2c04e0f5ab0eacb40345730178729736553f025037ffe77033d63407b4097f65cb31d1f300dd56b777d139630abe2f2f8f9991e0bd76
diff --git a/dev-python/botocore/botocore-1.21.27.ebuild b/dev-python/botocore/botocore-1.21.27.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.27.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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/botocore/botocore-1.21.28.ebuild b/dev-python/botocore/botocore-1.21.28.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.28.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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/brotlicffi/Manifest b/dev-python/brotlicffi/Manifest
index e28a306b115d..1d27a47d1160 100644
--- a/dev-python/brotlicffi/Manifest
+++ b/dev-python/brotlicffi/Manifest
@@ -1,4 +1,4 @@
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
 DIST brotlicffi-1.0.9.2.gh.tar.gz 22714 BLAKE2B 463cff7aed04718d1c77e6b3477dbbdb40cf61f0e045a7759bf1e8656e3b07e7b9f3ff5c5356069e752d750774a6ab203588a4094d27ad7ab9ae80f091c6ea3a SHA512 3d200f606c9851f0049835b53dd1f117727786505b5887e246934f41a978d375e1fa5a078e0811f130c009931e41c51575bd9d55b602ee7b6daebe9759ed15d5
-EBUILD brotlicffi-1.0.9.2.ebuild 1441 BLAKE2B 02003737d880b07b3c94e9e21c3ffd48f26d5911b28a9eacb52d8aeaf6cff64e46403dcc84503f7c336e43fa5c07dd427fbbcd0868e63c450cf18fc895338266 SHA512 f878acf8968d6d9f473305e9b77940b96d5f51203d59c33d686ca17be8563e3a7b538ae7e8510dc74ada436bfb9245f8701c9c4ad7cc29129dd2a80e0d4a8ee4
+EBUILD brotlicffi-1.0.9.2.ebuild 1447 BLAKE2B 9abaaf4b1cd0a015dbe6a2d0b86977b4a787395cba9ad07721e0b45f9e8da569fae1cd1b1614b4ff9f465f201044c6878a56dce2eb77dd47c6399941e5a50113 SHA512 52adaaddb497608d59b668845caaca215ceea755a6fc7c224b5c08c9a5cee2c1d5286d4189c996d0ce27e8edf09d346b5ddd1f0ee41a7fafa09ac40a01708a61
 MISC metadata.xml 376 BLAKE2B 7044a00a2d66d5f983cc9485bc9a3124d24162cb72fb65c716653f1b4bddf7c6a1d3e7a407726098650167f74d5c10bab2582cabbb533cbf966ac0b8292cbe70 SHA512 51fee847f41d497493f69a12962df09d1229357502538b00c1941025230745bda4595619dca1277e6c01840c788e677ec0d1033d897350373e84ca6e9222ddd4
diff --git a/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild b/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild
index 11b4bff3f1cf..424ebd32071f 100644
--- a/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-arch/brotli:=
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index bb671fc4fccf..6aa33be6d909 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,3 +1,3 @@
 DIST bsddb3-6.2.9.tar.gz 230475 BLAKE2B 68c7c498d581dd5ca860060a3152f7ae135bbc75d00714764446d071e8ea88d303a73d1aa411db1ff8fc922aa6d486632fe38bef3596550150ed511a97fc9c9c SHA512 9e878ef865cba608fafe4274b660234927b9106323c3e4ddd728682b0f11b3c7edb9a3dd56cdfe8665eba890df4121695c9710b95bb2f43b8a0be3ec4050f61e
-EBUILD bsddb3-6.2.9.ebuild 1660 BLAKE2B fd8e6f97ea1733ae47a30f4244731785b30443bb92062cc9f03698032813e2839e4cf54a7f1d71cbb4bce299ef32c674ae0d7acd35eecb560968e537318ac0c2 SHA512 a66c57468e88fefddf0925ce93f45cdde111681722435002eb92d4d566d4e364a35d5f953597ea65abd76bb2d14891b996f87f7c7d5389a2709748440b3b9011
+EBUILD bsddb3-6.2.9.ebuild 1667 BLAKE2B 933386dd8bf470125ea45a7896f6d507702cc7b86d3c3415cbc3fcd9ec58cc43682a9a1061102d38793e57636e6285571aac50e4dc6d44a88462ddf090b01a7c SHA512 706175d3f2815c6bc51a723986e803b22c1c359e01228e6b8cdca264c38475c045ddf6c293b07178f4c801248b867e27f7a735fe3e917d4035d77cd2f03bcc3d
 MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20
diff --git a/dev-python/bsddb3/bsddb3-6.2.9.ebuild b/dev-python/bsddb3/bsddb3-6.2.9.ebuild
index b30ba33d00f0..06f089aafd68 100644
--- a/dev-python/bsddb3/bsddb3-6.2.9.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 DISTUTILS_IN_SOURCE_BUILD=1
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<sys-libs/db-6.3:=
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index 6d7e4419b9d9..b744277d4ced 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,5 +1,5 @@
 DIST charset_normalizer-2.0.3.gh.tar.gz 363159 BLAKE2B f09cd3c9da04123fc7104cfac6829ea23a82173c04469c4d98acf9311f1006f4ecb152992a397a97838f9312ad0fc8bfeea03960650873a9aaa753315245dcc3 SHA512 4fa5507c4c0c61b3722d7423f4b597514a30ad0fea176a77a1e926328003ba6c0f49c95b4f4a64b8dbb32985373706d895bae1c6e3fe1fe224851b8383576923
 DIST charset_normalizer-2.0.4.gh.tar.gz 363800 BLAKE2B 81a0474238fc2fad6792201629286c261af73ed5dc3c7c4da525b356507f53bfb3e53d1ed325647295986a16fdd2a1e4bec00ee0648cb6e44f201196ef778556 SHA512 64fdddf2b6574828cc37dcb310e5e023d994e9cd4f8a7f6fb5796e997542cb1b14d9444994ab2594267361712a125fa476205462f9c7fea95505eef3c9770d5e
 EBUILD charset_normalizer-2.0.3.ebuild 710 BLAKE2B 19d9dfe49c4fc71b3acf10183cc1644b4b349beb5e31c590569b69a39f13480887afa0c97ab2c5b10c4321f4bbcb854e51f8aa3d7a05d0c92e7ebb7dea8a89a1 SHA512 48cbe0bca1c62305ffde8daf2f195cb767fc3336ed1f52315b92030b082e41b196d611481b2fc4600731dd0c52e6f193d8bfc9e7b3c3556c3f7acf259bc842cc
-EBUILD charset_normalizer-2.0.4.ebuild 710 BLAKE2B 19d9dfe49c4fc71b3acf10183cc1644b4b349beb5e31c590569b69a39f13480887afa0c97ab2c5b10c4321f4bbcb854e51f8aa3d7a05d0c92e7ebb7dea8a89a1 SHA512 48cbe0bca1c62305ffde8daf2f195cb767fc3336ed1f52315b92030b082e41b196d611481b2fc4600731dd0c52e6f193d8bfc9e7b3c3556c3f7acf259bc842cc
+EBUILD charset_normalizer-2.0.4.ebuild 716 BLAKE2B ce5b9bb62a5ab600106837c2fc5b26c1c2b3a776489942a016e3c6707a18d62f5302ef674a3687538200cee1298388b83ea752de17c993485c35835718876787 SHA512 f8ff1414c42c502558fef0446c0630ec94c5e263526fddc3bf23023845e8aea6c04967df9b0fcc4230ec4aef18925af025c08906475ee4338eb9665db1b4443a
 MISC metadata.xml 364 BLAKE2B be46c29b2fa986a53e4abf38f4f68a9882e3a01c0d3c524a0935a51a04d3e71d98548401ae96e84155c943dc2baf127f28e0f24d764d9e4cea466e2ba010f432 SHA512 bca4661b93af7b085ba8c71ba91188a984336c30467d4e38a7856c2522f83ae6dee122e3061a9b434a218bcb11e18583fc02b85c7629dca5cfbeb6aecc63bfeb
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.4.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.4.ebuild
index 68c3ead3e5a5..359f4e1a969d 100644
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.4.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/colorlog/Manifest b/dev-python/colorlog/Manifest
index 99cdbf205a95..3a474054bcc9 100644
--- a/dev-python/colorlog/Manifest
+++ b/dev-python/colorlog/Manifest
@@ -1,3 +1,5 @@
 DIST colorlog-5.0.1.tar.gz 29356 BLAKE2B 12795172417fd833a3a90175e4b169fee6299728921ed84c1eb9b96f18b22ce043809637744ba136299e59049fe5ccc21d5c9d35b0e402c0bfb982e8aa69ac0a SHA512 53cce2f97ee36d8429fa5917ce6d143c17d4f258aab5ab30e999472ff4401b8cf2bf9d6152a003f02e11a3c05ee42fa9562728853557b41ff17cf2a5112c748d
+DIST colorlog-6.4.1.tar.gz 30609 BLAKE2B 3171d18992ba6525ab63d6edab224f35cc4cd896e725dcb8b774b46ebe7e54457c27475aa3852ffa8bfda01dca9085becfdd67f2cb79c29fabba1f559c6ed6b9 SHA512 72b50175b4f762961f5d73399e62f8caac2f4edff361a7b3d33fba01de477bd7292345f7e4326191e770c8cff2317c481faa67bfeca2c2706d2f89a802cf28cc
 EBUILD colorlog-5.0.1.ebuild 437 BLAKE2B 0e8aaa539be3e192e632616c39bd7f490a7b354cc14f6459cd4000370376d203a5c0858854ac66787a00193b688b0f8e34123bb798fe277f5ff876dce5397439 SHA512 b0460a2a2c505854ab363e3df3bde7013ccf9e4ccfae221d69d484a1602a6bec6d627d38d9eeb6f216a7f8f1e89d43af97873f30a7cc7b0f7695820cd4679bb2
+EBUILD colorlog-6.4.1.ebuild 438 BLAKE2B 52af83e8d8d37ddd15243e52a181d2cbd4eb7123f4d1119e5607eb799b55499a9c30d61daae0959c7e8775a0e206e269021a406380597d6ac2dc59d0e457492e SHA512 5d4144acb965b148136fc7bc5aa40ea2b589dd59f4f59ee9ab837e785f28df75c654fd376864a9aa4e1abf31e807b4e65097f38327e7f6ad6bd1344914c10588
 MISC metadata.xml 414 BLAKE2B 6d745b11747e4fbe68606289b2fccd8433a73d9e26531dc966af716ea2309c023aff26f42f496f7ecc8f280476c7dbb46d0411c863dbf51921c1b7dbbd16ab29 SHA512 eda6c7896513bb601ee87038cb35f32b556007a0312821dd8024588ea766267931998d7276656761a41f6475a1bbefb79aebb5e82b05e010ca26f312c52a30d6
diff --git a/dev-python/colorlog/colorlog-6.4.1.ebuild b/dev-python/colorlog/colorlog-6.4.1.ebuild
new file mode 100644
index 000000000000..484dc6371839
--- /dev/null
+++ b/dev-python/colorlog/colorlog-6.4.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Log formatting with colors"
+HOMEPAGE="https://pypi.org/project/colorlog/ https://github.com/borntyping/python-colorlog"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index ad26f5393b0a..0aa6c328298c 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -1,3 +1,3 @@
 DIST construct-2.10.67.tar.gz 1189939 BLAKE2B e3effd2bb2906435208ef6a5fadbdbde2e1ef3565174568949207bdace48e25f423932f08598c82df661919d926a18d49767ea1189b01a5a3ee48aae601c45c8 SHA512 a4c7cc32b9eb63311c6ae2b1580b7a696c1e0c3960d78936798dd794cb37a77ec8ed8baa8128f12abd50390b9f4cb3f150e3453d5043797f0bd603525b8292a5
-EBUILD construct-2.10.67.ebuild 1029 BLAKE2B 02a11e7eb758eb5e9e4bf9321a2c4e03808bd60bbb9d575e8413a5883ed004a79c5ce157f246d2f7cbe0f44840293de51e4d275ab87de3a1d04cf9a2989d1b4c SHA512 02ecc011249fe759b12572e1375282e62caea91932569b25bf0979fb33979519d9ce924c5eebaa8d3ddb97462dce29ce56d2dcdcadacaca05a8fd4a2c5fc429e
+EBUILD construct-2.10.67.ebuild 1014 BLAKE2B 6b444e2fcff9e54ee78e9006e91c061336ed79db45c7577bfc072213c09b3fc96815b7719ebd552966bc3b479eacb37b4fc90ad0e7f81efa2a498306d0fff5c2 SHA512 02ccda08e22eff4b51219c415ae23caa870f584e83be50feae405abe934580b81c28c68983496050a1a4f489286d0136695f92b0fb0a3ee20c94a99f7c12c0de
 MISC metadata.xml 529 BLAKE2B d84b9d53c6bf6326dca24517df887c8edcb5ddce3c991bbcbbbe0b88df079f26e42d7bd1c634e6c769c9c784976f183e1f74f05d5476be4a5aabd22ad1be15e0 SHA512 6ccf55b1d39223fee6b243d86f918d236f8dbbc7583b7af4ca0c30d539a3998f74ed5d405d8f7381ca9a06ace0a7b405db0eec669e6bbbcaa33b6767639428f0
diff --git a/dev-python/construct/construct-2.10.67.ebuild b/dev-python/construct/construct-2.10.67.ebuild
index 89b9b60fbf75..4ec846464409 100644
--- a/dev-python/construct/construct-2.10.67.ebuild
+++ b/dev-python/construct/construct-2.10.67.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A powerful declarative parser for binary data"
@@ -25,9 +25,9 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-python_test() {
-	epytest --ignore tests/test_benchmarks.py
-}
+EPYTEST_IGNORE=(
+	tests/test_benchmarks.py
+)
 
 pkg_postinst() {
 	ewarn "Version 2.10.x has significant API and implementation changes from"
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 4c4a5cb46399..41c728c34493 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,5 +1,5 @@
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
 DIST coverage-5.5.tar.gz 691258 BLAKE2B 66bf340956b760d996ce424f977b407eb74062db56108e4910459dbcb7c271820ca655a648021763aede1c4d87c44524cea0cb34f969f203f630d48cf15b05b4 SHA512 fb78b4920a2f18afb9545a6f13910f491708443965881954fff6ee8553ab3d6bd898f7a95df1091435e8d5627ac850b880a6233e716a6acb934ecc195ec2ee52
 EBUILD coverage-4.5.4.ebuild 696 BLAKE2B 978145cf86643bcc100bafa81376905733e2da2dc18b049c2113ca157fce6ee9598bfe702ab3a971e625c9e808a49a8deb2975423caab242cb67226342b502f5 SHA512 4aa40ca9b749700ddfae1eb9ed2ab06bf6e2a342d1e54e4cd191caec4d6b25465399fe693d46e7cfef70a27855335e9e02039342a3357344408c663e52dcd463
-EBUILD coverage-5.5.ebuild 1660 BLAKE2B e64be303c89fc8947fb1d089fd5842291f2c8af248419df318faa6ed6ab18ba6380484bfac5588148c005f6db8addb516d9a09c82e0b8f6b219a70a01cc31333 SHA512 4cef25343b088f10630f57e9438541c2d9b0c126e9258cadd3d2ced4e5c7a80d75331357b0c7647cc16b0c541173b16146ef110815f5492af975ded256a45f57
+EBUILD coverage-5.5.ebuild 1666 BLAKE2B 9d962060ebbfa2d75379d57eeec9add4f3dce4114ecadb794e84dcdb5d4d1bacae224499227199c04a9b3e1b58546ddcae726530294e372ce2e035dd60d4be2b SHA512 f2c4486de9babb1c790acb03ab0524178c0d445351229a642636bb73cd076c14c442fe385a9f6e20a1a4612dc8b58a30938d371bca2253e37dc9d3b5f7ed2de5
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-5.5.ebuild b/dev-python/coverage/coverage-5.5.ebuild
index d5939aa8775b..c8e998d1e144 100644
--- a/dev-python/coverage/coverage-5.5.ebuild
+++ b/dev-python/coverage/coverage-5.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 #IUSE="test"
 # The tests are impossible to appease.  Please run them externally
 # via tox.  Or fix the ebuild if you have hours of time to spend
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 3dcf43a7020e..b9f9ed38927f 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,5 +1,5 @@
 AUX cryptography-3.4.7-py310.patch 8611 BLAKE2B 6cabc8056658f6a0c895a75b287ebfaa3d25c4ba9f95e28bf63c34bb87ccccdb4b04e42c5d72fdb4d889560e1ca13c602755fa05b9bab3b1fe05788abe110964 SHA512 d1c89a6c50fd4032d6aedcf026592b52b1e38922ecc2a83e8defcee5b7b4845a66de45de897fd3c2022c6118591811b9fc25df7fdd33d219647e0923cd906a66
 DIST cryptography-3.4.7.tar.gz 546893 BLAKE2B 49bc1e098ed1ba0181059b645f6668cda6332d196eaca55270ebce6e07e5bb6ab6724c5050fde20e89b7025773960d74ec782bb875badbbd5dc9a04db0a536f1 SHA512 3c4cf64bc0b067ccdbb71efe04c32ac9d673faea6cc4ccd13d6b1b61920be4785806d19359b7657d032a2ff1c011a8b4f16ec4924d9df8a59d1a875a7f844473
 DIST cryptography_vectors-3.4.7.tar.gz 35168102 BLAKE2B fbefd3ff96548dde012fd290aba1c99d57db376023d486910e486cc9c143461ef1ae9b77824cc03307723d35142f0360bc961b548a4edc02357d3f1a0e7e4e9f SHA512 269b50fa4c5300da6758006d12be42f998630d23053ef9af0eb588fc9e6994b044d8822cff105e338f4d0d746ed0e204a4a9c42f54667e355e1ce86e6754bbe9
-EBUILD cryptography-3.4.7-r2.ebuild 2080 BLAKE2B ab2d65326c4465b0bc20da266317f9fd6552fc3dac2b4249099cdc5671bd372e37267b1ffa53d7ac1bd1c425e965a3f203081280f5517a295556afc1b0c43b42 SHA512 fe4ee78741c32fbeb01bee53a4cc6cdfda9960568feac8f38d6e06952b3532fa7d5789e70a85895746e2cca840b365e4d7dc6ba5e52c4237f296cee95659eb9d
+EBUILD cryptography-3.4.7-r2.ebuild 2086 BLAKE2B 92b3e998320010df6b9383c93d0ca7c3438374d5d5f04d9dca61572ef405e2ad5c483f9447097b2fcfb8b66e8b2ec7378ce13b0a4def6fbec5f4eaab3710bf68 SHA512 bd50f4c52755ef2e192db99eb9d54fb859b8fefd4890ad2e058a02aabaf62c1f2d9c06986112ff88c1ca3a4cfe51817f392bc4fb36ece0004328df55e5090d1d
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-3.4.7-r2.ebuild b/dev-python/cryptography/cryptography-3.4.7-r2.ebuild
index 57dc03c410a8..8fb881ddf1c4 100644
--- a/dev-python/cryptography/cryptography-3.4.7-r2.ebuild
+++ b/dev-python/cryptography/cryptography-3.4.7-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cssselect/Manifest b/dev-python/cssselect/Manifest
index 303a59094a49..1c73442533cd 100644
--- a/dev-python/cssselect/Manifest
+++ b/dev-python/cssselect/Manifest
@@ -1,3 +1,3 @@
 DIST cssselect-1.1.0.tar.gz 35516 BLAKE2B b4480ad4335ba15ae8a2ae758ff942865a5b61de68b3b00fb59d517b1dacfce1cd817280e4aac562dbf829f90601a56220f01d99aecbc502420b9102e50c46ca SHA512 b33bca6a026f4de37b75606fd238dbd170b57d06288fbff3ea97ce79685a99af275fb8522b04ea9d6693aba5a18541d70b657191fdad881be79718bcf2e7655c
-EBUILD cssselect-1.1.0-r1.ebuild 695 BLAKE2B 97b8f89ca6e21371ad46e998786f26379fe6df1adc918dd432ce8176a1b7acd3cdb245ff4cb475d029cffd5ca185035579d6824cb60ce24bcd663d600f1dfe25 SHA512 5e0e3ff06ac1c6c9b7c1a183bfe4c06f2f08d0794ca4fcb061727ff2a858e2a4aeded3134f836afed14ce9af2cebcc1590c7c384e7f398a2b29343d274da970c
+EBUILD cssselect-1.1.0-r1.ebuild 701 BLAKE2B 33ee1087e527c53dbe55328ccd3dd7edd04862540051ba75784ca85143141b9f69b2599cdc50d624a1da156d5a06fb3aad44a88fd8709671a82b496f803cf13e SHA512 a52b32e55967051fb29191c479e0d0229da895a6236b8b31afc769dfd850df749b6aa418b615ea8ca6c335842d912116f8d30b692a7beaa08aa6b6877dbac742
 MISC metadata.xml 392 BLAKE2B 303b60a36eb7f9c18b3f6a9a7fc164ce8e0896165200bd418718a47d77e8a9d970ce0eb274702b7bf24cc3bdd0b385036bcd5d01cf40fb724587369001223693 SHA512 03d9bc1936c4b6567027916468d2e12f29be783763d1a19719de78e59a142e247d51844b4ae9d12aa533b195473b2057ce6d5e08ef9d548358fadc7f4eaf558c
diff --git a/dev-python/cssselect/cssselect-1.1.0-r1.ebuild b/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
index 78465a2f7da1..61ef27d555c7 100644
--- a/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
+++ b/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/scrapy/cssselect/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index e0b63e846d42..40eba72e1668 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,3 +1,3 @@
 DIST curtsies-0.3.5.tar.gz 53472 BLAKE2B 7ff50b8cf4b1b5016f15eee00333a1de38a31d97444f6462c7ec0429a1656bad442126880f770bff575dde8456660169cfadf63fed804b2c7890d700d792cc87 SHA512 e46ab3f79e2385055e4f3f9bc1d2c341605b93c21a0e6c42f4807b1801d37f70cfbdd1006db1ec12257e95d91aedddd95aa31a7de99bbfc09a6f0ee473497747
-EBUILD curtsies-0.3.5.ebuild 598 BLAKE2B a9f9244bdd22d5d9ab711f1f16716134072346f1ab987e0ae37e4450cf28ff747a9ac9da9e2da42d5711afca91f0f3788e2d2d67873820cbaa79c4a171795cd1 SHA512 94fc3adfc326fba335625f567181028c225c0663e49579d9cb6aaffa630ef3cf6cec9945aa34871accf0512b83011d34efdb9d1336a1f3feb14600abd6c0a013
-MISC metadata.xml 412 BLAKE2B 1e014dbbbcb73ac1fcc715a2e10b9438531645e642471ba14abefcb190f861ab224b847cf568ab014e8c39a569c67853bdf1d39cd41332902d3228b4690ece8f SHA512 96dc3f518a12d6e7f604e8f4750475831eac1f29c3431daf0983c0fe91e999136e7390c42837b2f53f33b256a4692cd064b16e84b97c942e7795282379b13240
+EBUILD curtsies-0.3.5.ebuild 592 BLAKE2B e32fd9a8bc11511b0056655bd5ac531ffd4ce8fc14cda8e784689c78c685b1faa3b4ebae4a0eaa913f8777516aadf5f094233e2760b8aa23afb6cbf60fdb60aa SHA512 a01cc46b45aad273aa6daf5d455e11ec8e5c9b004045d3e6e42408d1d3fc1beec7b8329a83a19b4bc2fe909ba0dbe14fe450e11354392c5808464126acd389be
+MISC metadata.xml 404 BLAKE2B 98362e43afe591f13b7954450f9554e2782f89d75c8274db46276f03e22f97217915a297652765e4e67af807e34b4a728bb2390b17f36f2dd6f8b369bc96e0bc SHA512 bfe6d085665f54da7c2d313ea06c41f25f3c63755111f876062873650d8e7a0cdf23cffcaf63cd18e9f018538afb8db8efef4ddbde6981d9aa73e5f64c4cd41a
diff --git a/dev-python/curtsies/curtsies-0.3.5.ebuild b/dev-python/curtsies/curtsies-0.3.5.ebuild
index 8bdf1bfc514f..65b04a9157fc 100644
--- a/dev-python/curtsies/curtsies-0.3.5.ebuild
+++ b/dev-python/curtsies/curtsies-0.3.5.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Curses-like terminal wrapper, with colored strings"
-HOMEPAGE="https://github.com/thomasballinger/curtsies"
+HOMEPAGE="https://github.com/bpython/curtsies"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
@@ -19,7 +19,7 @@ RDEPEND="
 	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
 	dev-python/cwcwidth[${PYTHON_USEDEP}]
 "
-DEPEND="
+BDEPEND="
 	test? (
 		dev-python/pyte[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/curtsies/metadata.xml b/dev-python/curtsies/metadata.xml
index 4a5e419f1526..80f96cb5f953 100644
--- a/dev-python/curtsies/metadata.xml
+++ b/dev-python/curtsies/metadata.xml
@@ -8,6 +8,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">curtsies</remote-id>
-    <remote-id type="github">thomasballinger/curtsies</remote-id>
+    <remote-id type="github">bpython/curtsies</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index e60d50583303..2ac2416b2fbb 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -5,12 +5,9 @@ AUX cython-0.29.22-spawn-multiprocessing.patch 963 BLAKE2B ebbc3f6f4fa88e7e08232
 AUX cython-0.29.23-test_exceptions-py310.patch 656 BLAKE2B 6c650c85d01b8bf367528d144cd967fa9def94634e35763e2e7a1c3e5afa2b01d0c84694024dde6e45577eee223f6464b5f88ab971d207d35892edf347a0c08f SHA512 d8f7f770a0b3303552deec0e7d3f9258de1edcd384f4b2c3881634fd21ce847a3d974e9142d1ed2fbe3a549e65292c6690be3a36ab4de52d0593d9831dc2f7ce
 AUX cython-0.29.23-tracing-py310.patch 13401 BLAKE2B e2359644ef2dd2c2f9eadc41eac6634d8bcde77edc4f7c11b8c6c3ae2f037965291c3cf9907ac5e07f3f97505adf9c2040f30e7830c9216bd7d51aeca68b5286 SHA512 e0fbd24224da1e848fc37dc8652738086c43297432627599ec8d43cf75c6f7a9cd1ff360d156f778e13749f339767608e631336f988f6f17d6f3f40b654275f8
 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
 DIST cython-0.29.24.gh.tar.gz 2097245 BLAKE2B 9f5f2da0aed61d7fda2e14ea0669a2dd187cd053f3b82621342c7be29e26ff581b673a32e43bacd5c0df3e515f250eb23a64b1dae8911132fdca48175910a3dc SHA512 387a827f3cb7428248019744e3ed606a133d98ac882b83624d24ae0fdf8a8f2334978555d7d84e5cc4adaf715c541fef64e45bcbdda85ca33473c21f99360be8
-EBUILD cython-0.29.21-r1.ebuild 1792 BLAKE2B 03fbab5e328ff2dba249e6a5bf17abdb4fe69217f3527a89c4920d78129bc4a40b267ac58f8eb70deddd432ea34538a44254e1a71931f7263fae8d3761b9c1a2 SHA512 7b0240e6ff14f2cf12e54deaf025cbb4c72984a351541b646234091159c0a4e2305339cd6a58f64b756a9f99aa39fee3e9b326127e5bcf98ccca5de26d9bdf3a
 EBUILD cython-0.29.21.ebuild 1987 BLAKE2B 1df83b6ef7f839622cd73c07384ccf0a6e722fe5ae9f42374ff9df2995e5b624e78a534c078534c341d034f984f73fc5c3abe954166ba8ef0f3fcc6aff2fbf06 SHA512 aa85e5d5ea9a1413686d8903af4c2c310f504ba0fc1ca469253010dae7a2abbb434b5d2e59f18b1a22f1149cfaade4b942466973e9559b913146abdf3b191155
-EBUILD cython-0.29.22.ebuild 1845 BLAKE2B fcace04a858c1fbbb291c7ac9c961c8fa2cfd9b222298082bb183cd0608015965110d0c809daf6cfc206c0f9db709d5689ac71711f8bf5c06cad0d974c09ce60 SHA512 c93468b1e423be8ddbc42bb507070d33a88454b85ddeae6eafbcaf3d50f6658f1732bb8f45381b714af3d141fb05ae76d294a8149a2cbb3cd7cf53893e1edab7
 EBUILD cython-0.29.23.ebuild 1952 BLAKE2B e8d88577efb70db3f75a7c0068bc1b9659132bde1927c3a50a92822020d6d575761ccacd66f2efea021570439c5c052cb352834071d8ef505247ba427d045da9 SHA512 cc6643d4a19a075e0e54184775596251060bcc9b73c6b9d6a26564c5588ab81734d30127c42b723d3c1e62d9afdc5f268dddf1a26df5c138634b9cabc5caca44
-EBUILD cython-0.29.24.ebuild 1826 BLAKE2B c412f584f72cd13a43a47d21d1406e692b634f964090b309868360c7fdd8244213633f831e970b4b1b5e756f636001ccfbd8a62499c2c5967f175d902dc35c07 SHA512 6e146597a191232445d624e1591c1e5cb52639743a9215e29c7ace4feb711d8c362d0d695eda698fe0f06d668bff157d39b6e501db0f341a275bf31c7aff175f
+EBUILD cython-0.29.24.ebuild 1832 BLAKE2B 8c16b823cd4559572787a1b135050bd7cda1301e902b393b537363b4657764aa8386810b9d57fd25b66231fc47d9502be265b1bd4822170ee3020af709e95d1a SHA512 68bcd199642518860b62784d718138510cb3e0036803e856642dbbd53ef50126c2d9df17fefb16d82929f8547973cbf20a4fd73897e6adb17fe6fa90d95d3b2f
 MISC metadata.xml 605 BLAKE2B 900f2ffaa501d7ce5bef46115f7fdbda0966bf4ae048b4c27ac4be06e1b23de17c674e27f97627aed8d1d65b52bea01532d8a698bdbcd20b7c9fab4bad278b16 SHA512 66176bb6e00f70b610a41bfbc973bae2b4b8b9aeeeb6bdc9e14c2832d513d5452aec6509f8225daffb7e169d93311a4ccb026c935ead80ffeb35d91f1ae558fe
diff --git a/dev-python/cython/cython-0.29.21-r1.ebuild b/dev-python/cython/cython-0.29.21-r1.ebuild
deleted file mode 100644
index d2425d2b6e78..000000000000
--- a/dev-python/cython/cython-0.29.21-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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}/cython-0.29.14-sphinx-update.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/cython/cython-0.29.22.ebuild b/dev-python/cython/cython-0.29.22.ebuild
deleted file mode 100644
index 0806d6415bb0..000000000000
--- a/dev-python/cython/cython-0.29.22.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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/cython/cython-0.29.24.ebuild b/dev-python/cython/cython-0.29.24.ebuild
index 2dc83aee957e..0c107a31d2b0 100644
--- a/dev-python/cython/cython-0.29.24.ebuild
+++ b/dev-python/cython/cython-0.29.24.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 )"
 
diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
new file mode 100644
index 000000000000..02447e94e7fb
--- /dev/null
+++ b/dev-python/debugpy/Manifest
@@ -0,0 +1,3 @@
+DIST debugpy-1.4.1.tar.gz 6687670 BLAKE2B c7761f354700d366d49365b0294ba1f07f357283c7527fc961c702bf99d808835741a899909e37092026c81ff19f6d96ef09c06512c8315ccad158b6e8e47697 SHA512 aef7779cb3a1af76b5cd3d6e8c7e0b78ffe08d1ebe25cf617ca3eb00966d5b3920358809c018f5f1f9eb56b913211134acfdba7d4c0d0174e4d6cfdae058d5f5
+EBUILD debugpy-1.4.1.ebuild 1052 BLAKE2B ad891f2789781b42198ec04e558aa8c05611ed9933430c84e7cb862f84d5803ac2a3e24173d566021b278f6d73d348601f3d0350187232d6d2a346b113208358 SHA512 aa6b5acdb4d2bbe5bbc7b90d78ce6f8aa824c9bc3eb548510f03d8682cf17869c71bcdcc003d02d2883646135846f45ee4630fcfe3ec2e1d1de0cd4318b98d92
+MISC metadata.xml 450 BLAKE2B 3f79fb2dc3ce19630fa2a268272de24b44618ffeb3ff71751976f83a76ddfa1a8f1266b09064228872ec1c26cb5124d520b835d93fc193c9138b12d54301cc22 SHA512 d41d73a2d79ea72997317b30526904e900becdddf0896e633bde612d0079e3e48d7449625f6117abfa2ec24a561bae1c1442b789935b42f6e3132fe21efc24f0
diff --git a/dev-python/debugpy/debugpy-1.4.1.ebuild b/dev-python/debugpy/debugpy-1.4.1.ebuild
new file mode 100644
index 000000000000..f49de56ebc48
--- /dev/null
+++ b/dev-python/debugpy/debugpy-1.4.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
+HOMEPAGE="https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/"
+SRC_URI="https://github.com/microsoft/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# There is not enough time in the universe for this test suite
+RESTRICT="test"
+
+# These files are included pre-built in the sources
+# TODO: Investigate what this is and if/how we can compile this properly
+QA_PREBUILT="
+	/usr/lib/python*/site-packages/${PN}/_vendored/pydevd/pydevd_attach_to_process/attach_linux_*.so
+"
+
+python_prepare_all() {
+	# Drop unnecessary and unrecognized option
+	# __main__.py: error: unrecognized arguments: -n8
+	# Do not timeout
+	sed -i \
+		-e 's/-n8//g' \
+		-e '/timeout/d' \
+		pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/debugpy/metadata.xml b/dev-python/debugpy/metadata.xml
new file mode 100644
index 000000000000..a8dc72385883
--- /dev/null
+++ b/dev-python/debugpy/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">debugpy</remote-id>
+		<maintainer status="unknown">
+			<email>ptvshelp@microsoft.com</email>
+			<name>Microsoft Corporation</name>
+		</maintainer>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/deprecation/Manifest b/dev-python/deprecation/Manifest
index 7038404372b9..b1d6fcc1fa23 100644
--- a/dev-python/deprecation/Manifest
+++ b/dev-python/deprecation/Manifest
@@ -1,3 +1,3 @@
 DIST deprecation-2.1.0.tar.gz 173788 BLAKE2B 444c7ff688d6eab7dfcf58ad24580b5a6df39a5749341b28d6d5b9b516fd6aa7a462d7f644e6cba596bbf289be0224968f579837c6c71dbe7b36b65588da6eea SHA512 c184665d210c6eeb3f055b23e75c3714f3b18050e03bfe1384baf6c2504f1370116ae0e8c53ff818ccc54c0d633bbb3ba5791fe20b8029f3be0207b019a00275
-EBUILD deprecation-2.1.0.ebuild 647 BLAKE2B 3ffa5d552429ebb8667eb784dec51139ae5338ee04fd5e71943ab34c38e230b3926677dff6c58739c62cd676e1bd75c8d1d0d69cbe45db255c85335cde682dd9 SHA512 25790f808a62ccb9e8a0cd335ea5515099c69dbf649f8c1681b1c679b86149d58fda23d712476bd68dacc94412579c079710abb95034475135a068a3215c801d
+EBUILD deprecation-2.1.0.ebuild 654 BLAKE2B a29118a1c3152613b7f4502032570418a9f8f8d2d58b6a5b95db4105e02e6e768759fc8a673afac8341ba7ef746107bff7fb63d6792cb8cfce3578b64b521348 SHA512 56e98c41e49f3bb8f22949228f431172feeaa388433a37c9caef53b6e2bc315af609740a258d56be6390629646d76152ff3a8db40cfe7b791a43d642fb5b4271
 MISC metadata.xml 565 BLAKE2B 007c1977dff6e93c49877fbd0a41e12f7b59e73b12dd8cbd0ee309860195ab560b9bbb3f52b861be6742d5e8f1b78564eb69f74cf53e121e7c9df2a2e58f0f8d SHA512 89374b3c32bbf7f35e585295cfd13c50019304f2620a4b8745b20f0e37b87abc04c7fa464b9277630a723a1a0d4a6a9460f85b87c902285ad4033519e6ad5120
diff --git a/dev-python/deprecation/deprecation-2.1.0.ebuild b/dev-python/deprecation/deprecation-2.1.0.ebuild
index 27e83e0c5858..f3183fabca12 100644
--- a/dev-python/deprecation/deprecation-2.1.0.ebuild
+++ b/dev-python/deprecation/deprecation-2.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/dicttoxml/Manifest b/dev-python/dicttoxml/Manifest
index 0a41ad5adf52..4f274a4f3d00 100644
--- a/dev-python/dicttoxml/Manifest
+++ b/dev-python/dicttoxml/Manifest
@@ -1,3 +1,5 @@
+AUX dicttoxml-1.7.4-py3.10.patch 2064 BLAKE2B 3cf7ba808fe4f0a74281f29dd120304ff1b69e39d1a8cfaac930297fdc801acb11f13903ce3806ba823968ff1df6c5493a4e2672c37c4bb385e806c624c5bece SHA512 8813bdbe353eb54087946aba4cb6bad7893ad1ca9b92b449d2298fe6e4e4ec6881f712ffe2eb42154c6ddfce37e6fef3f7a6949a792e148c330dac5f9d99383c
 DIST dicttoxml-1.7.4.tar.gz 18190 BLAKE2B e8fd4974cbd9e83b72c25f28fa5595421be88ed5fbb1e64721280c4ead3003f95c98c7b4f12bced926f0c4af31b30dd76ddd49ddf297fa5f68eeb466d042ede6 SHA512 91abcf2b9b248717618e9fc1c8694e881b9deaa16438dd4674f94a22b4aabfdab3b13f95c3d44a60577d49eca82fb268f59b33d1312cf5388bdaf949a2865cbf
 EBUILD dicttoxml-1.7.4-r1.ebuild 485 BLAKE2B c0e650f38e955b2aeeb7fc967836a109504962d2c471cef833e615bb7149f9309e1553ce19ac6ed0d7e4c51512e5264a212521acd18176b83589bb0b92007dc4 SHA512 5ac813ec429c7bcea6b43498c053bbf4a30f17c2deb663bf294911eaa8ff2633597722d79d0624225d5d9d6c027a1a616b0484544b313373c0a59deed4ccab6a
+EBUILD dicttoxml-1.7.4-r2.ebuild 596 BLAKE2B 81240c4fc242e115a395b9ca514a48f63d36105f19d6334e7097d256c0df9b97e92832e370120dd5cbfd967c5675c1754d4609655f626010e5c15090e52e79f3 SHA512 62a6903808755bda8896eaa6e3901b7f82663a5e62b2253b9cdb3341b81603eecdac79ddbe388651e2f6878fada61f843f806f51aaa56b73509e178d31ef6461
 MISC metadata.xml 503 BLAKE2B 6669e69ea7d5afa8edb064e78652a4b035f19dd786aa8eb531ed2cbdc4274a884330e7159b9a3ed051a28a0be531237bc88fe893961e5b59fec738a6d902a0c9 SHA512 3bf0c6926f48f42ce8e81c3111a625f43d043af1a95fc74eeb2463f789a2226591cea81b5f1ec1f4c12bbf365f3002f5f652f2dc7ce0ae2bf26bee1eceef75b3
diff --git a/dev-python/dicttoxml/dicttoxml-1.7.4-r2.ebuild b/dev-python/dicttoxml/dicttoxml-1.7.4-r2.ebuild
new file mode 100644
index 000000000000..a6882bd19034
--- /dev/null
+++ b/dev-python/dicttoxml/dicttoxml-1.7.4-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Converts a Python dictionary or other data type to a valid XML string"
+HOMEPAGE="https://github.com/quandyfactory/dicttoxml https://pypi.org/project/dicttoxml/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+PATCHES=(
+	# https://github.com/quandyfactory/dicttoxml/pull/73/files
+	"${FILESDIR}/${P}-py3.10.patch"
+)
diff --git a/dev-python/dicttoxml/files/dicttoxml-1.7.4-py3.10.patch b/dev-python/dicttoxml/files/dicttoxml-1.7.4-py3.10.patch
new file mode 100644
index 000000000000..5b3fe172949e
--- /dev/null
+++ b/dev-python/dicttoxml/files/dicttoxml-1.7.4-py3.10.patch
@@ -0,0 +1,58 @@
+From 2b7b4522b7255fbc8f1e04304d2e440d333909d5 Mon Sep 17 00:00:00 2001
+From: Kier von Konigslow <kvonkonigslow@gmail.com>
+Date: Sat, 28 Dec 2019 14:08:46 -0500
+Subject: [PATCH] Fix deprecation with collections abc
+
+---
+ dicttoxml.py | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/dicttoxml.py b/dicttoxml.py
+index ae1384a..5d2dd54 100755
+--- a/dicttoxml.py
++++ b/dicttoxml.py
+@@ -15,7 +15,7 @@
+ version = __version__
+ 
+ from random import randint
+-import collections
++import collections.abc
+ import numbers
+ import logging
+ from xml.dom.minidom import parseString
+@@ -96,7 +96,7 @@ def get_xml_type(val):
+         return 'null'
+     if isinstance(val, dict):
+         return 'dict'
+-    if isinstance(val, collections.Iterable):
++    if isinstance(val, collections.abc.Iterable):
+         return 'list'
+     return type(val).__name__
+ 
+@@ -188,7 +188,7 @@ def convert(obj, ids, attr_type, item_func, cdata, parent='root'):
+     if isinstance(obj, dict):
+         return convert_dict(obj, ids, parent, attr_type, item_func, cdata)
+         
+-    if isinstance(obj, collections.Iterable):
++    if isinstance(obj, collections.abc.Iterable):
+         return convert_list(obj, ids, parent, attr_type, item_func, cdata)
+         
+     raise TypeError('Unsupported data type: %s (%s)' % (obj, type(obj).__name__))
+@@ -232,7 +232,7 @@ def convert_dict(obj, ids, parent, attr_type, item_func, cdata):
+                 )
+             )
+ 
+-        elif isinstance(val, collections.Iterable):
++        elif isinstance(val, collections.abc.Iterable):
+             if attr_type:
+                 attr['type'] = get_xml_type(val)
+             addline('<%s%s>%s</%s>' % (
+@@ -295,7 +295,7 @@ def convert_list(items, ids, parent, attr_type, item_func, cdata):
+                     )
+                 )
+ 
+-        elif isinstance(item, collections.Iterable):
++        elif isinstance(item, collections.abc.Iterable):
+             if not attr_type:
+                 addline('<%s %s>%s</%s>' % (
+                     item_name, make_attrstring(attr), 
diff --git a/dev-python/discogs-client/Manifest b/dev-python/discogs-client/Manifest
index 5d417e1e2bd0..fd8ad041e788 100644
--- a/dev-python/discogs-client/Manifest
+++ b/dev-python/discogs-client/Manifest
@@ -1,4 +1,5 @@
 DIST discogs-client-2.3.12.tar.gz 32604 BLAKE2B 6c7960263d0158fc796edd76f6ccc549d582cbd96666cbf3ae10a3215eee6464c857e1b46c8e76ad2a48308ae9353c347a421189b3c754bd23a0f2ec455d9cfa SHA512 c14ea953e92f2d77909a7af8f840ee5a1df2416e16f6de0b7f0e988f6ef56a07fc04c75b247508dc0d1b5f7033faf6cce80196b610d1169a23350d3e816e2925
+EBUILD discogs-client-2.3.12-r1.ebuild 831 BLAKE2B a2b7f9fa3faeafbfb0fe3c49f3835de84c2a62d3284a898231a041aa817f4bd500fae58addddc1030ce966613efaa64523777da9950e4af7f6667c552ccde607 SHA512 9b084c7869772ec6f24767fc1a4bf75f1f0f4ca8b5b0a90a167b52dfc529c29f00bfc8404c04a0e5e3af582d24fcf780f4249ddf0bdcb1909a35290934959c60
 EBUILD discogs-client-2.3.12.ebuild 1021 BLAKE2B 94912d663b565ec5b35e12f234d02112d7b3a9a2e1175cbff9068cc42b1b342c736897b2d12dccc686e07c1fc8f5bfacdc441ea59dc0109e74663fe3264b1775 SHA512 7d9517e14029c69a4b2c240539f4bdc178a14c0c29433a01554951f02e3552a536b7cab1381dbbcc65a39222a1bf3c8634a42a2d2243a6e32eb0e3a43d44a820
-EBUILD discogs-client-9999.ebuild 990 BLAKE2B 68b8bea1d25b99f423dc166e21ac718a860e5fc4e77d986e8c9030fae462fc5d710c562956a5a71335ab44c5d4724dadb206f9c45b2f0eff619d134f2df6976b SHA512 2740adc8cc667b993645c80b5b29c294c3f45bab00f6a727559b44999484094b3986396d1836bc840a59a85bb8a0985e330f8be621d3b260b340b7ccd548d336
+EBUILD discogs-client-9999.ebuild 831 BLAKE2B a2b7f9fa3faeafbfb0fe3c49f3835de84c2a62d3284a898231a041aa817f4bd500fae58addddc1030ce966613efaa64523777da9950e4af7f6667c552ccde607 SHA512 9b084c7869772ec6f24767fc1a4bf75f1f0f4ca8b5b0a90a167b52dfc529c29f00bfc8404c04a0e5e3af582d24fcf780f4249ddf0bdcb1909a35290934959c60
 MISC metadata.xml 673 BLAKE2B 98e3a538d3ad8756846896f9f1ba0e750e708ea3995a6ef92e865c1c01124b0cd293baaa2b34d4aad302e086da4d8861f9e3b29212709a552c70edfe0c248c2b SHA512 8053b2b02dff82941b077b68eb3300f4cf79deb62426fcc6005f0b5690d3dbfd2b4a108c943451f5fdb84022f35adde37eb038935d537316ee01c6fd63ba0de6
diff --git a/dev-python/discogs-client/discogs-client-2.3.12-r1.ebuild b/dev-python/discogs-client/discogs-client-2.3.12-r1.ebuild
new file mode 100644
index 000000000000..36b9175dec97
--- /dev/null
+++ b/dev-python/discogs-client/discogs-client-2.3.12-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/joalla/discogs_client.git"
+	inherit git-r3
+else
+	MY_PN='python3-discogs-client'
+	MY_P=${MY_PN}-${PV}
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Continuation of the official Python API client for Discogs"
+HOMEPAGE="https://github.com/joalla/discogs_client https://pypi.org/project/python3-discogs-client/"
+
+LICENSE="BSD-2"
+SLOT="0"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
diff --git a/dev-python/discogs-client/discogs-client-9999.ebuild b/dev-python/discogs-client/discogs-client-9999.ebuild
index e9fcd94f2850..36b9175dec97 100644
--- a/dev-python/discogs-client/discogs-client-9999.ebuild
+++ b/dev-python/discogs-client/discogs-client-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -26,14 +26,8 @@ SLOT="0"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/oauth2[${PYTHON_USEDEP}]
 	dev-python/oauthlib[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	dev-python/oauthlib[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/sh[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	"
+"
 
 distutils_enable_tests nose
diff --git a/dev-python/django-mptt/Manifest b/dev-python/django-mptt/Manifest
index e3d79e0b7f66..67ddaea551e6 100644
--- a/dev-python/django-mptt/Manifest
+++ b/dev-python/django-mptt/Manifest
@@ -1,6 +1,8 @@
 AUX django-mptt-0.13-test-install.patch 606 BLAKE2B 06e54fa6c93c2efda52f73d6cf0cf02fb07cda7ccf5a131664143852862a220d77d49ff39c0f0bb63ad47811f356c347be19dc78a3f6cfe24f20ffff32639686 SHA512 01836b1c45be264f24ee584c7736502f3f31982321f3a5c77481eb7214ab7505427c346392cc3f8a79fd0f74e45853d64708e03a1df9fd47ac5721a13ae8419d
 DIST django-mptt-0.11.0.tar.gz 98300 BLAKE2B cbae24143007dfe8913aacf4cbe22bbccdf929617adc31640c2d429d6ea8be727a937be0aa8353e82862b9fe8c571397db4dd3877015eb17c2c5a56172cc66a5 SHA512 21af30007661db1474628b6f8af86a3f6de52494efe1aaf9235f8b1660ba153f0de3ad91ff979588e4b681b00b44652a05146df7d3951d6ee62da38a1900fd89
+DIST django-mptt-0.13.1.gh.tar.gz 302287 BLAKE2B 915e3066862be4d0883ba540cf584d917994ecbf83182726f5d39a40b61850e4ef1fade2c12325237f2c345de14ca6e54362712eb7bdbdf553eb6ebbf321075f SHA512 bc64d24f8d889109a054f270802f8ce6308c12bf3b9ebe1ba818d42e6c1f9d8904b8cad996e71e03c7f77ed80d912a7d8bb920cccc0e2fff170e754816367f40
 DIST django-mptt-0.13.gh.tar.gz 302525 BLAKE2B 21b2fde5c81d83321bf7569d2064db87aec3c184f27cf3fc3bd34421be04212188e15f79a575b08aabb3a7b95d116bf3e5f0fb57c56cadf9ad2ac166e8e77845 SHA512 63dbb61dab59d42b5e747f35370a0840d40ed465979d1f93e66561cf4c0726635cae774f87e39cc1ac480847f3ccf0eb65dc8593759a0860d586e334fdd37256
 EBUILD django-mptt-0.11.0.ebuild 530 BLAKE2B 6ec476ce4451ae16c49a0896992047fcb22177a3d54eb0e38aedca6814e0af90531285aa9a2e28e08dc1cc4c321ca2e196d5acd31bb21d591b2d4a30d559e6bb SHA512 6fc8d461af1f778e8d240bfaed4378d4b7b6993f28b209a2c74a158ee8ba12add77684063df6e1b1e09082eaee2f1d2ae343e1692445e14ff12aded46944f3e7
+EBUILD django-mptt-0.13.1.ebuild 657 BLAKE2B 6b08d5f77741b67f41edf92c0a2d8442266ec676d43cd0168522fe1a9627a0b13ae33f142dca1b4276811713049d79eb1a7c8949682a23a8b9ec5c6cc5a1d3c0 SHA512 e11bc2eed74ec36a2b65557c929f1a5d63df07088eb0fa19de0e3d21572c1dbc8369213f1b79601c1e383314f7db35686726abf837bd55b5b9dc6f8bafb4173f
 EBUILD django-mptt-0.13.ebuild 709 BLAKE2B 84b11240e817eb37b07a58acb6e7e5a2ced2e52f78505025ea6a3e49a22cdc78e4ec35847008066614fe449ee8780b6152e8743459d2dcc4e06fb7701a2d30d0 SHA512 8b71c5828c81212452be273b75de55d35f12725520aa88c372511cada83307f6771505095320d5daf0ac16ae08f6b0980bac12d908847b3a88ef65f8d1e81aa1
 MISC metadata.xml 241 BLAKE2B bad9f760dafaea022669e7b898724926b5d06aae0cf9bccbf622f39c175f3391b900c17da4d5c8764702a0bcdf6d4a3b016dfc9aabe8875c384822d5df18474a SHA512 ddf81ebb9c853811cf273bdc71b4afaf7f30fa2116d53a87bbaebe0a67f7a29f1b371607e38b713750823f3afae609aab7d6bfc79c4d3762d228e7f2f8332b5c
diff --git a/dev-python/django-mptt/django-mptt-0.13.1.ebuild b/dev-python/django-mptt/django-mptt-0.13.1.ebuild
new file mode 100644
index 000000000000..10262c58b326
--- /dev/null
+++ b/dev-python/django-mptt/django-mptt-0.13.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="utilities for modified preorder tree traversal and trees of model instances"
+HOMEPAGE="https://github.com/django-mptt/django-mptt"
+SRC_URI="
+	https://github.com/django-mptt/django-mptt/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/django-1.11[${PYTHON_USEDEP}]
+	dev-python/django-js-asset[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	"${EPYTHON}" tests/manage.py test -v2 myapp ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/django-redis/Manifest b/dev-python/django-redis/Manifest
index 09d041a952cd..823d6da2f268 100644
--- a/dev-python/django-redis/Manifest
+++ b/dev-python/django-redis/Manifest
@@ -1,3 +1,5 @@
 DIST django-redis-4.10.0.tar.gz 59208 BLAKE2B 76a6887fdcce7decaeb2c4b76ff0ff58b8b074e902f6ccfc57dbdd21aeac82fbe37367caaf0af1c6facd5b87db6bb053b2fc553ba87b3cca970f2c0b1f99e35c SHA512 39e2d72699ceb2b0887e7048db22a4067001fb5e2c10ae2c5d2d8a0ab71e862773e443ba3a109f7b874b994a842e89772b3e33152aafd2a98e1cd906d5d2e690
+DIST django-redis-5.0.0.tar.gz 47508 BLAKE2B 67d87bcbde16730abd71945fe081d425c1047962ff2ca0c382f65d0588ef72103204f8febfeeda9ea382cf53a5c871c087a85ea817f04fac383961f69324557f SHA512 4516e30122845b49789f04fd079b5bc99a732e814d82deb817f14d105895069defa627f1852ce3fd8464de313a5f01ba81f87272f7a98830f7100dbb0c0bfb12
 EBUILD django-redis-4.10.0.ebuild 495 BLAKE2B 3820d88bc95a84614d5370db8a4d746db09f6dc7323c65878243a2c28e8238a7f644ca99da9dbc9e46c51c5525361f6f3c904ee9a1d69b7fbe48fcf48293576d SHA512 3aa9b03f28c4f177b5b17546185403d8a53c82bbff612eb4cfb5492747b24a841c63feac33cbf587dc01c8b87fd1af54c60717a28dae7b4508c1e1823951cb1a
+EBUILD django-redis-5.0.0.ebuild 1572 BLAKE2B 9ba0eb8f6914320f4e38727c9fffafc88fadbf00212a95436235209c5b7ca5cc75082db9d7573812d9cc3ef3971a851c496263c228de87e0a1b0716aa390331c SHA512 5bfb19cd2efa4c7b702dcc904a2d9fa7ac1735c5ebee385ed4504c7281be0abb890f0ce32860cc0dc16ea3276df7850ddcdadc29e7af2dfd729deada1e460bdb
 MISC metadata.xml 384 BLAKE2B 5d0785252e97fdb57ebed48e7f192236d384946b893ae2c36b180fac006119d094e899f756e95bcc04151b541a5329b4c55ecfdcb3542a85a3c8c449d6c6c189 SHA512 da987a6c44f22bd8d136993c38627b8059083f4b274d4b39a341089d990217efaf0a4c0ac1197476af7d5687adea3fc664d42ee33779882ac78fc02541233592
diff --git a/dev-python/django-redis/django-redis-5.0.0.ebuild b/dev-python/django-redis/django-redis-5.0.0.ebuild
new file mode 100644
index 000000000000..e7e938e20d1d
--- /dev/null
+++ b/dev-python/django-redis/django-redis-5.0.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Full featured redis cache backend for Django"
+HOMEPAGE="https://github.com/jazzband/django-redis/"
+SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/msgpack[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/--cov/d' -e '/--no-cov/d' -i setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	cd tests || die
+	local setting_file settings=(
+		settings.sqlite
+		settings.sqlite_json
+		settings.sqlite_lz4
+		settings.sqlite_msgpack
+		settings.sqlite_sharding
+		settings.sqlite_zlib
+	)
+	for setting_file in "${settings[@]}"; do
+		einfo "Testing ${setting_file} configuration"
+		epytest "--ds=${setting_file}"
+	done
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+	local redis_test_config="
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	"
+
+	# Spawn Redis itself for testing purposes
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 95b7e350dad6..de06e0e3d986 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,3 +1,3 @@
 DIST elementpath-2.2.3.gh.tar.gz 234094 BLAKE2B e3e56469250f3fd2135d9173d68cd93af2a6e03830859d03872967d72a6b7a39f4bb9288c341cc47c406ad55d764ad65a16169eb78598eeded48c424245064e8 SHA512 75178c12f42582a391aeb8198a45c732601251655e381cf8961dac2f6467217e5a18effcadcaa7e7206b18f358a70e1e4b170b9e02ba9b25108b1721da50ee4e
-EBUILD elementpath-2.2.3.ebuild 688 BLAKE2B 28b4d705730fc634fcf9aff912a16bbe19c71b4d17873815065a8f67f79ee87b8ea8a977dd3505f4915813caf0b2f3ec9f0d0cc08d9b6762fbbbc997f180b16b SHA512 a3a9bc5cb6efbaee893f2473648668e566d493410c8a2e2d1cd26d93d5eaaf2c62598b857fe66215a44fa68898268d18a3c2006e564709ef5d6381630570f487
+EBUILD elementpath-2.2.3.ebuild 694 BLAKE2B 37b2cb347e483973c75fee0c52382afffbabb2048a3bfe4e3a3c357b3cd42fe3989831e55fd63f09e647c5e3d064bbc4c282c062ec4df5d483c6b295ffdec16c SHA512 22608d2ce56ac5abc70163fc326c6020fa7685016b4be55b427b8e2937938ee585291bb8107951092dcf41cfc4699831c804658891a8beb188755561ea5a2608
 MISC metadata.xml 379 BLAKE2B 83728e52dcbc4f5794b1d73c968e2f28858cc1e1384dc9c48b5d462f8c50124681691aee7d290b926654cb8453b7b372f81eefc5de785dc43a3165ab8933a22b SHA512 36bf1752608d8d5cb3de0be695774b09c0ac66934928476e8c972e7ec0d163d3e61bafbfdc9f587215a2d8996ca2ddd14ffd26c16791c85c70f5eca7e1e511ea
diff --git a/dev-python/elementpath/elementpath-2.2.3.ebuild b/dev-python/elementpath/elementpath-2.2.3.ebuild
index 8cd6b6f9cc92..ea09e56ec873 100644
--- a/dev-python/elementpath/elementpath-2.2.3.ebuild
+++ b/dev-python/elementpath/elementpath-2.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/emcee/Manifest b/dev-python/emcee/Manifest
index 8dbc2a868f68..f1ec88739b18 100644
--- a/dev-python/emcee/Manifest
+++ b/dev-python/emcee/Manifest
@@ -1,5 +1,7 @@
 DIST emcee-3.0.2.tar.gz 4054969 BLAKE2B 16b9ebd34b450f8fb92dc50f0652a34f06d20a027ff1cacd73474f4c74ecce7102d5eea54182598fc17175897980131742c0d60ef217b0dc8285c18406ef4d7f SHA512 517c447b9426eb97b72b6e3b21d77720b58a42fc1efe9495cf7ad8a0682841b8d7178a6f070641f68a09aef507e854ceefab9a54afe6baaca8b41f16f34dce9e
 DIST emcee-3.1.0.tar.gz 2868282 BLAKE2B 333bb3dfb1b88bd768dc824763827d7b5f7f6dbef83c98a3934789a52d2989fc09474f628a609b3c0b930f3582bd75240895a4f0fe6e2cab486bc5cdc6947c56 SHA512 45f4ee3a9f6e7f8b4e3cf6eef187facbc1c93dece10a6b0c9c2d55da093f26e159c254818aada3abb1c45985950cd83f286b7f3e5acc467ebd2f292df9f1202b
+DIST emcee-3.1.1.tar.gz 2868516 BLAKE2B 62f3fa2a963a256a9b807d648ca370461f2dce1c186f0fc0f7c191dbd1e1a840c58ad17022c8ef4c80e925c20405ddd2ee87d9f448f20a6f2a3976c3b7584aa2 SHA512 f824831f7a6661d69af3be26a6cccc41d582ec5a9a6301d2bcb0622412832498c047738249087ba9686c430cc7b3d5a8a9c1db3bb78202f7d31ff6f5205f40a8
 EBUILD emcee-3.0.2.ebuild 647 BLAKE2B 09dcb337e04ae0dc70ebd284c41eace4fbc5527ec9ebe64c285f3c14a378f0544f347cc3bb26185fdaeafa94de141b34579a73c040914dd9db62787778156f6c SHA512 d72959fcfa29f2ab984e088242cf31ce3c9d8f3f4215a4f686046b51990da104ce8ec55655c26468c3fa0d6e78b2ccd1777b07ff1263d5c6f701228b0a58b526
 EBUILD emcee-3.1.0.ebuild 795 BLAKE2B 7140d6499017f17cb304072c97192314d839f28f7ed9ac0c3a90dd3fbf3beb1954a52641553b883c46f3778c863403b57538e52729d6e2af3855161c5ea545c7 SHA512 a9ca8ed4df5f17c292bcf1f94d847dfb4f2a3380cb62528911c0056bc5dcbc7cf66be8bb8ed1ee2e5263a647d2e654ac8e073b91226d81f0002ca35d667214c2
+EBUILD emcee-3.1.1.ebuild 794 BLAKE2B 6ceeb5a000b67096cf888209aa364ba0595c8e95eca54531784f8016115ce2be45e61c8addebd788dd0b3a33d19159c13bb3e298a8885664c30cac7823bb6de0 SHA512 0c2501b13335feef98db7348edeb57e4f87c10a0cd0ddad7720b6add080372ff13502c675b40e15ed346eee4ab4a27aaf86262ea991f14d58fc6c668217a3510
 MISC metadata.xml 865 BLAKE2B 5d1067b3f5aa4969bf5e50ca73aceacdf45795f0e28562b8800d1b0c84d1d0df36d50f788392b3c508aae9c7eb3bc80d8115ea2becdca370f046f543d6f66112 SHA512 e3a8df62f73e85de2462f6f631706f2940cf7903017065e9b1c1e639e409bc7e99d2213ccbeba7da20f8ef15dd04ccb17be6664d2dd10b285f53b204f97e2102
diff --git a/dev-python/emcee/emcee-3.1.1.ebuild b/dev-python/emcee/emcee-3.1.1.ebuild
new file mode 100644
index 000000000000..36f8e19a6b26
--- /dev/null
+++ b/dev-python/emcee/emcee-3.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python ensemble sampling toolkit for affine-invariant MCMC"
+HOMEPAGE="https://emcee.readthedocs.io/en/stable/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/h5py[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( AUTHORS.rst README.rst )
+
+src_prepare() {
+	# unnecessary dep
+	sed -i -e '/wheel/d' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index e276699f0f27..eae7d4087b5f 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -8,5 +8,5 @@ DIST eventlet-0.31.1.tar.gz 412021 BLAKE2B 6358dca8e0a766f0cc2cef37586a8d38f5d87
 EBUILD eventlet-0.30.0-r1.ebuild 1785 BLAKE2B 6ba2285e9368427aa547becbaf4973654733990253be55b87500853925783456cbe4c72d7b9864ba1b2c062156386a4a5ba434bcfb5c091e80d9e162fa8189b1 SHA512 df33839410c4f074b6e5bd9d349226a0af9c94905b7beaf07410eef40776dd70fed116f40c30df9a152126ae26ea931839443f12107d3e0de1c58f628531ab31
 EBUILD eventlet-0.30.2-r1.ebuild 1693 BLAKE2B d263749a9074c7b39c4d0806a4ff806fe7bc50f5b8e2b5773e9d4d65d19bc5854c92e336170576e637f4996c927509c83eb40e779e04c1af5eafcaf291f48d20 SHA512 03c721c868e50becacffad8cef17633286ec1621fbe0bd3bda3f970ceacdb3de82d10324662954d0b984fa7465d82928dc244089627fba6b2bc62105cb023dbd
 EBUILD eventlet-0.31.0.ebuild 1691 BLAKE2B 08d0b1f9ff96e20f4e8b76d119ff2a49a212b90a4d47ef8ca9cea2f6583321190e4646bf6b80ddfd0e098e48a62c46a27f514b27bd999fb39536561bccdf9e18 SHA512 81699509d1017e135cd718064e2c8d0475ac7ce9190cdd92ce7e47d8e413c69da96f88c735c412a0f7536b14573e04716907af4ab29e15dda5714d54589f353f
-EBUILD eventlet-0.31.1.ebuild 1148 BLAKE2B c80a9064d7ec283bc7700d8aae9a4acd15540aa41ae54af8483cb78393ac50ffaae5198e082e65adaec499ffb76337818bbc4e4f7679f110eb9e82273e308af3 SHA512 0f69a9d1ed928667cb41f3b35fd5848e1bfe5fa69f97a72b47f5b18a174ae87847b2c9f224a290851c79bcd83db5cdf6f81c8ab31f83c4af60254301b652d1d3
+EBUILD eventlet-0.31.1.ebuild 1147 BLAKE2B 9d32fe93e932d6993bd08ed032e57d83010569c6e83449ba43534794b588ee0afbe7eaea1d6a01c87049505c4036aa4b7114a10ce74180b0bd8d3b35ed427ffa SHA512 cb9e943ace321d7e8bf639ac4f9223a9bf3a1ecec15a2ad7ed28e458861000fb6834fa597138c1161ea979e44d2c492e8ef4ad2c92b22b386d9c47d521a0b013
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.31.1.ebuild b/dev-python/eventlet/eventlet-0.31.1.ebuild
index 15b133320708..7709039b68c9 100644
--- a/dev-python/eventlet/eventlet-0.31.1.ebuild
+++ b/dev-python/eventlet/eventlet-0.31.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index a0a812625073..febf847bae79 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,4 +1,4 @@
 DIST eyeD3-0.9.6.tar.gz 250445 BLAKE2B 11f8bef4b17af07f08144e922634e4c6e467bd8856da9d445a70006b5bf32d442a52e234845a3f146129403fcc16047cc759102b93c433a0466bf0afd9576230 SHA512 0c993e9bf0a27ca41a8a2964a3347a6b0ffa472f833b3dada39ae09a5a2b40e0afb6bfd8c0ea5ed71d3dc2bf3cd062c1fb5fe79abe6ad867221b779786247173
 DIST eyeD3-test-data.tgz 97281754 BLAKE2B 9b667a5f8be157ace06d773d575c08f4a8e8b7a7b81ba9cb39b1e2c924b2e3f98597607ed3076b13150e02ef7768e89d1ff8a9913021e5f4b9ac6b59344ed397 SHA512 937971dcefc53812c59adb97df27d200e92de04e12391c735ab85cd547e2a168aa1212d88c206ec71ac2fa85a504a9faa91dcc444b45149aca7c8f3a794e9a95
-EBUILD eyeD3-0.9.6.ebuild 1198 BLAKE2B 268eefd6dcd32e29673dc83266d549efcd652fffbee49f5b9122812d7bd4acc93db18b88601ba11099fccd9539a1334eef5c0a94497ff7f3a9476d72cfbb4818 SHA512 8e67c12f589864602a7b10b2fef58f3205ef8b9ea38219660c92a7bda300be020b22abe14adf926735538c48819b9e715e0a14b6bae334c3d9be89b330e21343
+EBUILD eyeD3-0.9.6.ebuild 1205 BLAKE2B 0b8d7c2bd6955cd53b61e42f3460ca0ea076251cf204358f3f4376324d9a19d464cf8fa40d1731f747f4b3f1f4e1305e5c899dcb99a5fa91fb194d93c4c568de SHA512 d2281a945baa5bb823ac317e2ce9bc6d440721420a599be1c867608e5e5eb0b908fc73fdcbf656a97be4e9dff4d076c1e60d9990c3eebd336876bdf2d7618f35
 MISC metadata.xml 498 BLAKE2B 3d978f42129bedd19518980a3b7bc238b256590bc488e6b2d8afdd17ce9a93124861473f0fe7d80fd69cde6a9b53b1789f0dddc7e3de3e606a63751023d385fb SHA512 a4addfbe9bfb257176ba9ea264ac822f299d3ce643fcffc8f8fbedcfb033015ac7fb1832f1a053f1b188d9198d4505a174cf2747829358d612219e9f53d3e718
diff --git a/dev-python/eyeD3/eyeD3-0.9.6.ebuild b/dev-python/eyeD3/eyeD3-0.9.6.ebuild
index 34ee27ed6b40..2d9de3789746 100644
--- a/dev-python/eyeD3/eyeD3-0.9.6.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.9.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/deprecation[${PYTHON_USEDEP}]
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 103445980646..94f9be59f2fb 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,3 +1,3 @@
 DIST py-filelock-3.0.12.tar.gz 587613 BLAKE2B 3eb765e4cb251ace50fcaf3b7cf52939e697d5a710b87eb2f0ea0cf66f554b90bda2e95754b82e1544e45d0abd8dea861f52cdf9c7de0f1e91a8f5c8e0f9759c SHA512 0f30b54b9de2540f023855effcc582b18fedcee6681f21e1733f1b60dbd39eb148e3830bc798a44c5e8c22e7ea8ca26b6d4547fae79dacc78c62b819a3d84683
-EBUILD filelock-3.0.12-r1.ebuild 634 BLAKE2B 601fce9c6367f011a953bd30ee168f4f1f8281d647af199fe1c0fbb56612907d7c3b894b47b1a66f0331662ec7d74b7664aa5e03eae672c160707086665716d6 SHA512 49d37e5cfc633d63dc5c7d0a2d951b03932a5c1f486e39a535d6f23c219473e63fb9bbf60957f5d9f1728b5d2f5097bd80d6a85f93b35cd2eadfd65d9d9dedfd
+EBUILD filelock-3.0.12-r1.ebuild 640 BLAKE2B 798ef67b1ee71b99c065b48a8d5b54f9407a32d742a02a8d86e0c5f978662b2370afdc72617af1ec7712882bba3a92afbece905631265c1491a83f28db8971a3 SHA512 027590809537070c19811c080177863b21233728fa8db3c590763600a695898744e777d2a7f3a6a3cd48b04c2d1e6817e44ff59721ba7d254e05d5b90620d922
 MISC metadata.xml 380 BLAKE2B 24bd8ce3147524d0dfa757c9ea5aa3d5cce58bf31072cccc5390408439654631a016f17b1273d8110db978e5ffbc80fa4187230999ff7ff80c01835d0c63f9bb SHA512 b0d1d979278459dbc994176d6ff66c3f8490235046d2bd1356494b982ed881acf0f0d56ad16cfcbd5d5cb6b7167fd96dfd631507a49c3ccf67ee011b9d9f5c7f
diff --git a/dev-python/filelock/filelock-3.0.12-r1.ebuild b/dev-python/filelock/filelock-3.0.12-r1.ebuild
index 03de77de2838..c32a5318e232 100644
--- a/dev-python/filelock/filelock-3.0.12-r1.ebuild
+++ b/dev-python/filelock/filelock-3.0.12-r1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE=""
 
 distutils_enable_tests unittest
diff --git a/dev-python/filetype/Manifest b/dev-python/filetype/Manifest
index edb9c9f02b68..d4aab6d4c444 100644
--- a/dev-python/filetype/Manifest
+++ b/dev-python/filetype/Manifest
@@ -1,4 +1,4 @@
 AUX filetype-1.0.7-examples.patch 824 BLAKE2B 1e3fe9e72a422eafa45f35b43d04bb0cb1d4ccc379b7a318b6de33924b3e4139ca3e6c6efe529da5d99e4cc4038b818f4edae38778c9b9f7e0e0fca740b5ffec SHA512 9d5171016461f65330d4f1e6c985d1764f1ee8a173529e35d4abebbe98a7a3ccf920752f4baab8b3c6fcca484b59043f0338cc7c0b3c319948399781eae31e7c
 DIST filetype-1.0.7.tar.gz 666636 BLAKE2B 3abc1cc3a94b3ca8c91b9b43909522efa18736c826f8f45990b3d7dab18047476f05b259108290bf7383e4df82a63def4249c0d52ae313b0dc23d377bb5369d8 SHA512 8d81261082a5765c2f96b587cc8372ec2e7347536f3e76c1f4c17f10011fd1808309ceaf55923f0e063f379cdd253020ce651a263b9535a9d16375f07dc8ec92
-EBUILD filetype-1.0.7.ebuild 528 BLAKE2B 8d7adba80bf185047559e4325f2e91fe47a8cd24cf189a336944e3b9d9740cb7c35093a60fb1a404029b4869f23188bb47ca3beceeac07eeaa417af320fa757c SHA512 c9f3ca4d1af43451a05e448373227fb486aaad64e859f11d273370f4cbeae0141ccf9304b846425861fcfd325b405db8af5f2df9cc4d7d783e8423fbea9d97db
+EBUILD filetype-1.0.7.ebuild 535 BLAKE2B 85c921509c386714f9a1af19688f485a4679aa2da6778c3adafbb7ee3d9e963c063092a611fc4635cebc371fcf780b7a22cdef705ef68f12baad7800f42a4d9f SHA512 c4ed42b9e698ab22bb29afc30f18153b0c518a2040e0c365affd6655062b210e024c26cb9970465ac7d32b2ceb5ab39b60ce72a4d9fa048cbed39423e8d849cd
 MISC metadata.xml 477 BLAKE2B 6dbd312736921b69409b7fb9958069761814babf275ee8f27119fae412a59b13085eda8bc2075d4b1b0971b9662a8d7e1443f6ade74d644b109eb51df1d507e4 SHA512 e44e28a04f1a024d76a6a880eb0efcece6e9b5bce30fd1715dbcede55734412287ca810c42559470bf835705855e76c2c24286351ec53ed068e9b33932cca92c
diff --git a/dev-python/filetype/filetype-1.0.7.ebuild b/dev-python/filetype/filetype-1.0.7.ebuild
index a7cbac696191..ddb89484e0bb 100644
--- a/dev-python/filetype/filetype-1.0.7.ebuild
+++ b/dev-python/filetype/filetype-1.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 PATCHES=( "${FILESDIR}/${P}-examples.patch" )
 
diff --git a/dev-python/flask-babelex/Manifest b/dev-python/flask-babelex/Manifest
index 83d8c830dc13..c7c3d66892f3 100644
--- a/dev-python/flask-babelex/Manifest
+++ b/dev-python/flask-babelex/Manifest
@@ -1,4 +1,4 @@
 AUX flask-babelex-0.9.3-tests-fix.patch 1508 BLAKE2B 828c0932722c4a052e8360338a21f31e45e26d6aeb2e7ef18678dd159ac9b4ec4f2566e46bc088dcf556dfeefb25567227d28a885a00617c1551bef40328d728 SHA512 60761e4117919619562701c24ea2e7f7f55554da251b8144526063cdde35413ced741bcfb35c8666104b7f0850e665450a27e8f134d768b0c5d49d1ee6775ace
 DIST Flask-BabelEx-0.9.4.tar.gz 43423 BLAKE2B 9aa6223cd29cd1ce3de0d8c8b771980457fa0ee76b7fd361b9b6d8ae79f521b36096b4d912281b7fe671655ac8c7b04032c68fcc59463c5630af073f264f5815 SHA512 0deec4b481876f4c76cde398157cd2bdc564e9d1076a7accf1720be86b41912466435412ad5f7e5e8b06f17ad5363ea503191b159b30625d067e76a45eaba957
-EBUILD flask-babelex-0.9.4.ebuild 956 BLAKE2B 1e5c32739f0568764d0aa22200f7135ad3a944bdfd33bd946d378a88d075e4b94d3c1d8c24d2a744d408efd2b290dd0afb29e60aabc23cd0eda56d2824031534 SHA512 d1013c3a01a6bd34cb56e327bcabbcd94fd3b6bfc6e5e14c630fc5e12e12c3d0e4edbe061067e00c5d189d9defe11a73df70800577182e6ddba8b0a9668de964
+EBUILD flask-babelex-0.9.4.ebuild 865 BLAKE2B 3150ee62dfe1d1ec748e18b891916b257aedac83de757f484520e41d875605c6c7d027e699dd3b2246c4404f4f8850c8fc7432b241a980c4a85896578c24a109 SHA512 b280645fa88f85838b1c6c6e4f4d296a74e506bc00872b253165503aadc9b749fa8f499338b42d3d22f776578594e40e18a633cc67658ecdd0a19a7e7e7d42c7
 MISC metadata.xml 413 BLAKE2B d988fae9677e1421a5eed6c0b2179e5d65512dba2703c67d8feeafb2f3d2e17038aaa77edc2f6d7f13fb705a25148a35035f06e65541748a3d09ba5732696817 SHA512 57b4a268ebadacb38980a50ad06c22066a6ee44f05fc9f8cb7f5dbd77f083d34186de3ce359e9e1fe75369fed0485fc7112b8fc70872bf6ce4e6ca0525306c6f
diff --git a/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild b/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
index aadb87785dd9..8c709a50a162 100644
--- a/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
+++ b/dev-python/flask-babelex/flask-babelex-0.9.4.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=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_PN="Flask-BabelEx"
@@ -17,16 +17,13 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
 	>=dev-python/Babel-1[${PYTHON_USEDEP}]
 	>=dev-python/speaklater-1.2[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${RDEPEND} )"
 
+distutils_enable_tests unittest
 distutils_enable_sphinx docs \
 	dev-python/flask-sphinx-themes
 
@@ -34,5 +31,5 @@ PATCHES=( "${FILESDIR}/${PN}-0.9.3-tests-fix.patch" )
 
 python_test() {
 	cd tests || die
-	"${EPYTHON}" tests.py || die "Testing failed with ${EPYTHON}"
+	eunittest
 }
diff --git a/dev-python/flask-compress/Manifest b/dev-python/flask-compress/Manifest
index 4577e5c63b20..0cc906794cbb 100644
--- a/dev-python/flask-compress/Manifest
+++ b/dev-python/flask-compress/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Compress-1.10.1.tar.gz 12272 BLAKE2B 857319ea7fabece977429a810706314bc6a7984f2fb4c2ac3ed604fee0494fa60d45ab00a253bf4a3e9394d399f20f23d806744676597b2064bfbbd6f7b11c46 SHA512 fb94aef71f59e38a6058f5ef799c8973d258cf624b1d8bf0a991cac2e4eabb73e2836ce351faa73bc7640720396183212a6dc8d72428b53ceb3473f7b61f0d27
 EBUILD flask-compress-1.10.1.ebuild 580 BLAKE2B 148340c09b0a6396496f6676c1d033db81ef1d68844028db7ed9282c5240a94498a21964671be8c9496311338dcadccbc855ca0a339dfedabc7bec13aa538ed4 SHA512 cd3c761d9d86ce4bde6666b4d745f747f78c1f59b4f5e28898fb3e24573ac8d9278f505e35c002ece9890252d4a43255992e8b1d0697a5cee4686d8a1049f6ef
-MISC metadata.xml 455 BLAKE2B 32bea36b88ad19fed08198fe3ac37b3853dd3a50b1d24c67f56e06a222537e48ca275a701a11bd5d2027ef3533d1603f44daa9aa7d2c5b41081bf78e1c1ad842 SHA512 c3f44e2c49cda143874476662b0fb3458d2bd1f2651d2664e10e45cf373886765e0d6ffd1125bc9e8de9c0c0ce9ee1d9b23279ff4afc1ce40e60e5bb748850f9
+MISC metadata.xml 524 BLAKE2B 120e71081e075dc60e03dd078ff53ba326fa97fa89a764d61d8278908486e805a0652cc268d4f6883d7b83a8c4ecb21d6d86c6a1706f2be3b6866290b7eae894 SHA512 e4a6164bf8b1052b882de8bd711455689d0f2eda6d55db52af0352820b2b71d6c1e30726733d60f6bcc355dc560e01398afc731bd2042250febc5828f7f55213
diff --git a/dev-python/flask-compress/metadata.xml b/dev-python/flask-compress/metadata.xml
index 99b352b321bc..a9a1137d7b9d 100644
--- a/dev-python/flask-compress/metadata.xml
+++ b/dev-python/flask-compress/metadata.xml
@@ -12,5 +12,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask-Compress</remote-id>
+		<remote-id type="github">colour-science/flask-compress</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index eef74a63775f..08fe935da0d9 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1,3 +1,4 @@
+AUX flask-login-0.5.0-fix-tests-py3.10.patch 769 BLAKE2B 82cfe4209de45f6c282b3e289daca11f31ecd96764eba7185909f8d7896e9e39e4401ab7e250155d07575a779bf98f836a7ffcb7d47ae1a1cb6f35f342fd86d4 SHA512 04f0cdf5b6beac3ecbc27513fd994362416c6990f9040710f979b997cace59d7560e4a0471b44e04f9de69fa93ac8698a0c73765f7548f1adc9ddaf5de834e4d
 DIST flask-login-0.5.0.tar.gz 44961 BLAKE2B a780a3ca1ced7f01cbc1f99e3d92f57819c73982a4098330be7b9b4dce88e5fac577d15b2989b99971c4b2f7e6c9f02a54aeab9f7fa1c101f409cbdcfa3c6942 SHA512 8ffecd2a512738f81ec3901ad30d356b1d63355268f7cf1b427e463d0a271a4623723255e139bbd0f88845d73fa4aab051418b5f68aef0b4576c30294f6207b3
-EBUILD flask-login-0.5.0.ebuild 938 BLAKE2B 98355a765627fd33ed34af7bebee654140ed076b79e6c7614ba0c927dc014f6e0e764ee4a20b517b0417495d61285b02be1c8bcd9d31d41974a8daf5e28e61b4 SHA512 a8e401b4ac25170c90c54ae029c2a1169a05c443b39546b048ac5205437d09ec4a954e83ea63f72e4ac030b7a74470e2ebe0fd1b56a6f12c24c7fcc909317fc3
+EBUILD flask-login-0.5.0.ebuild 954 BLAKE2B 1161426afa0c97cc1130859296c56155a09cf0cc1cfe928f515b06060cafa036e4872c5f23eca25300d98f6fafa8cf933710159932ba9770b5fd99e64834ba5c SHA512 a2ced124a7b1169cb8fbb77089e2cec3f2e4ae62a9e6c42da4627c0d357224c75c846fdf3630f78857e00e090900b243b55f9d1b11c0dcdd134796b11136b92f
 MISC metadata.xml 403 BLAKE2B 6d3c96df8b0f4b87c4b08c55049c64e75d953228b7070f1fe9fce68f5c3cbc824d2d3d8430916678596102cf04b9493243a6c9d18d0c2e99eb2ffd24e63229b6 SHA512 151fcb723bb00f89e28147c2635a23834eac59fe2fccd250da22f386f897419071b31fde15f41289d48343803a7a6f1a14236c796c1772dca5f3a947c66a3d96
diff --git a/dev-python/flask-login/files/flask-login-0.5.0-fix-tests-py3.10.patch b/dev-python/flask-login/files/flask-login-0.5.0-fix-tests-py3.10.patch
new file mode 100644
index 000000000000..858783b36e77
--- /dev/null
+++ b/dev-python/flask-login/files/flask-login-0.5.0-fix-tests-py3.10.patch
@@ -0,0 +1,26 @@
+From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
+Date: Sun, 10 Jan 2021 21:12:36 +0530
+Subject: [PATCH] Import ABC from collections.abc (#525)
+
+--- a/test_login.py
++++ b/test_login.py
+@@ -12,6 +12,10 @@
+     from mock import ANY, patch, Mock
+ except ImportError:
+     from unittest.mock import ANY, patch, Mock
++try:
++    from collections.abc import Hashable
++except ImportError:
++    from collections import Hashable
+ from semantic_version import Version
+ 
+ 
+@@ -1548,7 +1552,7 @@ def test_equality(self):
+         self.assertTrue(first != u'1')
+ 
+     def test_hashable(self):
+-        self.assertTrue(isinstance(UserMixin(), collections.Hashable))
++        self.assertTrue(isinstance(UserMixin(), Hashable))
+ 
+ 
+ class AnonymousUserTestCase(unittest.TestCase):
diff --git a/dev-python/flask-login/flask-login-0.5.0.ebuild b/dev-python/flask-login/flask-login-0.5.0.ebuild
index 3891e82cb9d3..b23911bf5684 100644
--- a/dev-python/flask-login/flask-login-0.5.0.ebuild
+++ b/dev-python/flask-login/flask-login-0.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Login session support for Flask"
@@ -27,9 +27,13 @@ DEPEND="
 		dev-python/semantic_version[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-tests-py3.10.patch"
+)
+
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
 
 python_test() {
-	pytest -vv -p no:httpbin || die "Tests failed with ${EPYTHON}"
+	epytest -p no:httpbin
 }
diff --git a/dev-python/flask-mail/Manifest b/dev-python/flask-mail/Manifest
index 32dd42e22d1d..4adebef8e56c 100644
--- a/dev-python/flask-mail/Manifest
+++ b/dev-python/flask-mail/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Mail-0.9.1.tar.gz 45654 BLAKE2B 4b7e352698bd9434c507d3a27b8e5b4976cc82484e86e64245423392b25000d904d19bafa07ea97a32c2a80ed6bbbbc59aed7386a8d5a2ad6b9b61b23fe4c5f8 SHA512 1d19f0bade77c66e73624d8af0919165f8b6f208a00c1e4025049b50ad56912557b8446cb80f8567adf697e92b126954a5f130bd9fa7a2345d4e98e35b29ac47
-EBUILD flask-mail-0.9.1-r1.ebuild 713 BLAKE2B 8ec6fdcb9badc5986c32c4849a7f9cae8c57fdbb3a6ffa89a9b4f8a5f458c5ca6c6130b5fc916ef22d05947b60fe6d7f64bb865c77ae7b99441ee0c5726ba7c6 SHA512 60822f4516f5c36af0069b513d4f0a262cf5930820e176959b3219c8aca1b92c4fda747cea68969e08d4abf14c23aefcba12529fb406266fd791698ffb3f6b73
-MISC metadata.xml 337 BLAKE2B 423b4ae5b47e39dac9acd1f2220b35d7acf53df9d1ae3988594ae4e6d3c6711c075b27d2a7ccfa721dc09f0da402623c2db726cf31543120847eb83e604cc3c3 SHA512 9d57afe661482b872bc80547e464f05593a7d6d8524119e7ae84473e0ea635076c7ea97e08b119d0caf49cf9cb692563c8ceb41ee597391b21209cf6b99c6b89
+EBUILD flask-mail-0.9.1-r1.ebuild 714 BLAKE2B 0d9366ae735d442b8c4fc804edc93785bdd11b912f69bf9a02f91df6a8e8265a2141891ba1f41ca69d3b9e895d23cc78dad91d88d43c4e32313327927ebf4942 SHA512 218c5ab163b4f82103567343127efe3eedde7e246d95a64a8a17aec28204b28b5ba163f566475d472625427086163755d14804314fd7e872d2123c6d4d5fdbed
+MISC metadata.xml 399 BLAKE2B 33a0f05a9b9ce668b386fa09a3306f4514c9a1c66f75b0b10a09d4871354026d6c3292028307347efd261e28722b02d2ba8f3d1e177fa1f12b11a5fdcbce1a30 SHA512 9573c85ecf92afe188160dd06b9483e66f4b2cfca0bb7fc26f4a3030f9fd5e6cad26d960678681b9a0c1013cb49276ea78fdb79127b405a2ba3c518c1bb57002
diff --git a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
index 578a3aa5cacd..ff1ef2743777 100644
--- a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
+++ b/dev-python/flask-mail/flask-mail-0.9.1-r1.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=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_PN="Flask-Mail"
diff --git a/dev-python/flask-mail/metadata.xml b/dev-python/flask-mail/metadata.xml
index 0169ba7cdb0a..c024ca11348b 100644
--- a/dev-python/flask-mail/metadata.xml
+++ b/dev-python/flask-mail/metadata.xml
@@ -8,5 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask-Mail</remote-id>
+		<remote-id type="github">mattupstate/flask-mail</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flask-restful/Manifest b/dev-python/flask-restful/Manifest
index 1fab85c0b2d9..ba47ed54da57 100644
--- a/dev-python/flask-restful/Manifest
+++ b/dev-python/flask-restful/Manifest
@@ -1,3 +1,3 @@
 DIST flask-restful-0.3.9.gh.tar.gz 118195 BLAKE2B a4f18c3faf06a7c9b628657aafbab4b9492793d9a61ab60a3e4d8112e0fb5e120cff2f2dae87915e44915838572ae0ca1737025ad5f906c2a953afc4b1f49c6f SHA512 34bea8ed6e9de3ad1c2ca63e7af67ed2a175f84c433b08ff643f91d88feda0e3c1c3967deb2fe5ad308b05f373b10c08245edf65ed97a7c5a3683aa900e9edf2
-EBUILD flask-restful-0.3.9.ebuild 950 BLAKE2B f010b4547f34823e4c71135dea52185a39b720dda2178d025de5dc387a459aef1b1f59906c52bdd6f000c8afc176ef4a45530ec1bb033fb8cabb8b5a198afb2f SHA512 0967efc60209aaf8af1b9bff043cdae34a8b63ae24bda3650a16ab935f2e0d32093d494d428d9aa5653bd3b6962b5bc9a2155e7864c6f6c16d7b48bb556f78ea
+EBUILD flask-restful-0.3.9.ebuild 951 BLAKE2B f77ff2332fa4a5575a20f13b111af6bc600adc61dc5f3c4b522ceb82a344802f53a5d92aa35feea0cb3dc5e57a2cb06ac6ab3c643baa4e8d8c3e9be7a0e39acb SHA512 f562b9e87c3de9737976cd3a5a394ffd5ca154a13d02af21fca180e51ff20a0fcf2b94de6ad5db13b77f94e9e54f34d7355fa107bc4cd27625d9caa40e33a950
 MISC metadata.xml 407 BLAKE2B 32075e72b358faf256d1f2b0a650eb7b1d966dcb4376a4394933545b0b96d77d633bdcd8cdc6db044c825fdc237b9b4674d38d3d90027f9cb758325121dcba6d SHA512 2b7f74ec3648a92e7740b22a8ee5f367d61553d37fbc854a90cf2774a383e1fdc3382217c7811d21f8a0a98dd363ebefd873a8a8286cbb8e0f781382584ddda5
diff --git a/dev-python/flask-restful/flask-restful-0.3.9.ebuild b/dev-python/flask-restful/flask-restful-0.3.9.ebuild
index ced9457b8003..0dd0f3163590 100644
--- a/dev-python/flask-restful/flask-restful-0.3.9.ebuild
+++ b/dev-python/flask-restful/flask-restful-0.3.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-script/Manifest b/dev-python/flask-script/Manifest
index f69117bd5509..3900cea9775b 100644
--- a/dev-python/flask-script/Manifest
+++ b/dev-python/flask-script/Manifest
@@ -1,4 +1,4 @@
-AUX flask-script-2.0.6-flask_script-everywhere.patch 1792 BLAKE2B d3d674ad325f04b9338fd50850850173a3bb8c89de64702a8c6f5e78b6ad3945dadff4ffeb24bfce20b8d7e032338ae58695f9ce6eaa56f130286197915c3110 SHA512 83acf9eca3b2ee87222e6d307367f1aa789c8c89d6d4cba8dc93ff69a6149bf05e958baa4f9d7e71d3878e90ddce54a2d89b258024bf3bafc39de86814e4ad4a
+AUX flask-script-2.0.6-flask_script-everywhere.patch 1368 BLAKE2B 0d387cce36afdfb67bb91661df23884a7782d26ec5979121664afc84f48e780b7d1498b6233779980d3fd51f672a7fd5a6e097bef946a8599e189863d2be1ad3 SHA512 9694070e86a47f405d7bdd3e4c37df56e2fcbc86f64adea07d10c4e5be6856a6631eac5af43cd372bf13475b8dc9ab57f263f10dbb62621365fdf17d4e4efb64
 DIST Flask-Script-2.0.6.tar.gz 43146 BLAKE2B 146a65fce432063e67e5b6221a0c2437f2a8df1e2b72a5e14fb382dc51ef3f0755e4d8a0a67831c6c2c61d07acc332e8c87b7c9df3443a9f22aa2eeb580c4086 SHA512 03c51213be8e2b86f1f4450565cf4d7e3d9d7257ac017bd53830be57620d581f43bcfe959ef7b621af722c688c56495229aad3dd9654c8a8a5905db0105275fc
-EBUILD flask-script-2.0.6.ebuild 1106 BLAKE2B 90064f97ebda927f16b6531d14662f1518efc9f58cd4e04f16689ccd0904081b5d474160cc08d17aa1471cabe3506cb8bd490dd547ef7eb33683e93a46dbfa72 SHA512 7a5bb1464579da364f4132a47f43c47061d01cef403dfd7694e0e6bc816dc5c4ea385456b64c7471a79966919755b14c6b84289feddb6c68b4ba6009efbae274
-MISC metadata.xml 339 BLAKE2B 0a4f6acd12f3f742a5e5f140aba858a35b563f1b8050813457cfe9be240403bedd42c9672cfea69fedf7f00ab5166ddace90ce5e93561bc5f3fa33a7ece68595 SHA512 227621e6eae61c89709dbca856fc11be6367cfdafae280796d71b3962f6fef03e3eef4e3e57c7dea411f17233eed65077e37409b12336241aa64bae8ce084a66
+EBUILD flask-script-2.0.6.ebuild 762 BLAKE2B ef446d49b8e5e722dbf25da876b7aaba6499d58196f85efe6fabeb137c2a6a41c994248941d67ea4a20c8f7e5870f5d6d7a3b214c8ed3dbac5615a0e2be3a8de SHA512 f99022059ddb2af8cc16443b195295571826f05bfe63369b44d56e8127f0367c131fe53d3bc49a098d587d154d092bd6331f4c2c1daa4d1cb24c8de8138f7422
+MISC metadata.xml 399 BLAKE2B 86e06a282b8aec88aed0414253e9f93fb687806eff88dee296933e5956d466a6dfa2682143cdd1bdbb0b36ae45615492166648e51de4c5be3c9ebdc65ddb6e97 SHA512 046fbd63a3f45d8d26fbf8991111dd2e93c17e72409a76fd896147c534bc6cedd03a3405f7f0ae682168bfbf4db62743e88bb805419b7f687f2540155dee3f73
diff --git a/dev-python/flask-script/files/flask-script-2.0.6-flask_script-everywhere.patch b/dev-python/flask-script/files/flask-script-2.0.6-flask_script-everywhere.patch
index b10b2f0a2283..04259c89a420 100644
--- a/dev-python/flask-script/files/flask-script-2.0.6-flask_script-everywhere.patch
+++ b/dev-python/flask-script/files/flask-script-2.0.6-flask_script-everywhere.patch
@@ -1,16 +1,7 @@
-From fcf894b6e4d0ad17489480b722c870aaea600db1 Mon Sep 17 00:00:00 2001
 From: anthraxx <levente@leventepolyak.net>
 Date: Wed, 6 Sep 2017 12:03:22 +0200
 Subject: [PATCH] using flask_script everywhere instead of flask.ext.script
 
----
- docs/index.rst     | 2 +-
- examples/manage.py | 4 ++--
- tests.py           | 4 ++--
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/docs/index.rst b/docs/index.rst
-index 775ffca..9266d4b 100644
 --- a/docs/index.rst
 +++ b/docs/index.rst
 @@ -577,7 +577,7 @@ Then the user can register the sub-manager to their primary Manager (within mana
@@ -22,23 +13,6 @@ index 775ffca..9266d4b 100644
      manager.add_command("database", database_manager)
  
  The commands will then be available::
-#diff --git a/examples/manage.py b/examples/manage.py
-#index 5c0dc21..8129555 100755
-#--- a/examples/manage.py
-#+++ b/examples/manage.py
-#@@ -4,8 +4,8 @@
-# import pprint
-# 
-# from flask import Flask, current_app
-#-from flask.ext.script import Manager, prompt_choices, Server
-#-from flask.ext.script.commands import ShowUrls, Clean
-#+from flask_script import Manager, prompt_choices, Server
-#+from flask_script.commands import ShowUrls, Clean
-# 
-# 
-# def create_app(config=None):
-diff --git a/tests.py b/tests.py
-index 93d0071..24f3f15 100644
 --- a/tests.py
 +++ b/tests.py
 @@ -5,8 +5,8 @@
@@ -52,3 +26,16 @@ index 93d0071..24f3f15 100644
  
  from pytest import raises
  
+--- a/flask_script/__init__.py
++++ b/flask_script/__init__.py
+@@ -12,9 +12,8 @@ from collections import OrderedDict
+ import argparse
+ 
+ from flask import Flask
+-from flask._compat import text_type
+ 
+-from ._compat import iteritems
++from ._compat import iteritems, text_type
+ from .commands import Group, Option, Command, Server, Shell
+ from .cli import prompt, prompt_pass, prompt_bool, prompt_choices
+ 
diff --git a/dev-python/flask-script/flask-script-2.0.6.ebuild b/dev-python/flask-script/flask-script-2.0.6.ebuild
index cd84dc29df06..1932eee2f304 100644
--- a/dev-python/flask-script/flask-script-2.0.6.ebuild
+++ b/dev-python/flask-script/flask-script-2.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_PN="Flask-Script"
@@ -14,32 +14,19 @@ HOMEPAGE="https://flask-script.readthedocs.io/en/latest/
 	https://flask-script.readthedocs.io/en/latest/
 	https://pypi.org/project/Flask-Script/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/flask-0.10.1-r1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
 
 PATCHES=( "${FILESDIR}/${P}-flask_script-everywhere.patch" )
 
-python_compile_all() {
-	use doc && emake -C docs html
-}
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
 
 python_test() {
-	py.test tests.py || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
+	epytest tests.py
 }
diff --git a/dev-python/flask-script/metadata.xml b/dev-python/flask-script/metadata.xml
index 246d0bc31b61..fa530d0dfb08 100644
--- a/dev-python/flask-script/metadata.xml
+++ b/dev-python/flask-script/metadata.xml
@@ -8,5 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask-Script</remote-id>
+		<remote-id type="github">smurfix/flask-script</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
index 6e9c04bceb9d..d072ad8d07fe 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-WTF-0.15.1.tar.gz 45540 BLAKE2B 95ed9efaa89b487f406811926a8b206d15ad9c065f99595a35ea2ca4f98ede671673204c4085de91afe1e1b91b611ceb0f43b9c68b46fdd0e38d9025ac666f70 SHA512 9741e2c2285a500866b160e8c906c38ca579fdae2235bcba2336c7125ba614a9f75167c82bfcb96a45e553170c5925cb1a530d0164ecc57dc76cf1b560c40855
-EBUILD flask-wtf-0.15.1.ebuild 1010 BLAKE2B 6775c6ad4f00ded0f2eac08fb60890b28afdf4761ab2203a2996014a54544b379795df401d2a9798866e47fefde53f1d5879879a0069e7dcdf4fcb180b3e2211 SHA512 0a002fe933f4ed75aa095e26a1a12d7d1e3b5b485fb55b74e5776098351e1f52cc5a59458b864d20f151d69c9e74b03b4075e345b51b5b8ca2e2dff12c6c5fd7
-MISC metadata.xml 503 BLAKE2B 140d26af9657500e359d1d40308d83123de20d83b3536dd283d9692062b9dfb044801a3b099a7db74bc8df437049113d7e0ddd55d60b0bc1b46fb0fec53ee2c9 SHA512 ca4b90e216f28bfc736d5c617244d79c27b41564ecc33ad3f2d4bf2837bd478707ce7c08c01ac6579c839797686a94e748d725a594c7e7555352e93eaefe0c98
+EBUILD flask-wtf-0.15.1.ebuild 968 BLAKE2B d48618c76171bf9092e71bdfd8d5c933ae15d5ad431938fc8c3f4e9b49f7b139a5e7b7c8e6072d4a529085fd9d55fab88e460cf405f308921f8b00f28f655ec2 SHA512 111f1c9f8d32c80fa95dc19b9f6347db86f3cc426641e5482874600d9e30672fa0d968b2edd85e2ef9615250494f4b6a6d3ac30c66910545ab11c65413e8cf00
+MISC metadata.xml 503 BLAKE2B c474fcca2d33280f86cdb00f18c23172620f3fc63ea2988d08d515adfa5f581f142db207d83fcb3aaadea1fa60e1ebc74c5d3188a74ee27dedeeb70fad3111eb SHA512 165dd3fca28124f62edbf1a78ba00b5f57330a5de5e198764fff03e6ad0095e5aae0443bf5dffcb5f33f44d6f220674188ab97d13235a8fefc09c251ac076c9e
diff --git a/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild b/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
index 64af34e29e53..28eb66691c8c 100644
--- a/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
@@ -17,8 +17,6 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/Babel-1[${PYTHON_USEDEP}]
@@ -33,8 +31,9 @@ RDEPEND="
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
 
-python_prepare_all() {
+EPYTEST_DESELECT=(
 	# tries to access things over the network
-	rm tests/test_recaptcha.py || die
-	distutils-r1_python_prepare_all
-}
+	tests/test_recaptcha.py
+	# unpackaged Flask-Uploads
+	tests/test_file.py
+)
diff --git a/dev-python/flask-wtf/metadata.xml b/dev-python/flask-wtf/metadata.xml
index 0d1a899e6b32..9ca31c3c386c 100644
--- a/dev-python/flask-wtf/metadata.xml
+++ b/dev-python/flask-wtf/metadata.xml
@@ -8,7 +8,7 @@
     <stabilize-allarches/>
     <upstream>
         <remote-id type="pypi">Flask-WTF</remote-id>
-        <remote-id type="github">lepture/flask-wtf</remote-id>
-        <bugs-to>https://github.com/lepture/flask-wtf/issues</bugs-to>
+        <remote-id type="github">wtforms/flask-wtf</remote-id>
+        <bugs-to>https://github.com/wtforms/flask-wtf/issues</bugs-to>
     </upstream>
 </pkgmetadata>
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index f3cfdd57cc28..19cd0bbaa67e 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -2,6 +2,6 @@ DIST Flask-1.1.4.tar.gz 635920 BLAKE2B c1f19e7449177ecf6e901d5932ad25cbe866ff53b
 DIST Flask-2.0.1.tar.gz 626851 BLAKE2B 05273edacd6d66237a552410df7ef7ff367e28c273cc89f654eac5ed2eb3d26f71437169905372b398cc6c5c5067dcbea54aa1cab782e03c6186ac9ae3949f4c SHA512 fefed4971f0542b25ba2867919aa54a83b6e3f47e7cee94586543843e7e00ba209ac15d8fe28a3c53981f587aebcf2f3915a49e1a9cd1b729099dccbed3783c2
 EBUILD flask-1.1.4.ebuild 1330 BLAKE2B ae78a5a449bad145e9ae537f968bab105ce9f4c69a22ed881ea1dbc8cc7cba708da8724731c8009ee23a8c606fbeb32fed970a5237427d51aab13a91baf7bb28 SHA512 1885d47a974863080b2a3c5372fad49765958e2b17e7a70a01afddc7ed87866d9205259da4b2e3891d88594144ed13663a396844aa92e7f430489e2acbc68a42
 EBUILD flask-2.0.1-r1.ebuild 1229 BLAKE2B 67a9ac3d79a87f0aa6d6202cca335e7207ddfc0d5d284d92eacfc3329726acf9f004c1d23079f0b270ed95c72ab35da456a191d230e39dd0c0489ed153559711 SHA512 62c9a73ac355dcdfbd2b91c0f5c18a793ca94dfcb38a13b55b9e6e6903352af48cc38fb143e0fc5e5c5b822d75d7ebf998b288e3b2cb3202514720d2f6279c02
-EBUILD flask-2.0.1.ebuild 1161 BLAKE2B 652196afb4a78a8ca1bebc957588150522e6360ce1d524137b449bd4b2123a811ce3e7b08c161f8d20c397d1d85c174d63437f5df0dd2a7f2327539229ef7446 SHA512 03e7fdc43bb1582d20c8620e9f86ebf07a9ce52d63a134751190b68dc17027371a22a17c9dc23bdd97b86871bf1e4843a0684b6e5125d1c505012083127234c8
+EBUILD flask-2.0.1.ebuild 1159 BLAKE2B 0357efc951a3ada5f358b68f7fedd2d03d2d85a4702861c93d03806492e561e5f4d8f19da366f5d0371ce2c371451157eecf902bff75f4c8d05c6b0c824fc082 SHA512 de8eb6eb16406ff53d06089b81e9f8d0e1fe8fc3a8324118302ed9fcd731fe18abc7cf9dda06c1648fab6772187884072e328db09be8bce04350ca54236b1daf
 EBUILD flask-9999.ebuild 1217 BLAKE2B 57aa06a3fa33b0e8e5fd3e3054e7fba2e263524d2613207582e854643afd6b7c1ab3f41d73318012a9d77982a778cf90c6cdd13d0232447ef94fd2603f5f32e8 SHA512 3c050a9e65cc40a6556d5bace0ec403d043e8c5591814d47fa3c4284f4886d0eeb1c6f29ae0b9e25a001f2ab38f28fc20f34e3de67d2f74c9197b0b94d4a3f05
 MISC metadata.xml 385 BLAKE2B 0aa1fc56ae29e91457344d7ca4f8a26506d46d22b71ac7363fb443ba7fbcad7974f86b898dd7b2e4cc2bbbc5d58fe1a1904a077e5c7b959ba2e1761f1561769f SHA512 223a1a9459b462c6dfbfc2fa0d6932e1f9457e86eb9a70e96c5182a3b4f898a121aa13dc9425811b8fcabc6dca8ba1d715e5aa221453e235a5b5ee2c25cc02fc
diff --git a/dev-python/flask/flask-2.0.1.ebuild b/dev-python/flask/flask-2.0.1.ebuild
index f58300214be7..efe7d28255f0 100644
--- a/dev-python/flask/flask-2.0.1.ebuild
+++ b/dev-python/flask/flask-2.0.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index fab531117341..6470a8844e33 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -2,5 +2,5 @@ AUX flexmock-0.10.6-fix-with_args-sys.stdout.write.patch 2707 BLAKE2B 9848593b70
 DIST flexmock-0.10.4.tar.gz 45362 BLAKE2B 4ff79cff3b0d8fb0c97bd60b0d5aa5555a7b939d3d6275a17c9bd1002b1d7acb53d4f63f5f834faf0d349d8b8d429eb063f121c4d7b6d12aa1bb3e7bdbadb861 SHA512 d190fcb66f0c2c4e3be2384d68b95a22c695ffa0fe8f8a218f2baa68c91683641396197cac69ddab21e4b0990b9930f56423bb7cd85770ceade9c22ece72cedc
 DIST flexmock-0.10.6.tar.gz 46740 BLAKE2B b5c8083694e8787e85ff0f41265ad9f716a4c82d274ca5c793b6d93bf8bf28f3e57afd33f7ba59149e75f7bffbebd3843901dfa75caaefc6f76f3eef0c603314 SHA512 2ebaed78926f01bd4d886a509d978d0de04629f7d96c48f846b8ccf7906bb2303e7cbeab8226c6eb98d058f940434144cc2d6300d6aa2533f1f217788211490e
 EBUILD flexmock-0.10.4.ebuild 489 BLAKE2B f22dc9131f02343a598a8b61546184bee128d54de48acd2de913f6ef48121438323a0c7c169ad9c8761628f44923147403761e46c59bc5f302c48ec32ddb1be9 SHA512 e389dd36a35931b8d2a7354b32ab3155e3475f92332aee2040576ade042cf9b30310292e0d0925e61cc647993ab857d3e4ad7ccc12198c080f95e11cf2f1a217
-EBUILD flexmock-0.10.6.ebuild 560 BLAKE2B 40aa46b1ae2147d22b801a2723d66258bf64838aa50d1e3462d8dd1a1b1f2a6fc8906e76be2e13230a33dfcb173d8f2de0e63802c83023f3a456165a25787f45 SHA512 76bafaa5b4a816f9eb79b52548a79ddb3abbff67b2b3a1e97e250fcd7d10d4f047258a691b582789faf16aa60756bef424dac298508b0b71ce3d7d2ee3f01294
+EBUILD flexmock-0.10.6.ebuild 600 BLAKE2B a7e911d052d43c11540d8abfbc90f9d1b5099455bb4efdfb28652d7c017163730d4a282f7af7a824dd9d961b4defb7bc27a77fbf147ff4bc96d01dc5f38944f7 SHA512 df9f8c7b191d71c69978c19e40d300505c8d4d43712db7af15d3ac9dd12f0b76c83e84ce89112492ae78544fa3c4aa914c1701f7a1515869f4e68b77ca44af70
 MISC metadata.xml 657 BLAKE2B 065a19cc94f756b0702f9b52010d5ac63af8d3b8f67ea307a073f0ff6046143e2d2e4f4266df5324192e42c4ce823fff646188654207cd87277d854c986d2667 SHA512 c2cfa313f94d79e0cce3213f53449582e18edfdbdb244d9771aed0f4e610e2a7ab225b0d7d51483be9c1ac9763c376f051b45fffc1f83ca44bd06017c0b29a06
diff --git a/dev-python/flexmock/flexmock-0.10.6.ebuild b/dev-python/flexmock/flexmock-0.10.6.ebuild
index 7280fd3db06f..67922e50909b 100644
--- a/dev-python/flexmock/flexmock-0.10.6.ebuild
+++ b/dev-python/flexmock/flexmock-0.10.6.ebuild
@@ -21,6 +21,10 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix-with_args-sys.stdout.write.patch"
 )
 
+python_test() {
+	epytest -p no:flaky
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 	dodoc -r docs
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index 4708c3ce6288..6a6fdbf03d0a 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -4,4 +4,4 @@ DIST gast-0.5.2.tar.gz 14222 BLAKE2B b251f9aa54d8bdba318f0c8aa7fe97221615a22b7de
 EBUILD gast-0.5.0.ebuild 494 BLAKE2B a305be1db62fc33ab224764831b5613c72f15f2193bd8975deda5ca72d049d171d1eb1f1077177ff96f4ae532a71d1a4cd1b148b4524aa17c402ee5ce1964113 SHA512 1d85abd88a29dc52c1a13de328ce715e07835921db1db0012bff3c1c08453a3b24d141b8002ac6704d8fd211d5959412f96fbe047ba88d8589355688804e5be4
 EBUILD gast-0.5.1.ebuild 496 BLAKE2B fcca9acd62ce1a452e95747793b48e9fc6e865020bf8a6dfbf43ca1583ee061b7e1700cf1ec9cb2ac965d74348d28fe95330235608cf91451261a8b8d260ec14 SHA512 c8e208f3b930305a07b0cd7a55f38bb3e60a21b7bf47358e3895bed93489305122982091eb1c75d125a619e9c63374b340d1cab15841b3bca0af9bed5838b476
 EBUILD gast-0.5.2.ebuild 496 BLAKE2B fcca9acd62ce1a452e95747793b48e9fc6e865020bf8a6dfbf43ca1583ee061b7e1700cf1ec9cb2ac965d74348d28fe95330235608cf91451261a8b8d260ec14 SHA512 c8e208f3b930305a07b0cd7a55f38bb3e60a21b7bf47358e3895bed93489305122982091eb1c75d125a619e9c63374b340d1cab15841b3bca0af9bed5838b476
-MISC metadata.xml 652 BLAKE2B 487de5ab8f3b93f2a1546f307429cf547162f59ac6f8d35da73b9a116517c53e3c365717746f4f0369a44a4863bb2e423119b775ef3c18e4ba61aa79966c099e SHA512 e9b2688651207c7a7384e099b2ddb7d083fb5419681446ed56a6cbe18ec302a689e71dd7e795f934b0cddab96a0d46b2f1c0aefe90132c22fa2ec4700ef1945a
+MISC metadata.xml 676 BLAKE2B 86f6c175251aa6c823fa2c83fb615f16d738da41ef932087d3f3783bd50ad23b6eadbb903dd35e1b89f256165b6f3a6977ffd710995535b6174339deffdc533e SHA512 c271542d7d8f5d442321321dc66556405ee86875e2ec3d79dba15f375fbdb3db008ebfd3bb603bd493b360a00cd45b34919891c404e20fc44ea53896c015264c
diff --git a/dev-python/gast/metadata.xml b/dev-python/gast/metadata.xml
index bae3d6620812..bb8c688ccb41 100644
--- a/dev-python/gast/metadata.xml
+++ b/dev-python/gast/metadata.xml
@@ -12,6 +12,7 @@
 		A generic AST to represent Python2 and Python3's Abstract Syntax Tree(AST).
 		GAST provides a compatibility layer between the AST of various Python versions, as produced by ast.parse from the standard ast module.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">gast</remote-id>
 	</upstream>
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index d669b6c58e8f..bad8b5725f4f 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,7 +1,9 @@
 DIST google-api-python-client-2.13.0.tar.gz 25562934 BLAKE2B 6ce955995c0f2fa5d09e1c90e65d38a7f321421199f53957fb58934c1f067de03a48f47f1d161c9ad2cb852663316c5d0f873a32b9eedd7fffaa2b067d84ae05 SHA512 d2b0cf3c250a500e774970790390025119102e24eaf8c7a0c170139cf322c37f4c8cd3f406a41d18deb2597dfeb21e6304e173cfaafb4d6faeff23b2215d4072
 DIST google-api-python-client-2.14.1.tar.gz 25415625 BLAKE2B 2b843a6ec6345e51c5a92c0285c2b8ae195928bec61b73033fbc64d8e55c34ae39d8d542534d89edac36d6ddc6c12b6acf11a25dbcbc06f72776799a70606659 SHA512 e22600b9b87d646775780d0f45043753e4dea24e898faf16ae49f2c91677282700b45de993d085923c006f2948747a6afa2e58b38f42f934f1602401faa30d22
 DIST google-api-python-client-2.17.0.tar.gz 26302010 BLAKE2B 1d4a63825b79ff252b318d988aaa572a7567c4b3e19d110ec480d03c4ffcd16b16a19c4b54f51288a21e34a3a280c8077aa983da8eacaad1f176fb485ea7e89c SHA512 1967539825490530bb4330940bf69bc1bb25035b2079797185bb359c350fc111188b188e2d21dbd0009f8658a6dbb11539beed2aa5ce03daa142d7cbd330e466
+DIST google-api-python-client-2.18.0.tar.gz 26442309 BLAKE2B 84f0cadeed015e9e0cafa209f6256b6262822f7161728aa5eba88f0def718b11c555bd0d87867c1e1ebb02e93046cec068e4ac0f855c55b7abf34a8d51d42fdc SHA512 19b06a252c440d5bb8454fc79487f4009ff73a7bd4882b2d33a354d4c4f287a6ea09f30cff94df4c1d1e898ca237d8e118a7fd5e63022133338d944dcec1243c
 EBUILD google-api-python-client-2.13.0.ebuild 1594 BLAKE2B f875395c16c72fb494b03a23fd40f8601f1e4fa044e12d3cb1ce5fded0cf59dd57b1cbc6b1e16ae3a2debcd1a048349fac6a24e7b7368b06bbdf8c0efdaa00d5 SHA512 95d6c45769d3c03249ce492f2ff26ef2e4450bb787a6b4bb97174abbd725665814dfe1f9345bbff51eced71ed6a70b1926693bc1dac9462635edfb119a48edc7
 EBUILD google-api-python-client-2.14.1.ebuild 1522 BLAKE2B d81e73aa68eefc2b1982e2a377b4971c4a117de7b0cf48b879fca70bd77c1f177f6d42a3f5c9400b7e433a7e9f7f063de6a353b69aa93bc801a08a7d0e7e1a17 SHA512 c6e83761485362ec5501e151ea12419b4c46b6fef3e6eaa887fa9e5e99c6a90e2aced84ccdccf7f6b1f4a6010e8a56ba32047c95239397f4d60f7f1e935cfe09
 EBUILD google-api-python-client-2.17.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
+EBUILD google-api-python-client-2.18.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
 MISC metadata.xml 537 BLAKE2B 5cbf80edce906cc5e6907af3df5b67662713d2eb503bcc619f616a5e770f57143d36089c1f2dde53c9c78b8df8b974e27e61d056b01bb70e6d7b9bd18a061afc SHA512 4d050e4c5f9b8f2284d4025570f5e52619b5304be4d7f76f856cce782120d8e1c0dcd23b5699509cb57a7720840b019f2c9bb981a08a6071be56977115708aa3
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.18.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.18.0.ebuild
new file mode 100644
index 000000000000..2bf8009bdc63
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.18.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	dev-python/google-api-core[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	find tests -name '*.py' -exec \
+		sed -i -e 's:unittest2 as ::' {} + || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local deselect=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	distutils_install_for_testing
+	epytest tests ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/huawei-lte-api/Manifest b/dev-python/huawei-lte-api/Manifest
index 8673e01c12e1..8f2fec824783 100644
--- a/dev-python/huawei-lte-api/Manifest
+++ b/dev-python/huawei-lte-api/Manifest
@@ -1,3 +1,3 @@
 DIST huawei-lte-api-1.4.18.tar.gz 29701 BLAKE2B 0e242f2f2208646c9f3291dab8397a80934bce3757fb79b58fdcee389a087788962cfaea3350d7b95e53ff3e0f1fbefdf7ea6714266872fc1591848a4fb84462 SHA512 4750fcc84fff46c76f42715e6668d402b9057f8dd826276ad0682e9bac76742c86566794d4aaab7aa9ebf17d06246c4d4cc9385ee1fff9642ff5c995491fc646
-EBUILD huawei-lte-api-1.4.18.ebuild 726 BLAKE2B fff44a353aa68c40a9b3f9f71b4b91c58429e74fb2550bdf63022455c0a4e90c67f7a9fed1bf714866d0d64f19be3da7fa77e7fd944338f7ed9745fa53812975 SHA512 5530c1696dcdd7a67bd74366eabdb0fd05c060df2b07b745d146028b40e4ba3ffc940ccf2fe9e8ba3df58cebedad41eebff1b2833f8e86fc09f78ab8aa4a7664
+EBUILD huawei-lte-api-1.4.18.ebuild 727 BLAKE2B 60256ea1a5c5a1b3df80900537f46c5db2c2708a58ae5e73a1682c7a548fbe6bbc2b390e2d67d9036ffda63880b78f6a9e049f8a8ec73ad9b92d26ad64ac006a SHA512 f92c89bd54dd7c9fd7dbd3c2ff1498f9930dcfa5afb4baea9895c21574fce444ee937b33cf9c6aa8ae696bfe43e5a453fe36ebe5add4c22da5318f40abd46e9d
 MISC metadata.xml 486 BLAKE2B 1e0adba09107420b8ce5cd57a113b7fbf279569603e0dbcf5d46fa50a55bdf5e6b7542805a7da86325d12fd2b71fef1845f958e229617368c3f7d54d302b6d4b SHA512 f72435998aac307b623067acc4442df6d5f7f281e08997dc84bc2a9cfbb5a3761da14e7bf89af06c6adc49d2c4a3af487745d318dd301cbbae6a6a197bcbe149
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.4.18.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.4.18.ebuild
index cea09d4633ef..811235dd7a55 100644
--- a/dev-python/huawei-lte-api/huawei-lte-api-1.4.18.ebuild
+++ b/dev-python/huawei-lte-api/huawei-lte-api-1.4.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index fa59ff7893f2..4802ba46c227 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,8 +2,10 @@ DIST hypothesis-python-6.14.5.tar.gz 9135819 BLAKE2B 2e42949f81024038b901231a844
 DIST hypothesis-python-6.14.7.tar.gz 9136527 BLAKE2B 46176df0ffac48d3bff68a83b03b316506236e8a89365c419d61d0e8dae98a54961da3715377475ba7ce89d9d989e63b75eed1473758896c13bc8c0937617b12 SHA512 bb04434893c7cf937c1f1fc733fc424b48e87ec00d3f650ad85b1749b37f18b3a4718c346739d9121b4461d46516ee1af934a34922cc6ec626defa5ffb1e531b
 DIST hypothesis-python-6.14.8.tar.gz 9137594 BLAKE2B 421c3fdb13e172bdb93cd15f625dd1fbae576ab37b48181eb82e6f1ebed92284a3c2ea4d0314f9dfd735f3ccd968465b28b94525614a7cb0834985f8cdae79df SHA512 3f99bf54e01a7d6945d898b8065b3241a1d9fc871adc9e3bec9cfe187e36651aee78eb57fa69e28405a668a0f784a5dc90acf213211d0c060a1e9a82de8e243e
 DIST hypothesis-python-6.14.9.tar.gz 9138640 BLAKE2B 3cda0edace7b3a1c373bdd61267013874fe78ae18aa7fda02759ac451f7e576614a61c3ce1d588e24afe4333f61680d89eb30f6f055e41fee91312c791b1af5d SHA512 a32d4f09ae6a44354d136164a517ea53c653fccb3e21a39ac63df78ebdf695c887f13749d2f310ac67863b6645a85dca73ef0bfab077aefe0486e445f6a85dce
+DIST hypothesis-python-6.15.0.tar.gz 9138803 BLAKE2B 537d40d2f86b16730391e4f4f7fc692d882793b47854f1645eb587dddf41e37e27f74588c8fb8829e0b0ceb2b563f8f88006f8be6dd28c954be59ba76b81e8e6 SHA512 19b8b5d71156c08d77c11b6d675cca3df1a66beec493e2a52600e14c2d1444f42f58b55ed769f9d99c16dc6844da1843539b995bb972daa6bbd35480edc444ed
 EBUILD hypothesis-6.14.5.ebuild 1753 BLAKE2B 91d322af6a74614d3675c680d21ec4c89297f2717c016f32d4fb5d98243bd4786de42639bae152fb14a8502cbfaac41134e4d4010639b7152559e32157e92b4e SHA512 a864d799d54784324267fbe6c7006288b227f7c8de1162b3d2b5a5cc37ae0e745b4a8f67efc6dae43b56f9755dca232afcf355829fe7f1c7ff5de9176f43fe46
 EBUILD hypothesis-6.14.7.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
 EBUILD hypothesis-6.14.8.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
-EBUILD hypothesis-6.14.9.ebuild 1969 BLAKE2B 25935ef4681b6a104dc6dd93f5a2b2bffe9ad434eb05b38aaef0615d1de5241a5f4dc9dab4ae406ca882a1693815be62b0e67c73ff01da5a4f6a4ed75a8697ac SHA512 2b3a2083429ada92066bfc8683792baf0d25c3fdbde27dca6d0b3847acf0c463402c25ab1bd33afa6164b988333c880fc86fc5aca4864cfa3f3aa6d4f37a047d
+EBUILD hypothesis-6.14.9.ebuild 1975 BLAKE2B d95fd7586f9e56b1278f919599dfe53d6cd8c334ceb0c85e518fc217aa49179c8861817619c6a8fa87d9190103823a77b5dca4da80d88ddb80d4d317a4550861 SHA512 ee896bf82cad50a865d0d479fc23870e05a6dea0b61d077193c22ac25d91543fcb63f1363a1d43db0b79c1444bf2963eeee79047ba02474d215b3cc81dd54e22
+EBUILD hypothesis-6.15.0.ebuild 1975 BLAKE2B d95fd7586f9e56b1278f919599dfe53d6cd8c334ceb0c85e518fc217aa49179c8861817619c6a8fa87d9190103823a77b5dca4da80d88ddb80d4d317a4550861 SHA512 ee896bf82cad50a865d0d479fc23870e05a6dea0b61d077193c22ac25d91543fcb63f1363a1d43db0b79c1444bf2963eeee79047ba02474d215b3cc81dd54e22
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-6.14.9.ebuild b/dev-python/hypothesis/hypothesis-6.14.9.ebuild
index 530bdadd54e1..5a04d107e65d 100644
--- a/dev-python/hypothesis/hypothesis-6.14.9.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.14.9.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.15.0.ebuild b/dev-python/hypothesis/hypothesis-6.15.0.ebuild
new file mode 100644
index 000000000000..5a04d107e65d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.15.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 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 ~m68k ~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}]
+		' python3_{7..9})
+	)
+"
+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 || ! has "${EPYTHON}" python3.{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	# disable autoloading pytest-asyncio in nested pytest calls
+	#local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# since we disabled autoloading, load necessary plugins explicitly
+	#local -x PYTEST_PLUGINS=xdist.plugin
+
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-p no:pytest-describe \
+		-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/immutables/Manifest b/dev-python/immutables/Manifest
index 62770a848feb..b42a3a700f24 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -3,5 +3,5 @@ DIST immutables-0.15.tar.gz 81297 BLAKE2B cb58142c3b833d529046f09a468b3e3964e3d3
 DIST immutables-0.16.tar.gz 84916 BLAKE2B e699aaa1135fa9f7db9589276dc0801a67c5f98bd3c5b247913d8263f9baf02a8772d7715cc3eb2c9392694d48d3808d50f45e9fe8e66c4d507586d0e3fdc319 SHA512 5b883cfe43f8a042b617e719dccd3cbdded3b1d1df160ba26b6bb2f0816a7171698bdd2ba3d450e76f135b236e777052a22c09b8bd1a9183227f1ccc90617cf8
 EBUILD immutables-0.15-r1.ebuild 629 BLAKE2B 8b756b31629365c274c51d19894105ee6011724361c2aca1b89fcf6f421e01420f8c5e5b61d6f34d9ef5dadffc99181c3300e22909a0f59fe0e2e6151be06268 SHA512 546fce12a5f41544d94852281d030557f454d13deec05fd070ceb4a15418a1ff8bcbc7373d634c7b10518e3f26e1dd59c661c70f3f16f9ff71091431a7f8f393
 EBUILD immutables-0.15.ebuild 487 BLAKE2B 6eb8f45620525e4dd42aea5ae122f9c60e4a1ed5c7585967a7866a71d79fde296565b6e6aa7654f7ca6cc1121cc9ad0ae21a96899c80fa7d3ca2b0c9bef29902 SHA512 1b5e71a31832081a6d6537c8e3084ad29e3492cb2b9042000d6ca488a93a4357bd62c1bf7d4b3023786508604d3750c09cfe54148c0663869e5f607297748a22
-EBUILD immutables-0.16.ebuild 798 BLAKE2B 80b2c4c0ae37474dd4d0fd5673dc14802467e1ed1009a59ab05358452710617c863294e248d7b698bf817a93e9c83d39ab35b653f1849d8ab2b2c761697eb8b2 SHA512 7b1b7f1051a930a2f86a44a8e0633d8a717a47b3d7f369e3a0790c46906d27fabfa7e7459c381a3d540438d9eb76c26b2bd99ddbd010a85c2f4d1a45d89fe4a7
+EBUILD immutables-0.16.ebuild 804 BLAKE2B 73302349d6cdf7a5fdce2f105984580a8772fe2077f0ffd4c6b5aebdb662c2d01ee762355385d45cea9c036f9768893e7f46f453475b3290351b7eb8d4dec40f SHA512 823ff2453a5f3f1b781724be2b68cc7407b56e007fd9f6d7563d234a3069e548910d717389ac78e24b6eeff800a51d00abd5aa5577c16d213779b04ef61bfda0
 MISC metadata.xml 352 BLAKE2B 65ae089f4fcda6735dce5a7772e25b57c69f38e728073213b7c3d1c96382f22cb570fea4890ba1c9086a327b7e24cf1e58514fa6363a1ca595ea9c66cc4a8289 SHA512 96bd2296b24b710cf4a4eecabf3918cc49fb70e859989074d1c07f16b48dca7e2439a4f5f00e5e2283598216fa574621cdb69c78d7a3e7ee9bca144b3955d4d6
diff --git a/dev-python/immutables/immutables-0.16.ebuild b/dev-python/immutables/immutables-0.16.ebuild
index 8f731df8b75d..7615e84c44a6 100644
--- a/dev-python/immutables/immutables-0.16.ebuild
+++ b/dev-python/immutables/immutables-0.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/influxdb/Manifest b/dev-python/influxdb/Manifest
index 5d65d677e11d..434e69d1a2b7 100644
--- a/dev-python/influxdb/Manifest
+++ b/dev-python/influxdb/Manifest
@@ -1,5 +1,5 @@
 AUX influxdb-5.3.0-pandas-future-warning.patch 638 BLAKE2B a8cba22ef423b5162666fe9157516dae077355139f323ee98149cfdbde15fc12de163cfb54009ab8bfebf2697c4b539f512de19d6d066aa28623e7e9f272b411 SHA512 0d2a6213efbcd56b9908924a839fe63d369dc7ec674e3d1603a81649969f47fe085b6ab163028384752a033a98d358de2d7c651618370c018d05df7152b74e52
 AUX influxdb.conf.template 476 BLAKE2B 50416cccd720729d28b50d6cd4bcd6582c959b932c75f8dc64525e96be35242cd8dd36b3f689383e22b0eed3925b0c97dc42dbaabdd76dcc3cca4d5f49d8cc0d SHA512 3b8f9dfa149ed0e8aa25c8db8b39968e01ba7f81b9db037a0e05740c27d617dea8101efc9b9ddb00bf354cea7eefe5ad318b2ba309276e5ba4500bc3dc9db62e
 DIST influxdb-5.3.0.tar.gz 66683 BLAKE2B 28dd955fb26eb9a984bb910f26655720c566c08a8178f8aa08b5eb66a6f02933a6f3cb2d26981ffcfc3fd9a017fae2ad27b61f32e2a7916c55d723ffea5b248a SHA512 49ae48dc56ea8f6c6d4103f33207a35af4877c292ff4bfd32ebf8ff35fae816f570e64657406fdf9ef13092c69e7e2d1f0c641124445d35731a4a37812f67242
-EBUILD influxdb-5.3.0-r1.ebuild 1131 BLAKE2B 15908154b071d18142a1637b13bb571f717dd97e12e76462e7073a751fd59fecde4ff402a242fd60b077f896c0ff6071ff32aeb59d1eabd3705bf103c005f786 SHA512 791860c62c7e65b45e4988ef02199fd6da4eecdf3aa9854d8b8b7543b62ba2958abffa179ed722b37fbeaa937ed588e7a1489915b5ba7bb1cdf7c04d0020f57c
+EBUILD influxdb-5.3.0-r1.ebuild 1131 BLAKE2B dd5465e27ef1e666df17ff0b92c37eaec7e2443fbeeb6a33d6e481938034bf4bdb5786b2b3c8bf7b16e07007d8819ba97591cc88afd525f56e3e0e408c738cc2 SHA512 23c503fa3d3e30e6be17701e7829e5ee6dfa59e28262ee4bba7277b94e65162b9fc04740873cf0570f9775045b8960b02d2e3b1bea3711285ae13756daffe4b5
 MISC metadata.xml 527 BLAKE2B 88fe30a3737872fc6927e3891bc2e741eb969dea0fc85876b039b403c0cc26396ebfe65ada6750fcf47b0d9048bb30273ada10da84b1f2ffe514bc7927a1f04e SHA512 3550ae9eb19dde86751637a73a41d84029d0d49e419a8f258017bad578af1c186bbb0e966a744cfec5cca80572b70399c011990ec65b51b7dd043e49247d169e
diff --git a/dev-python/influxdb/influxdb-5.3.0-r1.ebuild b/dev-python/influxdb/influxdb-5.3.0-r1.ebuild
index f4c99bee7dd2..8cd5b7a8ae0b 100644
--- a/dev-python/influxdb/influxdb-5.3.0-r1.ebuild
+++ b/dev-python/influxdb/influxdb-5.3.0-r1.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=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index 8747f3415051..82cd4388e68d 100644
--- a/dev-python/iniconfig/Manifest
+++ b/dev-python/iniconfig/Manifest
@@ -1,3 +1,3 @@
 DIST iniconfig-1.1.1.tar.gz 8104 BLAKE2B 31301484887018a6aa75c944e2f8643f85b2433534ae46a8da893a113f2376eca14cbee88095a3784d1c52f26d4c748260c1df59c46b8f94cd342038f93242e8 SHA512 c9341db7e3ec2204b6a674fca7824cbeb492e3576d5ac3f084b234c82842b28f2f6acbfdb812e183f4334a95b990551f942a4caf548f5ce7ef14885f931535ee
-EBUILD iniconfig-1.1.1.ebuild 540 BLAKE2B 183f230f58830af6198e56d5e930db8c9549bf6c7186fbe608092c91248d5c10cb3227ca6f59ecedbf123417db291190d17657a77229345677cdd41bb71cdefe SHA512 41e74f1b69c57b9ea2daaed9ac25032a0bbc546d6ffdaab1cf1884fc2dba04c536502d86e3c7189184b22b87d948464aa1d137fb390290a7b7cc5443a1eeeda6
+EBUILD iniconfig-1.1.1.ebuild 546 BLAKE2B afb12ca318102b7ec90724b93cd683aa7fa5ec2ed9b92fc636779fb9c78c67391a9d49d8a654970317d65fbe95041a48dc62e769409f32be20e2ef58d9b1cbc9 SHA512 f27f016df947f06e193fa211bde48c7312b7cc7e29ca8f1eadc3f578c7fa88e6379218594f9bab7d5be0e362fd1ad02351350cbc5970cb1eba23a8e86b5b5c8f
 MISC metadata.xml 314 BLAKE2B 4d711ba8f750f4c66f8a5131c8d0549d8e13099fef027a4b2267f6bff083283b06d80e9650acf6d8df819fe3be27fe6f18d24dadfc85aab266064d43c32fb863 SHA512 7b1ec3fe73060f3145298dd94d741f7998a9372da8ac16290a25bcddb88d9c5780b4c93fdbf439ebee8ef19b147d41145640a9483af4d4554a6c6f5761f72992
diff --git a/dev-python/iniconfig/iniconfig-1.1.1.ebuild b/dev-python/iniconfig/iniconfig-1.1.1.ebuild
index 857fa64652e4..9c4050d064bc 100644
--- a/dev-python/iniconfig/iniconfig-1.1.1.ebuild
+++ b/dev-python/iniconfig/iniconfig-1.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 9116190187f8..194307df2e92 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,3 +1,5 @@
 DIST ipykernel-5.5.4.tar.gz 112728 BLAKE2B 489e12d0cbde2f80f2c921f026c7b84554b1fef481164e07f89b063127b01d106fc6b19f830ac321d79285fb9df065352dbc0c2a997b3629a64e766d2e50f347 SHA512 96728321fe71d528435415eda917c623269af734598a78168144d983aa64db4f9ced981fa67c83263da1ed878831669d821b84a769a08a271adafacfcbb75bf9
+DIST ipykernel-6.2.0.tar.gz 110042 BLAKE2B e1e9f140d434142339c36cdf72c9c4224143aeac8ee5938488fefaf0c15b33ddb6a4e4f49e4096431c89ba6bdcf6321f73e61927186d42518cd73e6016a017ed SHA512 7f3203b072cf7a4ca71e56df0c5621f6ac44440ace2ba855b7354971d04e872621650a0351f9d1ace50ea63459290835306e71fb91d414355810fa79968ddf56
 EBUILD ipykernel-5.5.4-r1.ebuild 1321 BLAKE2B b649dacfec66513392f26644802e89e4cea7c27641f99ea51d4f2f5a9250b8945fb235d1bed84cb056231d11f8742da01cf282a8a4df992ff4d8c510ddfe14d8 SHA512 1525e9a8cb0f72a8c99b55f914e60a438e40f835d78835c1df4f31e2ba81aadf8bfd3979932ff812fa751fd710c83a70d9ed4bdd85196efa9f88653693166c7c
+EBUILD ipykernel-6.2.0.ebuild 1138 BLAKE2B 1b4eab67aae3bbcb35d8c3c462c5338c22d4fda8eb834ac58c1fe05a022db685482effaec91c8ec951d41eb1ce81a78bffa6d087c9fca3bc4227fe134b83cbdd SHA512 0758bf77712f46d87cc85e76662c555034569e4496411aaf1529fd10ea4f528fdd04766c4a8280c247992af7562855a072a0d3dbcd3f586f02cb4d5953f3d01b
 MISC metadata.xml 526 BLAKE2B 736792bdddadea61e82623e7b510347bc00a8b0ac35fa6e10cb420fca4b3890bd00f26cfbc91eb15964a5718b14037cfc8066503345ceffb5c69214f93babc50 SHA512 33e7a9809469d373b1279395f3b09cb735defa451982b69059f10d334b449e8fb75851271db71315939b44fe4f1ac6bcdf988308faa05d705ccf0fad9887daf0
diff --git a/dev-python/ipykernel/ipykernel-6.2.0.ebuild b/dev-python/ipykernel/ipykernel-6.2.0.ebuild
new file mode 100644
index 000000000000..489193326312
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/debugpy-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/debugpy-2.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	<dev-python/ipython-8.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
+	<dev-python/traitlets-6.0[${PYTHON_USEDEP}]
+	<dev-python/jupyter_client-8.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2[${PYTHON_USEDEP}]
+	<www-servers/tornado-7.0[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1.0[${PYTHON_USEDEP}]
+	<dev-python/matplotlib-inline-0.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ipython_genutils/Manifest b/dev-python/ipython_genutils/Manifest
index e78b77fa4284..0e4ac77bada4 100644
--- a/dev-python/ipython_genutils/Manifest
+++ b/dev-python/ipython_genutils/Manifest
@@ -1,3 +1,3 @@
 DIST ipython_genutils-0.2.0.tar.gz 22208 BLAKE2B 1a898e11cec26787f530f72e2d2a79e7834664e0f6be6a27ddd426bc2d0b3f39ee46e9ea10ad03e01a08054873c9752007038e863d7dd9e501613a68e40e1635 SHA512 0e5a9f8be17d98dfb74ec77d1360ee79276a13fe1914e6d31e8740f06375ed1671c49356a77f118495f50823b8384c1e2c5b6fae73965e3d4249c831b9a2b095
-EBUILD ipython_genutils-0.2.0-r2.ebuild 567 BLAKE2B 1945b4c213d42a2c68217eb8a43e5d7e4b0fd6284cb5c04bd5c36a2d22d63560f95d493cd43cfd23308c5c9f20216b8ed0d13a82d0f392ab0d5e6c6e55e9b594 SHA512 09a7067f9ca9898296a416baa4171a7ec87adde174f3f5307d157400264ead53632c7e58660e87527e60af4166790802f1266e07df7426a667863b68b48676ba
+EBUILD ipython_genutils-0.2.0-r2.ebuild 573 BLAKE2B f3a17a7bb33b7de32fdf391e368949d70c74e681db5b2f1a78429443d778c119ac664068e09a2953e5550829e55bd941d2be9331c384d914db8042946fd2b263 SHA512 864a00d351eaa881139c2f21312db720a1633151f928429393ea9b5a2d9c37aea43f02836743232625f3c03999f729a076d99d48c22883a28b78cf60c3af44c6
 MISC metadata.xml 861 BLAKE2B c2d0b90a2e95e3a71c9309011c5dfe8bf711c2143e91c288d0ee42bc9cc1143e17f2cf2a6257bd675c17dd33ec3bfd764c62ba90f40204bb30ec6135e35a811d SHA512 f56d734c089641d8e615121f026702ae47b46be7b8b8cf0dca3c42b866b1c8f1f5240041834403a82ab6a22acb3a0986b11cbd6fecc9171655dd23f2509a1e0e
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
index 00e18bbf6e57..917d99484249 100644
--- a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
+++ b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 
 # Needed because package provides decorators which use nose
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/isodate/Manifest b/dev-python/isodate/Manifest
index 99d1896cd4b3..4900ced37c4e 100644
--- a/dev-python/isodate/Manifest
+++ b/dev-python/isodate/Manifest
@@ -1,4 +1,4 @@
 AUX isodate-0.6.0-py310.patch 3387 BLAKE2B 669a1eb70890aa2be676be24489f4434dcf9b8f56cda20bef91913e8d648ede59b78b5e6697cf5d56461db43e9a0df14d76c2210ee0f434d0e7303a9a7eeee18 SHA512 a9c9662f95c60895eef90278d8f628cc06f56d6ed24780e03b7e45d13acf677dce4114e450876bc47fd47c637c933f48a47eb4bbb2b628ec1da7e4063059b694
 DIST isodate-0.6.0.tar.gz 28480 BLAKE2B a7499c736b67193ac73026df7a7c9d9bd5b743a5d556fe5e8ba0a62e8a5238d64afb88547a27e4bcbe706483e3e1e97eecd437e4e1c730c20652cff5926502fc SHA512 e977748e13ee2c94ab47bfc47113d152280e9acff6f70e773de73717392148dd2c111a7db2d9fa3679d37936c6ed9a23dc526cb00bd601df45459b6a244f9f7d
-EBUILD isodate-0.6.0-r2.ebuild 629 BLAKE2B 74460c2091f1e6634461cae46cbbf576680a6d9d0d172fe67cfdaf7721641b7d6cd306d10d274f6d810a8e8b3092aed7d019e0f4f591b884baf60174da295c47 SHA512 894784c520c8c23b6b524feb89938800b2b6459fd5a752c85dd6339edd9902462d9f7a2189b12cefaf1b66ca2b31fbe09bf3b5a8b70a80d98c6b457671b5e2c4
+EBUILD isodate-0.6.0-r2.ebuild 636 BLAKE2B e60a51af34004a5cb3344f94657ecf76f0a8ccc89228256ba9629f73e2c69eea3f4e473dfabced3b54c191b8df62914ca8fec3195e4ae1256d5900aa36588025 SHA512 a7af09f26ab396b80be9c7b29c32df2e7b3306d5334d576c86d06862129e378b7abc7c373b106e7ee19221c132758358698d304ba3870488eb7cc349f9dbdbef
 MISC metadata.xml 1175 BLAKE2B c5c2b7097b9fb22baa38deca60688f3ea7ed425f4fd616b45d8ecead521b2050f01292bfb77d8eab2def7992feef85d9960319b4b266c835e267def63bb9d020 SHA512 894c2ada19b76d1f76c31160055a5f912994e3c001d887728eda305126fa8351ba914a3c6d4055f8eed64ec54ccce4544292727da5a45bef494e8086068fb056
diff --git a/dev-python/isodate/isodate-0.6.0-r2.ebuild b/dev-python/isodate/isodate-0.6.0-r2.ebuild
index 4b9e27d5136c..556f3522bb83 100644
--- a/dev-python/isodate/isodate-0.6.0-r2.ebuild
+++ b/dev-python/isodate/isodate-0.6.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index f5b136f2651a..1dc04030b22d 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -2,6 +2,6 @@ DIST django-stubs-1.5.0.tar.gz 180400 BLAKE2B 0619a76f89fe4fad456a82e3048009f25f
 DIST jedi-0.17.2.tar.gz 474372 BLAKE2B cd0bf217202e4413a7d4f1d4095fb22ad5c3de557993fd33e246a1fb516992a16a7382db9e18e0c0414ff5d927008c8148e9bbd8ee0dbd62368d01a31611c326 SHA512 cd96faa6f9cd6e8ad8b9a52ceaa6a84f30c8ced51b20d621932f0babf1b90bbc445fbe5ffd11a4f0e356bf20bdd1da756ccc3574e5fc978883de72dfdb519977
 DIST jedi-0.18.0.tar.gz 462786 BLAKE2B 35021ed1566fffc24056060f16b8a0aa6f8b6e382f716ff5978711fd66340e96f4e0b628463aadead5605db32cfc20df06a6c53a9b435658f1c455a6212da6e5 SHA512 fcee84496285a0b0b1cf1f3827593d0603bd87c84baf725cc7bdbf594979f49729b18a29b7465848413bdd3a5670fcc41187dd3eadbd9750d77788c5a9408dbf
 DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
-EBUILD jedi-0.17.2-r1.ebuild 2116 BLAKE2B 6de10753d4a30cd0f0d68c7518e8b1602f8ab2deb8f002af5804bd12488ef55625f7d1e96ea6b5c0fa03621c2840ff888c872d1d05f7bcc4a201e707dac04322 SHA512 cd55cd1ff4ff7cf8696f13b6adef619b792b31b14e892d43700b36bde99908c8246415a2928116407d76d5f94c5d2ece453d9095320b6a0a26d4b3269a9f0e0b
-EBUILD jedi-0.18.0.ebuild 2119 BLAKE2B 15011e91ae4132ed0b82b4a2e1202c1e7051b58030c31586f20c5a2d7893baa0212350cc2f88873fdeb75fd698f38511f95db2458cde1e16c8c540be2e65d2a2 SHA512 d8611876cd968a002ae15e513273f48f32ec9605e9667f7b2234a1d3e18968c42331893efe56413ea970320c099d4755f5cde86fe17d049dbdb3e8a1346308be
+EBUILD jedi-0.17.2-r1.ebuild 2115 BLAKE2B 04ee9cc3bc0799a5567c9fed92c02eb9ad5d191ede8aed4538e80a8fe7efd3d8155b221d731e3d5db69fee9f53ad1f7d2bfdd8eb580d544d60969880398947bd SHA512 c672c7c730d7e56aa16c43ad48539464170079f0d295ef98940385209304de904b33cb0c0ab86441949bb6d91932f678465ebb9b6a90cbe0555a06109bf1c64c
+EBUILD jedi-0.18.0.ebuild 2197 BLAKE2B 68451364686999c71ca59839ce562cb0542af62906a0ba9ad2ea7f9944f72c293612f556e9199d74662580124b786b2808c07162229ff95063245b148c45bc11 SHA512 5ce9ddc87d718207a31640930d6cecce0a5e78ee350f74a489345467bef3594e26ca6074db8a24ab2750cae5a97817803d7a177a59a0955707911f36d39167e1
 MISC metadata.xml 400 BLAKE2B 7ae1b5a2edac295d8d1cce978fd3c6470eacd06b890c960c33c58050a5bebdfd091cbcf48190e2f6b3681341db155f36e9492f41a4c5d88b2f1ebaacd92ca15b SHA512 f3bd9785ed160ea3335a03139abf10e68d10d2431b4b6f56da12c9a074954ad70972e953b2d283646009af180b9a50e59adffd455adb2937905812a98146360c
diff --git a/dev-python/jedi/jedi-0.17.2-r1.ebuild b/dev-python/jedi/jedi-0.17.2-r1.ebuild
index 1a353b18d0af..74c4dcea04ef 100644
--- a/dev-python/jedi/jedi-0.17.2-r1.ebuild
+++ b/dev-python/jedi/jedi-0.17.2-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="MIT
 	test? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="=dev-python/parso-0.7*[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/jedi/jedi-0.18.0.ebuild b/dev-python/jedi/jedi-0.18.0.ebuild
index b3a377fe8ad3..088ffe44b0c9 100644
--- a/dev-python/jedi/jedi-0.18.0.ebuild
+++ b/dev-python/jedi/jedi-0.18.0.ebuild
@@ -27,7 +27,9 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="=dev-python/parso-0.8*[${PYTHON_USEDEP}]"
 
+# RDEPEND needed because of an import jedi inside conf.py
 distutils_enable_sphinx docs \
+	dev-python/parso \
 	dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
 
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 75118881512a..8d4f7752af40 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,5 +1,5 @@
 DIST jinja-2.11.3.tar.gz 258057 BLAKE2B 4735464d044718ce1e6b2663ecb1b238b38fbf0f37ed683257775fe9e853186c089b98494209e511be5aa96bf6df8f6d472be132b6184a7d9213e182099c0433 SHA512 f8e2951edf780d7b44ac74d36579c89b0a5c076b4250faf643ae7e3ff6a431fedaabed640e5efb496cda1a79a4057bf312ae652484c8d4631d521689eb0adbc1
 DIST jinja-3.0.1.tar.gz 272329 BLAKE2B 71aff8e78c49a522ef78d418be1b3b104dc149dd623b75aed3022f979930c8d6071c2adc3693a6110425469d6092e84a7721ac9d7907a8dc0c8414ccdf7c9049 SHA512 da3238bbab9f5966df933dd0511faf010d799aebf06d17b9352f412417ceea842145ee970a0ddd84f49a3ef1f7fbca29f62a14ee75c136a083168311eda89ddd
 EBUILD jinja-2.11.3.ebuild 1558 BLAKE2B 11b319f676e492a970f2ade22a208431ae247aa5277219c5cff90ef23e21b675b779cf1c09402f6c07f41629f77b4f8be427bdcb97d40c8b8de07c6ab45e9645 SHA512 26f8f456af243710d4fe9d2b7782f90c6800b23403b6da77742f975b4fb151c1f18b34b091689ff8b84fbacfa78b81564fc363fae467848d2841572be1007a5c
-EBUILD jinja-3.0.1.ebuild 1310 BLAKE2B 5f5b74b41477c1af7e87917436eed303b5ce9fb5545e8ef89717babaf93e95648881f6dcd302bc96206ff0ca5912b74d5b70f43b18bbebf5a3f528c2e13f0f31 SHA512 019e506427bf72eeb15e16d7160d5f62c834001bcf4f840898d3999ee065d6ce44bc20db378acba491d5b194b45aa5f83f5a00221e404e3aab614ac50c42267c
+EBUILD jinja-3.0.1.ebuild 1316 BLAKE2B ff37ce0c64da5e4d1bb14e05ebc012680673d6da585ec8d23904ee52a95f2c72ebadfdfeae5f2769ce28c4439f9d9ba32ad8318538071f395cb1de334b6c2c11 SHA512 4f22e89c2a0fba6e83d96df17f5f25ef003394dcc57d1c8a274ab8f58c31ec4bfbc5817c213625ee8bca43536c505c34db8d0dce9b35ad2dfa22d9862771aae5
 MISC metadata.xml 466 BLAKE2B 76540215466d45bb582810d8e8fad3db88cf0ccb7d4340d3ddb2c6c85e3ce552fdfe81517466382db89adf660269711a0fb861cf881487d7e4d1ce474114d6a0 SHA512 3ae5a895f264984d8538551346b7031c712ca244c154ff435847949db29239ca1c7d9ad88f82dd7cdd02ea8906600b6d7f7d4c0c6dec1f025a5d5e1173569c10
diff --git a/dev-python/jinja/jinja-3.0.1.ebuild b/dev-python/jinja/jinja-3.0.1.ebuild
index 2c2a5c2e3791..4ba3d45cac3f 100644
--- a/dev-python/jinja/jinja-3.0.1.ebuild
+++ b/dev-python/jinja/jinja-3.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/jsondiff/Manifest b/dev-python/jsondiff/Manifest
index 122a17b6e829..3df8b68b7017 100644
--- a/dev-python/jsondiff/Manifest
+++ b/dev-python/jsondiff/Manifest
@@ -1,3 +1,3 @@
 DIST jsondiff-1.3.0.tar.gz 15283 BLAKE2B 408070816a4b21a3f11f5b039464ba276fb253f712f29930454167d3aff22f78b4d828aba5e28cf05587c8a296b908fd1945a65958244a1093279bff5e3a555c SHA512 512e34d1a0673ed785f066c284c09412a3590ad916913ae1885ac567795cc73e2adf30596b60b64b6b379954e6cb82d5174e80dd9cf40ed53f6968bec8a3d8f2
-EBUILD jsondiff-1.3.0.ebuild 776 BLAKE2B e6326a47df6281677346f590f5ed3490eefcef417fff756a170dd8e73258fe7a1f159382afbb721b346dafc7079685ae071cc359609bdb17f053fe4d38898281 SHA512 408716e01e9c39fecc33339b97a1867cf9c221d57e75d201277df8829f62bff680b31c805a80364cbf93ea6698f634be1391da366ed628e8ebfecc63359d2d71
+EBUILD jsondiff-1.3.0.ebuild 745 BLAKE2B ae65de622ab435fb92ea9e4abef51b3673e09cc5f010baf4331081d48e3e7dea2715bad1379c68ac51b65cf150d85c8ad54370f95558c53c19cd11570d6ee59c SHA512 39ee8da8327eb4f0bac726aaaf031510e9e80cd7daef0fed3f0bfc8359e1f11a934f48e8480fe1207ae0b0e6ceac27bab6cc6562085879ebd9791b5020aa6073
 MISC metadata.xml 536 BLAKE2B b4fb49f36f553a6d01a07661a0b273a923f6fbe95661958fb742b1149d6679e05771dc2d9825087647e5282f33b11b60b00ed11485a3976dce5b4f615fd1afe6 SHA512 9d0e82a422d7d2e40cd68d9f9b3f3704049b73ce22496763199517762c6531fac861edeba777ccb2a4769d0df90d4749d7cd57542654e8ffca3cc73d733bcc0d
diff --git a/dev-python/jsondiff/jsondiff-1.3.0.ebuild b/dev-python/jsondiff/jsondiff-1.3.0.ebuild
index 8ca8da9c1579..c53abd845dea 100644
--- a/dev-python/jsondiff/jsondiff-1.3.0.ebuild
+++ b/dev-python/jsondiff/jsondiff-1.3.0.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
+
 inherit distutils-r1
 
 DESCRIPTION="Diff JSON and JSON-like structures in Python"
diff --git a/dev-python/jsonext/Manifest b/dev-python/jsonext/Manifest
index f7886161c9ba..4167aa94b4a4 100644
--- a/dev-python/jsonext/Manifest
+++ b/dev-python/jsonext/Manifest
@@ -1,3 +1,3 @@
 DIST jsonext-0.4.2.tar.gz 9574 BLAKE2B cba417bc116e572f383a6d396d33fab0f6b63534ae89c402b6cfc0297a0c2fce336bf63464252fe9c87a9617f7f00ed82fe9de9d4e95356b60ae555963d4951b SHA512 2b47b48b529ad8f3b9662ce19f6ea9250648e17cb94e4a59a52ab6a9aabf64abb74f3c76a1edf274fe1e52863352456c0f95c5cd7406c44ca917b6addd09a2a7
-EBUILD jsonext-0.4.2.ebuild 493 BLAKE2B 8b953a9eb6feb610d406ebf9b5cecb3f5a65d9165ba7c881e57fdc836625e3a844463c88a7dc30aa0de34d0ece594bcb08396f9abfe7787b8f2e9cfa1f3eda0a SHA512 5b5b6ca417fd1ee1e343fdf04544d92d7fb41b745eea843f839885bfdb7927de366b1f55d02df46bc3ffa713aed5dcb6999d44b6ffcb92779dc1ed19d0432489
-MISC metadata.xml 427 BLAKE2B 8f3eb96564585f36de7f6b46ef699837b09c3d230efce1f82413251299be94d243e25d3e17fef8232de9f3819d36a17bf2eec529c5b0588791fbe1c3800761ec SHA512 d47bba0c18463d9ee52f09ce48e3acd102006199babc3da9baa8961a5fd2f96c63800c05c52a79ad93384fa0455257083918a2e78a0d264f7b24fe540cc229d3
+EBUILD jsonext-0.4.2.ebuild 493 BLAKE2B ce13c270689df6b5034239283640f1610e43d35e89dc03cf011c21e549a8e78d5ea9b02e13deb4ab7a7b578ccd9755a4803ceadeeafb3389ee4a9cf6f4b18e98 SHA512 03a927519b20f525cba101f41e426bee90a635b2bb83b84baa19e32a7e3c11f34dbce583a790b38998b53f8ed6f6e0c6c717e6273965b5d58f2ff5f36323a3f7
+MISC metadata.xml 478 BLAKE2B bab531c2e626242493c00f0bcf83cc68150345688b21b06670090724d645060c843e7f55bf0a323b03a00fc0a87b99d3cbbacc0be991929e3c7a80b8e00b84b3 SHA512 0b62f6ea253815ce3b1d7139ed4d65a8753bc96c26f9909bda233932d7b0182aafd76a2ac7b0ad2c31dab0dbe98080fa3d7340547d1ac380a740ecb5f9e2942f
diff --git a/dev-python/jsonext/jsonext-0.4.2.ebuild b/dev-python/jsonext/jsonext-0.4.2.ebuild
index 3b6e7dd7a515..f1efbcb8308a 100644
--- a/dev-python/jsonext/jsonext-0.4.2.ebuild
+++ b/dev-python/jsonext/jsonext-0.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonext/metadata.xml b/dev-python/jsonext/metadata.xml
index 11d4c2d256c3..2b016fe93963 100644
--- a/dev-python/jsonext/metadata.xml
+++ b/dev-python/jsonext/metadata.xml
@@ -11,5 +11,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">jsonext</remote-id>
+		<remote-id type="github">mbr/jsonext</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 8d4fabc337cd..6030b3024a66 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,5 +1,5 @@
 DIST jupyter_client-6.1.12.tar.gz 301499 BLAKE2B 8041b84ad2e89413ee60d1aee2e49a67a89b5aad1c3118c8fa7d7d719c8ec2acbc72278c9aaea095cdcb89235800d09b1792b2138c09a4aad59ceaaf695af431 SHA512 f31ff1a24b264c32d35d07491785e1d77935cdb463243e90e4aadcb0a093a074cdce75f01662591766588f39b146077639ca697f71157309dc92f12ae04d5cdd
 DIST jupyter_client-7.0.1.tar.gz 317467 BLAKE2B bcaa4f58071e0c90e81afb010a10ad221793a186aba0e7ae233538c810b787e3a0bc734735cd20750500c9d74d6c5f548f7deaf3daa3e989d75b5f9cbb5344ee SHA512 5665018294e87b0ae0fe58a7281e205e1668c3676f7092128f4c6ce8eb13e53983fc888508e913085beb29b13b1aa46307c4bf1c8c25bfe1f9efcfb7254bdf3a
 EBUILD jupyter_client-6.1.12.ebuild 1191 BLAKE2B 01a775659ebdd59be525c05f968cd59c4a765ac16ea30351656100ded5514f5de0487d31dc479a028091bd62fd53203d37eb729ea59ee793893289575690dd6c SHA512 6085c4666e926547f7209f7b918a6eff5b0399f0b04977b69a8b283cbc37041891606a9820759fbbe973560073af7744eb309505107f613c549c8589692b0ea4
-EBUILD jupyter_client-7.0.1.ebuild 1337 BLAKE2B 3714b4b4d9c85a64b64700d6d44e1d5c3c20f69fb19fcf205a70d9078e68f11f0238f0bc288e390e946b93acd0ac29ee75c039ea507bdd89458eef39bfac4d07 SHA512 a8f03c9620edbd3036441a44f25783124c9ba5671e3e231fa3a7fb881731c7786cd17bd1a53a28ad9e600719946d23a3eb2a73064d36483774e73d00fb4f2ed2
+EBUILD jupyter_client-7.0.1.ebuild 1344 BLAKE2B 5e51ddf361d64fe3e36259b11fd8e27b31a32569ac33c095f6c5b9e3443be3a6f4dd2e77f7a71e0ad3e9f0c81290c2cd2f129d0a75778eb1328ce207d2014cc7 SHA512 68642247b38a3b421a7ed92af36f85704bd39145c006d0627e674709fe90a4817da598382f06f921137c4f2b9746fe2f23ff69a2586859f19eb431c27d4545cc
 MISC metadata.xml 779 BLAKE2B e9744283eb51cd9df5ca7a65a29d80e7712e22a1c4f039bac233a4301a821bbf616a59bc5f923dca0edfc16e32fee9a676a6aa90fd8011beaeca68ee97d63355 SHA512 3e07a943513fb5d2d0e689572c39084c63ef2b54503843897dc1492adbd9fb217a3a26931e48f2bef2fbb99e32900aec85968a9597ddf54350e174ccd82a7b4b
diff --git a/dev-python/jupyter_client/jupyter_client-7.0.1.ebuild b/dev-python/jupyter_client/jupyter_client-7.0.1.ebuild
index 1ea8114ff2d4..e190dd1ddc2d 100644
--- a/dev-python/jupyter_client/jupyter_client-7.0.1.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-7.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab_pygments/Manifest b/dev-python/jupyterlab_pygments/Manifest
index e097edfebc1d..8845ad38533a 100644
--- a/dev-python/jupyterlab_pygments/Manifest
+++ b/dev-python/jupyterlab_pygments/Manifest
@@ -1,3 +1,3 @@
 DIST jupyterlab_pygments-0.1.2.tar.gz 561989 BLAKE2B 85d6b59b2c959f838746c7c6fed99ad5adda89a514a77327cc8e9ba7d6a91b1c0206d999c09149e6c5b9c67911ca16914f0b17a67b3505db73c23a7194fe4566 SHA512 0b4f4c13017f8afbd83e9fb575b3c4ee44272bc01421761ae7b140ecab743d825aa195432caa5f6153bda0ef84fe3ab92dad61ffd9b048927736a916dd267b5a
-EBUILD jupyterlab_pygments-0.1.2.ebuild 519 BLAKE2B 8d870d5186f34ffa3111986bb125f331f96338d64f041ef360e98d39bac62ba2f0959a997ebb7d159248c4d9758102f35d33c9d9fa2149baeb87408e9fd73fd3 SHA512 34030b3dc1bd8e2f05a1f36c68e5ea45dc2ba16dd641cb155dd9f7f1fb74fe933ac61f66fa86bd6f177a91159d5b24528b8a7f7464246aed4426e39186f1d726
+EBUILD jupyterlab_pygments-0.1.2.ebuild 525 BLAKE2B 4988e851cc7fa08263357f72cab3c30b399e196dcf930ddb1898b0a1777ece9ecffe3291c55800c43c11583b8899a74a5817711f690f56620d989ac1744dea1b SHA512 72be9f6d2c7fe5bcdfee6310feb48d2de8d9fbdfbdd06cbd90a82b6a140fdd6247f3ff1c5a737ace9b28aded4448e38a3a5204ab1d71d357ffceb303a8353a67
 MISC metadata.xml 430 BLAKE2B 76c31c9c34c245dd076500a07cd506a4673716c16ba4af9f7a444ebf2238d5fc3fdcad3ce52a046aa91032d9927436841cc051b9ec45abe58e861657d8a77f0e SHA512 0be5b66170f81b0c209b406f7ce33971cac7972cbcd87def1fae2a09c91e7a7ae18a42c36733cb3e247309be44b2eb6bf1d2f803f8d8aeb5e943247feb308312
diff --git a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild
index f8f9b28139b3..eece01e8dcb4 100644
--- a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild
+++ b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/jupyterlab/jupyterlab_pygments/archive/${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index ce3bbc3d4044..30c79c3ad5da 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,3 +1,5 @@
 DIST kombu-5.0.1.tar.gz 404428 BLAKE2B 89d4c2daf70c3dcd0a990c8f045074780f2d4f13f39899c0ab3b73b473948469746cf8872aaa8565f5c4b071bf18ff510cd565e8f9b6a3735a0bf1d0af55e9b6 SHA512 aa5d35b7753f5ec8d95512c322fabf0163628b9afbd228faa2be910a1cd4ea3236a7e43485e17650e1aa9aebae59a91a2b0bdc1950e4e4c622b499a4ae29ea0e
+DIST kombu-5.1.0.tar.gz 416353 BLAKE2B 2c26aac0a8eda62475e2a9a859b2548046dfce0699a8dafce3cc6471ee3b82f82882a53903a86f69cf16f948e4d0e66f379479f7f1f46aca2bcbdd031ba87811 SHA512 62ef16e8e3fb592882b8060f29b95e7224ba635132ed688eece0c2d254e7f7fb525c778cac23f15495464c6dbcf84d7a1372fde6f55fcfe66677cf43d3e9d4de
 EBUILD kombu-5.0.1.ebuild 2370 BLAKE2B 0733b0f462f325644531c0afc2466a2febdd7323441a1ccf0be77f1648115cb40bf7ce79ed8fab2d82046dd7567276794804516dbe39b72ca330f4089e712877 SHA512 6318f501b42fd2a35c68ed213e75a84643ad491b5651d36274feccd1551b48a26a52f8240405dcf9c81cc7383c3ab5d523354dd2d695993927391862fa623dab
+EBUILD kombu-5.1.0.ebuild 2331 BLAKE2B 7993c08dc75cef243125f29fcbbf938c71dc90b4990669835d79d534b633b5c67f3075cc6bee76a096e04c8f4e92c87c2efda0cb17c7d97ec23326639960fbc1 SHA512 ebf1938cb1453dc9a81df7b1ea9db06566ccfb85b7dc3f6a2a928c48ebacfe12504185a7f8f2406e942eed727b214146bb29384e1e5e7a4aa1d9f365e42e7806
 MISC metadata.xml 699 BLAKE2B 895ddd1afe0b826cb3ae4e279b2bd12eabeac29c68104aa4b819b412a66bbad8fc0da49dcf8aadb779573247094f8a6ea60a18c967b6385515cc2fd6420a3622 SHA512 3d1f92614be2f17ef5188d0d987d17721db7af60d27cd9901ddc8adc96c0b7523afa26210e36789bc8a9096994be7cebd7df72f624610f11b45cf4aea6e56cc7
diff --git a/dev-python/kombu/kombu-5.1.0.ebuild b/dev-python/kombu/kombu-5.1.0.ebuild
new file mode 100644
index 000000000000..5d90881cb0c6
--- /dev/null
+++ b/dev-python/kombu/kombu-5.1.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="AMQP Messaging Framework for Python"
+HOMEPAGE="https://pypi.org/project/kombu/ https://github.com/celery/kombu"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/py-amqp-5.0.6[${PYTHON_USEDEP}]
+	<dev-python/py-amqp-6.0.0[${PYTHON_USEDEP}]
+	dev-python/vine[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		>=dev-python/boto3-1.4.4[${PYTHON_USEDEP}]
+		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
+		dev-python/kazoo[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-3.3.0[${PYTHON_USEDEP}]
+		dev-python/pyro:4[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+		>=dev-python/redis-py-3.3.11[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_celery
+
+EPYTEST_IGNORE=(
+	# Unpackaged azure-servicebus
+	t/unit/transport/test_azureservicebus.py
+	# Unpackaged librabbitmq
+	t/unit/transport/test_librabbitmq.py
+	# Unpackaged python-consul
+	t/unit/transport/test_consul.py
+	# AttributeError: test_Etcd instance has no attribute 'patch'
+	t/unit/transport/test_etcd.py
+)
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Amazon SQS backend" "dev-python/boto3 dev-python/pycurl"
+	optfeature "Etcd backend" dev-python/python-etcd
+	optfeature "MongoDB backend" dev-python/pymongo
+	optfeature "Pyro 4 backend" dev-python/pyro:4
+	optfeature "Redis backend" dev-python/redis-py
+	optfeature "sqlalchemy backend" dev-python/sqlalchemy
+	optfeature "yaml backend" dev-python/pyyaml
+	optfeature "Zookeeper backend" dev-python/kazoo
+	optfeature "MessagePack (de)serializer for Python" dev-python/msgpack
+	optfeature "brotli compression" "app-arch/brotli[python]"
+	optfeature "zstd compression" dev-python/zstandard
+}
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index f7994917c4fa..4d95afefdfb8 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,5 +1,5 @@
 AUX lxml-4.6.0-tests-pypy.patch 17417 BLAKE2B fb4c8452f1401c5d617ebbb3a944772c4da72d8261a99d3593c9886ec7c734d145f4919c61d5a4d434a3df942eb30183988965d28407fbfdae6f228c23dd5ab2 SHA512 527d330145491227319cfbf07d176f100b6d61b285a13f3e6fb0c3fb259df697de45ea22e2dd18db7d927cae32219992c542616c4c0120003b796a30974becb5
 DIST lxml-4.6.3.tar.gz 948931 BLAKE2B 373248827cb6bc0698b632ef60978adb2b8f7c37444fa1804567f08eb669018dc38fadf52422262fd96280e88c59578d244e4c5a1ed55609af55c010b3bf2b09 SHA512 50e42d6269dc45b4c0ab3285c49307f8bee87fcc4b9e0f531e1ee37bcf83c5938b7e361f906a3158fac8df89a79b932dd64a8839455e45f45f3a5f0ba73ff6a5
-EBUILD lxml-4.6.3-r1.ebuild 2721 BLAKE2B b6b2723505e7f0d8e246d3ac28330f9bd1ea0dc06a7968d1b6c5e5bf8a94d64d9e25a48e4acfd1251723d4575ff7712700bdd8cf6d0d4f2069040ccdf8a52c36 SHA512 dd7e8dc6ba281a1cd5a427df9750c38e1c605f7415e5d377fed415c0b7bae6bc8b5d1f951886462d67ef02521182403f90930adc634db23600005c9eea3d84c7
+EBUILD lxml-4.6.3-r1.ebuild 2727 BLAKE2B 5e2cb962ca2de783c7e2734a8f546486a09cf973908cd603f7084a0e43d6c5c6572f2e7b035d8297601e77f2b9c5e74f01d5aa9bb36500083d1e7a2e0c5f249c SHA512 c7f945d97beffcebaa63a664219864e26619d7c8edfd2754344baac662cd97e4a0bfd0a1f50137e8d7c7cb329db77058a260d641ccb75762c63ac0cc30a85d26
 EBUILD lxml-4.6.3.ebuild 2717 BLAKE2B 2e8557208185cf2c0a5a46302266b6bf05e3fd614d5aca04dfcf9b758912b8f6379c06039746ab70b070d3d25b830397683cff87eaae08051534a4ab4fe19b07 SHA512 e65da2610f2de905c2c867c9370824ab9d7c94c6c40ecfe660587b7b0f75c800b0846191ba5c961daec73434351260ac50c4983f063eae23dbadbb46d58c6001
 MISC metadata.xml 409 BLAKE2B 95add82278696324ff1c27f90f3bee49ed0b1ec46546751b5c9551991e1bb208139cb9e6594dc013ff14c032611f890da2330471bafa30960f8b61f45a1f0d4a SHA512 f4ab9197ba14428808081c0ff600b4b6d004690914ef6e8d053726a8d4d7dcf8df6ed2da56ce45a2aecc7484e9c5beced927771f1eb46dd7f6f61d5fd91b4f91
diff --git a/dev-python/lxml/lxml-4.6.3-r1.ebuild b/dev-python/lxml/lxml-4.6.3-r1.ebuild
index d2d041e17644..6e745baefa10 100644
--- a/dev-python/lxml/lxml-4.6.3-r1.ebuild
+++ b/dev-python/lxml/lxml-4.6.3-r1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index b7f04cd61a8d..30674441a283 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -3,5 +3,5 @@ DIST MarkupSafe-2.0.0.tar.gz 18466 BLAKE2B d065eda7f3f2e02abf2d1a9a20c2eb8ed774f
 DIST MarkupSafe-2.0.1.tar.gz 18596 BLAKE2B 3f6d576733a0033ca46df5e92892c1f052c1b0c03a92f27926383279f81531981139e5a659a7d21d436643795706480dd9e6aa979f70a81a2b95f2b9d0ac9f8c SHA512 77249bda784111ece15d59eb3de1cbb37a58fb9f22902fe6b73fea9eb0f23857ccbe53dc55463278e3b91f78dc35e2b027fd823ca50d88d8985d5a98ce2327f1
 EBUILD markupsafe-1.1.1-r1.ebuild 639 BLAKE2B 267a221a71d8dc36f34fdfb818298e268a7cd2759d1e0ab49099c6f57d934516e71ecea2b7c529c745c4aefe6124a7d52eab880e3c157f8d40384eb0cd6e59e1 SHA512 ae11b1f75420b8d4f142856ffeeb2e68929243bbaeceb8d08e19523bde4cb659e1b08ccbc68a87cee2bc97225bc35bb73268cf61b6b2c63fbd47bb9ec39209a0
 EBUILD markupsafe-2.0.0.ebuild 647 BLAKE2B 249f78f4628f85d1d5998373544c70c609d403d9f9a572fd8929dc4ecea7495e7efcae42aee361a037368f9706096788825a44bed25b65b68720e85352c09ca5 SHA512 ccf216823b5eae1fb4572f6163381410e59dbe3a194b76e01456f0c787b59560b5b5c8b75379350980c789e81806b98f71c1c84cb5429fe80b5c4d2daaca4ac0
-EBUILD markupsafe-2.0.1.ebuild 639 BLAKE2B 267a221a71d8dc36f34fdfb818298e268a7cd2759d1e0ab49099c6f57d934516e71ecea2b7c529c745c4aefe6124a7d52eab880e3c157f8d40384eb0cd6e59e1 SHA512 ae11b1f75420b8d4f142856ffeeb2e68929243bbaeceb8d08e19523bde4cb659e1b08ccbc68a87cee2bc97225bc35bb73268cf61b6b2c63fbd47bb9ec39209a0
+EBUILD markupsafe-2.0.1.ebuild 645 BLAKE2B 1774cf1a543d05bbdd7c2ba7bf08c151c02a51fc0677ec462dee1cd92880c1e928509387b80368e72a426a8d792a6a6caaa6aebd8f4c4c80f6d6fb32758ee870 SHA512 6313433cd4b4785de1d23aefc6af8e935cae6cece5488eb2175fb4c4c0daab2e9e53ba018d85eed31772b60e34d38a40b6c64339d0bbad70d151f8ac2e2f84c8
 MISC metadata.xml 313 BLAKE2B d83629ec355bdf3a33ec1987d8826509f6485ef34a873a6db1122c72beff76de648c5f80da70f2102e60532d852462e13826f714b6ae263d65d5c81bb9aa63e9 SHA512 91b859646ec529ca9b646ac0a6526554de887d6aca353069dd00a6b01dcd2b5765a7b1a1e02c8b52bd50ea67f1476cc2dce086651ee46f7c575c56d1ab7f4c8d
diff --git a/dev-python/markupsafe/markupsafe-2.0.1.ebuild b/dev-python/markupsafe/markupsafe-2.0.1.ebuild
index 74b14b8eac66..a1ed5ec07f51 100644
--- a/dev-python/markupsafe/markupsafe-2.0.1.ebuild
+++ b/dev-python/markupsafe/markupsafe-2.0.1.ebuild
@@ -17,6 +17,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 59e715dc1944..f3a0105e771a 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,3 +1,3 @@
 DIST more-itertools-8.8.0.tar.gz 93660 BLAKE2B 7d26b847c856064b6edfbda661b9e9288ba2069604e687d90713040ec469abab9853f3bff1b4e25b9ded764822a9ba58eccd5be5e9a13094ab4fc0871626289b SHA512 c6efec614a10a2fc72a4bbb7c62ac586e5dd28e04582768e0b3749cbd8307df0b4a609637d427d9c4940874e2aed1432094c09ac249e16a20dc6a09723172f06
-EBUILD more-itertools-8.8.0.ebuild 623 BLAKE2B 2a75e8dcded237195bb6a71f406124e02fa5bb9d28f038b76d4e88a00fb44a800a7013b4381f507efb93ba05eaba3a82875e5ff3828fcf4249964dc5edfc85b3 SHA512 95d8e90cdbf631c94ee3b091dc165ac31c7594b9d8b820af8c96536f705be4a38ca84c086b7c4a73ce79583982754eb90c7f796c8d32eedf9705ea2cc00898ea
+EBUILD more-itertools-8.8.0.ebuild 629 BLAKE2B 92e23e9e38a4577c6df424b0716ae99f07df1b83a8f522e44730aa9cc7cc659935757dd52065613fbc29119d0810d13781167438a5d62764f8acd5a6a7009047 SHA512 c2b99fbdd94b9d823cff83f191440232af7cff11a2340e7cbcc032fb8362eec7306b96a1cf4e59d59e7aeb13ae8fe0e02c6d0fbcf246fb38f904b26a2ba8e556
 MISC metadata.xml 487 BLAKE2B 32273e3af64b6c58907948a20fa547f733fb0c1a1bc8d8cf580657d4ed19f6eaff7f9b6e8f930887d5af7052682bad3ef1131a0c10ba2474791f01b450b86e65 SHA512 5ce5d78097a243fe8ad553783a5de64c1df82ef77f0eefc9c55452bddebe472622ef6c95d28be9247739ad86cf68a1854ac66c5725555728a46a080ff26a6c8e
diff --git a/dev-python/more-itertools/more-itertools-8.8.0.ebuild b/dev-python/more-itertools/more-itertools-8.8.0.ebuild
index d430192b622f..dee6dd69a2b9 100644
--- a/dev-python/more-itertools/more-itertools-8.8.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index d42d3b7ec6b7..7ce78f47b568 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -3,9 +3,11 @@ DIST moto-2.0.5.tar.gz 1551415 BLAKE2B 452cb94443188e1715145bee574f04924d894a3d6
 DIST moto-2.2.0.tar.gz 1650655 BLAKE2B 9969de2fb323b2deb272eb47727884054a35827a5db382f83a4177cf6cac5339f89164d05c288a977bc1895a204d13d02069e8b37880ea3d04374f6ed4d6be47 SHA512 7eabb515f94920af9b8f028afaaa51e27983f7bfd73f66c29fc191e2f3dd3e8939ddac67de0127c67c35cbc17c3500a7390103b26c85056780c865aadeb5e1d9
 DIST moto-2.2.2.tar.gz 1684678 BLAKE2B ebe1eb08c67ccdb8c484fa8fc75d7ce58750d94620f46b53268d6b6b0732d90160bf7b6837efa492f621e1c001d933f5d59d39c266d65bbb1852f315b3bc03d0 SHA512 a8b192637b701eda0e4a7b11e84f5251386de98590f1d7c33732d8bf12642b39b61f1d360ad39c3e1b0a645268139d9e330d48fbe7029b943094ad317cb45ff6
 DIST moto-2.2.3.tar.gz 1700636 BLAKE2B 926fe245ce457dd79eef6780fc0b984d2ff1cbe95807a3463f0d0080583af2ba356ccfcce22e60927737e1531ec7bc167c5f649e784b191ec821aa56df65277d SHA512 0b46229ae06db7cb2634df3f1b3b1a6b6fc983978a763e8879db0d9e209ccc6b96b28e8e2ee40f6e1a8e39b74d7a2430788126220e3a7dab5e8df217c3c8c005
-EBUILD moto-2.0.10.ebuild 2244 BLAKE2B 31fc24db876db3ed47b35fb778c1cd488e9b8a6008d6b1d2ae8e62ae67b7d33db28b197cc27ba7b2414977f8a5cb161f6351f97d96477e63640452d6c3266624 SHA512 b886499c02343fb0e9fa40c34ea18cf981d151412f11af2566eaf946c3bc49a015cd06a9c9a3cc53a3e98a8192b162d54dd0470cfaca707b13cac3e9dda5f3fe
-EBUILD moto-2.0.5.ebuild 2242 BLAKE2B c91ef2e544d3ede2a2f1b7774c01165e24ff290ccd557699eab48c83ad166010943ddbe9935f7942529277b484a0b8e3f7cd6062da4f86adb4cc464d15344cd9 SHA512 a98b0e7c220bb14333dd72867f83836d2d5a564c20805e0be1fb89bb998c399bfd9588b46c027401fd8507962bbe454cc879ccf7851a876b238dedbd6821de41
-EBUILD moto-2.2.0.ebuild 2356 BLAKE2B fb455c65f90349695b51118d6a77b67d247f2fd127acb1f5559d955e0e463875c1b009b6f94ff5237327c69e23b904d8480b3f236024e0ae7d4d7f7c37867252 SHA512 f3c33665eac7d83da0062c966ebc7cf95110100a8208ec735df30025a12de3e92d714dd0cd48db89785bd54761d4eb948f69d3b85e593237aa5843a534e08b40
-EBUILD moto-2.2.2.ebuild 2373 BLAKE2B a78850846ec99cd454216ada1bfcf81ac5098e7b3bfe301e811cb02c513fd2d6e6056078905a00f3b76f19da10a44ff426c941649cb76b59b692c2460ab09535 SHA512 9730b1363024fcd6dc816d2179dcb942e1b11462d58ff9a55a3a3273142bc211ac6a11b3504470e1f64f25a32f3b46dbc14536851d4190aa0bf060c7ced08be2
-EBUILD moto-2.2.3.ebuild 2373 BLAKE2B a78850846ec99cd454216ada1bfcf81ac5098e7b3bfe301e811cb02c513fd2d6e6056078905a00f3b76f19da10a44ff426c941649cb76b59b692c2460ab09535 SHA512 9730b1363024fcd6dc816d2179dcb942e1b11462d58ff9a55a3a3273142bc211ac6a11b3504470e1f64f25a32f3b46dbc14536851d4190aa0bf060c7ced08be2
+DIST moto-2.2.4.tar.gz 1724663 BLAKE2B 3feb39bec246a8157aa542c711289ab0ca257ec510835cd48aa732c3f07903db857971e3d024c1aef35b5a0b55b7c4ecef2b319824c1d76f0076ab8d2d75329e SHA512 8acd8a3156db71af35ad0ac6a5105a6b7739d8ca9881a2cb091637830bc6fbb10d8bf6adfd1a1091556f9269fad737b345d2bdf50e09b54201fe7438674dd906
+EBUILD moto-2.0.10-r1.ebuild 2204 BLAKE2B 035213d75689a0c92e51da444befd8c0aebbe4d6984f1c74e8f224b7551f55daff6761132951a59afc7091d6b89a89cfdaeec4b1c05cbeba60977ece33270528 SHA512 ebdbc76753d468eaab43b0448728375f387e92182badb6f30b6ea17206b876ba979c819fc6c679c55c15b0895496ac5d2158972008d722717aec3846d7c4c856
+EBUILD moto-2.0.5-r1.ebuild 2202 BLAKE2B 78dc6466511968204fcca5e6df49b3e696e5e6f143617f4d4544c36281d3b87e04204b7a4074358425b38f0630b0f274eda050064cad953573f2f2318efbbcc5 SHA512 f7d083fe0307870a7da48acf4df2d917db7cb11aceb7a19da62673d1aee3b53530535e74d30b3775fad0807b47beb184eeb83e77474491b936bc99b007384b48
+EBUILD moto-2.2.0-r1.ebuild 2316 BLAKE2B c14f8aa340406517a880e87512ded8800579ea7a4f5e6d1cb50b1137f9c8d5d7831e037467542cdb6511d2883dff75b6dad62e8a7986f026f8e3ca1b8ef8132b SHA512 6da3993c5fc7496ea6adc0c558c286bf0ae0abebd0b2de7a8a4ffe01bd882521fafd504c0ba6b56bb87c53d655366719e90eaf0d38347a35cf95089f9207b701
+EBUILD moto-2.2.2-r1.ebuild 2333 BLAKE2B 66a0d332dba46c093fcc4b50a8dfc36a2b6ea6e2e6d8bd566262eecba9f4261f02408b54e54121bb6a7687782fc0d9c32077b031a413be92dda7c063da02fc8a SHA512 428f6b979986cdafca75494c51c96a1e21913f67c43d12e997a7d061160ceee35735a5cd52dcb6eb938964d76166c822e9cc3f70f5fddeafd1a313d20f7cf13d
+EBUILD moto-2.2.3-r1.ebuild 2333 BLAKE2B 66a0d332dba46c093fcc4b50a8dfc36a2b6ea6e2e6d8bd566262eecba9f4261f02408b54e54121bb6a7687782fc0d9c32077b031a413be92dda7c063da02fc8a SHA512 428f6b979986cdafca75494c51c96a1e21913f67c43d12e997a7d061160ceee35735a5cd52dcb6eb938964d76166c822e9cc3f70f5fddeafd1a313d20f7cf13d
+EBUILD moto-2.2.4-r1.ebuild 2333 BLAKE2B 66a0d332dba46c093fcc4b50a8dfc36a2b6ea6e2e6d8bd566262eecba9f4261f02408b54e54121bb6a7687782fc0d9c32077b031a413be92dda7c063da02fc8a SHA512 428f6b979986cdafca75494c51c96a1e21913f67c43d12e997a7d061160ceee35735a5cd52dcb6eb938964d76166c822e9cc3f70f5fddeafd1a313d20f7cf13d
 MISC metadata.xml 551 BLAKE2B 5473a586a27737f95b3795ff19bd08359fa5135aa60858c52b633d1ed53412fc1cbac3952f937ed497de18e90b00bd45725b920ad6fc75c8928181ca48ac5c45 SHA512 5b68da384123be90f74ea6cdd216f59ee004c4383b13da95fa17864c998ecb821fd0f16bf65abdc9b29f081a1e06be482518ede38139e29e32e46c962b3d4805
diff --git a/dev-python/moto/moto-2.0.10-r1.ebuild b/dev-python/moto/moto-2.0.10-r1.ebuild
new file mode 100644
index 000000000000..58db774d616a
--- /dev/null
+++ b/dev-python/moto/moto-2.0.10-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unping indirect dep on ecdsa that's supposed to workaround pip
+	# bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network'
+}
diff --git a/dev-python/moto/moto-2.0.10.ebuild b/dev-python/moto/moto-2.0.10.ebuild
deleted file mode 100644
index 9dda3ad8ff09..000000000000
--- a/dev-python/moto/moto-2.0.10.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	dev-python/dicttoxml[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unping indirect dep on ecdsa that's supposed to workaround pip
-	# bugs
-	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-2.0.5-r1.ebuild b/dev-python/moto/moto-2.0.5-r1.ebuild
new file mode 100644
index 000000000000..5ab0773bc0fa
--- /dev/null
+++ b/dev-python/moto/moto-2.0.5-r1.ebuild
@@ -0,0 +1,69 @@
+# 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=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unping indirect dep on ecdsa that's supposed to workaround pip
+	# bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network'
+}
diff --git a/dev-python/moto/moto-2.0.5.ebuild b/dev-python/moto/moto-2.0.5.ebuild
deleted file mode 100644
index fba6965bc569..000000000000
--- a/dev-python/moto/moto-2.0.5.ebuild
+++ /dev/null
@@ -1,70 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	dev-python/dicttoxml[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unping indirect dep on ecdsa that's supposed to workaround pip
-	# bugs
-	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-2.2.0-r1.ebuild b/dev-python/moto/moto-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..99a95fab7d4f
--- /dev/null
+++ b/dev-python/moto/moto-2.2.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local ignore=(
+		# incompatible versions?
+		tests/test_core/test_decorator_calls.py
+		tests/test_s3/test_s3_classdecorator.py
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network' ${ignore[@]/#/--ignore }
+}
diff --git a/dev-python/moto/moto-2.2.0.ebuild b/dev-python/moto/moto-2.2.0.ebuild
deleted file mode 100644
index 000f0ec8d51e..000000000000
--- a/dev-python/moto/moto-2.2.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	dev-python/dicttoxml[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
-	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local ignore=(
-		# incompatible versions?
-		tests/test_core/test_decorator_calls.py
-		tests/test_s3/test_s3_classdecorator.py
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network' ${ignore[@]/#/--ignore }
-}
diff --git a/dev-python/moto/moto-2.2.2-r1.ebuild b/dev-python/moto/moto-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..76d660dee8cf
--- /dev/null
+++ b/dev-python/moto/moto-2.2.2-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local ignore=(
+		# incompatible versions?
+		tests/test_core/test_decorator_calls.py
+		tests/test_s3/test_s3_classdecorator.py
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network' ${ignore[@]/#/--ignore }
+}
diff --git a/dev-python/moto/moto-2.2.2.ebuild b/dev-python/moto/moto-2.2.2.ebuild
deleted file mode 100644
index afcc32f23366..000000000000
--- a/dev-python/moto/moto-2.2.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	dev-python/dicttoxml[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
-	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local ignore=(
-		# incompatible versions?
-		tests/test_core/test_decorator_calls.py
-		tests/test_s3/test_s3_classdecorator.py
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network' ${ignore[@]/#/--ignore }
-}
diff --git a/dev-python/moto/moto-2.2.3-r1.ebuild b/dev-python/moto/moto-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..76d660dee8cf
--- /dev/null
+++ b/dev-python/moto/moto-2.2.3-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local ignore=(
+		# incompatible versions?
+		tests/test_core/test_decorator_calls.py
+		tests/test_s3/test_s3_classdecorator.py
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network' ${ignore[@]/#/--ignore }
+}
diff --git a/dev-python/moto/moto-2.2.3.ebuild b/dev-python/moto/moto-2.2.3.ebuild
deleted file mode 100644
index afcc32f23366..000000000000
--- a/dev-python/moto/moto-2.2.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	dev-python/dicttoxml[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
-	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local ignore=(
-		# incompatible versions?
-		tests/test_core/test_decorator_calls.py
-		tests/test_s3/test_s3_classdecorator.py
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network' ${ignore[@]/#/--ignore }
-}
diff --git a/dev-python/moto/moto-2.2.4-r1.ebuild b/dev-python/moto/moto-2.2.4-r1.ebuild
new file mode 100644
index 000000000000..76d660dee8cf
--- /dev/null
+++ b/dev-python/moto/moto-2.2.4-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local ignore=(
+		# incompatible versions?
+		tests/test_core/test_decorator_calls.py
+		tests/test_s3/test_s3_classdecorator.py
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network' ${ignore[@]/#/--ignore }
+}
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index d2649e0462ce..0c405a831c4a 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,3 +1,4 @@
+AUX mypy-0.910-py3.10-tests.patch 1821 BLAKE2B fda18540f14b0fcba8d57bb7e072135f7415ecc39750424ee03fca835ab65491fb8966326e7f51b260b7f1b98e9bc408eb04df4a74e6007a5c1c72b28ed8a950 SHA512 64a6b2361260b0ce9bb22e706b2531af4ac2894191c92501274368d92beb159e53b4da6174e7f91ef4b2f7752936d86250b5fe8347beea1bdf223b7abda98414
 DIST mypy-0.910.tar.gz 2551057 BLAKE2B a3c6939c8f0e2ea19a3a3f91031330df2fb25a93cc3f9239535f15c17eedcca5716cc75c5412a1d345d8572d396c3d7128e38989fd694833cb6aec8366ac4afe SHA512 49060c13da8bf17385b6b1db6efa9ac5771f2bac92d26760c4087cf128de22846b8a062f38e83ecff524e7893f8c9cd0647a2ef89e10387138544436a2840459
-EBUILD mypy-0.910.ebuild 1637 BLAKE2B 5ccc41bf6e8a204d842539864da26cfbcf0908dc73638aa7352e774a73182a686379a45848b93f6f7c065ba0a3ef463bac02e04cea844b6d32c041675d2776b2 SHA512 cac8c4c53d0ce8a96739f1926c75d4bb4def5259bd0677841cbac1e75a39fcb143723d10b9ecc03a71bac541a0becc9f4f5348c31a36f7a4a77e903efadfb7c9
+EBUILD mypy-0.910.ebuild 1915 BLAKE2B 26d3d52f03366b10d173d689013675ce02f6f4b9f4eef3b1d4fdd50403254bd5fe5db8531599286af49f4d7dd6ec796c077a0385572da3a87909ff0feb55186d SHA512 fe74145b4ae732a102047993f80ee3cfe48477fe4d1b01a3fede3a7dd962806d7db08b00fae7c7430602a9eff605bacbada3a23a8fffd6f8c919d74e397b9249
 MISC metadata.xml 514 BLAKE2B 12e8ffaeeac0b2501560c015aed0707a75162182b00e899221c9600b78a2969dd6e24a7cb5580aaec810885cf1787882628b2fe550121dabd3737e4cb61d09e6 SHA512 83496ca98f9207accab51a98e3e52c0e68a5b290c6b4f518544e53ecf38cee8153372212db198b97c8a1c07d922cfd00dfcfa41c3d49a9d69eb4bc146633f454
diff --git a/dev-python/mypy/files/mypy-0.910-py3.10-tests.patch b/dev-python/mypy/files/mypy-0.910-py3.10-tests.patch
new file mode 100644
index 000000000000..16e85049cc1e
--- /dev/null
+++ b/dev-python/mypy/files/mypy-0.910-py3.10-tests.patch
@@ -0,0 +1,51 @@
+diff --git a/mypyc/test-data/run-misc.test b/mypyc/test-data/run-misc.test
+index 431efc228..0c1a26c1b 100644
+--- a/mypyc/test-data/run-misc.test
++++ b/mypyc/test-data/run-misc.test
+@@ -13,8 +13,7 @@ async def g() -> int:
+ async def f() -> int:
+     return await g()
+ 
+-loop = asyncio.get_event_loop()
+-result = loop.run_until_complete(f())
++result = asyncio.run(f())
+ assert result == 1
+ 
+ [typing fixtures/typing-full.pyi]
+@@ -22,8 +21,8 @@ assert result == 1
+ [file driver.py]
+ from native import f
+ import asyncio
+-loop = asyncio.get_event_loop()
+-result = loop.run_until_complete(f())
++
++result = asyncio.run(f())
+ assert result == 1
+ 
+ [case testMaybeUninitVar]
+diff --git a/test-data/stdlib-samples/3.2/random.py b/test-data/stdlib-samples/3.2/random.py
+index 7eecdfe04..82bda03f7 100644
+--- a/test-data/stdlib-samples/3.2/random.py
++++ b/test-data/stdlib-samples/3.2/random.py
+@@ -41,7 +41,7 @@ from types import MethodType as _MethodType, BuiltinMethodType as _BuiltinMethod
+ from math import log as _log, exp as _exp, pi as _pi, e as _e, ceil as _ceil
+ from math import sqrt as _sqrt, acos as _acos, cos as _cos, sin as _sin
+ from os import urandom as _urandom
+-from collections import Set as _Set, Sequence as _Sequence
++from collections.abc import Set as _Set, Sequence as _Sequence
+ from hashlib import sha512 as _sha512
+ 
+ from typing import (
+diff --git a/test-data/unit/cmdline.test b/test-data/unit/cmdline.test
+index 92ef7e069..87d04f3c4 100644
+--- a/test-data/unit/cmdline.test
++++ b/test-data/unit/cmdline.test
+@@ -791,7 +791,7 @@ c.py:2: error: Argument 1 to "bar" has incompatible type "str"; expected "int"
+ [case testSrcPEP420Packages]
+ # cmd: mypy -p anamespace --namespace-packages
+ [file mypy.ini]
+-\[mypy]]
++\[mypy]
+ mypy_path = src
+ [file src/setup.cfg]
+ [file src/anamespace/foo/__init__.py]
diff --git a/dev-python/mypy/mypy-0.910.ebuild b/dev-python/mypy/mypy-0.910.ebuild
index 3d67ec726460..c1cf48585100 100644
--- a/dev-python/mypy/mypy-0.910.ebuild
+++ b/dev-python/mypy/mypy-0.910.ebuild
@@ -3,15 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Optional static typing for Python"
 HOMEPAGE="http://www.mypy-lang.org/"
-TYPESHED_COMMIT="add4d92f050fb11d3901c6f0ee579a122d4a7a98"
-SRC_URI="
-	https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
+SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -41,18 +38,28 @@ BDEPEND="
 distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://github.com/python/mypy/pull/11017
+	"${FILESDIR}/${P}-py3.10-tests.patch"
+)
+
 # this requires packaging a lot of type stubs
 export MYPY_USE_MYPYC=0
 
 python_test() {
-	local deselect=(
-		# TODO
+	local EPYTEST_DESELECT=(
+		# Fails with pytest-xdist 2.3.0
+		# https://github.com/python/mypy/issues/11019
 		mypy/test/teststubtest.py
 	)
 
+	[[ "${EPYTHON}" == "python3.10" ]] && EPYTEST_DESELECT+=(
+		# https://github.com/python/mypy/issues/11018
+		mypyc/test/test_commandline.py::TestCommandLine::testErrorOutput
+	)
+
 	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
 	# fail with high COLUMNS values
 	local -x COLUMNS=80
-	epytest ${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
 }
diff --git a/dev-python/nest_asyncio/Manifest b/dev-python/nest_asyncio/Manifest
index 1fb93121f6a3..3a9aa043e179 100644
--- a/dev-python/nest_asyncio/Manifest
+++ b/dev-python/nest_asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST nest_asyncio-1.5.1.tar.gz 5738 BLAKE2B 0aa7d9a71c75b97b1eeb40dab8b2b9942a6c2107643aa82429b3d27c3fcc3602494a86903669ec3ee4f577802463cdf05cfafc4bf0c6721b251a61b079d7381a SHA512 cb85ce82706d17081de58e4176bbc6bba9efd9eec99a36902dd689010d08d4267e742cabb89c088cc274aac13ed9929f09e0f55f375cee35e3c15385ed2fe0d3
-EBUILD nest_asyncio-1.5.1.ebuild 677 BLAKE2B 69195f20919745a905f8540297795c8efb9b8e359066b5ea0541002af145fbfae11cac958b85f0069fba782bad87b9867cd0c52721e442db3e1606b694e100c6 SHA512 b94b413f740ce8f08e8b217400f85ad4e89babdb5dcb9d422cdee3c06ae8e54d9279cdef562ddbe2a3ebf13322f9aabbd01a7773e3396aea829120dd66a5ca28
+EBUILD nest_asyncio-1.5.1.ebuild 684 BLAKE2B 03625cc5c781bff059bf3ce13a5e0fcfe779a4417b1177d50c07ff7709b042eb10539f19fdf5cfd77f716e38885baaea4853ebc64fee97255303bd2bbfa6f64f SHA512 ee2d2649b3d9ef4c714d15bfc71a661a364f0813723d475f9db9c3187377ac2ff268d2ec5e185f266a705468f92343cb36af68d8e791aea6ee467490c9d05b9b
 MISC metadata.xml 388 BLAKE2B 5997502316ff6f700e55980bfccbc7ddd0b4775d95866d76803b37ad0c8e6222cf13f2ad8cbee455d6327b4f96b66f7318bcf05d3f861ecd26288ae144f8a2ba SHA512 f55ce5e44a97d4cc234f0f17f231324b72d60213b9a0c4f94d6ee4cd24893cd6592f1ab8fc6c9527d482e430cf3268299ad08e3b7f76434fce2385a5f23af174
diff --git a/dev-python/nest_asyncio/nest_asyncio-1.5.1.ebuild b/dev-python/nest_asyncio/nest_asyncio-1.5.1.ebuild
index ca2018f94cde..d34b4dcc4ac9 100644
--- a/dev-python/nest_asyncio/nest_asyncio-1.5.1.ebuild
+++ b/dev-python/nest_asyncio/nest_asyncio-1.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 4fcae7fc9f06..c18bee836023 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,7 +1,3 @@
-DIST networkx-2.5.tar.gz 1542085 BLAKE2B a4d1d1f65a09f8e7cd830a9e670cf540c19b800dffb90aa1cc6ebda8b6116b6181969382f90339254746a3f277d786020506a3c8f10c90ff48999d3b2c3c433e SHA512 ab51198072d20bdba7c9ceb6856631a20a7e9527a7cadb41271a999f57bf60da5488269c6e4e1f3f4f33420ec6493af665386842c216ea1cfadd1792ccb6444e
-DIST networkx-2.6.1.tar.gz 1842369 BLAKE2B bac0106758fa7d33000d970873ee221ee9b367ad895f2f8fbfdfb29908851c69f632214dac06c48ab433e3b6251a439199fe3675517252c959ba2a29076cc866 SHA512 132f34eb8790fb366263cfbb501ec5ca0f9c9082562215a06a114b2ec80baf72f5489f27e7fe1cbea49749eab48116e8772ff953339de0caabf37096ce097500
 DIST networkx-2.6.2.tar.gz 1842077 BLAKE2B 8493e2d6a64d140b012ea443e9b1dc2409f8208dc1678c1d21cfd19bbdc07df6e9051aefe994d5fa6460db48320d563bb3051150782545ab5f671b7aafda4d0a SHA512 7006dcd209cce79f0f6cac4884797775422bd90fd3e8abb2eee70e6e00c9a25a785dd5856fc1657019a2b5c13a6fa5f705ea2e650c15a1f9d7d93580bc299219
-EBUILD networkx-2.5.ebuild 1504 BLAKE2B c281bc937ee2e4b13a57e6e861e4dcf881498e8b645230038d53fa6b10b800a15a999297c85503491c54a091f170604a91004a4d8c7387a67b4b36d4ea724730 SHA512 1c3d8159f280fb08aaea8dba9224db19ce801f73a991e4ec5f654ada7e9d28518eb366b05242a483ecfd812cc8380fec08770e56b61bee5c17e5f36dfec0df5d
-EBUILD networkx-2.6.1.ebuild 1232 BLAKE2B bb1fa41ae7cbcf4d5a4840fb969b2a2a2fe32b93877d0a5f6bf19346c243a65a020843d224daaaf665b61513b9d80b640e6a8c134d90c8c7649507ad78943afd SHA512 d3c13b48a8c5cfe3431ea7aae0363f7f54fe5900f943d4dc0e970f6ac64336d20e0f16ddac21318ecefa23f7b7ebd9da25b5d5209e9c49f89f5e7f9ce2ecbfde
-EBUILD networkx-2.6.2.ebuild 1231 BLAKE2B 728860a2cc80e65dcd92c40451c2490707b1b9c441baca02a2bdf6ad3b742a23a122dd240881ae9968a9bd0889d81a761fbe39ba757f2bb648f93896ae3e2457 SHA512 43b0e4fed020a6555c192407b295c6f7c0ac5c31084450f0bb149b566175911b205213bc54e5b8413e66575adb3493b52f33aeae7bac7a96a40b6d09ea695a40
-MISC metadata.xml 1460 BLAKE2B 2b3d94eb6c3b4827ff154dc73ecb99a46e8e194150cb508928b88366cfb6842f8b535c738fafb33fe0c4de70829b9a211cc64108621213fefd2305a725d8945f SHA512 3beefd0d791e9799438f097cc78e38aadec92100e013d5a477851f6a8db7a9fde606c3f1d5c2c0f4e75f4c8b3190b5daecf3b7c03b5f06a6f7866d46eecb1095
+EBUILD networkx-2.6.2.ebuild 1230 BLAKE2B f1a8c22e8e56a61b57378b3517d30460abaf0fb5db50947028f2a35c116d9d0010130a15a7d25d4478eddadcb22ff1d7a4f23d0fecb0799202eb50deb0f075ca SHA512 a455b0a1e09ed160352a89b38dca4d063b241d763aa59b0f917c1eeedc184085c9043762fd3574291609bce39b436dde1a01447e376fcbf9d0a5d252b2849229
+MISC metadata.xml 1303 BLAKE2B b7e7ec394e2a786a40922ce1650cc89907fe5ca52e9b3637617b686a2c7b8a237044e2039a144bfc07a97b26391c7f1ede5c5c488a591ec15f3be6ed91b9adb5 SHA512 da9f617b73ba248a8bb8937cb83c40665b046f25c52ee45f2002231857e00de7acf491591e54588b2976a922c54806e9be81653c34948f4fcb89c35e778bb82f
diff --git a/dev-python/networkx/metadata.xml b/dev-python/networkx/metadata.xml
index 1183be08b85b..c143cf25c90a 100644
--- a/dev-python/networkx/metadata.xml
+++ b/dev-python/networkx/metadata.xml
@@ -23,8 +23,6 @@
   </upstream>
   <use>
     <flag name="extras">Provide graph drawing and graph layout algorithms along with shapefile format reading and writing</flag>
-    <flag name="pandas">Provides a DataFrame, which is a tabular data structure with labeled axes</flag>
-    <flag name="scipy">Enables scipy backend</flag>
     <flag name="yaml">Provides YAML format reading and writing</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-python/networkx/networkx-2.5.ebuild b/dev-python/networkx/networkx-2.5.ebuild
deleted file mode 100644
index 1d68a8d37f79..000000000000
--- a/dev-python/networkx/networkx-2.5.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="https://networkx.org/ https://github.com/networkx/networkx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples extras pandas scipy test xml yaml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/decorator-4.3.0[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-2.2.2[${PYTHON_USEDEP}]
-	extras? (
-		>=dev-python/pydot-1.2.4[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pygraphviz-1.5[${PYTHON_USEDEP}]
-			>=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
-		' python3_8)
-	)
-	pandas? (
-		$(python_gen_cond_dep '
-			>=dev-python/pandas-0.23.3[${PYTHON_USEDEP}]
-		' python3_{8..9})
-	)
-	scipy? ( >=dev-python/scipy-1.1.0[${PYTHON_USEDEP}] )
-	xml? ( >=dev-python/lxml-4.2.3[${PYTHON_USEDEP}] )
-	yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
-BDEPEND="
-	test? (
-		>=dev-python/scipy-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# pyyaml upgrade-related regression?
-		networkx/readwrite/tests/test_yaml.py
-	)
-	virtx epytest -p no:django ${deselect[@]/#/--deselect }
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/networkx/networkx-2.6.1.ebuild b/dev-python/networkx/networkx-2.6.1.ebuild
deleted file mode 100644
index 51a49fc1b85c..000000000000
--- a/dev-python/networkx/networkx-2.6.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="https://networkx.org/ https://github.com/networkx/networkx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples extras xml yaml"
-
-RDEPEND="
-	>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.1[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
-	extras? (
-		>=dev-python/pydot-1.4.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pygraphviz-1.7[${PYTHON_USEDEP}]
-			>=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
-		' python3_{8..9})
-	)
-	xml? ( >=dev-python/lxml-4.5[${PYTHON_USEDEP}] )
-	yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=()
-	virtx epytest -p no:django ${deselect[@]/#/--deselect }
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/networkx/networkx-2.6.2.ebuild b/dev-python/networkx/networkx-2.6.2.ebuild
index 9a58afcb4778..9e0f4791bb22 100644
--- a/dev-python/networkx/networkx-2.6.2.ebuild
+++ b/dev-python/networkx/networkx-2.6.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples extras xml yaml"
 
 RDEPEND="
diff --git a/dev-python/nose-random/Manifest b/dev-python/nose-random/Manifest
index 8a0c7f5c728a..9a4c87ae08d0 100644
--- a/dev-python/nose-random/Manifest
+++ b/dev-python/nose-random/Manifest
@@ -1,3 +1,3 @@
 DIST nose-random-1.0.0.tar.gz 3776 BLAKE2B 18dc40b13fcb970c4d2edeb6be9c6f3e710b36d14dcdc4a56c6e3ecf811ab2acd6be3e1c1cea2231eb5dc10581c77f201220354c77f3d9f67d89d894ed8b4f24 SHA512 9c62413fb00c3b774954ae7a65b08b122ae0dd2b24377efba8de345597b4ce4952aad09a0c2fea7f9d92f57a3664908fccd6eabadf32074a35978c958ea2b66f
-EBUILD nose-random-1.0.0.ebuild 507 BLAKE2B bd21d459c65b05d00b350949e4197f44ee893528f4bcc06f7e790c0e0f1a4f4cf7323cf4a56ce16ad8ba3c2e3c590bba986694b8a504bb7288fad7361c846947 SHA512 56d28cf376e63ca2c611db7f26d278abb6526ec7147a3f4e81dcfcff6fe52ab459272da6051ae1dbf1754558fbf3c2cf5fffa580090afdc5f286523e339c4c01
+EBUILD nose-random-1.0.0.ebuild 508 BLAKE2B 6ce8768e8eb7278cfb9bf099e1f4961e4b3df2ea77fe4b6e3d5d8e10e6c4a552c94aad26d7062671979bef2c1ee9ef45bb8149141c71aad1afb3c59c91e89659 SHA512 b2776bfe79943ea3ec237e0c6aab966abba703cc0c829a3ba742e48c43a008bff4aabe7554c9767b1b74163bc569b4cd38a1e90dd4659b91e606915e6d6d18d3
 MISC metadata.xml 338 BLAKE2B e8be381e5e42a081be3637b77a9b5356dd7d74d0352976badfca62bdf7b65c04554552703b3e12e169ec1c4b57d07cedcf75387a0fd65a8177213f0de8bffa9c SHA512 b3e03151085bcaa51e2108d7e69042523148aaba924415421323d53005c1d047103827ed99bf064cda4f02cc313b3ff4e5fc681bccb5f1f23a82b40a744ed9bc
diff --git a/dev-python/nose-random/nose-random-1.0.0.ebuild b/dev-python/nose-random/nose-random-1.0.0.ebuild
index 6df8bb831e47..e2be18fa4735 100644
--- a/dev-python/nose-random/nose-random-1.0.0.ebuild
+++ b/dev-python/nose-random/nose-random-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
diff --git a/dev-python/nose_warnings_filters/Manifest b/dev-python/nose_warnings_filters/Manifest
index 4bae18a9ea90..ac6044f81dac 100644
--- a/dev-python/nose_warnings_filters/Manifest
+++ b/dev-python/nose_warnings_filters/Manifest
@@ -1,3 +1,3 @@
 DIST nose_warnings_filters-0.1.5.tar.gz 3895 BLAKE2B 90fe9d0255227159cb4465648f45aa33623bf31b2182a7579d2f7f17687a832b2c96e9c2b3f0b5c477d808907d92bc8567d2aeed6bd13dcd28878394e9726fb6 SHA512 7ada463840bb2e3a1c7e357c231f9c7d4c7ce9f24fe7fe1e33404df41711663c8232001f9a258898f49ce89bb542a942240cf7312ee41bc75f86ca2015378405
-EBUILD nose_warnings_filters-0.1.5-r3.ebuild 508 BLAKE2B 4512c4e2c99cd05e8e5f4fb909c19ccb53800221836a20ee0e52f9bade40532f2f9b4938c76ea37fc102d721b30b8aeedcbada0dea7a607805baf9691f29ac9e SHA512 98d89de5c58dd689b70f2ed9360cd130c0a9e28ab467614f26f48274c0a95a9f1bb8c7d8471a78cbec937a91ffc9077136546a27a3667e19f4f6db2a74b436b6
+EBUILD nose_warnings_filters-0.1.5-r3.ebuild 514 BLAKE2B 60559cf366b23ec9a5eaa90a022758559760cd2de22919f016f643ae4f28435d1fac7b4b4d982c1fda6184d8314da87db092aee19dd5a6006a24305c1a47b017 SHA512 5be9144372ee617b99bc1e4b2ffd21d7ed3f26b62524e0b4fa20f506b4345176e4722a5ca89b52529c1eeaae8307b672c51f33e66c2488735e8cbfa32f71ab7d
 MISC metadata.xml 393 BLAKE2B 2d913eafaf1a4ed0f91821c1f762365da85e445d8960f964044bb9facf9e099790e23fbb0e809fe256857b118dd282e9dba09e75e2d048414afbc1a21045ced5 SHA512 9e366f3dc84ea9488c736cd1165317d9886cd37362b61e1579685a9e84899ed3f9b92fc36d7cf72e26826f98e70e0ad4de7aaca462c1b768a8e0db703c1e0a86
diff --git a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
index 7e73366af61c..f0ab5c058630 100644
--- a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
+++ b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index f36637fd5e35..c4f00b82b049 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -27,5 +27,5 @@ EBUILD numpy-1.20.2-r1.ebuild 3789 BLAKE2B 04b13cd33ea2805716faf5c2d286e3f0928ee
 EBUILD numpy-1.20.3-r1.ebuild 3724 BLAKE2B 3d3c2ade82decb593116388cbd00e6c688e0b308b2a4bccb122fa716e7e8826f83f0d9f2fb6edeb43578325007b97c228899be055c5ae90b2740bc5a5dcfc7c4 SHA512 496058416f50bcc39632458bac10017071df0231bb564be2b496c65f693f0bb12c6a01a50df72f70a7f98f872f8258c8030db766fbde2f89a5c8327b1a786dca
 EBUILD numpy-1.21.0.ebuild 3567 BLAKE2B 8bfccf3046fa52a171d97bfe22385688d37a383a772310833fd59ead145d8ef7e1c45567ab664f3462e99595bac7411faddba01863143d553db30017f88f1225 SHA512 77e8d721c372f06aaab330c69d21eaf699cd0b04f91a1466878f9e2e89169a14979f7ec834c906ca0905ce909215f74c0b9c77f0e08b39dbbe34d07f275a83e9
 EBUILD numpy-1.21.1.ebuild 3679 BLAKE2B 523d82f2a2dbdfb1cff4886dc78c41d793c5850bf283b95ad3a1a3161e4c34e96542baad5e4c489167d8078cbfd9eab9e3354d5ee87825b52ccaeff3e7ced9f5 SHA512 9e746ac832581cf1d34cdd339cd7511e9e55a96396ca242bb5635f1478d3b3628e27b6e06f820786a3e8b950de26aba20eb45c969ac52ef0dd7843badf20c2dd
-EBUILD numpy-1.21.2.ebuild 3684 BLAKE2B bec6b2a8cab14cd5348563c635f20918b43fd26e079b10e5bb42bcf0e360b1600111793f64695c0317b06d2bda5efc2a6fa131782b1cd65819598d995551bddf SHA512 06adc056c295c6113f7d69a1cd31330c7dae9460e59e7e7f53dd153392940d6549f5dc3d173a539cee26ae9c7738cde34a9d9e5e96e62992fa4550cf6604fe8a
+EBUILD numpy-1.21.2.ebuild 3690 BLAKE2B 0d287ef3acdb77aab83f2e6d1d7ba440202afc5a973a48ba73842ebf0f5dbde2bbb93b880fe48bdac6fe098295f654bcad3be0e979c51935a80b2911f8cb5881 SHA512 9ac71ce6fe68f91fe68bc62519e7d1cf7e3eb9dae71ac91ad111fdeb3a909e915f327caa90883a79013d81d57ca7db209498c87873b1d873a92f6c1a80093a06
 MISC metadata.xml 929 BLAKE2B 8e68683e2bd2abb060d534956969afbd67990f9e4ea0b95af977b7b326dd63a08fd3951246aa87aafc4c986359555bba8f4485b4bec7ff3162589a7c7d6f7ee1 SHA512 0a3e26de394c00d33e1a51c9f5f1eec5052ea9eaed371b23c0a15e71e25d7114f0cbde96b17abe3f7c3aa6d00692274d06bde8cf3d2637baf647714ea196e6a2
diff --git a/dev-python/numpy/numpy-1.21.2.ebuild b/dev-python/numpy/numpy-1.21.2.ebuild
index 32f6ce2b232c..d30062bfecb0 100644
--- a/dev-python/numpy/numpy-1.21.2.ebuild
+++ b/dev-python/numpy/numpy-1.21.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
@@ -34,7 +34,7 @@ RDEPEND="
 BDEPEND="
 	${RDEPEND}
 	app-arch/unzip
-	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.24[${PYTHON_USEDEP}]
 	lapack? ( virtual/pkgconfig )
 	test? (
 		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oauth2/Manifest b/dev-python/oauth2/Manifest
index 7fb869bc8a78..6e5b78aae45f 100644
--- a/dev-python/oauth2/Manifest
+++ b/dev-python/oauth2/Manifest
@@ -1,4 +1,4 @@
 AUX 1.9.0_p1-exclude-tests.patch 332 BLAKE2B 82d468bd3f94baf4e99ddcc17252bad0b71ff2331aaeda3ec3d7b4117017b5a9ac2ab57f4fcdaeeaae9afec4c39e1ca5481e2463e197eba7bae40c6d27e0af05 SHA512 9b4b45d22076517ac6e79ecd74430ee7e53501aea07f0e2c43bae3c119e572d9357dfc32adb036920f4ff15c1344ea3cde20e79ee4c609508feeb9fac3293c57
 DIST oauth2-1.9.0.post1.tar.gz 21306 BLAKE2B 3e61ba6d46b98c594fa31e828885930490f99390f14e0173bdf719cfc1d5e8ad385e56c9654e139279cd95611a7e35b1fe0276679a2a4849b67125f5e6919788 SHA512 a3b64eef331d4c4f59c275f14efb2dfb48ad60de47a59a88106f60d64428a09b76d8bedf08c98c113493968d83708b1478b4b61b2b5528b5b01fa22777daff4c
-EBUILD oauth2-1.9.0_p1-r1.ebuild 893 BLAKE2B 6811542f406060de72af227822d3db384facc7faed8430eb9f7341d46fac9680162b7639a08bfbffc411bed8fd94ea1d4f7ba21675164b402ff18f4e82ff8d5e SHA512 731e50dc553d8d638766a7c89a252b159deb7e479fdee8a5d64b91f60757e61a1f09c2e26a80c450255fbe0e574ad4db8cb88cf84756931a8402b8e91bbe7a44
+EBUILD oauth2-1.9.0_p1-r1.ebuild 952 BLAKE2B fc8a6ace84c2f2d287a85a4cefe5b8f132bc8993b3c937644a589f2305f2e48bc9401fb96d90e9d3aa059a0de7a66c9b7b3fb539f3d5006e97c88ea4a8179f00 SHA512 cebfc71ee966dcb14f2bec7cf6de6383d0e463864bf15c9e91cdadba162afd3ebbe859c7bce1e923e0b88e7d3fb526a0b1f3b56cfa978c07efbd1e203b552332
 MISC metadata.xml 395 BLAKE2B fdb3154d83208eb7708b69af8b8be5fc74e6c6a872e7d916522b64c7169e58d39f64080c96a443b220c5651a84ac6b73a6794c5971a9180573bf47952ff0f078 SHA512 3d775e5d647cb78ab418f0b6ff6ea0365fda706949957b05b79eca64aed221f4c8e457e72937dc50200522146297aff08c400f978bfb4c1782e498fdc837b2c8
diff --git a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild b/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
index 4153a69ecea5..dcf5e4e10dd9 100644
--- a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
+++ b/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -31,9 +31,10 @@ PATCHES=(
 
 distutils_enable_tests pytest
 
-python_test() {
-	# Skip tests which require network access
-	py.test -k "not (test_access_token_post or test_access_token_get \
-		or test_two_legged_post or test_two_legged_get)" || die \
-		"tests failed with ${EPYTHON}"
-}
+EPYTEST_DESELECT=(
+	# These tests require network access
+	tests/test_oauth.py::TestClient::test_access_token_get
+	tests/test_oauth.py::TestClient::test_access_token_post
+	tests/test_oauth.py::TestClient::test_two_legged_get
+	tests/test_oauth.py::TestClient::test_two_legged_post
+)
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index dbb6a489d6d0..67c524a4cdfe 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,5 +1,3 @@
-DIST oslo-config-8.3.3.tar.gz 154910 BLAKE2B d9d3d45d3f9bd191e2be9ef277719d723c35d36006836b2803dfa973283432745d6f11c7d764f2cf4a9ce62098cc0b94ba6aecb364869fd8957ffa309d47bb38 SHA512 6071fbcb4f9e641e6914d676bab3f58cd9e763219bcce0f7de16017a4e1d3a16fcf4296a36c232ac14d8c5c4555f4c433fedc1811e505e62decb0400a9cc2a7c
 DIST oslo-config-8.7.1.tar.gz 160536 BLAKE2B 71221141226024b6e7257c74afd082f297980bd45091de1a30c526d52c5514b970983c9389b82bb49283ef2176b7fc408f4b7f3fc29f9d6cdccb513652b7bee2 SHA512 a76995ff12204968fd9a52ca2922a89039858392b21befff827bf02c3466e365251d90e2d02894a50bece32751e9f5f86a651768665f404de2d3a438e53f158d
-EBUILD oslo-config-8.3.3-r1.ebuild 1343 BLAKE2B 278b0a27e97fbdc0e6e117053afaed3f491af46e2bdac48c69274f70416c763fb5245c11b3e0f7f874c00cabad867b5b19649cf371d9a989c01183d166f991a2 SHA512 32697eb830aba5a94120174b00eb3b802424cb78ce701063ea9072fdf7e4b3bd5664a40f72163a5827d2413fad1086bb4340faa12923b4dbefff6721ccf3dfe8
-EBUILD oslo-config-8.7.1.ebuild 1343 BLAKE2B 120d5d58bbc19bf4971c347f00b526de9ace49a563e20980cc5431308dad26e9e623db2bdebaed3d122dadb29edf78ad6f082dda4e567cf80c6401b977d36aff SHA512 b60eece73c43e521b25bf4987d7b505ad3c2ae76ba1c0476b210ab6ca577fa475b079d22d0f334f52598bee883fcdd5a3c37c2d843a2f676df796f4f229ef1f1
+EBUILD oslo-config-8.7.1.ebuild 1340 BLAKE2B a3e81e3b00e5a5b403dddf6c34d06ee5bd2778e0ac001965274e87e68c13c591e5a0f94608ebf19f46f6b6b5c42fdf77982ae11dfa0584f16dcc95ac3bd11119 SHA512 fcc50610b959eb1e5e3a6c9ae4eee396a2004390f46188fdd73fb93f62b899bb76231515fe7cc1f270c07440adf14cc48c102d629676f2812922d03a1f4b070a
 MISC metadata.xml 695 BLAKE2B 0212d67590b4a45c15ca718cb088f52ef025b3fdf4327363d8cfafd705d06ae56cfd5ae8ce9b42bea04399398756ebcb7572495e5d470d2999a69a6e1a74369a SHA512 3ded64c073be245f2087840a098deece2ee6f4b84a7e412ee9a4c0cfbc72bbb2622dcba4912fb714dceb6abe025204212fd3c8861f68c7af3e6e8f1ba78520f1
diff --git a/dev-python/oslo-config/oslo-config-8.3.3-r1.ebuild b/dev-python/oslo-config/oslo-config-8.3.3-r1.ebuild
deleted file mode 100644
index fa2d903953de..000000000000
--- a/dev-python/oslo-config/oslo-config-8.3.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-BDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_test() {
-	local -x COLUMNS=80
-	eunittest -b
-}
diff --git a/dev-python/oslo-config/oslo-config-8.7.1.ebuild b/dev-python/oslo-config/oslo-config-8.7.1.ebuild
index e0f0e4b92ca8..c13a669cb2ab 100644
--- a/dev-python/oslo-config/oslo-config-8.7.1.ebuild
+++ b/dev-python/oslo-config/oslo-config-8.7.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
 	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/outcome/Manifest b/dev-python/outcome/Manifest
index 2fde59c3c854..927464f0b8ed 100644
--- a/dev-python/outcome/Manifest
+++ b/dev-python/outcome/Manifest
@@ -1,3 +1,3 @@
 DIST outcome-1.1.0.tar.gz 18675 BLAKE2B eef22274bb4d1ddd19fa223167b6c8ce96f015ac0b3b0609aed3717deb306087457ab068fd2466d492fcc5859d561e6d3172ad14611a937ec59a75b604565953 SHA512 65de1c0a38b8cbb041a9fc3a79518eeacea54ec87341846ae80a9a2075369f72a397f5aa747ae179eaac8f341a7e07cc1641555fbb809cc7924b2171f7f3d90e
-EBUILD outcome-1.1.0.ebuild 758 BLAKE2B f7619def9baedacf47db92db2432f701eb30ccd5d9da71a29e694f048953834b91609457416023f12dd5d43735ba28d8b94e327a499ef969d91dfac836c8c280 SHA512 84dc0aecef0cd800ff3d8d55c0f44ab2839675ba5d245e2405bbf2031a5db78eba4fd79f2acd57fe7ff6a723f32d4bf1cf1412e60ceb610628260c836a780b3b
+EBUILD outcome-1.1.0.ebuild 764 BLAKE2B 1868ab8aeddb4463a61431c340a08555275dfc009bd8463f500026623ac98719f69af963a6a8aa4f85c2489ac4746cc3961abf4c52e4f371eebca3e7654837b5 SHA512 e3babf5104d4f76a0945969fdde793e37254f6da374d01497349abda00348c69c253d933fed6ddfe0b552ecf7df7652a3f14a684c25f0ca8fa1e0368a171d79d
 MISC metadata.xml 412 BLAKE2B a6981a62dd453c13e7568abd6842a1e800ac403566f6a719bde8eb2cf39e85d2d23790af491e44e00219937e8ceabda6203b9a9bb94ace8b42a3b1df9303607c SHA512 ac1240cfa6facb9a0703052eedad4b22c7176a7f1b6b191ddc52b80a9de4087c5edc910cf1c9906f5ffac0d74f4b6fac18cab8c34d5f478ce6146aa78768ad0b
diff --git a/dev-python/outcome/outcome-1.1.0.ebuild b/dev-python/outcome/outcome-1.1.0.ebuild
index 9c373adf3a3a..acbcab7c8d5a 100644
--- a/dev-python/outcome/outcome-1.1.0.ebuild
+++ b/dev-python/outcome/outcome-1.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="dev-python/attrs[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pandocfilters/Manifest b/dev-python/pandocfilters/Manifest
index 403ccd1b0cb2..ef864311fdc7 100644
--- a/dev-python/pandocfilters/Manifest
+++ b/dev-python/pandocfilters/Manifest
@@ -1,3 +1,3 @@
 DIST pandocfilters-1.4.3.tar.gz 16586 BLAKE2B 975000f96475e8338a54d8a96793a8bcfbf62c5251897a01c185a6708ff7c47f2a1bee617e4e25d3854e7de1d078769bbd887527beb20ebb7e06f0c4da59126c SHA512 9c7ae1329c103ff2baae3488edfcbfaba183bc94146b29e413e7e83ba2ff2dee69823138bf213f5c81a8b0097c2d9329bd05620b10c646662a9617aae7a528a9
-EBUILD pandocfilters-1.4.3.ebuild 459 BLAKE2B de1908c2876a269ea44f638b6dfaf33de9ba1ecb30740c15d07c2912511000db9d6d63561d9fcbfc36f4d3c317dce8716241d12736bbe35163130404b44a1411 SHA512 a1dbea8aeed31dc7e9fff57dbadfa5eacd30b73ab5c32ea4de61638f755352029edbeaac2ea5b0034ca6a04bab8bf96ea8549c2a0735f0ad3698ab82642ee220
+EBUILD pandocfilters-1.4.3.ebuild 465 BLAKE2B 06d73e8bf0c8593d91e35af7f58c9393d42a8545bbfae95d3f24fc76ec47bb24a4011e92f7b3cf1752bc9aae6cd8f1e7137b936f15fdc45ad2029366c6e35804 SHA512 a3fe1efb1b3523aa1137f7f816b3f5e0ee285ae1c23bc234a9267f0de84cdfbf77c751f8bfbd44140a63061e8bf9d34ecbe7754a0f98886d74326e1921290bfc
 MISC metadata.xml 530 BLAKE2B a4d60e832cd40f14269e822f158fcaf555c7ac84a3bc1aa4ae04b588233ad158b2b2e684e1d8ac46a6316790e1392669351274938f4d77595ffd6e3dee72bcf1 SHA512 bbafe21e07701977a4936514a82cb8fa7b8c72be7fc10c1d288c953971702aa06a84d12f175649ad7c108bf97686775a4f0827dd7023fb13ebf75d71e7536a87
diff --git a/dev-python/pandocfilters/pandocfilters-1.4.3.ebuild b/dev-python/pandocfilters/pandocfilters-1.4.3.ebuild
index 41f0ea225ec0..304266a08e87 100644
--- a/dev-python/pandocfilters/pandocfilters-1.4.3.ebuild
+++ b/dev-python/pandocfilters/pandocfilters-1.4.3.ebuild
@@ -14,4 +14,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index 17b9bc99a326..18ce9b6e2c12 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,8 +1,9 @@
+AUX parso-0.7.1-flaky-test.patch 1307 BLAKE2B 63af3a1a0f0d31aba82de3bf9e00001257a794e8e4da752a780d44be83421ca28600c400d9f1ad4bb491c0ed94bdcf61e430880d7305378246be2a16db8ba4f7 SHA512 2101a4cc01e90cc4ce37aa1386bea2be8334834bbe0ee54540bf5645e11ebcaf8395dd8b1fdd308cc1a124ec4f1fe623f7fdd35abc3b82aaf3d9c120becdc961
 AUX parso-0.8.2-flaky-test.patch 947 BLAKE2B b6ece3214328f3121e4de8217395ac108678a37a97bea943e900e13cf44fdbeccf70f2b3bf8dda70df6cf06feb73a55f2bd2d75236898e4cf45c8b22f46b93fb SHA512 b7c5ac93d2f44a897b8d9eb59c470c82b2013f4e3ebf35e81254294f9961e8916a6d590d61ed1d8f3841e50c47cc7902e13d1e28826869afa9168e44e85a98e0
 AUX parso-0.8.2-py310-2.patch 2145 BLAKE2B f0b403c9b9ca5370b1c2ffd52d0a22d995bff03242526a4a649cd58392380c3e38cad4b251b20580b5c22ab859f4829d8ef6ad9c5faaaae3a02b39526d3d585a SHA512 6761d95f4ae0c9a8042abc3fcb42848f323337920306974802f008614c75c7c313aa9a666dd24cfe7e01c7d01f06cbd8e2d370fbc89cc08fdd8b87bcea0aec61
 AUX parso-0.8.2-py310.patch 1128 BLAKE2B f052039f8aef2913cef406c97d55e1afdcd76e46d2a64e2e2f1fd2ac1b7571950ca816213b155602f7b974d01996876a4a7bb0b92f49161d9b29e4ec98950918 SHA512 5aaff0ca295195674006f1435863ff59eac121189c938ef44428eba929a2d76daea9fffb51feebcc75502dbdfb5df7ead18d62c4ee98cb53c35129b81c562810
 DIST parso-0.7.1.tar.gz 399842 BLAKE2B 1e47c1dd6846d01aa5820d7cedc3eafcf12ea0d4a2e95fa3f54429633b1c12dc39a4abe237fa46eb629408006777bd1f512cf878025b55119568ac19729b8c19 SHA512 318969a7a941c4a0948e58643b07b6f5c446ea166b3a8e44a556f0677ec9a36d7dc8c6d37ca7bce3f8276ee3d7144e22fbaaeac90c738fb90f7e94a0cf8abf7d
 DIST parso-0.8.2.tar.gz 394419 BLAKE2B f4e86ae55140adc9bbfdd34a8044e7fdfbf9d318a6385ac5feedc07127061943c2d690581af144f158846e3bf6f82124046c7e625369a4055ab92a54f9210c49 SHA512 a90810ad89301d804d215392ed77593b015f13bc7ef8512302a8893b314a9e74c15e2aaa77157c8595a134d3481e8115f306f9628835271478837ec6f19e645f
-EBUILD parso-0.7.1-r1.ebuild 869 BLAKE2B 0b906c4aa9d6fd0e31eedb932560f741085380e9ab2d91188e1eca5be7bc082ace6097cd5b85a91e2c6864cc65f1cef16e03207ccd911f6f77d4b17409f9bfc2 SHA512 1fcf6676478daf62f12bbf9bb8ddfb49fd0a267637de678059693fbaac0dd07f05238782e5e0a48ad0645bef27e46c2383492bfc7f829b1fac450b0df3831959
+EBUILD parso-0.7.1-r1.ebuild 962 BLAKE2B aa2ffca7196799bc053be25fc8683e63344e4f690d0d8825d74264988d5fc7e943be088332dcc7a9ec25cafb0a4f04bdd9505c24d1c43c4ce9172235b34873d4 SHA512 be6eaf76d268fee8f0cab25d04b271d18944468cf96c70afbbb8038a4215c8163b6e13869f6854591ef1000f9dfe95b469dd79f0cac5c4bd03b65f4c248d5ab2
 EBUILD parso-0.8.2.ebuild 922 BLAKE2B 30e7445875016d94268188ecb5f654c8daac9a473bf218190317c8cd15b1f45654ce94e3cfd5e2360b0de5c6ac0a02f6eb4cb786749f45c2d1e83c0a2a38031f SHA512 08a707da0f0e3a69f0c84cf8391f025f911c9a560a2da38d283f721e8053bc8289741837bef1c2e3408f6c6e2d5a7b4c3725608956fc9cdc6ac9595f5c19ddf5
 MISC metadata.xml 402 BLAKE2B 3dbbdbbd15ec82aa4f38d92f52f4342a14b209edff3aa09b5dc1866784533e21f8c5d75146e3b9b535c01bb4dd36cd259abb2deb959382866242d99fb5d8fad3 SHA512 61cca7520333f595582f3e52602afa09d685d8072a211c4b8a2930fccbd98645c8c69ef7f687a25c05e2e2dc7ddda2fee16b7666cc2854b0b5ac6e23a95bac42
diff --git a/dev-python/parso/files/parso-0.7.1-flaky-test.patch b/dev-python/parso/files/parso-0.7.1-flaky-test.patch
new file mode 100644
index 000000000000..609918f31bb5
--- /dev/null
+++ b/dev-python/parso/files/parso-0.7.1-flaky-test.patch
@@ -0,0 +1,37 @@
+From 2799a7a3c2cf87fdc2d0c19a0890acea425091ce Mon Sep 17 00:00:00 2001
+From: Ivan Babrou <github@ivan.computer>
+Date: Tue, 23 Feb 2021 22:27:05 -0800
+Subject: [PATCH] Fix flaky test_cache_last_used_update
+
+Sometimes time moves slowly and strict comparison is not enough:
+
+```
+>       assert now < node_cache_item.last_used < time.time()
+E       assert 1614147958.869299 < 1614147958.869299
+E        +  where 1614147958.869299 = <parso.cache._NodeCacheItem object at 0x10456fe80>.last_used
+E        +  and   1614147958.869299 = <built-in function time>()
+E        +    where <built-in function time> = time.time
+
+test/test_cache.py:149: AssertionError
+```
+
+In particular, macOS timings can be a bit coarse.
+
+The test failure is from Apple Silicon M1.
+---
+ test/test_cache.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test_cache.py b/test/test_cache.py
+index bfdbaf5..f4291c2 100644
+--- a/test/test_cache.py
++++ b/test/test_cache.py
+@@ -146,7 +146,7 @@ def test_cache_last_used_update(diff_cache, use_file_io):
+         parse('somecode2', cache=True, path=p, diff_cache=diff_cache)
+ 
+     node_cache_item = next(iter(parser_cache.values()))[p]
+-    assert now < node_cache_item.last_used < time.time()
++    assert now <= node_cache_item.last_used <= time.time()
+ 
+ 
+ @skip_pypy
diff --git a/dev-python/parso/parso-0.7.1-r1.ebuild b/dev-python/parso/parso-0.7.1-r1.ebuild
index b4f7c8a1858e..74e95da16baf 100644
--- a/dev-python/parso/parso-0.7.1-r1.ebuild
+++ b/dev-python/parso/parso-0.7.1-r1.ebuild
@@ -13,11 +13,16 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-flaky-test.patch
+	"${FILESDIR}"/${PN}-0.8.2-flaky-test.patch
+)
+
 python_test() {
 	local deselect=()
 	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
index c1a11f210de4..167d847636a4 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -1,3 +1,3 @@
 DIST passlib-1.7.4.tar.gz 689844 BLAKE2B 38f616105ba70cf93cf36383c73f2a4da7bf66ced2844effffe74d9f7c29ee0aece5652974dd1414f16e32fbe6957e2e921cf01bc59daa70195a6d50a4a3bf2f SHA512 350bd6da5ac57e6c266ffe8bf9684c8c2cce3fc6b513eb6c7bc1b302d2d8a1b701e9c01c953782520a2ac37b7ec1f6d7bd5855f99f6ee0e2dbbf33f2d49a9530
-EBUILD passlib-1.7.4.ebuild 953 BLAKE2B 37118b12652177f815d37c9afbe31f1a77d2b395b02d98caf5f39b663ac975d5a424b2d06fe0b5b428ab153ebdf83d38a48d9d6006763ac2a9713d37dee79796 SHA512 8c04a71cb0111f3863e4a6a7c0ab28e1ab51e5f7320287ebe4c29bf18ce0098805717e79941bcecb00f4168b9126d15fdd8a8ccf6f1658888e5da780120396f0
+EBUILD passlib-1.7.4.ebuild 959 BLAKE2B 139467429cce1ccb944a5fe8b6f5ea483bd6b8677823e7c51590dd6de8d2c7959ce769af84c3eae650535e69601ad3a933ca0de3a911ab5d28a777c37d838367 SHA512 26a367e61736bfd755f2a7cde3e3dc1cc121a11a9a4d912d8a675f21a89ae2f875f4a89e338b5dd7a9a27c2707fdfdb40fe5741f3859d92e1fbf42bd0d778b25
 MISC metadata.xml 759 BLAKE2B d38105517b388dad196bf6012214c4bdc4157896b8e6c5fd63441486dfaed1d8e9874fa892ad4376bb753ab82ac739500629e889bea5d9795db922616e6781e6 SHA512 6fa983f68d9d8a67352567dc5e7f20a42761ea144988e7a1dba8117e19f164fbee9229f14308cbd53ddd4dc26a52774ecfd52090a1f75188ea542ca184a0256f
diff --git a/dev-python/passlib/passlib-1.7.4.ebuild b/dev-python/passlib/passlib-1.7.4.ebuild
index fea08a994582..992453322b0e 100644
--- a/dev-python/passlib/passlib-1.7.4.ebuild
+++ b/dev-python/passlib/passlib-1.7.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://foss.heptapod.net/python-libs/passlib/wikis/home"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="+bcrypt doc +scrypt +totp"
 
diff --git a/dev-python/pebble/Manifest b/dev-python/pebble/Manifest
index 705b54d23209..8733a2927d2e 100644
--- a/dev-python/pebble/Manifest
+++ b/dev-python/pebble/Manifest
@@ -1,3 +1,7 @@
 DIST Pebble-4.6.1.tar.gz 24800 BLAKE2B 5030b1206eb263ac4584b4dc5a6b2d13c39af827245c5f1574b30138a80ac4eb501374e22109bf20c4bafc21105cea7030d30f68fb9f48e77400b028f30c37be SHA512 0d6c04a45af66f8d849225e87158f33e8ec218943008dc385c5b13187f816d7e7a2fb485ab1a230b8d5e2ab23fc9fd18efc57ef3f15dc5caefad9b75cd149de1
+DIST Pebble-4.6.2.tar.gz 25877 BLAKE2B eee4835ecf9a2a83ef4ce58be3f87c41fb9a4469695218e5c4f4b779b4f14b8d8097bf9d9e9cd60cbd12a8261c7715f2356d7e8c700e633738d9313ce6373b3a SHA512 a46b66539ce8a51417bc7a396da82a9d3f63b69be09f9d2d647c0e5c52e920a1b68f7543ef06c3d3231807c965a7ddf93ae5ad1ffcacec98b8bd15e2eabb60ff
+DIST Pebble-4.6.3.tar.gz 25888 BLAKE2B 71f9e4c77d7dcc841f8c3a5e9d3df764727c27fc1ee5bb8250e33d49ce006ee94c11309f469f2ebb79aa720fd58ac2741b240aaad8f6d3c18be68189f180b639 SHA512 92cbb5ac01cc6fe57055facb6bcb6a64e19eb5eb3a3ae5fead32d4dd1001a3c70fbf85ef832dffc6b6bb81af6b1c275e12a61eda421176548a7bd5a928056313
 EBUILD pebble-4.6.1.ebuild 535 BLAKE2B 703a36115d4138f5f7a04129bdb1ff7137461f1b225ba10fd95c185867dd8c09139df36b8a071e5c091eef56f94ff26fc59e2c9c86d712d2ae4077e884119617 SHA512 2fe56fe2a040b402b0e16b67816c1876cb13678b21aeaf353d8b30d9588a6d4449e05e7ad962044d9a53efc26e368b017141269b64c4f652c3d3923b5e64ec48
+EBUILD pebble-4.6.2.ebuild 537 BLAKE2B 159e34e53805f89c6dfc121caefa9ec9103c0c14d2cee81d77d34cd5155ace5db245118421ae0227d78f2ae3e305a24141cbedb3077b40c18f03aceaa11a7e31 SHA512 dec99a3d895584cdcc2dfea6821092f5c2316228f947c0200e924a5fef455aa3b4750a0cceb6fda7d7b4a87b7b34d53d110a1adc92d9cab8677b164f44fac926
+EBUILD pebble-4.6.3.ebuild 537 BLAKE2B 159e34e53805f89c6dfc121caefa9ec9103c0c14d2cee81d77d34cd5155ace5db245118421ae0227d78f2ae3e305a24141cbedb3077b40c18f03aceaa11a7e31 SHA512 dec99a3d895584cdcc2dfea6821092f5c2316228f947c0200e924a5fef455aa3b4750a0cceb6fda7d7b4a87b7b34d53d110a1adc92d9cab8677b164f44fac926
 MISC metadata.xml 366 BLAKE2B 65d8f6a8f317f3d4dc671ecaf51954d904265d61c261e5e52dbb09f2fe963875a325bca94ae6028690ace79fbf03e9277353511e736a8fcf05e446f9736ce0bf SHA512 bc3e0a767e97e35202912e6d52a4104daaaa9ecedc8f42b35651f94d76bb3b187ed0d2a74c9c024f84904b0d12384d6772550d7d206ce4788775fb1497319e88
diff --git a/dev-python/pebble/pebble-4.6.2.ebuild b/dev-python/pebble/pebble-4.6.2.ebuild
new file mode 100644
index 000000000000..a56e138d22ff
--- /dev/null
+++ b/dev-python/pebble/pebble-4.6.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Threading and multiprocessing eye-candy"
+HOMEPAGE="
+	https://pypi.org/project/Pebble/
+	https://pebble.readthedocs.io/
+	https://github.com/noxdafox/pebble"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pebble/pebble-4.6.3.ebuild b/dev-python/pebble/pebble-4.6.3.ebuild
new file mode 100644
index 000000000000..a56e138d22ff
--- /dev/null
+++ b/dev-python/pebble/pebble-4.6.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Threading and multiprocessing eye-candy"
+HOMEPAGE="
+	https://pypi.org/project/Pebble/
+	https://pebble.readthedocs.io/
+	https://github.com/noxdafox/pebble"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 1bf011db9caf..f4f8f2bf49ba 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -2,8 +2,10 @@ DIST phonenumbers-8.12.27.tar.gz 2258133 BLAKE2B 73a295a464a0e4e7d32f3633a0a1495
 DIST phonenumbers-8.12.28.tar.gz 2258298 BLAKE2B 02713540accf8c77c37acd7f69ffe3d1fe972124e4c8e82aa56f390d9906b10771c5a1a845c9b1adab602b041c38f4eeac6ee76d0e3382d542d64bcff5788fcc SHA512 49678b2b44038938733413d9bdd56904bb1a55bff9e1fa9a2636ceca18233c2ecdcc0fba8da5d1eb09e28c3c5d0eed61dcfcec1da729b7e599fcbc895ee47ead
 DIST phonenumbers-8.12.29.tar.gz 2258737 BLAKE2B 6a885e4ba28d7093746cd754a5fb60cb62b002a42d4331bb1cdfc2291b39b6da6d3c6673364e4715c09186bebf05b11988cf3beb8ed1690826ef800d07b17e7c SHA512 23e88f9a8bb801bb7a95cd5ef74527572d315e69b2db1c9c38c84d83293d99a015492f010321c9dc0596a5f40dc63453a42e2fd5a7d9dabae7ac0b78967876d7
 DIST phonenumbers-8.12.30.tar.gz 2257690 BLAKE2B 24d30fd69684b48f4cc5366dd419869f591c9556c2c1622775d9f479528aa15b817767f57f97a2789257024b0fde25467a8c88ecb210fa977269a9ab5f25a3e4 SHA512 0e824ac7dc2ba5a994a9af83c4f5d82eb0f31e64c7dabca6cb047185853f9a93fcd145e3c575fd43f76f6c48246954c4be2c6147081d311439cfaf456af629b8
+DIST phonenumbers-8.12.31.tar.gz 2258495 BLAKE2B 7b08961cf50382857b5bdbeef640091967e3c14f3949c8975028fef4192c7776a2f7619c6fbe177f4b46de44de9103cc62ddd949f5e1c882f742ab2a80619cb9 SHA512 28b608a81a452638e25eaa1311e42384725c55cb8f438e9ab54006b8b8cebd0ae848449f1ab6758884113b3cecae21729c3b4d8e1bbab1120df0d82c9ebe7f04
 EBUILD phonenumbers-8.12.27.ebuild 433 BLAKE2B 6a56df6866a0b13825486b809d85c17df719b98a4d265244f45f116dc28770aca60723352c9260595a86e1584803232f22d73e1dc7f01e02fc745a4079ed66fb SHA512 494f26ab2d60d03308289f6fca26d54d2d1f08f3ec00647cbe0db0bc2e1be56a68c8606767db712a1124901cf2f8acf2279a898f4ab1cf6e7db1191cfae81eae
 EBUILD phonenumbers-8.12.28.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
 EBUILD phonenumbers-8.12.29.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
 EBUILD phonenumbers-8.12.30.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
+EBUILD phonenumbers-8.12.31.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
 MISC metadata.xml 412 BLAKE2B 3244f00cf537fc9f8129cb4c499963a121ce2b33ea1edf0c1cc3833afbfe22c9afd5442e532b7324ccdb13cbd6a25e64e312715b13fe31ec16cf8d12a4e218f4 SHA512 a527e1c4d9bf2446bb5ef628d22731a2647bd937260f015a7cdb02c42fe3ce8a9c3d6a27660f3ab2521bf0a1400575063682dfc3faed2187edfe3f531e8427ed
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.31.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.31.ebuild
new file mode 100644
index 000000000000..4df0c54c7011
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.31.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/phply/Manifest b/dev-python/phply/Manifest
index f2ebb18900e7..b9420cad6d43 100644
--- a/dev-python/phply/Manifest
+++ b/dev-python/phply/Manifest
@@ -1,3 +1,3 @@
 DIST phply-1.2.5.gh.tar.gz 35624 BLAKE2B 99fe9704cef570ad3055fa6c5aaaaed866d3c41c1479efbd29bb3224ae666d2ba13ccca61e6d67a8a0da4542dec79b5fdd201254e1ad638de81fa762049f4d13 SHA512 f0e4d0a6d2dfad5163fb68660602482b6de58c0dbd60d8db2f1df0622a9da3cc24e5fd309299a4a9ccf7abde081644a9a91fac8a2800520859199060f4080dc4
-EBUILD phply-1.2.5.ebuild 799 BLAKE2B c8357135d06ec303ca5ef733c59cf5947d44c1d1f6241a578349e3e8f9466b8cdc6ba08b58b567ba72cb43521daaf2631ff1f5df4c5deca755a0c61d816140ca SHA512 e37929965fb6a40859b6669529e5fac9378fba70731356f46bf008adc972c73c95430a40af7f7c5f0cd536d0f060fcd0db9872009746ba133877b54caddda85b
+EBUILD phply-1.2.5.ebuild 767 BLAKE2B b63e846fc81683356c9c27a379a5ec6dbeae5ea33ebb8682fffa18d5ebf18208eb0863203147853e54ffe32ad1ef0e1be60ad6d04eddd334871c16621cbf646c SHA512 92560d06ca34fcf0c1409ec31b533c78cd0f80e46ca3daa5181907219f0f3961299ab55f2c17d091bdef491bc48da042caa4353e9ecfe9f00e7da998cb6979e2
 MISC metadata.xml 364 BLAKE2B 32f89060e0ce7bed45287e0d206ba333b07888c7b32c6e76f916c7a153cab420440f4cc9a0b16e9747949339155ac013696f65ce4e4d7dbda69aede6fb8531f2 SHA512 67ec43a111b7cbdd46954b82baa2d528d2cd86d25f579500bc556069b67aa5055abf78dfc3c51afd095e282a240c295f5503ff5a1c0292a996d3f2315fbe27f5
diff --git a/dev-python/phply/phply-1.2.5.ebuild b/dev-python/phply/phply-1.2.5.ebuild
index 19867796c40e..1875f9ed1ff1 100644
--- a/dev-python/phply/phply-1.2.5.ebuild
+++ b/dev-python/phply/phply-1.2.5.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Lexer and parser for PHP source implemented using PLY"
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index ffff77361f69..fd8ba7907a29 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,3 +1,5 @@
 DIST platformdirs-2.0.2.gh.tar.gz 11365 BLAKE2B 53257c69f26dde3a0031c991cd6b5c72b361084342617f5c0590007a11a1d7d6e3c925dd6a8d73d3553cf1cc1d2b9fdf74fd0553d6b8891ef6b21d64bc0e256f SHA512 7cdfbcb4e37f2b4b551f3d685a40780518f9ba9c333cef0664965abaca320a10f6e944f967c0b0ba2d00e80df04b0e1e03426e6d1291e28d8f64128f50ebc1fc
+DIST platformdirs-2.2.0.gh.tar.gz 17674 BLAKE2B 1b8e31033194f5682fb8c06be8268cc1ce6172b2bc9f0bfa0d376ab4387547c03c18d46e7c387eb2c36e5db42c09398c95d75cb32e4c5a59f0c7517e867aa1c1 SHA512 fbf4a6929543f5777576a258592e8065195e4d86d728f5c9b4065d1639d53b1c3c5de23c9d58282c291a7f600107af2de097ca2328f632927b9b773140590510
 EBUILD platformdirs-2.0.2.ebuild 651 BLAKE2B 41b314b1b210128eaa6bb06aef2a26f1fc41cc179155a6c0857e5fb25ba6f4508059d5949fdce52e4ad21f33a4f70bc121da5ae5d6357df43cba20aacba7714a SHA512 41c14115ed346e8d5d5ca1661a616a4d12bce35bc7b292f4de7cc0103b9efef08d7620eafabacaa68db3fe4bcc43833407fefb5c6188f5f2f5bc77473886d338
+EBUILD platformdirs-2.2.0.ebuild 785 BLAKE2B 684d0310c09f107334ef902e4c3eac28bf9e5eb32b972430573643ee8b38216db0af16a2c5121ab84929887d95e746d235afe42a8d526fab95e5c1f2264d07c2 SHA512 f4a317c329777d239cd41950f1884400005322ca8461bd362ca9c03b52bb3b748f1081b491260484c4824b24e8c18eb0ce27c156bedf057863fd21ec079a4aba
 MISC metadata.xml 358 BLAKE2B 59aae3db7ff7375600e504797a7fe4dbd4c0119d5b3fa31ef523854d8a8cd54ee60131f9bac4f608dbb5740a1e9dcf27d47cca75c7c83de4850600eb02aae2fd SHA512 09d5618647fdc5104705ac94e3af0a3bac586e27105f95d14c827b10265355a53deaa66483c12567596c2c4e8285c1cc0520f5475a1404aca3b1d677792d7654
diff --git a/dev-python/platformdirs/platformdirs-2.2.0.ebuild b/dev-python/platformdirs/platformdirs-2.2.0.ebuild
new file mode 100644
index 000000000000..ca2a1a338088
--- /dev/null
+++ b/dev-python/platformdirs/platformdirs-2.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
+HOMEPAGE="
+	https://pypi.org/project/platformdirs/
+	https://github.com/platformdirs/platformdirs/"
+SRC_URI="
+	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
index 28c0b34c03ef..52de9618bea4 100644
--- a/dev-python/plotly/Manifest
+++ b/dev-python/plotly/Manifest
@@ -1,5 +1,7 @@
 DIST plotly-4.14.1.tar.gz 6373585 BLAKE2B 8e8d15a7f68bbef835fcbc0048c2457916aad1b10e06c903222030b2b2e1b902e2d42080f8ac2c19928dabd7e1623210930b9f33dededa71dbbb28b2f41f848c SHA512 e052680d0e7344b9f53f1b917dd0b9bc87b0c34300d93b8958ccb35b38f9dc5e7fb4db016d1113df4bae78c419f3d378112c59c3470723ce1349eaadbc5011f8
 DIST plotly-4.14.3.tar.gz 6374650 BLAKE2B 91d950b6365876b03b2b0393c642275c37fc352fda90ce010310f5dae046c3cdd835de438036c5d92fd35d3afcd2c7b8548a87b1354d4a33cd2cfe10838ae94d SHA512 7d8db7a0f6c1abeda1b222f9bd25e4395dd8d14d246ad986960868a8083e4f1d1f600d84f44416eb1d089640d190192e931b5a5f6ae24e01cf8146c4cf8e80eb
+DIST plotly-5.2.2.tar.gz 7293292 BLAKE2B baef3accf8f5a3085908fcea558f8003687e18a1f97471c620c378c10d23d4222ef87dc47d64f45199b594414890db5b8ca5e3d7867c871d926c2ae441128c4a SHA512 4d6d79f7cc2063e73e7c17ff90a7d13324497ea8034d8ce62d79ec62b0530a59b2eaec8913fb05efb804cf5be8387b6f96d1710f41b9993233b5a13cf64dd310
 EBUILD plotly-4.14.1.ebuild 613 BLAKE2B 5f45698653121c6f20f3f933c236fccb8a4f152806795e24686425afc75e57dc1337736a63e60c982587d4b30e315c21fce0cdab78075e5cfbab1539a03be3f0 SHA512 18a4ed69b6b3983ce8b6cb1ced62bd11502569b0a8f381ba479ff69fb926c8892798ffbc7315872ee0ab24f071806f95a785712bf22eb83d8365bed4288faa21
 EBUILD plotly-4.14.3.ebuild 614 BLAKE2B bbc53aaad602a5e0f0609f06e1372fb1c36b5a778e27af9d19c1a5624702d31ab9a8b8e368ce79abc0638f3553bfa8178918bc303710132564c8d3a9ba4b4eda SHA512 b2b432fff00ea557662fd43f91eb37c45ad37940f1a6cffc39bf025d087e6413da139a5edbea569bdf1c8db4ffd62ff0ca70131616414b2894590a9de2f521ed
+EBUILD plotly-5.2.2.ebuild 795 BLAKE2B e609d220f61b73ca3c11255e0fc28cf9c3a2ed316be1f39044cab25679683300d6281e80ce2f5ead3be391b3c537be7531c9148ec1a1bb069a04ba621ba1784d SHA512 a1bac18949480f19c68891497effdfe60cc3ca474ca24ce27134f2a1da5cd894426fca9b00ad8d6d24138da141fafefd09a40723b1314197068422cd988574cb
 MISC metadata.xml 724 BLAKE2B 1508771febfbd6ed56f55b9db32cd255b84139e53b63341ad90e4f95d71e9c4f2f74d88a55ec4d1b66f1b21004017816e6cc74d62eb8f8e0850823502d23598f SHA512 2de0e70fdefd14ba91b72046f31af45a5f68be8d8955f746e6a35ee71c639217caf2cd2d8d3f44687146fa39076eeec15c5186e113599000528c429631e0b5af
diff --git a/dev-python/plotly/plotly-5.2.2.ebuild b/dev-python/plotly/plotly-5.2.2.ebuild
new file mode 100644
index 000000000000..7320a8a0913e
--- /dev/null
+++ b/dev-python/plotly/plotly-5.2.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Browser-based graphing library for Python"
+HOMEPAGE="https://plotly.com/python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+# The GitHub tarball contains the tests, but it excludes other things which have
+# to be fetched with npm and therefore it does not work in the network-sandbox.
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/tenacity-6.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.15.0[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	mkdir -p "${ED}"/etc/ || die
+	mv "${ED}"/usr/etc/jupyter "${ED}"/etc/ || die
+	rmdir "${ED}"/usr/etc || die
+}
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index 5fbf34a33849..6deb60384ee2 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -1,4 +1,4 @@
 AUX pluggy-0.12.0-strip-setuptools_scm.patch 1186 BLAKE2B 443f5af807826baaca7e956759e7ad7ba3e50c0b0955823ee40d4d95ee85c864bd144104dc2a39cea03aa29ef05f799aa28c14763b85ce3c696baaa9cb249c24 SHA512 031e021a9dfda5b64ef8fcd077cfd6373d2e47bb0d989cc31c59ade70e6d31336b7929dc2e55bd675753487b124f3acd3803f14d112080b67f7e2766c4594364
 DIST pluggy-0.13.1.tar.gz 57962 BLAKE2B aa0a3eec06c988a727bc15511313f12a08bde65da55bcc5e7547a654e3ca8a34c12dfa72166b6a37b524972730f08454b6a0446e071d2710396e868ae3a77151 SHA512 eb747ff341cedacbd90eb20e22ad3d1ddf5588056f14d069f56331f4141a15b7eccaee23ea196d2f4906964ddb77a79b156bbf3ef8c8083e9952c55d13d55f3e
-EBUILD pluggy-0.13.1-r1.ebuild 739 BLAKE2B fddb654c1709866778b81602af214fa260706c6fdddf138bd4ad07f7441a5ee18825db570f710e5ecdda5d7a5d6d6fe514c61f96984b4d1125bd359dbfaaea84 SHA512 628c10bb25c79a375323e2faa0677c187042e85102b8ad39b8d219679cd7a9f9501988fe3a6dcf3d814728918d8f17638bdd714db257b8b521f608b6c923f95f
+EBUILD pluggy-0.13.1-r1.ebuild 745 BLAKE2B 1fad71bed4d8bf1387763ec11a68085d7b06a8ef3b795b92848f3d2485c3010333faf6c3d4969aa1cbc554cad94937067c1b5d1aa4fc9f204d3d3ce3fc5fa406 SHA512 33eca15334d5cf080f1846a43ed371145ed4eb964a2f1ec15a07e152aa712913083dcc6e9a8b6ee4b85b159ae176e19eb58cb17ebbb717c32a7af0e943f45552
 MISC metadata.xml 481 BLAKE2B 7a2a5d4730cd4ee4589f07273f261c932d4fa173924970a8816fe3c15231ac576ec359974945e332540647a5f0a209198c72a161eeee17d95041dcfd8049b86d SHA512 6fbda8552dac871f2b105cb7c46ec5e8350af42b2c67ac55c9869b1f55915b55105c787a66ccfd981017b060024e8c5a1bcad83fc08c72a38b510a019381209f
diff --git a/dev-python/pluggy/pluggy-0.13.1-r1.ebuild b/dev-python/pluggy/pluggy-0.13.1-r1.ebuild
index 9c51e6832712..cb5c5f89def3 100644
--- a/dev-python/pluggy/pluggy-0.13.1-r1.ebuild
+++ b/dev-python/pluggy/pluggy-0.13.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="$(python_gen_cond_dep \
 	'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_7 pypy3)"
diff --git a/dev-python/pockets/Manifest b/dev-python/pockets/Manifest
index a67256a4f6af..ac3b42e6e471 100644
--- a/dev-python/pockets/Manifest
+++ b/dev-python/pockets/Manifest
@@ -1,3 +1,5 @@
+DIST pockets-0.9.1.gh.tar.gz 42077 BLAKE2B 0cdc5a63389b7c01df9a2e63fc1e18edfb8471da8084832b3381141459932146fd46e2e1cf8f87fbf33fea8204a46596566be62ca6c5780985f0d7bd18d5d3e3 SHA512 a24418759bc133a0c62cf0a606a851d00cf1bd280c731065b92fb96a5274a45bc2266a4e1fec3db929aacec5baab774667052e7b732a53c4c4a217663c02ec7b
 DIST pockets-0.9.1.tar.gz 24993 BLAKE2B 9962655f755bb96853f1b4450f2bdcbd111ba945dc3a5cdaad84bb43a84150e7384ecb3c5758274b9cf578adc1c8991c163c56f72a00a00bf8fed634397e02af SHA512 436f2fd8cfb9c5612733b1163d381f52c28b8749de28f5e0de609d012ccfc10ad77a31851d3e1010feef5b517f287f1e5c7fc4b447e7b080e5536fdaf8d2e9d6
 EBUILD pockets-0.9.1-r1.ebuild 595 BLAKE2B 05dbea40222ecd161b81ef971a96486119fe3e539766b5836df97a951280bdbd2326e8456504d9b27427c624b3e14d72d1e9fc5010886d71c14fb9df55020b33 SHA512 b01b2a6a5886a4de0937de8a47c0266546ab0922a065013f440c3f20ab7a7131a808fb0a873fb45a5e34749ae9b9c095d2cb38f7101fb95728b4dc52d298df02
-MISC metadata.xml 331 BLAKE2B 57ff3f70f5b0cb42df8457080661731a0441e28a962e97106bcb0d7b53250d28dbd1278bab79ec649aa23e13ac6244b124df55119b62a55877381dd1c917f6ef SHA512 4f0519feb2582567a86b066ceaefffe6d1b11c7b50afe60b5a730045bcacfac0a8b24f485cd4ad3faed9b03fec69278d7eb8ba33fe72269bdee274ac05185707
+EBUILD pockets-0.9.1-r2.ebuild 846 BLAKE2B ffc2816c5237773c9126885c6890914c9f9912d89ee12e74dd0c4bd6192f301b90a70e93ed38b231c585729ea3d74fac54091ac3cc652a6c19f82abc9acb1068 SHA512 cda0a83a7a3e3ffe40f91087453398f8d61aba6f200c65b6c97ddc09e6fd3a305ab3e90786f3a09b7630744788020cdf53d8ecc4bb67ba684dabef69aea09f96
+MISC metadata.xml 389 BLAKE2B c2ab12f344722b501f9097fd8a83fb4bbb465c02f6f49a30ec8c2e89901feb2e614fa16571c50c01609a778b7f45372390ed731c5ecde18d2f20f305201e7bc2 SHA512 798ed4bd31167a3816accf7bd34e15fcd237a5b976ebb52d68e110eb48393918cf3efdd477ce6a44efe5463fa83da913661196b6d049a08da3e15a547cc0d727
diff --git a/dev-python/pockets/metadata.xml b/dev-python/pockets/metadata.xml
index e51fbf707757..3764c5e24076 100644
--- a/dev-python/pockets/metadata.xml
+++ b/dev-python/pockets/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">pockets</remote-id>
+    <remote-id type="github">RobRuana/pockets</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pockets/pockets-0.9.1-r2.ebuild b/dev-python/pockets/pockets-0.9.1-r2.ebuild
new file mode 100644
index 000000000000..4e7e77a96337
--- /dev/null
+++ b/dev-python/pockets/pockets-0.9.1-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+# No tags upstream, https://github.com/RobRuana/pockets/issues/5
+COMMIT="777724c8eabaf76f6d0c5e4837c982d110509b2e"
+
+DESCRIPTION="Collection of helpful Python tools"
+HOMEPAGE="https://pockets.readthedocs.io/ https://pypi.org/project/pockets/"
+SRC_URI="
+	https://github.com/RobRuana/pockets/archive/${COMMIT}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/pytz[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's/description-file/description_file/g' "${S}/setup.cfg" ||die
+	default
+}
diff --git a/dev-python/progressbar2/Manifest b/dev-python/progressbar2/Manifest
index 05a598147ba2..84750a88b5ec 100644
--- a/dev-python/progressbar2/Manifest
+++ b/dev-python/progressbar2/Manifest
@@ -1,5 +1,3 @@
-DIST progressbar2-3.39.3.tar.gz 131839 BLAKE2B 2cbf1ecf04947b3a393b5cc473a696528cdaf38f132a1b0faab5e45dff76aecdee497ca1b2810b9ec5e3b180acfa8e2af1d195e5804c058a7d8880fc3b0a330f SHA512 b8944b319f1133fe7abdd256bed8803e9f426208af5ddc58935121845e81b9f65878e536bd5a1e4810eaa6906b24d114e8681dddf1f77c1bf96cb231f6473a5e
 DIST progressbar2-3.53.1.tar.gz 44741 BLAKE2B 80f406adf42c5c57ecad87002426115e1254339d5cd310dd42f560f48a1123702dffbba8f26114a01f2bd5be75a29cb12cc1c091d5554509b6282ceb2b66fb76 SHA512 4817bbb45d0f51ee2b3feceec56b3177ed5d0561894a13eea53a30e8b9aad5805483b5b669af93f3fd0cc958984b8a5c2a14ba3591e0a85be12180d057bc2f81
-EBUILD progressbar2-3.39.3.ebuild 541 BLAKE2B 7b4d5a6ed0eee66fc39d1aeeed679df17e3856eb29ea4092cc39c5d103f65b2cec4bb2ee923c862e227e19371fb553aa784981803092d9fed4032388849daf21 SHA512 291fcc07377a37bd8392536979416add9e4645a7cbeb0e03cdfb9cd44268e640fc7fb4c5b7811666e152f5a0b7b2150a7e813111f590eec4415b8d4c1a1374a4
-EBUILD progressbar2-3.53.1.ebuild 769 BLAKE2B 88bcb7ec45d567bb614e9928cc270e1b223ff1eafae82430816fe46802263266cd85987a128204737104e9b174fe5d5bb6dbcd10badbe24c16cbc82f94499bb6 SHA512 cea0ace32dfab0a26fefaa9241bd2581aef7e0a12594004beb81126601df2a78bea3aee9471fef0bd003bffc949cd69347b6d06d4590c0921286dd994aefeb77
-MISC metadata.xml 344 BLAKE2B 812c8fe2236cd0dfaa9ee6772f3753cef9ce3d58c29f1da23f31cb7d0a76db44b3b3369626940f09120e7ac491cf74b4cb31aab16c62d8ec66b4c9c4f493b18b SHA512 5b326b7408019457ec81d540c94bf092358c81ff873a9eac6fb60cc9bc624d2bb194d1d432c53e75673bd52e15fc4bd96a4d881e56c800d111e5faa6dcb9520d
+EBUILD progressbar2-3.53.1.ebuild 709 BLAKE2B e94d7955407d1a1909aded633a2b8cadb5a83fae24c87b68875e1b18354583b83b6bffff6022c2ec10f4f1f67f12efc4f77113e13c1846e0a75b9478099ba77c SHA512 99507009a42edc4c970be2edde4d14b2cad3eae2cc4184397c99c34fd08c94e0858552c2e40bddbfd7bf2957675fbc56303836f29ec4474183c87cff275f1c57
+MISC metadata.xml 408 BLAKE2B 922dbf7588b1e17cda9d8dbf5892532493c2e706ce7c2ada1ceb3f6aa34d3dc1c455494f93c7b01bb3e4e0a4a71e29c0c308c54b53401a33e6cfcac161044bad SHA512 728359a9f8aeea7e9d103f04a0d1eb1771b37b40ffe95057dd62a9bc1f50d0f0aec0655b87d5367138a990c6742d1d09a68b87562fd5c2d02f33962282cca1e3
diff --git a/dev-python/progressbar2/metadata.xml b/dev-python/progressbar2/metadata.xml
index 829f6e9c6205..d8c1685015b9 100644
--- a/dev-python/progressbar2/metadata.xml
+++ b/dev-python/progressbar2/metadata.xml
@@ -8,5 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">progressbar2</remote-id>
+		<remote-id type="github">WoLpH/python-progressbar</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/progressbar2/progressbar2-3.39.3.ebuild b/dev-python/progressbar2/progressbar2-3.39.3.ebuild
deleted file mode 100644
index 3a77ce10e11e..000000000000
--- a/dev-python/progressbar2/progressbar2-3.39.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 pypy3)
-
-inherit distutils-r1
-
-DESCRIPTION="Text progressbar library for python"
-HOMEPAGE="https://pypi.org/project/progressbar2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-CDEPEND="!dev-python/progressbar[${PYTHON_USEDEP}]
-	dev-python/python-utils[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}"
-BDEPEND="${CDEPEND}"
diff --git a/dev-python/progressbar2/progressbar2-3.53.1.ebuild b/dev-python/progressbar2/progressbar2-3.53.1.ebuild
index dc065e44f017..8e572770470d 100644
--- a/dev-python/progressbar2/progressbar2-3.53.1.ebuild
+++ b/dev-python/progressbar2/progressbar2-3.53.1.ebuild
@@ -2,22 +2,23 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} pypy3)
 
+PYTHON_COMPAT=( python3_{8..10} pypy3)
 inherit distutils-r1
 
 DESCRIPTION="Text progressbar library for python"
-HOMEPAGE="https://pypi.org/project/progressbar2/"
+HOMEPAGE="https://progressbar-2.readthedocs.io/ https://pypi.org/project/progressbar2/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 
-CDEPEND="!dev-python/progressbar[${PYTHON_USEDEP}]
-	dev-python/python-utils[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}"
-BDEPEND="${CDEPEND}
+RDEPEND="
+	dev-python/python-utils[${PYTHON_USEDEP}]
+	!dev-python/progressbar
+"
+BDEPEND="
 	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
@@ -28,6 +29,5 @@ src_prepare() {
 }
 
 python_test() {
-	cd tests || die
-	PYTHONDONTWRITEBYTECODE=1 pytest -vv || die "Tests failed with ${EPYTHON}"
+	PYTHONDONTWRITEBYTECODE=1 epytest tests
 }
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index f98ad3e3ffcf..f32f17f041b1 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -5,5 +5,5 @@ DIST psutil-5.7.2.tar.gz 460198 BLAKE2B 203445423ce5e0ef35bbee00a7160a282401108c
 DIST psutil-5.7.3.tar.gz 465556 BLAKE2B 6a9f31fcba571f381c1f4c904a9ff65659d13ed64e91df478aa7df4dabb87a35c4fbd9c0491a3d10b9eaf0fdcc8f2407fcf7144e729043eda605dfe6e6f93844 SHA512 8fcff56dd4e4c1b877c09023721e6f562424f7f84ae5304d518976a1e7f21dd026772f1abfc063bdd0857a375bc869f42febde090dc0b65918d1ebf44e3ad71d
 EBUILD psutil-5.7.0-r1.ebuild 1140 BLAKE2B 95af4642e5489c02e92536181bc65ac814ee5b48aef220f8a54b8e7e70d53cfcf3a9a31d592c5233b4a2de8180f4018a8759a43aa731bc6a9d327b3db3c3d78b SHA512 7622f810bac7d26ca1a9eef9558e0749b1a506ffc316d4dc253d966d1fb7c14a191b54b3bbae17938dffba157c739526ebe650789d1f063ebd6e1a92963fcd09
 EBUILD psutil-5.7.2-r1.ebuild 1153 BLAKE2B e48b32b47313c8041b518e61a81441a5ad477347371e6156b23eff2e4eddfa859317700d6b03e366484b4c3fba2c2300dfe31d720a03de3d8566070576f27c01 SHA512 70c177b24471ef79854eba6673d66aa558a9ea376c11b502c7c8228f25dfb6e8ecfe96d926938a66ceab9303ff703749084f7ea4c997356ae32a89138b8a3c9f
-EBUILD psutil-5.7.3.ebuild 1155 BLAKE2B 13f89c3397dacf75c21c2506e21ea149bab5334cddb7b94f62c30ba2ae6ce6f7f08144d07c9be7983de8913d113f861f6dabf51aca997123cd83e40aadeed500 SHA512 3d29e2ee60cc953a45724904c5c656554f83b3a6c7d8618d5c9863c38d563c2c31fc68d7f422241b7a52b5e33cfe33f8eaf3109b60022953cf031397379a4526
+EBUILD psutil-5.7.3.ebuild 1161 BLAKE2B 1fefed698955a9dfc48e1a61992a3f8c1d8a9395d26327fafdad7237e0c9baa5f966a798f0c2a30553f0adba6b799daa1d1f07357bc67c6d8070d70b5ce759e5 SHA512 b8490a41703a6bc04983a69944c884e7264ed2a5784aaf9f9e9a6e7fc73e10b58a68f96478ee1834df1c06e2e6a564e3c511ed9c34eac47e0c21e76149449ce8
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.7.3.ebuild b/dev-python/psutil/psutil-5.7.3.ebuild
index 775a42abf9d8..40677b1a3599 100644
--- a/dev-python/psutil/psutil-5.7.3.ebuild
+++ b/dev-python/psutil/psutil-5.7.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index 2f01122bc56e..714522c81ccb 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,5 +1,5 @@
 DIST amqp-2.6.1.tar.gz 119956 BLAKE2B a575637ca3d39ef8577035ae156f09b87dfb053757cb78b058fcb4f23759707084297e12941c766783e99898c486ea8eca968842464223ea46f42a4e4495c0a4 SHA512 e2c628cfe8075a3014a9fe991ae3e6f49198db2ecd46dd48f980730da692e4d25d9f055b1ccd4743917fc38a8afa69a5902a64275f8f45ef68113c6756f3a17b
 DIST amqp-5.0.6.tar.gz 126856 BLAKE2B 3eae4d0f97477dc7b72eba65ee95ab74afa051bf2d745f86944c4236b4a90ff6c2a38f18a5bdc8441215f4607ed4e8eb867144695619eb08e0f1065e7a624415 SHA512 bf15fad413bedb2f57dfaa03986f4abfc8fb169d5e324d5741b94a1e3776f2590e7686774c69dfdda848b484dbc1e6d0fa78a4a3125cf08ab20eaf7192885252
 EBUILD py-amqp-2.6.1.ebuild 1511 BLAKE2B 1703fbf5771a262eb1d3c5cc4a918515fd4cbac511804669bf4debe5bc89ff7ed744dfb5f422f59fb6ea6358e719786dbdb7d76e22bd7877f4b936f5b7088b80 SHA512 9c44523c7d6e49a60677973422272fc2e6e224ad062ae073911d84de47df786f8a0b77df5ccdc9920bc41d2bc8c4d2cacfeb7eff91249aa1f8be07ff10666070
-EBUILD py-amqp-5.0.6.ebuild 1032 BLAKE2B dc85f7d05099432fafc7b836b2f65fe40474ea0a24c3be33fa19705022cc06569461a517a43dab574fe7f3566b98a8666e3bbf10cc61c8f4e9421e625feaad58 SHA512 59b60dc873b32935338312eee5a466ddfaf158bf953f6e67b2e448f57e141762b90a4de39df273f46165472571f338a3ab2515bd8ba4a8a4452a33e7fa94b0ab
+EBUILD py-amqp-5.0.6.ebuild 995 BLAKE2B 7e980a808b9c245a0da37cebf64d736bf8d47f291566042c385f928d3291ef764ca4842def7486c4b89993d58fed5f30775ec576c4db7b2397a6dd0ca8e987e7 SHA512 9ef5f33252f542679c3dbfbbe8bf17462a158cf8776fa55c6e4bd8848a845f429c944ef195ea2a31ea5619d4969caa60568b378b3543ab553141d5f85d10266b
 MISC metadata.xml 504 BLAKE2B 4b09bbbde836a690c540191860b0251f329f39f9650df8c0246dcabec3c2444f8f0734a6acd4bbbd17e3f276d6bcba195326a07f19b4a43451257d526dd9796b SHA512 069eec0fc089186f692bd331463d8f6e452545cd0bf8f48e1fba4169c49674b3187a02e0ae25689f2033a65365fa7d3086d23affdb1875cf320a5cd36d9954e9
diff --git a/dev-python/py-amqp/py-amqp-5.0.6.ebuild b/dev-python/py-amqp/py-amqp-5.0.6.ebuild
index 7d0dab216872..82ee3c01e5e4 100644
--- a/dev-python/py-amqp/py-amqp-5.0.6.ebuild
+++ b/dev-python/py-amqp/py-amqp-5.0.6.ebuild
@@ -2,16 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
-MY_PN="amqp"
-MY_P="${MY_PN}-${PV}"
+MY_P="amqp-${PV}"
 
 DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
 HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_P:0:1}/amqp/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
@@ -31,10 +30,10 @@ BDEPEND="
 distutils_enable_sphinx docs dev-python/sphinx_celery
 distutils_enable_tests pytest
 
-python_test() {
+EPYTEST_IGNORE=(
 	# rmq tests require a rabbitmq instance
-	epytest --ignore t/integration/test_rmq.py
-}
+	t/integration/test_rmq.py
+)
 
 python_install_all() {
 	if use extras; then
diff --git a/dev-python/pycups/Manifest b/dev-python/pycups/Manifest
index abca1b106582..ba8c672a4334 100644
--- a/dev-python/pycups/Manifest
+++ b/dev-python/pycups/Manifest
@@ -1,3 +1,6 @@
+AUX pycups-2.0.1-py3.10.patch 576 BLAKE2B de0c617d24d18290c23fa7938a62db451dff69075ef180a781c285a7b6a6b4c6fdeb4010a0994c56dcff5c21cc902a59cede52aadc523b9d642c49cde0272a89 SHA512 31f025e9ee09530836a6efac6d7cbb39d2311fe4264dc245dc8f80314a3d03416395f66759f505d63119975a443a286b703b6e21f68dd0eedf320595d8ce68c4
 DIST pycups-1.9.73.tar.bz2 52732 BLAKE2B a6c9750970548ba85cdef4041f716491e9b0cf4273cb5381bca8e57deab457affaa62eccf74d36eb3f8b047e5142c952e56e7e624f85ed7959a769f568824f26 SHA512 ee893d64f1645b71805ac358c4a3cc594f6285f04272ff0558aa60cbc90fafdbac30b623ffcc3a6b739218d9fd7a6a6e1d8cb186a5582f2cc30a518ed4dde810
+DIST pycups-2.0.1.tar.gz 62968 BLAKE2B c9d955b89f2e9746827721c875dfc97538bb4575ee3f78c41a94f06b361cd3d22c14d453bfbea210160026d33c6e161b1d14c4dffeaddd644c260779f56e1db7 SHA512 fdebf1cac8cc4fffb8a76a938aa91965dae4a3dcdb6d8ee26e8e6054809d26dd3fb20b10c2351fb9265c03b16d6bde011815111c452ccb058518372f22d9d617
 EBUILD pycups-1.9.73-r2.ebuild 652 BLAKE2B efab5b0d6cf764fc587f38c58ad9f151425c3c279a7096dc9599de82d961a377d42c1f5b6cd10f2c46f50a05584334adf2fe27a82b705815d33bf499f83865bc SHA512 5d075d080f51d210462b8d5e904a735cc9e83d86de80d83bbc0413dd342cd724c4af67b07774f171724046cc71dd00442d91e65ac870b0f7098e141a1c4ee3d2
-MISC metadata.xml 456 BLAKE2B ea7d7af9ed2baa3cb5270b3da9c5e1c6dc64d1391e0b280ddd1a6e3e8f3317808eb3906e1c9551615ac2218b89685b9ccbfb4d4656e80eeb54cf2d8dec2149c7 SHA512 c8318d150b07e8a369037201bcb9a99a7bc8c406a2a2889f4a1af62166313d4db740e8546f78f0de1e80cddf774f8818e49a4d3e99e906456ffc2f46a562e7ea
+EBUILD pycups-2.0.1.ebuild 796 BLAKE2B 8bcc13fba78f4eb834b63e48b716d7b97ee6921b30ce6ab7bd5cd907fa69894d6da2b3ebf63534afb0da4370399518ff53f04a803ed24290049436bd740545c4 SHA512 be670284f5f6809bdb29ad064f8d7350e4cb0668e1be84e60336e228575cb60b2737be4a2b5e1ae360395eb84c6021d4d3b4434d421de60a9376d11279402fed
+MISC metadata.xml 566 BLAKE2B d215b6553f5fbc4a4ca6427a454e3cd8564829a57b4455642dac82af52918fff9d92fcb15b4a29c6edce2162a43633842755c17a256b9df0d306d708cf8ba725 SHA512 9a4a153324575e4da6a744082e12313773e7615673a8d68a82740560334333bb76b496167a9e0923b5924aede8834ebf0a80f64232f917f03338a0a27f753870
diff --git a/dev-python/pycups/files/pycups-2.0.1-py3.10.patch b/dev-python/pycups/files/pycups-2.0.1-py3.10.patch
new file mode 100644
index 000000000000..557b485fbafe
--- /dev/null
+++ b/dev-python/pycups/files/pycups-2.0.1-py3.10.patch
@@ -0,0 +1,24 @@
+From 8cbf6d40a0132764ad51e7416aa7034966875091 Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Mon, 28 Jun 2021 13:17:45 +0200
+Subject: [PATCH] cupsipp.h: define PY_SSIZE_T_CLEAN
+
+Fixes traceback during IPPRequest.writeIO with Python 3.10
+---
+ NEWS      | 2 ++
+ cupsipp.h | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/cupsipp.h b/cupsipp.h
+index 2a15ce6..b890198 100644
+--- a/cupsipp.h
++++ b/cupsipp.h
+@@ -21,6 +21,8 @@
+ #ifndef HAVE_CUPSIPP_H
+ #define HAVE_CUPSIPP_H
+ 
++#define PY_SSIZE_T_CLEAN
++
+ #include <Python.h>
+ #include <cups/ipp.h>
+ 
diff --git a/dev-python/pycups/metadata.xml b/dev-python/pycups/metadata.xml
index 5080ddafb1fd..b349df59ee54 100644
--- a/dev-python/pycups/metadata.xml
+++ b/dev-python/pycups/metadata.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>reavertm@gentoo.org</email>
-    <name>Maciej Mrozowski</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>printing@gentoo.org</email>
-    <name>Gentoo Printing Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pycups</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>reavertm@gentoo.org</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pycups</remote-id>
+		<remote-id type="github">OpenPrinting/pycups</remote-id>
+		<bugs-to>https://github.com/OpenPrinting/pycups/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pycups/pycups-2.0.1.ebuild b/dev-python/pycups/pycups-2.0.1.ebuild
new file mode 100644
index 000000000000..46c50c1509fc
--- /dev/null
+++ b/dev-python/pycups/pycups-2.0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the CUPS API"
+HOMEPAGE="https://github.com/OpenPrinting/pycups"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="net-print/cups"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# https://github.com/OpenPrinting/pycups/commit/8cbf6d40a0132764ad51e7416aa7034966875091
+	"${FILESDIR}/${P}-py3.10.patch"
+)
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pydyf/Manifest b/dev-python/pydyf/Manifest
index e20804bfa80a..2812926c1c54 100644
--- a/dev-python/pydyf/Manifest
+++ b/dev-python/pydyf/Manifest
@@ -1,3 +1,7 @@
 DIST pydyf-0.0.3.gh.tar.gz 25610 BLAKE2B c236896e56163bb64267e28106a2058f0c6e85e918bd441537df9a494bd7b75c39dda247a0c4b99a918bb439f88a412763975d2d64ab4d8d7cfd0dab2d142f8e SHA512 bc72d5bf93bd4aff653b6496a07278c5ef8b22629f137f9a3dc8713dce4851d2772d4b1ae13d59fa0203c962405f93842e7d5159be1b276632419d6642add149
+DIST pydyf-0.1.0.gh.tar.gz 13906 BLAKE2B c0bedd82e363ee3ebef16151ce48da2dc7a7a26ba0c8e92f2ba1b6f2d33833e648fce008eeca4b748e682eeaa8626486eb7a22ac1ecc22714efe046436447857 SHA512 942d786a8091c8a57516c104a17b3089cbe814767c330a352e5f1601d9673e37392aa6679ca0d3eae8e0c5053c1418cac1ccde2a8b886e09577a18c4482f39d6
+DIST pydyf-0.1.1.gh.tar.gz 14014 BLAKE2B ca95861914d34df1f3e6b805550d9ec620633036ed4413d3e1598a463270ad59d79781923b79b00d36c863452f9726b7f05d39e17362cc75ab6667b6826179e6 SHA512 65b4c6a05bcdc7ed356d4936e2972348508446e3481feb3a736b7353f652edad177ed0c9f88e27c981d593067e1aa46795c3b3d2e857af06eaf0dcde23f4c236
 EBUILD pydyf-0.0.3.ebuild 681 BLAKE2B b4d4cf0189e83502b333ee80d819255b5bcff3c29db9cda7050bc3ca395f2c1f453a9a57962b748e323fe656674b67a77ad09d5e35b3f79fed9ddfa6c0a0528e SHA512 27f34e058ccb48b64974ab898e37a1df85f3cdb1f8e48e47d19597a5023b4d2162eced02a1c239c3c5facf74e7b80bbdc7dc480062e7065fc9f6f8e19ef716a5
+EBUILD pydyf-0.1.0.ebuild 681 BLAKE2B b4d4cf0189e83502b333ee80d819255b5bcff3c29db9cda7050bc3ca395f2c1f453a9a57962b748e323fe656674b67a77ad09d5e35b3f79fed9ddfa6c0a0528e SHA512 27f34e058ccb48b64974ab898e37a1df85f3cdb1f8e48e47d19597a5023b4d2162eced02a1c239c3c5facf74e7b80bbdc7dc480062e7065fc9f6f8e19ef716a5
+EBUILD pydyf-0.1.1.ebuild 681 BLAKE2B b4d4cf0189e83502b333ee80d819255b5bcff3c29db9cda7050bc3ca395f2c1f453a9a57962b748e323fe656674b67a77ad09d5e35b3f79fed9ddfa6c0a0528e SHA512 27f34e058ccb48b64974ab898e37a1df85f3cdb1f8e48e47d19597a5023b4d2162eced02a1c239c3c5facf74e7b80bbdc7dc480062e7065fc9f6f8e19ef716a5
 MISC metadata.xml 345 BLAKE2B 84502c87aee0578bcc579a95ba2715afdf414125a7f7ed3497fb8929a701fe3c3fa3944b472c9778a4ea617f9cf94b893e546227add9b704e4245f814c5ab21a SHA512 c4d615019768b6ef5b2ff4f7d8736f1061fab264d05df4793f839bdc8e96c31bc12a43c8a78b5875976b8efc065c170642058fdd63a30103437600197efd1fd6
diff --git a/dev-python/pydyf/pydyf-0.1.0.ebuild b/dev-python/pydyf/pydyf-0.1.0.ebuild
new file mode 100644
index 000000000000..0ecfdfd4412d
--- /dev/null
+++ b/dev-python/pydyf/pydyf-0.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A low-level PDF generator"
+HOMEPAGE="
+	https://pypi.org/project/pydyf/
+	https://github.com/CourtBouillon/pydyf/"
+SRC_URI="
+	https://github.com/CourtBouillon/pydyf/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		app-text/ghostscript-gpl
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pydyf/pydyf-0.1.1.ebuild b/dev-python/pydyf/pydyf-0.1.1.ebuild
new file mode 100644
index 000000000000..0ecfdfd4412d
--- /dev/null
+++ b/dev-python/pydyf/pydyf-0.1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A low-level PDF generator"
+HOMEPAGE="
+	https://pypi.org/project/pydyf/
+	https://github.com/CourtBouillon/pydyf/"
+SRC_URI="
+	https://github.com/CourtBouillon/pydyf/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		app-text/ghostscript-gpl
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 71bfc8b2e77f..e28b986cb38c 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,4 +1,4 @@
 AUX pygresql-5.2-CFLAGS.patch 333 BLAKE2B caa18ab6ba4da14437637faf6cea4d27e829c4f547f9c08e33a452b1e5912a24235af823c9ea385bbd1516c0c80a08d3225e373ad64ad4d13873ff4dc5155695 SHA512 ddafaadb4ebfb68af71727f840f36800d3dd78323f8ab0324a16b50498206c8ac33c76a80f24fff7984195ed5ac0fc383bdcacb9ea334f4b47e5046864728cd0
 DIST PyGreSQL-5.2.2.tar.gz 268818 BLAKE2B 4b74c5496f63208164efa10e70222b63512f3afb928bdc612f9874556ee2084b42a80ba05e9ebc6951c68c1c8a70c71320396aabb20b9d5c00d5edd46e287f3f SHA512 a88af2590a515ece19b7f64796e241c6e7b53c8aef90c6e2ae064298a4c71d44695dcf43e0e84595a704c4fdafb9abe35e1779492d3a9ad3708759215cb188a1
-EBUILD pygresql-5.2.2.ebuild 715 BLAKE2B 083f2c4292b6675a08e7c7109409b79cc2db6a95f1484baebf5635261a310d929dd06d48b38b3133dfdbbf32bda52e072a934cb70f35b41ff1278424a9907778 SHA512 e1f8d71bdb81ef93844b6bdc84c45d82b12a0be45ba9130897f8fed61754df724cce8e7b61f0b42b1ad9d8ac2addc71d88621df26ae66f0e4da9fddcb3c076ed
+EBUILD pygresql-5.2.2.ebuild 710 BLAKE2B 2beae939b8036e5256623cd786256afa35b386fdeac640df17c3b9c3224befc1ab371849035627cd7e0980be5a15a12bc44d35547e806e69838a8a092b0f1815 SHA512 571b0c4a9ec0046f9d51229678727134ed515c1736f0566d73e950ec31103eff4634a771559b4dd67bfc7fa2724ab831457575d8d5e73b1d1bfdf3328d271dc9
 MISC metadata.xml 452 BLAKE2B 8d60fd06e68e39b5d373f30fec25979a0a67c51eee216425e382b559b908ccd12e425c95995dfd28d8487fb306f03fa10d8a71320a4ff5ebd6349e887af624e9 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f
diff --git a/dev-python/pygresql/pygresql-5.2.2.ebuild b/dev-python/pygresql/pygresql-5.2.2.ebuild
index 89085e70a5e4..578b5884f409 100644
--- a/dev-python/pygresql/pygresql-5.2.2.ebuild
+++ b/dev-python/pygresql/pygresql-5.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_COMPAT=( 9.6 {10..13} )
 PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1 postgres
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
index cbd31b46af6c..88b600f5e9e8 100644
--- a/dev-python/pylama/Manifest
+++ b/dev-python/pylama/Manifest
@@ -1,3 +1,3 @@
 DIST pylama-7.7.1.tar.gz 34740 BLAKE2B a4bd5aed40c2c4e7bdb9f9968030f0954f0309cff80567b2252ee9576fdb4598714286bda63c22676789d4919662430ef2729089faa70b5cb590784eb47ef1f0 SHA512 298fabffcdf38e3e868e3965de87a0e761bc9dfcfe33320b53057c4e05598bcc22045481ec16ccb8df27f49ea41d6fef82b69fe7327905f93ce74d9350682cf0
-EBUILD pylama-7.7.1-r1.ebuild 1311 BLAKE2B 49fb4dfb38d4d761fc6628926d093bb1867d3530b1480ae56e1b48747afbdab226cd7a3d7ac5a60aef92bc7fc12a65f5d6918d3d3fcb1c5de87cbb1047ceb9b2 SHA512 31a6d6f2f2767e0b666b634b47151afde7e2d371cbb148de51774a02f956d75efbdcb3f8e6b8077f4746c717a949c9a285ee0cfb0aff095c53b54e6d88f49fc9
+EBUILD pylama-7.7.1-r1.ebuild 1254 BLAKE2B 1d649e036e3646784b3c719a099c85793320f5b85d7ea4e6d1d436b447ade1c8d40664cfc00aa475695389d8bf550222ba08f51c67199f374c0af134c2274a86 SHA512 5dec83afa56c7c64defd42c446a7527dd2058329265e475b25dd9468c9bb06594e98a9c687b4928db2e0f4ad51d2be37366964471718e651a87211d09dd108ba
 MISC metadata.xml 388 BLAKE2B 9fd8abe101834b8d24d232875dec2f2e84e2d2983b7fe27243cbadb60208df63e7fbc9b450c7587df71a3ad488b104e43b43ec0e013907006e622ca5cac7da73 SHA512 96cd8e9bc7391c28d2625f02521ae93a1ae901c04c144288cfb5a7d7c0de70d2e58f73a51071b4f82f3f043c4f6c94bfef67a2e29ff7187302dedb3a421117e7
diff --git a/dev-python/pylama/pylama-7.7.1-r1.ebuild b/dev-python/pylama/pylama-7.7.1-r1.ebuild
index 3bc25306acac..a7fb5370fb22 100644
--- a/dev-python/pylama/pylama-7.7.1-r1.ebuild
+++ b/dev-python/pylama/pylama-7.7.1-r1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -41,8 +40,10 @@ python_prepare_all() {
 }
 
 python_test() {
-	# Disable eradicate until it is fixed:
-	# https://github.com/klen/pylama/issues/190
-	pytest -vv tests --deselect tests/test_linters.py::test_eradicate \
-		|| die "Tests failed with ${EPYTHON}"
+	local EPYTEST_DESELECT=(
+		# Disable eradicate until it is fixed:
+		# https://github.com/klen/pylama/issues/190
+		tests/test_linters.py::test_eradicate
+	)
+	epytest tests
 }
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index eda3de380400..1ce7ec9a5459 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,3 +1,3 @@
 DIST pylast-4.2.1.tar.gz 39787 BLAKE2B 1f2f06671ce38bd42f7297279a58f674c3af8f66de4fe804d90e3fc178c73f09a24f65bbc4fd534da0c04f593dc5eb31f03da38a4ca969ea31a04978a603b7b4 SHA512 c1418ff1e6b6ab905d790cc83eb1a4b3172c0c28d523c2bbd641523a2e2601a84aff126dafd047f0fb9b82744bca883648e197b273026611f47671d39afd4fc6
-EBUILD pylast-4.2.1.ebuild 690 BLAKE2B 5067cdd191cab67f2c4a98e48ab623b6fc31cfb01b0acab07aaef8aef55a3e4dd929fc61bcb461d7f9bd476eaa0b615d798e6ab6b94c67cf7459fa3272ba686e SHA512 88c600e041f468c19050c3e423c9c179979ec9f67e934b46bfd4d68e986220c185f5f4c426a72f996f6a106377a2e242b24f0fc7149424d7a726109488845f43
+EBUILD pylast-4.2.1.ebuild 697 BLAKE2B c36f3071349b584a4e63b4d916aac2af829d8be6674719c3a115aae759ba278baef78316529e22388e80677af0b938403aceb30672abfbf46f19bc4477bb3cf5 SHA512 b91d3154bcc386696fd6c022e544a343356c1111690c7d7f92543749b4dd540fdf8c38769a3c641d463bf9c4e74aaef2ba61711bf2d4428ecacd889c3a248118
 MISC metadata.xml 906 BLAKE2B 6bfe370296de02da86dbc7d9b193ba499a3667cd3720014bdea0c37e51b0c945564e9bf5f2b6ef65008dbc58ff7b7799e5464b292ca1d3588898849123fe8ff8 SHA512 15294c8d03e6f8a9571f2610bd8ed831e0c274a124e4533f7375b0a753e95d2277503ab38541c1dedc1e810fd87a2bc154424e39b52135b07f06f788165f8619
diff --git a/dev-python/pylast/pylast-4.2.1.ebuild b/dev-python/pylast/pylast-4.2.1.ebuild
index fed80ca96744..e1be16ed48bb 100644
--- a/dev-python/pylast/pylast-4.2.1.ebuild
+++ b/dev-python/pylast/pylast-4.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 53f4789e8545..b49e3e9aa012 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,8 +1,10 @@
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
 DIST pylint-2.10.1.gh.tar.gz 813052 BLAKE2B 487c95851c6aa68ae6fa81a345959fa6b7c1ffe9f7c4c1d722f6ceb4c50671870f16c2a24392cc374cdaffa279028d38a23b9cb94376f58f4ff0e448da49d83b SHA512 c32948ef2eceab8857fcd789690c4766a606b053c1f931da13acdc0265f76fe96622439da12661e8ab899cdeccd93427a4561181670f14dfbb36e4e9c720ea07
+DIST pylint-2.10.2.gh.tar.gz 813391 BLAKE2B 109f8817e32ddf8d93c9120518e77a1d2f7e61cd1a6362eb1cf9e6d242db72fa1a9271588a3abb28efca54bcc449dce623ae5d5fd63153ec2bc367e008aab465 SHA512 5d694587956c4f11eb4afaec26cefb66ccbe14dc2aacf378a0362326506d80eb2633e0d351c0a20715a3359a9bc438092d77b2e46f7f787210c7ab0555f2722f
 DIST pylint-2.9.3.gh.tar.gz 770364 BLAKE2B 3892286ffbd79b417c6decba44bce97f45192299ac8e2ec0e24770b2dd6cf1c28bac790626a478d47a6124ec0470ea9fc0d4230c5a1e807532852844445bb95a SHA512 45c037b970b66254b54a4810a5609dc098b5493d409826333e6a75f9ff0fc02921162711d88c45fd2f437e6521f639c33b25b714830a977c501612ee497501bb
 DIST pylint-2.9.6.gh.tar.gz 779390 BLAKE2B b1d8794e1e7ccdde87919eb943f83287c0a7b85b67f3722cbbe68887f2c61ab30b354548e25b70c661234647e35f79beb6aaad5f6be6bfde8c2475cf03676922 SHA512 a23ff089853398df2e4232767ca87c21e4ab4fc6805de80db796c78c56e0da1ade9b0586f5c14a98524bf607e0d240c354cf63287eec7dfdce263188eb19ddce
 EBUILD pylint-2.10.1.ebuild 1439 BLAKE2B 55e6ec9a60f3859385aba59cccd1edaab18db52e74f39856fc324f27e3facf9ac26a89d316bb74bbfd800d2c92f080d07cc5f3ced2ac06876177699ee862c8f5 SHA512 1b769ebac0377cadeaf1855bf3f376d968ca57c43c375b87994dffad901637a1121b0401f372fb819d9b6af57deb749837e9c728264d258507b4d1f4110fb9d7
+EBUILD pylint-2.10.2.ebuild 1438 BLAKE2B f7859625d7509bc218213ecb770d844e02a9c010c016e698076e81dfa7c7fcd3d10884f09ef14892becbaa28c07db8d7a841813693f06fe5d1f84e6484f596da SHA512 246c2980f41824aceffc529273dc686e77a435b9875b7ad13bbc3ae55b7a1d00c6efa209867fcab54091ecf7041500284de0320a80267ec76b7a7f34fdd7fb71
 EBUILD pylint-2.9.3.ebuild 1417 BLAKE2B 27113579fba476d9e389e1186e39016c40975478f61f6a8ad08a01cf7a1a121d3361b78a968419f92cdf075df8e89a3aed6bc48cf40066c7d2650ae5b2ead861 SHA512 79761e88e4234e352575ea1d26afaf52310ac33e08ed6bbd47d82e7fea4046337cfe00189a0f11747e40e19c09e9121be33526d88bce7c74ffe5bf2cb878dd21
 EBUILD pylint-2.9.6.ebuild 1424 BLAKE2B a8e024e6460e91525470f51b6010e436384a0a8b44c86af88553aa2a60d7b36c16851566f1a90d6c7cbafed48fd839c6def04e871790c525e672caf6bebff244 SHA512 901678329e3c7a09be3d0d359d3b692ba5663d6f361a84db07c583a3f58525a73d43f044f12f675f937b06b00ce443125f1f26500f51b9af06625b975daf30f7
 MISC metadata.xml 1099 BLAKE2B 11aa1f9ede89bc8c27e520c8fe9a8219aeff70c1f456dedcc816217fcff1ec67ecc41a528c93365cef316ec863466b706d4709dcc1237a3aae4edb792e2be7b5 SHA512 d2b4e51b129d7c83727310da44ca9385e81fdaeb350f63560a6a328308bcdcb939ec4e570b02e255fe6c8f68cabeb0d651994058b385598380edb42932785ad5
diff --git a/dev-python/pylint/pylint-2.10.2.ebuild b/dev-python/pylint/pylint-2.10.2.ebuild
new file mode 100644
index 000000000000..618413d2c624
--- /dev/null
+++ b/dev-python/pylint/pylint-2.10.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint/"
+SRC_URI="
+	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="
+	<dev-python/astroid-2.8[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.7.2[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+	)
+	# Specify the test directory explicitly to avoid import file mismatches
+	epytest tests
+}
+
+python_install_all() {
+	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index 81df98dfd07c..7e82062b56bd 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,3 +1,3 @@
 DIST pyparsing_2.4.7.tar.gz 648158 BLAKE2B 24525b4ee7876e245b9eb270f0e3e22fe2d8b398f9777ad3b3657b8a1227dcbd25983aa64a3f3018debdbffc1a042c732e6b3a09800e081c7acac7b97da15317 SHA512 c7a546729f86a2b5176e2482b566b9fd715b03e495aaef4d720b21307bb03f385dbc849247f8d266cb3d92be0a83c34ce4995b655ce85318355d5a0d42d6991e
-EBUILD pyparsing-2.4.7-r1.ebuild 848 BLAKE2B 8aca0e5b9b69435b674f58074687d560f08c6804869f9bafae3a8ddcb143cc592c3ca6b550fc4a346ea9ed1572d2064950eaad9889532553461a5fbc18589cc2 SHA512 58f409e7a53aefe9773ab7320267d9d18a66378b4890aa9590b84df1c9c1b2c66db5ddb0d1ef6e8810fcd7ee2a691a1deda7b820063d84d3985872cb828ab413
+EBUILD pyparsing-2.4.7-r1.ebuild 854 BLAKE2B 1f1ac9c6191168f08acab4b57e26751e5a217d8b76eef3eaaf16fac78bd88704dc514eb72cf5dd98d47d7b5801001d42331de63f131345a7b0c5d181c8af599a SHA512 4d5086e7f72f9aaa1151d7cb6e54c48482d52c218b7221200b526d5e74c52bb17603c74b4ca3c6702d506e127381efb632a2dbae1b4a66f77790c81bc30e87a1
 MISC metadata.xml 796 BLAKE2B 181d16c9c3d8ff66e019dbcf57006dd363b4bc0899fccbde2eb07e1270d70b93ac645ff61ff0a5f03b2193bf1cf05f8943a03ed0ffdbc231e32ea93b848c39dd SHA512 31e722b12b24597d3a10451f749c40ce36d67779c53c2d6fca644a4000f9900a1e692c727dd8c89b5bb26b3ea4604587034ba11054f7e83a5eb383224f0976ff
diff --git a/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild b/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
index f570cba32eb2..5273b6f4b0e2 100644
--- a/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${PN}-${MY_P}
 
 LICENSE="MIT"
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index 31e590c44c82..bd2049f73270 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,6 +1,4 @@
-DIST pyqtgraph-0.12.1.tar.gz 899513 BLAKE2B 17f6dec41039186ceb0afdfbcba64aebf5900d17b890d9a6d1f8a30586a27e3cc61bb1d3a8fb2446f9ee3a66c54095b7c5d37b5c5fb83296b481d8a95a7fdab5 SHA512 b1ed004c7db4ee4f8302a42dd9e8574692b4c353bf512ec7a42d5ebeaab126e9ed5df3a228c631dc77e16a61efce1c918cbd0a8b319649e346e2082215c56d40
 DIST pyqtgraph-0.12.2.tar.gz 1292676 BLAKE2B af5e61bbc7f55cda669825a9742a3f2424638d35e3a10b85b7fc635a5e40b630848bed1e88bc84383cbd3e85de538b1b1fa051d6d761b368209c1d8167f55a2a SHA512 8a7f0e1e78cf147568ee6e393a07f07301632765d1bdb50328fcf1f815dda76f3e89808cef945409dcd9142407f864f205778a76cf804d4cbce544c60bcf5042
 DIST pyqtgraph-test-data-8.tar.gz 306068 BLAKE2B f3aa418dfaf2e74950fa880da4b6dfb4ef5dbd46346b78065d885c1f9fc06fc3de86756af17e27035d4cd47d98cc7ce58c036b493837b568086a4ebceb230c78 SHA512 07ef414f2b57e00589f8c18459e88ab16001c7cc3766164cdfcd69faa26cbc90ed64611fd0c5e3b401dc6a3f1a6e9e4ce6a7d9fa96ebcc4360e03fa9fbb856d2
-EBUILD pyqtgraph-0.12.1.ebuild 2357 BLAKE2B 813534be9225f64cbd2d9d6539d24092cdb0338a494ef10066628f01ed2bc108a70a6233db56db5e25ccb1a1ca9c34648be4e817c244f3be3dbeb0b86b46a901 SHA512 54207e530efd6dd391e7162bc68942cbf2a4e41885d4f19a16061038f9623145c13d8617e112e66db94e3b2e1d590fa789c37c314895882e88cd9a1e74774a55
-EBUILD pyqtgraph-0.12.2.ebuild 2450 BLAKE2B e867cc19b84e0ddb1057ddd468669202beab38a73135ea4643e4e4a1a9458b35da0e1d9cd660fc61e629928f7749145c6e8cb0d1aee7dc5d08bd803adea2c3b9 SHA512 df1454e4bde7b7a6b693702ec7180a604644a7dec4c48c264d25262dc63137d95f114a08f5d0a03c22eb5840cb3f0007fe0d933d92c102512456cbfb4586e9c7
+EBUILD pyqtgraph-0.12.2.ebuild 2448 BLAKE2B 4ce693ffec4c109bf20367ac3d0d9524ccadb4c4d357420b18bac88dc18d830cc5337d683fb3aa1cf11f088d42da23e6d9adab10d359ead8098c28f318bbf113 SHA512 a1af7760bfb2756c3539101fd45cd7fbb3de8e83fcd6adaf661eac569f243fadede2012900d2c775c3733f265eba56e18fc7e7e9780db1c8893e42b744636089
 MISC metadata.xml 774 BLAKE2B 4e4c11fc145888225b343a740b67918f0409426868c44725040ed16f200a1d1a7a51ae10398aeba1ecb3285c0d18a847845dd546958efac1c2688fd67b04c423 SHA512 d9f564b82d4d90f88606dc5badd7818289a4cfd8ae8b9658e36278bedcdad441c067e212d9988bc0d9098946c63e1a233698acb5c60a90e93bda244990fae4b2
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.12.1.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.12.1.ebuild
deleted file mode 100644
index cdc658825f76..000000000000
--- a/dev-python/pyqtgraph/pyqtgraph-0.12.1.ebuild
+++ /dev/null
@@ -1,86 +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 multiprocessing virtualx
-
-TEST_DATA_TAG=test-data-8
-DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
-HOMEPAGE="http://www.pyqtgraph.org/ https://pypi.org/project/pyqtgraph/"
-SRC_URI="
-	https://github.com/pyqtgraph/pyqtgraph/archive/${P}.tar.gz
-	test? (
-		https://github.com/pyqtgraph/test-data/archive/${TEST_DATA_TAG}.tar.gz
-			-> ${PN}-${TEST_DATA_TAG}.tar.gz
-	)"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples opengl svg"
-
-RDEPEND="
-	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,widgets,opengl=,svg=,${PYTHON_USEDEP}]
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )"
-BDEPEND="
-	test? (
-		dev-python/h5py[${PYTHON_USEDEP}]
-		dev-python/PyQt5[svg,testlib,${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_sphinx doc/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir "${HOME}"/.pyqtgraph || die
-		mv "${WORKDIR}/test-data-${TEST_DATA_TAG}" \
-			"${HOME}"/.pyqtgraph/test-data || die
-		cd "${HOME}"/.pyqtgraph/test-data || die
-		# we need to fake a git repo
-		git config --global user.email "you@example.com"
-		git config --global user.name "Your Name"
-		git init -q || die
-		git commit -q --allow-empty -m "dummy commit" || die
-		git tag "${TEST_DATA_TAG}" || die
-		cd - >/dev/null || die
-	fi
-	if ! use opengl; then
-		rm -r pyqtgraph/opengl || die
-	fi
-}
-
-python_test() {
-	local deselect=(
-		# apparently fragile
-		--deselect pyqtgraph/tests/test_reload.py::test_reload
-
-		# pyside2 is normally skipped if not installed but these two
-		# fail if it is installed
-		# TODO: this could be due to USE flags, revisit when pyside2
-		# gains py3.9
-		--deselect
-		'examples/test_examples.py::testExamples[ DateAxisItem_QtDesigner.py - PySide2 ]'
-		--deselect
-		'examples/test_examples.py::testExamples[ designerExample.py - PySide2 ]'
-	)
-
-	distutils_install_for_testing
-	virtx epytest "${deselect[@]}" \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
-	use examples && DOCS+=( examples/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.12.2.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.12.2.ebuild
index 523718072f98..3bc55a927f18 100644
--- a/dev-python/pyqtgraph/pyqtgraph-0.12.2.ebuild
+++ b/dev-python/pyqtgraph/pyqtgraph-0.12.2.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples opengl svg"
 
 RDEPEND="
diff --git a/dev-python/pytest-flakes/Manifest b/dev-python/pytest-flakes/Manifest
index f410993c8cec..e59df42f0d9c 100644
--- a/dev-python/pytest-flakes/Manifest
+++ b/dev-python/pytest-flakes/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-flakes-4.0.2.tar.gz 7225 BLAKE2B 3a5ec59e3df90b6bf90daf5cf4abdf2946852a8e62a98ed08e5ba93c2e3f9e93699b2a4b571df45edac83e4c1791a5828b0bcca2a26a37b71f01d81bf3f0342f SHA512 bb1fc432e2494367849acedecba80495ede34c18dcf3ada09ef3dec8567d55f8dd6ba427bc3d9e47cfe3c0bb2aba80576612282d5a71858ccb45bce458f8656c
 EBUILD pytest-flakes-4.0.2-r1.ebuild 504 BLAKE2B 0f13610f981bb55bbf3bf835cc0a8e5cc10736b6db315b816285d177b8fb74daf28e9eefd10275ab22d0d8f005c7beadd5cfa68ba662e799f4fc6f73a7d0a1df SHA512 f0d6a0861840cc0a53c4f2b672ea05aa2b87d0c7563e100cd913d24c97ae0f0edda4afa0f9ecdf5b8f1c00530f0ed281847079fbc14a44fc4b8bf6773f32693b
-MISC metadata.xml 345 BLAKE2B 30c89e99999ee7a34a424f1a71511353cd7ba4a73c05f50313d3c4afa7c191b64af1942651d88216c8577b2302a25ac9ab7f10fa4f2c145fe569ea5227ccf136 SHA512 ea5807438cc727c462bd09213cf4f1de85ac98c31edf750cf9292feb320e9d40f6d2e1c79af57c2e1d74e328fcd0eb751577ed4810397bfc5344e1b4e0b9aa28
+MISC metadata.xml 407 BLAKE2B 2e8f65fbdb38cc3c3ea57e44f7cf5b0494abcc0cdb79491d26fa46f06bbce1df59ce4bf3ee4f7d260e631d85bff888198255fcf1d4137a4c730e8a6f2abf7090 SHA512 e679e73ce16cb26f95d9181237d491e344e50d4cc45544d5cf41b9eeca1cb5b3dadc68620b3aee2a4c3710b475f329835fa206ad39ac1c5fa8a1685ac0dcceae
diff --git a/dev-python/pytest-flakes/metadata.xml b/dev-python/pytest-flakes/metadata.xml
index 8dad66ec297e..f72cf275581f 100644
--- a/dev-python/pytest-flakes/metadata.xml
+++ b/dev-python/pytest-flakes/metadata.xml
@@ -8,5 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-flakes</remote-id>
+		<remote-id type="github">asmeurer/pytest-flakes</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-forked/Manifest b/dev-python/pytest-forked/Manifest
index 300615fb05d4..5b384788abc2 100644
--- a/dev-python/pytest-forked/Manifest
+++ b/dev-python/pytest-forked/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-forked-1.3.0.tar.gz 9850 BLAKE2B cbe44d87052c5a3bc58934ac17153401810004aaa38b53ff3100384535cb2ea0fa99dada706113f324fa0a135ddbd9b97488319b4a9554d912388c341b62943c SHA512 25d639aa43380155d7744f1d05a95e0144f5fe7dea42ff3c2bba3803a07d73b5eb008525469330c5dda14800fe4b611241691be197132f31f88f66930c3ecac0
-EBUILD pytest-forked-1.3.0-r1.ebuild 929 BLAKE2B 048aae0f2c2cb19d732cd3a51abeaefea9495e19358d4f251a07a18704ef93ecde250d77a355926948cc78f57776050b9527099fca3becc8bed91cc9dcb43dbc SHA512 b12c104539014bb470ef8ccb65c89d13ce6823ef08d0a9146c8b40c9ac04001907c7b2beb184f9337414315af61673e423e2a4c4a81ae8c86186056915f07ce8
+EBUILD pytest-forked-1.3.0-r1.ebuild 935 BLAKE2B 55fa6f0134ca91c17164c797b60f9742ca28b8d93d15af25a2c8a7239f78e44f22edcd4949d06a5fee5c227be9051ac8a7c895c433e1ea4ced1d35bf2c87bc84 SHA512 5bed1117b5d7575785d36e13e2a51e5d89d531cc3eccef7ed99b804e821b477c1479dc2aca51a37613cf2ead610dcbfe3579dbdfc37547ac68cd1a9a32a87a88
 MISC metadata.xml 404 BLAKE2B f53cbdb55297b417dc11e904b9bb22d7576ee7df9fa2f5ac80968c31dd9580ffb908bdf1c5ee966b910d8642971410bde39800fb38a01545f5e361f512389a65 SHA512 f6dc614da0c972e76e4ccb2f2141e7da63ac6b6899108b57f3374ec0296652345b97882dab1bf958aaa23046a1070c11889fe3fbc6eecb111bb2bc420620bfff
diff --git a/dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild b/dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild
index f898602db489..1047da546dfa 100644
--- a/dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-subtests/Manifest b/dev-python/pytest-subtests/Manifest
index 8316192eb8c0..2ef5f170359a 100644
--- a/dev-python/pytest-subtests/Manifest
+++ b/dev-python/pytest-subtests/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-subtests-0.5.0.tar.gz 9793 BLAKE2B c671eb14189c0fd34180a636592b20c9e2b4225c5faf3b702103164e60bdbac4c9644e464f1e0c783da3da1263f7b841ea7a4149bcbf1de23325a8ef3ce5c030 SHA512 e3d7e90c3ab66950eb80d25049bc6f6f75b08b3da5ce0de5f3fc55d6a176a8d1fdcb19a19f7d9d137aeadcc82b214550474f76d5611bc5592ca649ddd8257a2a
-EBUILD pytest-subtests-0.5.0.ebuild 920 BLAKE2B 758191563212f5086dca9396df801ee6889ee69414c3a8cd1543a954d80b7e5cc36c4799f215caafccc2d7f2fb8735b6801f207d1e8a3b19787f3ac4337dbc5f SHA512 120b66684fb9219f4eac5e6c373ab7ae7d29bde2b393450909473dc9282c336c89315a04439447ba7ae70ae44a77f33fff9c262e3691115cbfcba946a79be347
+EBUILD pytest-subtests-0.5.0.ebuild 926 BLAKE2B 41f44d5488aa5d24223c8feb09b2e77c923df3123c54ad4ba2670a40666a1af038e5bc4123583fdb809f247a3344a469c0b22e337f0f536424a71328e7c124c0 SHA512 95d204b529068760d8ffa9126c473bf77d6e6f0c129692ab5e0c16e85bbd373c12501b8bf438d4ea6672d8e4f7db4ff71640b016a5a4e45fbdae764005a49338
 MISC metadata.xml 408 BLAKE2B 6aa0bbf41b922dcd85d121ac03cb177f2527c8bf89eebb53bbcf86bb3e551e2023c38a1356f1cb5c55010bf65c97f95ca77d9aa26db8e898ed1bb74133825a6e SHA512 5485b50b9c2f5f23209931bdb2afdea6bf77bd55d2853aea2418691fcd9fd93c47bf4ba3c5769cdfa5240e463b7926a8fe5f0a0795464fa02d46fc61e8dd59a3
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.5.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.5.0.ebuild
index 96ccd96fda1b..273692475be2 100644
--- a/dev-python/pytest-subtests/pytest-subtests-0.5.0.ebuild
+++ b/dev-python/pytest-subtests/pytest-subtests-0.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-5.3.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 8e170c58ec90..7e30dee41ef5 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-xdist-2.2.0-services-conflict.patch 1097 BLAKE2B edc3ecb79578f89e9ce5515e194dc16df34abc2685d9fb78cc5930f29893dbd9e145c95e5b1f58bf252710c57964ea00dc8b71e20fd0aa713e9b9ab2d8d29a93 SHA512 50155aa39d0a87be7a22d0ccf6c9d8eacc8ce4342baa3fd67839b3c5b4d05b31fef5786a60e15051de3000b3ee3494ddb48feba43850d677484e239ee4be8b02
 DIST pytest-xdist-2.3.0.tar.gz 66072 BLAKE2B 367ff15cd46b8594668ccd9710a2fc7665295d41e268b464b81d5e740a580d70621a1ab5ab590788e44887b7aa3049a83853ea097c0cff54e22c3422c8f11b24 SHA512 bf49a1684b29f0ae21621b9d293f530cf2fa3d88b33f631fb803aef872c0d5ef6b3bbf2e16d01be8a6c1872fe3e6cff86ab842e3000b9e642fb46c2a170627f6
-EBUILD pytest-xdist-2.3.0.ebuild 924 BLAKE2B 0a88f0aeab027eaf95f8dd92c5fefbf23ec685743bcb71925ef7d35e64de52307e9a83a0e1927ab51e37cf7894fb9660f931a9eb6873006880d2cbe4a25f51b5 SHA512 13626bf5baf5d11a1e1ea98a063359496dbfe01b861d4c13e3d7a2fc3f3d609cf2e9b9686d1ae1ce9e1db47ff7a401e0fa401526e15589f96bf4192529bf5dfd
+EBUILD pytest-xdist-2.3.0.ebuild 930 BLAKE2B 6a6d05f009e539a9bce4749c6cd6cb3de3414470f47654c15b11cccecb319bd60a11ccbd755f5699f1c0124c860bd887e3d38d0053992a5d5b28a2dc553be144 SHA512 6629403b5e92ac75b51ba53453e51d0c2e2e22c89e99cd6e686610857cffcccea92593729a0d16f5e1450141a8b0f18c1c20295bb509594e9b3c17622d42f9eb
 MISC metadata.xml 402 BLAKE2B 9e24660b4146f94ecdf375e3bd89a9ab01157ab7c7e9b37fa183eaad12edfbb6574ecef4a98e6079b3dd81e6614b5eb23b0bfd69c9468abde7bbc073e8ef44b4 SHA512 7fbab209b81bba0684b9dad109dc7ba64f9c496e5ad69fcbc659f9361aa131f6779a5419a54112b4ff1c2a63a9deef5f36791551165b1b4b7219c7a00fe93060
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.3.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.3.0.ebuild
index e50a1049d0c2..c151147a967d 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.3.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 # pytest-xdist >= 2 fails with pytest < 6
 RDEPEND="
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 89a418593031..4292d8ed6bcc 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -8,5 +8,5 @@ DIST pytest-6.2.4.tar.gz 1118084 BLAKE2B 611db50e7432dfb6f8d212621a3803871fd8f6c
 EBUILD pytest-4.6.11-r1.ebuild 2471 BLAKE2B 159e689c5597088979d0d1d0e9be37b0128f2a3bfe54cd0bc11ab6c4d7c26fca121a0bdaeaa1621964aa24d8b03580f0a00663a1b77a6a62195d031deb1bc712 SHA512 4533c66af3f820c63437504655af8607923ff0b0d386a38073dd32eaacf0f47043d3b31e6cca1aff353aeef7b82ea747737270db1e8cebbcb2fe69750fe24898
 EBUILD pytest-5.4.3.ebuild 1938 BLAKE2B e40cc338970d931c7cd51b5a6377f5d73cae21789fcea2a6f2b401f92fb9dbe6e12c45b3357a10b76c0d6bc11708f35b8fc65a3b7084328b5664c0ad2baa6c77 SHA512 dbfc71f4a77d366a1eb55d38a1c8f209f6e6d42fe22d0604a5695d8e99faae05883b82fec45b7192399ccbc7bddc25997291fca9638edc01d961b292190d25e1
 EBUILD pytest-6.1.2.ebuild 1662 BLAKE2B dddcee1dba302a810b80dd9832edc6af6f044ab728497498b5b4b762dfbe383d7255fce15b0615c37c3857ee2353546de2ee6b7093b01651f43ad4df7cbbfaf6 SHA512 e9ba570887b4ff0889abc2db20b3de2e634be5ba5ba60679f45c466006d3f7626c329c65f427b1cc6ede1942d2786ef4da44528a82d8be09752e1e028dcad2f6
-EBUILD pytest-6.2.4-r1.ebuild 1713 BLAKE2B b410805cb4f066f290490eb30ed49f9612b1090fe1fb5ae6c3e3f25e4b4225a77356e30ac68bc7a13081f15af4d971a49d19b233e099895304b465f9db6c5be8 SHA512 f7f7aed5d4655e3412250117f7015867e48e6b7111e95f3bc2e70d0791b662eb0cdb3f76b55ebef67051e5df4f61be7c36756045f02fc2324673c31c3cb91e2d
+EBUILD pytest-6.2.4-r1.ebuild 1719 BLAKE2B a6bb7f7cd393d8d5bff4d6f563f621328eaee18ed482e1dea2b14dcfc9540515868507eb769c2522d140285417f822db158c5f3598eeee62f001b73a9b37bf27 SHA512 71e8a53b22f5093b577be42a5a3cdebb1c2aefc77f4fac25ad8bf4d980c1c0b8cd1d09f7e9e6348df776814e180ca172a356ad4816f8f0ef05ad5cf5930d30db
 MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-6.2.4-r1.ebuild b/dev-python/pytest/pytest-6.2.4-r1.ebuild
index de8a62049379..ac093bcc4d5a 100644
--- a/dev-python/pytest/pytest-6.2.4-r1.ebuild
+++ b/dev-python/pytest/pytest-6.2.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-levenshtein/Manifest b/dev-python/python-levenshtein/Manifest
index cc453d79ce4b..003370c64a84 100644
--- a/dev-python/python-levenshtein/Manifest
+++ b/dev-python/python-levenshtein/Manifest
@@ -1,3 +1,5 @@
 DIST python-Levenshtein-0.12.1.tar.gz 50567 BLAKE2B 795c377a29045caecee245b23138ef5499691177e2d50f1729f3145c667818b34a2c05e86e5fe8317357570347e7b21188fb64a84e85cb9645513e19f1438509 SHA512 e5b9dfda4ebe1f1111e2ac86219be5659a763368759d13393bd32c6c5d78d9b183c757c7e8ff1bd8a2f73450f0a255cc78664f03d899e1e5af2e58d871843722
+DIST python-Levenshtein-0.12.2.tar.gz 50502 BLAKE2B d8992d30639e36aac1b85fada8f5273ed867aa3019208ffeb9972e999dad783d4ee16e1f6988c9306eb80f622b61fcf3a0a937b380c7a5acf50223268ed8de1d SHA512 97eac9d19121758af7620ad3963846e48434ceabb5376a83f28452015adf1a620620bfb53edb1c4f60b0fc8ec2b0faf35a105d7e2a0fc5df7a45fce81ba0dcdb
 EBUILD python-levenshtein-0.12.1.ebuild 659 BLAKE2B 6993c1499b4a9fdc3c0d564a81301e00773a577df0482b7137516ec579e07dfe9d5819994932ea9a674df0c43dd66f0003c05593aea27b5b0182f51e57c15abf SHA512 1d82d25474ed66fcab7f9f083ae9efba3b363678f8937229e3480b3d4ff781ef72b56d6ea4b38618676554de3deca9ef8a8e204de03d965804f617efdb8a102c
+EBUILD python-levenshtein-0.12.2.ebuild 611 BLAKE2B 97bc33f7377eff12c31d1525daf737bdc36b8ead849dd81a369ec0767145fd6601ae94ae2c9df760ffb11627097cbc719233a1a0d7ce97e167428fd6039a15be SHA512 253ac90af521c48ef8c8a68ba2b2f31746a08eac78a323025478566a6834107016608a47252f61c3c5bcb0890eeddcf2d369400839333794c50bd3bfa94e65ab
 MISC metadata.xml 385 BLAKE2B c550a5bf9e27b3e514164ec28c311cfef21144c746e71dbb4ea8554d87cefa97c4a94ead564a557e15bda4f60cde32cfd3cb5140524a711bf57ac72e75103b82 SHA512 4314a89127d81a04635029b87baf8b9d71b931441d6e5ffd01b96fa9cf9fb5b2f1ed5c4ff2ab4f5befab2fb0ccec8890601e98ab2bcca93da548e07bb6ffbe57
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild
new file mode 100644
index 000000000000..d296a9ca63f9
--- /dev/null
+++ b/dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+MY_PN="python-Levenshtein"
+MY_P="${MY_PN}-${PV}"
+inherit distutils-r1
+
+DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
+HOMEPAGE="https://pypi.org/project/python-Levenshtein/
+	https://github.com/ztane/python-Levenshtein/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-python/python-slip/Manifest b/dev-python/python-slip/Manifest
index 6bae8ce42a8f..be332f2d6beb 100644
--- a/dev-python/python-slip/Manifest
+++ b/dev-python/python-slip/Manifest
@@ -1,4 +1,4 @@
 AUX python-slip-0.6.5-no-selinux.patch 2942 BLAKE2B 87cb1fee6aba70228b78ffc8b8a63b6b3bc0b11aad8f5e38369919e6c5a33780a9f255c2c81cc9220fe02b11b8d6daf24278bdbc495a831af03c92f1f2bd25f1 SHA512 64a742f93a38a2ff15d98e9d22c30a821ecd2044457ac958bf34cd7fd8e333b16a5fd56e80b169cc67c9ab35d13298d0caf418ad7a693372539701bda56f123e
 DIST python-slip-0.6.5.tar.bz2 25996 BLAKE2B f2c512274c35a451aa5a97f8c8b16d117edc34901cb2cc51d7d99314eec9c2e90c95019290ef9a35511b62a822471f40eac8c4228c0094bd72c71bd579bbe0c5 SHA512 84dfd4d74602e996797261aa4021fc1579a6aba554d2b3d497c0a7b8618366a9c0a6f12051b00c5653845dda923eedb58afdded37f2a1f31b5b0ce1a0532ccff
-EBUILD python-slip-0.6.5-r1.ebuild 1118 BLAKE2B ba7aa73bb7207e248558738441f7a4cd0afabeedc9d3c5a9dd6ddeaa75dd08f2d81b0311ee1cdcbd2a6d6971f7df61f72e9dad8bd1bc6766061d231a2602b92f SHA512 31d2b87b86f6c26a86a983d8f52966f76a7ccccab7bc9359a22d38605575a84431ce2c852ce8134329b750031932277e40f4058b2ef038efa89f03ae0a595211
+EBUILD python-slip-0.6.5-r1.ebuild 1123 BLAKE2B bcba19333a275ab0f51e403890b6840f7c4edb88f8186d4d517b15160aeba5c0e4693f004c774b74f103050312ca0eb3fb584a089e6d768e473afc566ea14711 SHA512 d23326533a7de53641360809669d870f071bdab143de73a4b4eb6c879596f82a11ba8bb7882dfd23c60324ad00a6c06756a143c80ae78fd77046a5613206103c
 MISC metadata.xml 277 BLAKE2B fdd3d0858258cd42bb21a1759e210802c20d42422a6b527e43f7c2488162ecc74b31a8098018999b986f23fefa9ce8752f59bce9dbd1becc6044e5a5b999c2cf SHA512 a7f1ef17d50370f30622f5a9f9a3d69623214ce9e1eb76fb9d59fcd8e016a2dfa18e6141ee130e7e1c6dab517d274ae8d252638a27320e356d4f7267d09587db
diff --git a/dev-python/python-slip/python-slip-0.6.5-r1.ebuild b/dev-python/python-slip/python-slip-0.6.5-r1.ebuild
index 14ed51a46c86..36a8e2b4a6ad 100644
--- a/dev-python/python-slip/python-slip-0.6.5-r1.ebuild
+++ b/dev-python/python-slip/python-slip-0.6.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/nphilipp/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="dbus selinux"
 
 RDEPEND="
diff --git a/dev-python/qrcode/Manifest b/dev-python/qrcode/Manifest
index 176bdd5a2b94..e0d3b5b21585 100644
--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@@ -8,4 +8,4 @@ EBUILD qrcode-7.0.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133f
 EBUILD qrcode-7.1.ebuild 617 BLAKE2B b6e696e03cf9ded2d1c48333e3abb97869604352c3ab69a82dd1c842e1b62a7a36dfe37621b82d55e647dc84266d3d92b000aba8fa95721c19955d4b08e4b597 SHA512 64dec804ec83f00d006d189b135898af053357cd0d672da894c8a0d8dd31cca9fd966ab8e4b74b0ee815bd12d7415bb3cb045a07b162eddfac9a6a743af235cc
 EBUILD qrcode-7.2.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133faf63a6000efbf678360f5bfe0a7d5cfdebc2f924cbb384e66dbe126d9aca6402a3b3da8433baa4aea73bc SHA512 24f6a06811fa989110986820defc69d0f52694ba4c6840ec76894c1fe527c91c9dc18a47bf7c004fdc98f6c430bebbc16d2207fbc6bf32a28882ff0267baecd6
 EBUILD qrcode-7.3.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133faf63a6000efbf678360f5bfe0a7d5cfdebc2f924cbb384e66dbe126d9aca6402a3b3da8433baa4aea73bc SHA512 24f6a06811fa989110986820defc69d0f52694ba4c6840ec76894c1fe527c91c9dc18a47bf7c004fdc98f6c430bebbc16d2207fbc6bf32a28882ff0267baecd6
-MISC metadata.xml 309 BLAKE2B 1ddae27e1f2ec0dc7c656238d9895afa6034ef205f42bea031b29cc69191b074e29f4049ec8103701cd916e17dae25e26d25d4e61f123d53fc0b0f6321c8d857 SHA512 65fa150581939d81a62bcd84b25e733b5cbf394ee6b201aaf7f64b22eeb75a3466ae0a6e1e230a8bb8f08b678544660e4382eb85fe55754bd64014a3c7b35aec
+MISC metadata.xml 333 BLAKE2B 4bca10030ca4234bb8b96b7827a4b8725dfbea7f03a09d48600da12d36d8e4b73a3b9dff4472e3c9e228f02e02a4a41b5030fcb106058ec5fe774d1451a5b8c8 SHA512 77e67feda0fcef516af2e6dc3718a1d8d02afb17e25220d03720bdbad962cc375ec7f0d86d701ffa63af413e75a6b93f6b4da56aed276a9e1a00534942ad82f7
diff --git a/dev-python/qrcode/metadata.xml b/dev-python/qrcode/metadata.xml
index be26e2b2cafe..fd081fe89b59 100644
--- a/dev-python/qrcode/metadata.xml
+++ b/dev-python/qrcode/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">qrcode</remote-id>
 	</upstream>
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 13a5c0063ba8..093a2ebb1672 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,3 +1,3 @@
 DIST rdflib-5.0.0.tar.gz 818586 BLAKE2B d0046590b00211ccb4f0f586dc829c061a5f426b1cefed44a63d21d46396354b9012dbe0a63c8f9de138b25ca7d73ba624c49da6fb305ececd983c62c917fd8a SHA512 ba98ab6a7bb9d993d11c559a739761f297282eb9307f3e333db8dd1c6b365b408a59b701d823bef9be774a59b3f44f64c9444e3bb0115c0c549cb00945385dab
-EBUILD rdflib-5.0.0.ebuild 1202 BLAKE2B 447459bfbd7f2c953766997bf060500d22222e9f78eb8b335f5ac096b98e110d542ec71792c581bbec1a24ffe011e6a6d530070d9e82cccebfab506ad4a5e453 SHA512 ff07b8f94217826a86478ba68169c36de4a43a31041d072d3826c302b6a07a016793e53d6b8b9a7b243cb6415d1cd87a4b76d84bd00a49c2c822e6815dba84e1
+EBUILD rdflib-5.0.0.ebuild 1209 BLAKE2B 8c7608e445a10f5ee8cdf04d44d0055ae1eca18b6af29bb7eec75fe1ada154510439818822cc2470976628e9f226a6ebfa4a0c0f564dc894f77a6c6196fd2671 SHA512 d45fe4ca9a55f56d9622bbd0193216907796e4b91e4d949df0a93ba8eed8b58f30995fe74d8eee96da7bdf3aaa52f4bb681cdc4b4b3799b7029825eec8660e5e
 MISC metadata.xml 399 BLAKE2B e2869846251c99bd7ad7811f6f3831916f230f3e19b62eb17b19b28f94b5d3422c31a6b71e1231768489ea625a52b0e0b4d145e19a02cdd57d22be2e2ece85f7 SHA512 ae939728cb382dac06c8c76ce2907bcdc53dc5ab5dd934a9278a3826d1cec5e8158cb2685c2410c808269f04019d47c40db37eb8e27d0593a2e669575ac4679e
diff --git a/dev-python/rdflib/rdflib-5.0.0.ebuild b/dev-python/rdflib/rdflib-5.0.0.ebuild
index 5bb8e9d11b37..56db7cdd4f7a 100644
--- a/dev-python/rdflib/rdflib-5.0.0.ebuild
+++ b/dev-python/rdflib/rdflib-5.0.0.ebuild
@@ -1,10 +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
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite?,threads(+)"
 
 inherit distutils-r1
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb examples sqlite"
 
 RDEPEND="
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 5c5b7645dca4..afef605a9048 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -3,9 +3,11 @@ AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fb
 DIST regex-2021.4.4.tar.gz 693187 BLAKE2B a13a51a883599f726c20cdbf28d5b0f1a53d8f2eec5f4047da0ede2951694507c5065de5a84152510874db087c342d52f19d920a7b72c034325ddc91f5fb75ac SHA512 2eff9867639f16ad7894997f399262d653a9ef0bb4e8d40bd977e5c55625cf57b4bb593f84504009a0b3cd50b3876d1938c71fd733c0ad1a076de32b6b4b33b9
 DIST regex-2021.7.1.tar.gz 693459 BLAKE2B 484259e14af99d911a20835be73686fea621e501756b02e760128b60a52eb62719efaa0b788ca57026dbdc3dfd55aa321a0feb8e73f6b7435f8711cf465ec2f6 SHA512 7b28e24a829b8ac8f43fdfadf012e833c715b9743d1c9a7cd34eea2789ec54df23d651c8a15aabe8c5d69662402f6302cfdeb23287c49d91b4e9fb3b9452ef73
 DIST regex-2021.7.6.tar.gz 693843 BLAKE2B 9acbca300632ff45744d509e47de56625b003b2046c068f3bf5cae3987bc9bbd51e5cdc442c3e72c6c9c0daeeacd658c56b56754c0f9e83c03816237cc311000 SHA512 0849caaafc669b6dc322dcd4d48962cefbe955c19f9ee3d657b7b8389f77ab2b2e27ec341745dff01a60dd3930904d69015a334ff748de10be2d0b7c421b0967
+DIST regex-2021.8.21.tar.gz 693951 BLAKE2B 4d10d6da6480b9e3e82546ad73e8c03e7625a515d1619943447f2aaf26f05df3b7397028f428e20ccd1bdfd6166a9b3d3335ede84605d2b4751a01306ebd807c SHA512 10bacc761a878ad1359c0ba8dbc7396dbaf7a2c1658dba228b8d993f41583399b097c665a3ce5887257fabb54e6be2ef7010a03a5af26d11af51075f3b8f0584
 DIST regex-2021.8.3.tar.gz 693937 BLAKE2B 886dfe1a312bb34d83a3fe9442231215be7e263cbd123da24c454cdceac1055cb4dacfe4a3104699b6b97f86b14e2b723ea1267a13c2395ce2baad4ca367d77e SHA512 3ac33421ca15e47a1d8beeb3841b6e698d492e96965955afe69529dc71cc7d522e5e8236e4f577c934a3fd27036340a8084c84055bcfff0a9572e8fb56ba272b
 EBUILD regex-2021.4.4.ebuild 872 BLAKE2B 2cab2ea84342bb3e2eae49f4d6e4456b507713dcee7ffc5f85ef2f54be4f774f8c3a138f4be7427af0656e50c5b97671f9d535bb3e7bae58be01134934597a03 SHA512 1ad72740d9b239bca774777eb12a685f7230344b6788f8f01eb120184d888cf4e5deeb1158d1d9c0b546993eff91c7d3bc00a34836ae6844fc3f39d76f7f1061
 EBUILD regex-2021.7.1.ebuild 879 BLAKE2B 50834b1ef67a73159b65498cc429e8d9a38b0cd30fd1e0ed994563d240c81c9c0b06a196e1b5fbc7c9ff9137ec7bf176d577e6bf1161686f13103fdba479367f SHA512 e971fcce3414eb203ddd4dab3eeeb964e3e93470e3f3c5a450d5f8ff8e1379d9ea27083b9c3f5e594b43f8cb52265191246a9d4097531aa723bb6c308e5f9d3c
 EBUILD regex-2021.7.6.ebuild 872 BLAKE2B f8f05064c6607844486915fe028a3ed8ebeda5a50e9da29630a8b33c78153eaa502f1d8b257e8532c360c833fece7335207a03eca1a2f13474a175df33d0de52 SHA512 675c282e68ca4993902f2edbb855a22d819ae0d07e76e09c5c4281e056c2adbe8c4ab89dde979a7577f2557a212e2eaa22d5816fdd1d8d90bebab1487a3fc38c
+EBUILD regex-2021.8.21.ebuild 879 BLAKE2B 50834b1ef67a73159b65498cc429e8d9a38b0cd30fd1e0ed994563d240c81c9c0b06a196e1b5fbc7c9ff9137ec7bf176d577e6bf1161686f13103fdba479367f SHA512 e971fcce3414eb203ddd4dab3eeeb964e3e93470e3f3c5a450d5f8ff8e1379d9ea27083b9c3f5e594b43f8cb52265191246a9d4097531aa723bb6c308e5f9d3c
 EBUILD regex-2021.8.3.ebuild 879 BLAKE2B 50834b1ef67a73159b65498cc429e8d9a38b0cd30fd1e0ed994563d240c81c9c0b06a196e1b5fbc7c9ff9137ec7bf176d577e6bf1161686f13103fdba479367f SHA512 e971fcce3414eb203ddd4dab3eeeb964e3e93470e3f3c5a450d5f8ff8e1379d9ea27083b9c3f5e594b43f8cb52265191246a9d4097531aa723bb6c308e5f9d3c
 MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/regex-2021.8.21.ebuild b/dev-python/regex/regex-2021.8.21.ebuild
new file mode 100644
index 000000000000..c0a5a26d5c4e
--- /dev/null
+++ b/dev-python/regex/regex-2021.8.21.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -s "${BUILD_DIR}"/lib
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index a30f885b8274..890386c9efae 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -2,5 +2,5 @@ AUX requests-2.26.0-test.patch 1328 BLAKE2B 4f9e66505a4acfe7b4bd62c6c95c28fc01eb
 DIST requests-2.25.1.tar.gz 102161 BLAKE2B 1901ca3bb1eb7a6eb7689a81e01c1c23d3f359835507fda78de734162cbd8573b7640c9376cb50ed9397603d67d9a14624028573c2709086547f37993a959429 SHA512 ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45
 DIST requests-2.26.0.tar.gz 104433 BLAKE2B 49872a0602ab0e6b3838c4ff84d6611c5265dd584a1902b51d5903a2fc566b97f7a70973a9244adf190e9249bc6d1fa448a2164a31d125ab6b3dac172ae62e1c SHA512 c3397d77f0d2f1afb05661c4b98adad6c1ddaf360906254150b33ab0d9479fd306905bd6d61b8cf8becd9a40bdcf9b03542e8267c644ef19f03f44bfca0bc461
 EBUILD requests-2.25.1-r2.ebuild 1674 BLAKE2B 6efa6716415cf24e9bfc2b001bf2aab3ef7c10032921fb5e43fde6824a6202856eb5282b6dbda13206e1b19a7ec22e542b0721abb2688671f2a475dff6d33882 SHA512 3632026495ee62d4e17596d18d8f7ab78dcf1cb21646f1c04e2baaaaafc3925515c4018581ef47b86abac87e63ab74277fa43557f15446f12f06d6c79cc988a6
-EBUILD requests-2.26.0.ebuild 1593 BLAKE2B 5bbada6550ec3b6ba5240a95cb1832e1b5ddb1b8ce7cb68be64ff9a414d5cbd26003ad37971ceaaca946dfff2e036086293029c5b6b152855785567f0c7521ed SHA512 9b81f5ea758ad4d5c7d168137c17091c41b636de159d49b2748e67de89554451ee8f286581fd17e7d1885d8b8029ac12d27816948f9d264f23a40caeddb6d43d
+EBUILD requests-2.26.0.ebuild 1599 BLAKE2B 0ee5b3bbf68ab9fd73b7103b9c01a6883b3599cd743a12c29e0153a872f0bfc6df19abaa65193f998b7a2af338a68c9497ce35a32f1264d82c0ecd5574977a16 SHA512 5d780d5dabae6615a262d681490db407b3e9d19aa5794f3217c6c64118c035668245098494403645df644a768f5fe1dd76624971d8d1347baeba5dc89043c61b
 MISC metadata.xml 769 BLAKE2B 3b70fd8b559e10b971a7c72e4e134028300406af09445bf3d9c013cc15899f10452b493730b0af5f1ec958b81f719ae1af9be96cbf3fb5c0e3bf6f5bf1de7326 SHA512 12d72ea4ecc2ba0a58306917322a1687b73a3234b6dfa7f9ddbc4aa861daa4a56bcc6a8ea7e5da7cafdca2239f065c0f839a998de133958656b2c9a764fc30ae
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
index 97902378064a..9d8ffb655d7d 100644
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ b/dev-python/requests/requests-2.26.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="socks5"
 
 RDEPEND="
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 5b3f15bbe8dc..acf8f02afb91 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,5 +1,7 @@
 DIST ruamel-yaml-0.17.10.tar.xz 183116 BLAKE2B 2795f470a3f7da609780109dfac502a5b47184f465c68420f467209275c8857418a4ec7424e130df2e7acef614d93f91551910eceb06cd9e49b365bb23d2a015 SHA512 3cd2598fa37564c44c74720e72babcd2252b2dbcdde626bdcf771b591da5d2852d90bb1f22428e28cd7ec38304be2a437aa0569ffbd3ebb526b2b79a955bc88d
 DIST ruamel.yaml-0.17.11.tar.xz 183476 BLAKE2B 02a1693d3a20f44b7f82668918a53d06f9fa5c0cff6f149fe51de3fbb3551e823f3a7a2f0f4e818f43e2974eaf95c4219d53738bad78544c6bb1f19d85457715 SHA512 8f24b33592c37fd1d370cb6367a3652e72df3d88c7a14fff187aaa8622b9bbd77e780193fcd920916eca7f627dd37c87eb9b987d091c944ff08ef25ee4567b45
+DIST ruamel.yaml-0.17.13.tar.xz 183676 BLAKE2B 7b1be322f99a9cf6b4c5eb9722e4e425641c686574e6bafbed06e094e54ad93ea858c38779bb9f8c4fbc03916fcf7a65c4a3f4514bd8f10c46a8f6d112785350 SHA512 285572292e91702b6ad1e383fdc4f6434297f36ee9949859d2f5a21d23090957d9aabe323f505594fa10dc42822c3384b017c6ea7c3b04633925a291324392a6
 EBUILD ruamel-yaml-0.17.10.ebuild 1313 BLAKE2B 545d26daa4b7210c4a0bfab97c8959534dec58e3877906eaea653001f294ee9207123da79df59bea7056ad698c3c2f01398299c1240b19dc95f3739c1d33322d SHA512 ed3019c17273eb7e3e8fa358a7db08cc5c0e21039d18af7b0090ded4ce86ccc5d8cbbe6e0a2f7fc5262ed54dda7dcd218fee02122435ed1bd1b39a90b9c1bf83
 EBUILD ruamel-yaml-0.17.11.ebuild 1278 BLAKE2B e0646bfd1057d47eff7e9b32471620a10d0688adf4c6b13e05cacae4b145d386a33fa739aa5c75a5f38932f3fb33efcfaff8874075b057f34098c7b96dcdeda5 SHA512 65411e5d043f8a58e2fafa71d5b9e63670f463bc5d6eb050e4a5aa7694f9b726a8c581b6b943b526831cfb75d4e4b6469ce4709f415ca8953f0053aeaefef4c2
+EBUILD ruamel-yaml-0.17.13.ebuild 1278 BLAKE2B e0646bfd1057d47eff7e9b32471620a10d0688adf4c6b13e05cacae4b145d386a33fa739aa5c75a5f38932f3fb33efcfaff8874075b057f34098c7b96dcdeda5 SHA512 65411e5d043f8a58e2fafa71d5b9e63670f463bc5d6eb050e4a5aa7694f9b726a8c581b6b943b526831cfb75d4e4b6469ce4709f415ca8953f0053aeaefef4c2
 MISC metadata.xml 870 BLAKE2B 2cecd06b655552acecc4946c417b1737c120ff9ac0c84dde9ab0dd8f1e6ce7499e9568f7be4ebd9ae4835787739f9acf0e3a0a5475fdbef9327257dbb8529e8f SHA512 7162e297ad95daf7ef9345faa2e698576f440baa5dab43816be924327eadcf04925e02076735ec50f764f13dbfe054640c72d723742af76890f517de95ab3457
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.13.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.13.ebuild
new file mode 100644
index 000000000000..f87789872e5e
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.13.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+MY_P="${P/-/.}"
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="
+	https://pypi.org/project/ruamel.yaml/
+	https://sourceforge.net/p/ruamel-yaml/"
+# PyPI tarballs do not include tests
+SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
+# via test_z_olddata, tell pytest itself to leave the subdir alone.
+python_test() {
+	local deselect=()
+
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		_test/test_deprecation.py::test_collections_deprecation
+	)
+
+	epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index 302af36fbec0..6facf1dff452 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,5 +1,5 @@
 DIST scrypt-0.8.16.tar.gz 54205 BLAKE2B ce4f86f8bacb4f12408604822a32c9f63f96a155469cca1d2aa50cf67fc9e9576432f13ef49694a9d7ce21696aedcef27419fc0d3aad67a87d16c3bf8c0f94c4 SHA512 9498637d1354a84021f2c069a919ff157ff189d1385453397a9c43e522de77af9d628a90d649d50e9243abfc0b96efe4e38b615322d83133137bad94d448ef06
 DIST scrypt-0.8.18.tar.gz 56651 BLAKE2B d0e71e0677ab5f159da829eaf8e794fab9fa9290ff3688e525c4f2e9c60fda532d1c302fe4088bd8e88e06e926ef95d06bad145697e8a13e2662eda7027479b7 SHA512 b033203f65dd63c1e915eeff6232c01f806eb01d3ce18e753b6161ae667555095fe775585dd0d4e15ae228f2d4862860093c1a18d5b810b438d032df9fb24d81
-EBUILD scrypt-0.8.16.ebuild 546 BLAKE2B 50c4a02c3b543f7e71125db91de82bc04beb409a93bb3cc79ae6e5033975ffa65064f11e2e21da41729957d158f2ed53a6dd6cc082aa3955a0735fb84095b5ca SHA512 47628f918727a8a3075fbe9f69b1d2829aa9dbaec7e35d4b895b34e081fd892ed9de1af4ecf44c2e86308d98f2812d9f4d19640992a988d46af61ec7617bf671
-EBUILD scrypt-0.8.18.ebuild 532 BLAKE2B 3382660eb0028c429659e56735cd7612aff960793b8197c2f54e485ad1ef19eba75e59635cde8b657ca8ac0bc8334398ba08259a6e5d1c619e7ecef63b136033 SHA512 2867de741bb035702596c0a811f6e45dfafe074bb648a131888b44ef23d0004fc1b75182c31e7235c8e0d62b89607842cfb146b1b779e70a0c902c85b6f0587d
+EBUILD scrypt-0.8.16.ebuild 552 BLAKE2B 11d7b75f0d5a78a0dcd2430c7517e5ae73e0c8fd15811b8746d064fa40cff5792754be52096a616a27a86c11679065982e66d59c6dd58aa107a3760710c13929 SHA512 bde7fac5818e59d6985af755ddfa475f9ab22512cf6e28790ad675a1eaf4cae85841c9902d9544c43484ac2e5fe631eb20cf609d9a3bccead0884c7225f1926e
+EBUILD scrypt-0.8.18.ebuild 537 BLAKE2B 24212d60ede61f97ee2bb66679f4213b106276eb49a8a3e4150a1b0ca2f3ee56c92a8e1b623468d902914048be2733d8fc40cfcc8ffb308aa27db464491949be SHA512 b0d67448e6d179f20b15c4d362da22a66c2f303349ef019a296c23111b200e8b9e792fecb9a2371831212713c54a42010edd4caea18ef27d29fdfd7de37395df
 MISC metadata.xml 476 BLAKE2B 3b898ca601f0aeb1e05247bfadb54156de56a5c425d1bda5c25cd0b3f05c51fbf1e14137022a954b74f0d141f494707db2e437beb0c742bb1bc4428a48e2a555 SHA512 821250cfea1c6d91a6165173d268a7aa8a61f19678c02d5df665ca568793681a1387b68e0d661c9f7b3b384c386a0b2b20a9b86ac8d1eedf1a06f06d9d2db65b
diff --git a/dev-python/scrypt/scrypt-0.8.16.ebuild b/dev-python/scrypt/scrypt-0.8.16.ebuild
index 39a840266ab6..e171f4d2f015 100644
--- a/dev-python/scrypt/scrypt-0.8.16.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.16.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/holgern/py-scrypt/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
 
 RDEPEND="dev-libs/openssl:0="
diff --git a/dev-python/scrypt/scrypt-0.8.18.ebuild b/dev-python/scrypt/scrypt-0.8.18.ebuild
index d7034e8ceaf9..68f680a9be2a 100644
--- a/dev-python/scrypt/scrypt-0.8.18.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 # no functional changes since 0.8.16, so no point in upgrading
-KEYWORDS=""
+KEYWORDS="~m68k"
 SLOT="0"
 
 RDEPEND="dev-libs/openssl:0="
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index b76b1bcf7984..a1f63368907d 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,4 +1,4 @@
 DIST python-gentoo-patches-3.10.0rc1.tar.xz 8112 BLAKE2B d6f9b44c5a231f447ffe3533afbcaffe0f3b8bdd5a6690f1854bd7e1199d036d11a4cf4abfae345a88c42740ccbd4b72e53cbe28aea1a5db39dda1e5bfd47229 SHA512 bba7045f56369ca0354a539f8478a1afed77dc89a9faf548a0cf8959d644360b0afc4f84b95151ebfc2a6553078322c7445073f7a4104e9cd639ccc86ad0f792
 DIST setuptools-57.4.0.tar.gz 2141309 BLAKE2B 89b386b6d5bbac61df400f60c91a0a9b9ee381aec7d2f65a856c317c7b0b5512c5e9aa8844c0e64f1840a8e954ae22ed542ad97a104d5416b1df2ac02351809b SHA512 7fcc297ea3e6310f2ec8ba5bf0d509e3f4acbce6bde7e5f0fe1b022c147cf88a047471bd4aa278724e86ebc6be800015fb935c7a31dbb6a0801a2d380ddd89f2
-EBUILD setuptools-57.4.0-r2.ebuild 2798 BLAKE2B c15aec674a9406bbab7ffdce858aa25b869bdddd4e6b24a2b9d84ce051ec6b9823b629b22f08a35146a340009bd50646a8cded7e6ec46dd57c63fb1452dd81b0 SHA512 643512670a0133300b33407aeaaa9771c45e2ae92459177e26cfff51ac61532764b8f675f8fc870844cb0d712a67b057dae3b6795aa6d22d48815fb59554f065
+EBUILD setuptools-57.4.0-r2.ebuild 2804 BLAKE2B 8845c2e96920b8d480cc1266b300c496f1b905ee5d5039dac1d5dbbe52efa8ca421e43ed7ddaeed4ad1f59f0b6e457c8dc95611d9ec8dc6d7937e119360a0e11 SHA512 843422068d41d76ec969ffe3c30b8f8ef04da1a320247c9586b94449773ae66cc6dbbb0dec23cb55348b50c3045625adf33853ca017ea77d31512e28084073e6
 MISC metadata.xml 468 BLAKE2B 7acca7f204485279233a4ccd34d76661954e2f995cf82bd178f1dac0d9825b073dea76e734aa7625d036813d658e1dd7a5acd408b79b6841540bde62644ddd47 SHA512 c8215fadf291dc1cf8df2f1d8931f5f70657fc6c37fd105426d03f3e4b19963fe93ec4b76107aef5c2f9bf6fe5ce123fcd48519bf942ce8cbbc0c5f2678e1de6
diff --git a/dev-python/setuptools/setuptools-57.4.0-r2.ebuild b/dev-python/setuptools/setuptools-57.4.0-r2.ebuild
index 9eee2b0f368e..2b2cdf079def 100644
--- a/dev-python/setuptools/setuptools-57.4.0-r2.ebuild
+++ b/dev-python/setuptools/setuptools-57.4.0-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index ca23914ea93d..e9d81e45d1d4 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,3 +1,5 @@
 DIST simplejson-3.17.3.tar.gz 82434 BLAKE2B ae6f303a204f0c5a6bc7a10aa8da3dadbd4fc3a257abb15e330d13299dcbd5bc6be97506f6d5b48f3a3fe24570ac28b331644870d03aa30f80d40e69f4d2ec15 SHA512 b4ccdff3df2c87ed6f5119e93560ea7ddf60fcc64f996efeef1f6077f3a559c8f9ea77fd217348c1cba2de50e40523714899de110614953baf8385bb78d10af6
+DIST simplejson-3.17.5.tar.gz 83182 BLAKE2B 8fbaa83c81a7478b3c62c6625e717874f6dd3bef236b85504788a66d2b820dbf601e65edbcc7056528e67a66b806b3847b8efcc522464604bd4987dce9870643 SHA512 f5af32e4f9b4575323f9c0eb8163e794270a8607710d08a72cece953f57861e3619038798369ea049d82b9b53f293b9d9eefdeb4dd94ab4f043506bc3f1ddfad
 EBUILD simplejson-3.17.3.ebuild 622 BLAKE2B 5477f8ddb16abdb4f4902dec056dd52b0794c5d45a207211666d5644b4ada9dd021576a3fd5a1586bf4f4c5e3099a7a21bb5baf59dc9a36f237e97f5cf774f6e SHA512 fef504464ee8d265e47cf01f4ff5110d7800c2dae7a9cf82750e3c06a0997a1b7041807e0d16d2b8f1bdf46333ea4291d63c3876097dd1ee88ee7e6f79a97c42
+EBUILD simplejson-3.17.5.ebuild 630 BLAKE2B 79f94d0e77e3b2f3a0e96602adfedaa74be0f3e701acfcdee8a4aa81f1a10d0002b9e306de82539a8f1f2f639f173d4feaa379187aef4eef449c0eb0fde5b47b SHA512 2ea2e35033578aec72b5bf69f73664d14c4b599d3795b3acb4008a19a49a634cd97d782c7365a1db72452fbf9ed9bc1fb232e1b90eb3a67820ab642409686f8f
 MISC metadata.xml 374 BLAKE2B 9bc3d7ea8f41525aa5306e4d8db6373ea172453d9b62f8712c7ce6e4982cd2d09b2b7581f42f6728442085eb0ec120333dad9a1ae6fb8f2752a5d690f640a5df SHA512 f1091ba57b32514620ff6265354681c7ee168a12c384c66d1302b3c4a2fca897d08802156b69136a0ed9bbc026a14ffdbf705419c43da66d0b659592b05b68ae
diff --git a/dev-python/simplejson/simplejson-3.17.5.ebuild b/dev-python/simplejson/simplejson-3.17.5.ebuild
new file mode 100644
index 000000000000..4eeb70ccbda3
--- /dev/null
+++ b/dev-python/simplejson/simplejson-3.17.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
+HOMEPAGE="https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( MIT AFL-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"
+
+DOCS=( README.rst CHANGES.txt )
+
+distutils_enable_tests unittest
diff --git a/dev-python/sniffio/Manifest b/dev-python/sniffio/Manifest
index 632d7122aeb4..bfbf97f2cef8 100644
--- a/dev-python/sniffio/Manifest
+++ b/dev-python/sniffio/Manifest
@@ -1,3 +1,3 @@
 DIST sniffio-1.2.0.gh.tar.gz 17335 BLAKE2B 0d67baa18702ac38932680bdc741c87ee0a31342cc752c1463a7f90720ea0ebf6d62ef682a042c58e8fe96456e1461638e0f02c6f60da5f5e0d07464be27a4a3 SHA512 8e1dd2bb6fc22ee5824adfffe688ff0621b8c1ef5daea594dedce13d5e04a498e05816bb32e9bbed206a653a330ff710df57c888ddcff00a6254eafddc538273
-EBUILD sniffio-1.2.0.ebuild 693 BLAKE2B 66a9e2d7e9b336e83a9da4cf734f5756deeca95502208c92a50bc5d90eaddb19559cd42c091a56f24679157e703aed1b86108a089884c13397d324ed4be63a87 SHA512 e7b1e62c2194a8b1bab2146dda14f139b7c7b1c69e6bb9b09804acaf5f2476a9b0dc0981673583b1e7aa0c321653b990d7cd56fec957d67a872d2dd24a4fc28d
+EBUILD sniffio-1.2.0.ebuild 699 BLAKE2B 7ce515f775187b0498850fc13f9e213b17755ab07022e3ff4efc871b06aaa0e39277684d690b8582f6455122e8038b4c75c8f44bfe2d2ec6641d243a05f15321 SHA512 6003faa75520ce31678c2c219dcdda9ac2371fa14e636abdaaa87bc97ac6e5764e8063df7df64be7d775a97ce27afdb5d26da44187bd71c7979831ffbc8b5580
 MISC metadata.xml 393 BLAKE2B 1e85a6ae107eb5dbdbaebf54211bca24f605c8b40d8dc9f941a485a5dd6714c9e6b69646e627d6fdfed874f5ecbc4217b158c6be66b392e583f4aab24fb4c609 SHA512 ed60062a1393a7a3bc73388ada684e70a51fead79e3bd5e4cf3fc14aea6ff133121f2fcdc68ae0277c0bf2290d3a0f18959d00eb835534e16abb58b19c7b0f9e
diff --git a/dev-python/sniffio/sniffio-1.2.0.ebuild b/dev-python/sniffio/sniffio-1.2.0.ebuild
index 2d82899e325f..f33f8de8f646 100644
--- a/dev-python/sniffio/sniffio-1.2.0.ebuild
+++ b/dev-python/sniffio/sniffio-1.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
index 1d446808ec76..6cea4c790e70 100644
--- a/dev-python/sortedcontainers/Manifest
+++ b/dev-python/sortedcontainers/Manifest
@@ -1,3 +1,3 @@
 DIST python-sortedcontainers-2.4.0.gh.tar.gz 9229380 BLAKE2B ca9348ab7d467b2a81126217451262bb0547901b953edc3bba7c87c67b415eef5c3d454a08d227ebc8b213c1cc7db6262e864511fe67beefe865014ae5fc5977 SHA512 f80185c6f95a85cc78f88f6f6cf389eb48be22cf94d5fcd84f3592873f17de37ec7f44c1627b7f02956ac4b4f74ca4febefc47d3c6232f70ee05dbb2449ad770
-EBUILD sortedcontainers-2.4.0.ebuild 796 BLAKE2B 8fd3c6fff84e969a0caf6f526202806fef308cb2e52337a87dda69ed1d0d4a84e68ee51351969771ed08cd8b2e64aeba801b135bb5a078be24339d030c53c9cf SHA512 ab94b91691dc89a6631addc5f0c9a8f7bc3d331cee3e12da9fc146904bcb7d03d4a8995772f2a56bb047a6017e1a664eaa4f3cb571a54cbd11489fe0e01b4a46
+EBUILD sortedcontainers-2.4.0.ebuild 802 BLAKE2B 1b3ad2046bdefad599498d02ac27a17e738ac1d1bea4d995e36ac4a5ad075ff2469a52bb537e64311009923dd1bb453bb45d6100973be210b73f150fa2466a98 SHA512 d2e086e2b8f4fa0c7962021dcec78e13da1613ecd6312120434d62129c52c61d785f71dd1e3034956f1a1d6758b65c8e672e25b30b23e7d7e3adf175536c189d
 MISC metadata.xml 417 BLAKE2B 8f56ae7ddac9a7fab6b99e9f03cf53829a7a7543be90ce3b508af2d2cc912ddc4a41f80fe9e8d395f8e0f92cf08ec4d99023cc70a3cf089e9519ee958659243b SHA512 0b286e9c409d08a4448b377f46e0d8abed4c23910a09a770cdf9c2b2797318831570b79c082fc3b9e9e15bed338b5f283e6004e63771f2e52da2be6749554c99
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild
index 8f7ca5dd0de0..76cdbde4ac77 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/sphinx_lv2_theme/Manifest b/dev-python/sphinx_lv2_theme/Manifest
index 6c4fc55693d2..90c36a2b71bd 100644
--- a/dev-python/sphinx_lv2_theme/Manifest
+++ b/dev-python/sphinx_lv2_theme/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx_lv2_theme-v1.0.0.tar.gz 9795 BLAKE2B 7406d03b53c06a4e814490df65c5dad3bb8299be2808fe89da842c4285ac8798141d7e59713e6bf3b3ea72a7af8650c2b7ead586fdf48004df78350ef789a649 SHA512 e10331f4a979055929b7146b89a4c19b05698e32d0acb2eb3d7734f6e9298d1dbe24dbe5f56697505f9f7488845643011fa1df4ed112b4f016ba21d41a4f91c8
-EBUILD sphinx_lv2_theme-1.0.0-r1.ebuild 501 BLAKE2B f0347b8a1a72ae517c7da2910aa20341bc33c7e833f6e99ba59c91979a7ba385662d73920afe3b10f67ce26848de81e6e17f0e6a93d3240ff5bd7010de4e5828 SHA512 eced3ddba1c3e6a1ae060206e48e90e662f7570c54b43b6f3d11ad27a9a47d9f1d0dc06e12cac8bc1d7f48b294c4288b086b530c5dd04b1dce4fb3e4987647f5
+EBUILD sphinx_lv2_theme-1.0.0-r1.ebuild 506 BLAKE2B d5757c929030e6f80b127208257287d6330b31156c2b7ed365a516b1165a762e9a99908400b1ab7b7082af9b55b55cb8cf1594a411c777bd29d8b4c042faafd7 SHA512 9c51c0e780caa15f43c6e61776b3856e3b5ac777ccf38e8add8795fc26693f9ca7d29d2fdff482d482ae19042b02d852c6721fb64691a5e7dc421fed3b55cf5b
 MISC metadata.xml 428 BLAKE2B 44682c327177ec1dd09978a294329e8a23e25dbc5b382d802e5cec4a281b4345d147b6348ee6d2008d9e8b9463b35c0c3feff62f3c5d4c6083618fda5a7f8629 SHA512 df698193da79c7d54795ffc35f22c043b7144b62f833d50dc3f1403cc878954fdf294ec2668d2e6750ff4baf0043ab81bef28e927abbfd61bfc252625b8e8e3e
diff --git a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0-r1.ebuild b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0-r1.ebuild
index 6280d12d0c3a..8d6b73eec050 100644
--- a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0-r1.ebuild
+++ b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Minimal pure-CSS Sphinx theme using the LV2 plugin documentation style"
@@ -12,6 +12,6 @@ SRC_URI="https://gitlab.com/lv2/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 S="${WORKDIR}/${PN}-v${PV}"
diff --git a/dev-python/sphinxcontrib-trio/Manifest b/dev-python/sphinxcontrib-trio/Manifest
index ebc9976697f6..493b6a701a2a 100644
--- a/dev-python/sphinxcontrib-trio/Manifest
+++ b/dev-python/sphinxcontrib-trio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-trio-1.1.2.tar.gz 24131 BLAKE2B 5ddaf5ed6c85905275e206fdd966745ce4dd7296595c488864df291cb7202725ccab722f306dd9d6c27d660f5cb3e43bf9ab2fe50e8aa5a7232c2615dddbdfd0 SHA512 cb90f37f463fbdd3f810eb6d76b4bdaaabe83317de0ad747fcee55980849d691e272884ecdfcbee58851cf536f268f2520caba281d7550fe3250e92c69164434
-EBUILD sphinxcontrib-trio-1.1.2.ebuild 993 BLAKE2B 58210576ff865927eca1d4d39b742fcf0e33fde0b1029827a1275ec24808f6d92d3ccf3797b59293eaa9e5b1d0d61496f826934cf5f92026b8a178f7730466c0 SHA512 29882be7b40b3fc4dd43baf9eb20e0fe838e600bbd59b68eb3d04c6069551798b0003519bbb643d161559802ecb2469acc90c57db56bddf0f419a3968df38714
+EBUILD sphinxcontrib-trio-1.1.2.ebuild 999 BLAKE2B 7eaf2ad66b9121b3eaf29f4135ad7393a0ea63d25cbd94730f11065b29a172773b880221e571b64bbfc034c0fceca99c16e7235209945ed84bb9f49e663cb635 SHA512 f4ed72d1d212086e22d907200112b8929834e72a668d9ca1fd415d725bad997c5600361842e63101d386b7390acc3f6fd17f272a73818c6b642c362a7c4ea85f
 MISC metadata.xml 1117 BLAKE2B 947c7c2b888c24101db258e47efffbc6db4873c99cb9dd5c2076dfc25d25de04736db46d9fff88667f57f8f09f01c17f2937b2d7f641a8b7cb5baecf9d3d2b2e SHA512 57341896ef4194b5ddab0485e46bd8567c4514518c02e1049db21e9174c420175e47644d948c9c1a6dc03bd4248f235d2d811c6252be7c67f624e0b2883ff2ed
diff --git a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
index 2b3c82a6c4fa..579331160793 100644
--- a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
+++ b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 SLOT="0"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/svg-path/Manifest b/dev-python/svg-path/Manifest
index df5862493f33..17974153bdf0 100644
--- a/dev-python/svg-path/Manifest
+++ b/dev-python/svg-path/Manifest
@@ -1,5 +1,3 @@
-DIST svg.path-4.0.2.tar.gz 18161 BLAKE2B bd5adbf059808b8197fbff0f12e274d98cc72ef840cd29e504bab1dd5fbcb5240aa3d6beb2cc3f6b91bcbdd9251fa29285de0ecd163c22d6cb8454102b911597 SHA512 0659c3d012b81cca83306c2895480bcc770cf23f4fc98dc4f167b6799a9c5618a90aabd81e2c91e6b7c57998d42f04a47d8f0fa966546111cd165127df239510
 DIST svg.path-4.1.tar.gz 18228 BLAKE2B 3b70a37336078f0c4fb9ae1754cf92df7be957ac632931e4151ea158b05e54a29b68b74b9c69694d3e79986c13095e357fa52a8cecff3d1ad5ab3e2ef7c13015 SHA512 fb302c65f85bd61d98baab9e2a9707bc82f1bf02f3c9a34e5b864dcc7d2e03f85bd26a4fadd91a4249dbc37ae13f57eb5cdfc2805cbcb4f693d6f5c8863a3e92
-EBUILD svg-path-4.0.2.ebuild 542 BLAKE2B 2d61a1161e367c5fd9bf347e83bd26d0664bfb34af2b53d0ecdf2e03f5bdcb03fee5472f6ca55efdf9ea3e18124a04e0ad0af432be59f5a40babf048ce933934 SHA512 f32492194196cf0fb440006de8451c181796a1818cd580d471be29164bee30c91a83ce53070968b8b6ce20eb49ec881ca78c77f939ea56c816a4dd36c01dba3f
-EBUILD svg-path-4.1.ebuild 468 BLAKE2B 01a11bf1cf711996d5df8e1e4ce7ada0b61680f72cbc89903ebe852506144a65b5d4c35ed6d7dcbf0098083d378d7b08bec765c897cbcda513dfedaf58eadebc SHA512 b4f03b107909e4b1c3715d674ca0623ed5b271887188e6681efc61074955e7a59f36635e50373c60b8cdbc02372983586d170d2fa9acf8f6d340d4c0bd855712
-MISC metadata.xml 836 BLAKE2B e42666d5dffaf97d7ed3e761f566b6cfbefb5bf7d3d163d9db956ecedcf29af50df3aea7ec01286e00d3b0c4180b5cb2a65e2a16869b7a2db7a68ac0bd53b332 SHA512 6a6daa93a77c1e7cd7c2f929fab5672433512aa8ad236e295689311b016447c8afe92d3445b82486957eb58ad3a611a4be9cdaf88d8a1c6e64ad65c8e36c3d8b
+EBUILD svg-path-4.1.ebuild 474 BLAKE2B a8f1c6e5e4bcf4b8c5c02ed7e9acf9566ca690a9719c21420b1da0dd8127f61b995d0641b57d2e55d18ebcc7a6151650dbbcb5cbc40bdb0cadf14c6cd5225d9d SHA512 ffd2a1dd1487cd7c49462ccca7679de70f6bbe49f73566813a34cf5e3cea944c1393036f02975b82715c47fa3b771c475dc66db81149240462633ad45eb34070
+MISC metadata.xml 860 BLAKE2B ba66914508a84346b4b3e1a674003370f09eec9b2bc9d3b246f8da90f22bf4a4aeb814b6de4385a0518fe945b13d15714c00b4020854cce6ad2dbfcb7fb9f81b SHA512 1bddbdb51c5f19600ff557ca14002688ce21292980fbd6fb1080e620b283d74ce8ca14a070f52c1d4df22391d2a36bedf60994c959fe82a3c53454fd35f16c77
diff --git a/dev-python/svg-path/metadata.xml b/dev-python/svg-path/metadata.xml
index 7e64024dc695..5c0f234e4ee5 100644
--- a/dev-python/svg-path/metadata.xml
+++ b/dev-python/svg-path/metadata.xml
@@ -18,6 +18,7 @@
 		implement the different path commands in SVG, as well as a parser for
 		SVG path definitions.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">regebro/svg.path</remote-id>
 		<remote-id type="pypi">svg.path</remote-id>
diff --git a/dev-python/svg-path/svg-path-4.0.2.ebuild b/dev-python/svg-path/svg-path-4.0.2.ebuild
deleted file mode 100644
index 5610e44fd423..000000000000
--- a/dev-python/svg-path/svg-path-4.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-MY_PN="svg.path"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SVG path objects and parser"
-HOMEPAGE="https://github.com/regebro/svg.path"
-SRC_URI="https://github.com/regebro/svg.path/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests setup.py
-
-python_install() {
-	python_domodule src/svg
-}
diff --git a/dev-python/svg-path/svg-path-4.1.ebuild b/dev-python/svg-path/svg-path-4.1.ebuild
index 04e48aed5e83..a0106eaa7a87 100644
--- a/dev-python/svg-path/svg-path-4.1.ebuild
+++ b/dev-python/svg-path/svg-path-4.1.ebuild
@@ -1,16 +1,19 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 MY_P="svg.path-${PV}"
 DESCRIPTION="SVG path objects and parser"
 HOMEPAGE="https://github.com/regebro/svg.path"
-SRC_URI="https://github.com/regebro/svg.path/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="
+	https://github.com/regebro/svg.path/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz
+"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index 843a62609fdf..156303d44b0f 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -1,4 +1,4 @@
 DIST toml-0.10.2-1.tar.gz 23325 BLAKE2B dedab7d08dadca963e62d64e9108e254dd73b78761985faa892792823027befc6473ae02c35c275a216b4544d1af8776afa78e39c63c95eb856e2bccf1de49c4 SHA512 5c706a3ae336e6b29bdce9752b91c677f7610cbcc1af4169cc24779e248031406cd19ac367725b2aa7903e4b1db71fa59255238c0270b2c146fd5d7e12d9a5da
 DIST toml-test-280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz 19593 BLAKE2B e9deba7c5d1eea7bd87fcf5e5c74bda4c2b9e9686e597e3ad51516f60eb8d192fb01d052ac57729c6f0851e2715cc6409a904affd637c9b099cabc1b12ad5d52 SHA512 7bd69b8c14f09bf431094b52d988eb233922527719ba5047ff769d2e709c2039fb6fb1c8144e630ad2a58835d19e0e4cc51433a427596d37f8eccb6d73d7e5c0
-EBUILD toml-0.10.2.ebuild 1054 BLAKE2B b0895624d692ada601c8c61e4c53f2c6ccd4f57057443f9c257da9270c8b9daeb069ce08bc670fabccb0ac4f7ef02f8b07d4d8d409ac6168418d2fa9c716d163 SHA512 35ddd5aa991b746097e65763a3109f24982365488b22f50945dd6799516c0a822c5f26015ba926410a948c48b962fc3d4ba9cdb996144daf6ba215f656efb057
+EBUILD toml-0.10.2.ebuild 1060 BLAKE2B aa8005479a1d75dc78d9d2ea8371c43d20298f55b0f8fc60efe141455d2a8bc325a21c28bb0cffd546c06eec420b291fe7c1b649afcdc43e7b0048b811918b69 SHA512 1f04eb4dc8c3f4344a63de523640008ec78a73b9727636670a468d27b9f8b24a77c74db891be2230f82920346d9779ce94c29bca53ca7292aa8ec68255f04548
 MISC metadata.xml 380 BLAKE2B ec4806e600de8ff5dc0ce341d90563166feae233c7911cf6c396ffe3b1e80b30fa1ac0b1a8c7b99a3e690cabadd8ae098882f53ca415377e54f08d37028e0b4a SHA512 09865620b098af31212c38a6aec4e5efd3e1725ed3963dcf7382aa815f0b607c4c4c4887d43ac678feda5165c9a3eef879c877b7853d133635023f7fc8f0b3bf
diff --git a/dev-python/toml/toml-0.10.2.ebuild b/dev-python/toml/toml-0.10.2.ebuild
index 474d3942c3f2..162c73d55e37 100644
--- a/dev-python/toml/toml-0.10.2.ebuild
+++ b/dev-python/toml/toml-0.10.2.ebuild
@@ -18,7 +18,7 @@ IUSE="test"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 719bc2434b1e..1e53cce224a6 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,5 +1,7 @@
 DIST tox-3.24.1.tar.gz 305886 BLAKE2B fcedf8054a19a79045b2edead599fb11b7942986fa4bbc184140603e3bc6700eada452e661f4a576d029804ab2a9282df0cf9198eee9b483c2c6c68b086ee156 SHA512 e4bfb3dab15887ce6432a91b88a7387179cbf2a5ab5fa608b3f1f7349be4122d76ce01d396ae9b1515c211f2905d110a8414e254cc72bcf8a74542db98ea52de
 DIST tox-3.24.2.tar.gz 305924 BLAKE2B f91af9fdb4de94eb9ecf65774619234f1e52827c7c6e3ce75ca8161564f8cdc8af210f229ae07f5d381f7964cbbc936f47d4242848513c9bf1c8989a73fe0420 SHA512 e33a1126440ac53cf07cd7dbe695ea1307ebad92e0ed4d6e6c738affa059104f1b5bfc360883283ddd59e5156f7bb00c52d2d2ddd2294b6664f22a2abaaf66c3
+DIST tox-3.24.3.tar.gz 306285 BLAKE2B 368eaf959533f62b08d6e44929ae327ff25ea6eca25a3f47c7b9945428821bf80ab7e0ab4daea8821b55b9a7a009f30c3d5641812fd444a86577ea0ae83adb7d SHA512 de1c1ccc3a277c617521e77806d1d993a5c19f811016bebc442bfea12c3d40a22bf80b7d11b11744a5ddf705c6e8955f2811f149d413ea8522d94c985ed1f715
 EBUILD tox-3.24.1.ebuild 2134 BLAKE2B 9589d30a68afe753813e64b7ec5d8a60db842c08634d4e94f8bf942d022fd75c93901a05e234a10a3354b6e3fba88bce5fb868e1d76ad181efac7fcc88fed1bf SHA512 ed38d8c09730746beff05bbb9c9813fa5db5205d462252cfcd4dac19d32fdbe6e7713cefdc16f9f7c8ab6a19b73f9831b9eb7feff3e7b61d3953e00f30038caa
 EBUILD tox-3.24.2.ebuild 2141 BLAKE2B d27b4a9b6e0d4e0bb963365c26e2cfd9e90a1bdcac628335240c3360a589c07d9d79cd3cf98900484ef21fb6cef467d81f3bd0ede54ab37a852394ac2d8fbec5 SHA512 4607531b81a352bd6d6e6d7f7711eca0d8a14161e4e704adba48d175b2f86e3d508f57798bec24c7dc8dbf1354821bf96df831699d395fc4760add99e65e9f6c
+EBUILD tox-3.24.3.ebuild 2141 BLAKE2B d27b4a9b6e0d4e0bb963365c26e2cfd9e90a1bdcac628335240c3360a589c07d9d79cd3cf98900484ef21fb6cef467d81f3bd0ede54ab37a852394ac2d8fbec5 SHA512 4607531b81a352bd6d6e6d7f7711eca0d8a14161e4e704adba48d175b2f86e3d508f57798bec24c7dc8dbf1354821bf96df831699d395fc4760add99e65e9f6c
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/tox-3.24.3.ebuild b/dev-python/tox/tox-3.24.3.ebuild
new file mode 100644
index 000000000000..1e0885d735ef
--- /dev/null
+++ b/dev-python/tox/tox-3.24.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		# broken without Internet
+		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
+		tests/integration/test_provision_int.py::test_provision_interrupt_child
+
+		# expects python2 to exist
+		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
+	)
+
+	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
+		# TODO?
+		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
+
+		# broken without tox installed first
+		# TODO: why it can't import itself?
+		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest --no-network ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 3df1cd7b14d9..705a86e6fa22 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,7 +1,9 @@
 DIST tqdm-4.61.2.tar.gz 169665 BLAKE2B f5dff67eb549cab0dd667815c25f6e885a2e0cefc2ad68e97fdc09599eb41b13589f7a88d5a445813973454a5e5f835b3139651ec2e09b717db0fd6dc705890e SHA512 bc33e8fe00244f90f61ab51d0c7c0b98d5580efebd9758284d9dbe2a699eabeb0d92871eedc2f95f377e29dd0f7ea4b5247b96cb4cc1687dcfea3a9ed1152ab7
 DIST tqdm-4.62.0.tar.gz 169668 BLAKE2B 64a3df2f00a4fcba6bb67ae15e04f392a73b54cf7284f3c013ad31d00317e9d84ac2e1feed302137aeb7ea9e3c9d1d730623cbd96e8c76c46df6382435146efa SHA512 dd60d5522b68086410ec5f02574477dcc33a887ef509cc1d1735921dd906f951180d6115680517b3abbd2cf6c4ee1c60b9c950654ea9b7642d52d28052326088
 DIST tqdm-4.62.1.tar.gz 169567 BLAKE2B 99e14631abe19d20d0fd67e1f885c307544103928f22e8913952b35adc2e596d4efa54fa4fedf4efdb1f8b83efdcee5de25052d6aba1974a668ba44f80de37dc SHA512 485d5a88588d026b3311419839abd57f8092295a2e68341708aa2c4ff35a97e30e9eb0db0db4ef9b0fc19c4d7b575ec6f30b213b97cb7498a9267d7c6e0a57ce
+DIST tqdm-4.62.2.tar.gz 169564 BLAKE2B fd3484db22eda5db7431fc337e23cfcf44882efc56c8b10208d799c156fefb5aa70c69c7063315d86d3ff881b97b62ac0b5c8be73ad3546ad0728f3f544cadfa SHA512 a59a041fa239e215e541f07c66292c27bfe067f3f2eac2916662b4ef1faa630346dec9558a7f66a3456b3d2ddcd164f9381cb89e5ac8350d0295367bfc248a8c
 EBUILD tqdm-4.61.2.ebuild 1162 BLAKE2B 1c239c6f6202c694f1acbda28820226d91f9905c055ca5639f3f896293078271ba79acf3e10dd5b8e4dcf9a6abd20bfc5a7bf2bb3c171122d724866d27e6f7ba SHA512 10d7735f0c6a7f22caaf0f59bb915b4bb0ce0a04531f15850316dbb5a4ff17aa614b0b37934324c2f7f3dc9e530a79dc6ef2d2a657c5888155da1fd2b9b54f85
 EBUILD tqdm-4.62.0.ebuild 1170 BLAKE2B 2409955943a44f519894be995f246cb779fed309aa1a6be85c4a73fe1c5bd622d92ff3debd3da955804c83ec269a3d01fa6ef8bd1248f25bbdc950e37c4129d2 SHA512 aa59e6ebbef2545054fb3cd3606e55b3c9267af575302b1975d956d15ec2457b7cd46f3657e8e46f63e5f0c6bdfacbb3f5e02122a42c66c5781133eab0678046
 EBUILD tqdm-4.62.1.ebuild 1170 BLAKE2B 2409955943a44f519894be995f246cb779fed309aa1a6be85c4a73fe1c5bd622d92ff3debd3da955804c83ec269a3d01fa6ef8bd1248f25bbdc950e37c4129d2 SHA512 aa59e6ebbef2545054fb3cd3606e55b3c9267af575302b1975d956d15ec2457b7cd46f3657e8e46f63e5f0c6bdfacbb3f5e02122a42c66c5781133eab0678046
+EBUILD tqdm-4.62.2.ebuild 1170 BLAKE2B 2409955943a44f519894be995f246cb779fed309aa1a6be85c4a73fe1c5bd622d92ff3debd3da955804c83ec269a3d01fa6ef8bd1248f25bbdc950e37c4129d2 SHA512 aa59e6ebbef2545054fb3cd3606e55b3c9267af575302b1975d956d15ec2457b7cd46f3657e8e46f63e5f0c6bdfacbb3f5e02122a42c66c5781133eab0678046
 MISC metadata.xml 604 BLAKE2B 574eef287a9260a1c115d2e8751c417962cbc09fdd18c68b189898974c8396bc7fab56fcb71a067477e0701916cc9e4dd6701d19e86e62027fd8a34e630b3f17 SHA512 d12b1ccb6601676fcb18122a94d0f397ed1d411a8f8a40d32e595bf36faa08d5a9aeada278c471f063ea75605d7657f6697c2ed45ccc658b9e7f57a0114e7982
diff --git a/dev-python/tqdm/tqdm-4.62.2.ebuild b/dev-python/tqdm/tqdm-4.62.2.ebuild
new file mode 100644
index 000000000000..be993f734871
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.62.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Skip unpredictable performance tests
+	epytest --ignore 'tests/tests_perf.py'
+}
+
+python_install() {
+	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index f47c7cd0f024..8398b3ff81c0 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -2,5 +2,5 @@ AUX translate-toolkit-3.3.0-no-install-docs.patch 652 BLAKE2B 202cfd408059115cfd
 DIST translate-3.3.6.gh.tar.gz 1140841 BLAKE2B 77d8b930ba8a91e801a04c67bdd13c0c6538d4df2418f26e1f6bfdb98c275fe746062840034c5345dcf61abc87ee6b8e1b2cda34a71c8e3850ac37df707b8a34 SHA512 c6eedcdb9ecece4804c25aedd57de37da12baf9b2f3bae1c87377f9a07e1e5f1cfeeed8073861b73201de3b35ec4e5da5f972d775c7ff35fa7be21c97746435d
 DIST translate-3.4.0.gh.tar.gz 1147056 BLAKE2B 94b0b4f6d12f4ecdb210338a814e9f4bf7b7f5d31c992f03d581e8ec0ece849eb3e74c41396c29a1c756f0aed286d073e5bbea8ca4e7f74987bf61d6e3ebe24a SHA512 04694b3c277cb63e405a00c5c8c13ec63f232c641c7987e5e2304f30af05fb912ca7339fb42c1fea29c0906e75975b66261474e7fed16a1e47ba0b4265cbfeef
 EBUILD translate-toolkit-3.3.6.ebuild 2466 BLAKE2B 045ef0a99924176b23591574e9b23d226fbc593c01c5878537f64797e8cf68efb6748d00e4a4b72e1e79a142ae15c1b5d4a91eb163409330a047bcd09d87707c SHA512 3a5099f26e850b7da77dcecac1e41e13d4695cff3a2d8ca94785400635a1e79b13dc0d91c28f5144649faca8ebbbc70130623fa7e873d81112ac0d8ef7b3a393
-EBUILD translate-toolkit-3.4.0.ebuild 2509 BLAKE2B f8de865deeb6c701a4292e08723e5fb1ad6ab943347858cb1e0e7d9063cff7856fa37eb6ad54233f45c6dc19f5bc72b50c3cec674049b7e8da4089121729987c SHA512 daeb63d44ada93bf5cfe7d0a558327bd806111c4b1dcbfb12c48c53b979b3072018fb2c9959a2496d17e0acf6dadd6130c6eaf22bcfb9c2e9b3aa09decec482c
+EBUILD translate-toolkit-3.4.0.ebuild 2510 BLAKE2B c3acc1248ed06cd0898e7af6ea1b4655b6c4a843b602cd96a7687aea44efbcddd98e231f50070a2a76faa09de76c2268185a6f5dd209c4e9a4eec9918b583cea SHA512 29e110afc60268334432ab3f90881438375475df7968936d2ef481c4c4088d6566f712c3953f68b29da5b9221070ad274893a46f0c854f3001e88894b4e4d66c
 MISC metadata.xml 745 BLAKE2B fada3477df5ccc4e5f6036d8d60f948dd4c015ba9ea4e0c844526a43bddf469378e3601a6f5652f8e4f7fe88e65beb82e3dbd1f171c1e7fe83794e91ac7a52ac SHA512 314825d2d8187ebce4e0fb63bed639dfdcb8455883eff29e75cfce963e200371bd38de86190e7051d0950c60befa2115cdcb8630313774946036b693b3c51106
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.4.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.4.0.ebuild
index cdc540e11264..44ac05997215 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.4.0.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="sqlite"
 inherit distutils-r1
 
diff --git a/dev-python/twython/Manifest b/dev-python/twython/Manifest
index 06c1e708871f..040d6ebc882d 100644
--- a/dev-python/twython/Manifest
+++ b/dev-python/twython/Manifest
@@ -2,4 +2,4 @@ DIST twython-3.7.0.gh.tar.gz 373183 BLAKE2B a84e10c1d61736af3e93f265d92104dac15d
 DIST twython-3.9.1.gh.tar.gz 372933 BLAKE2B 3db7f37e284ec83546e4f93a23e34c21ce9853e6206b62353e36b738ba591acadc55fd3dbbdf8cf7d74e63ab9966b9cdc7f49c5caa06e165bb7107b350509835 SHA512 e64d623dfa7ba2e81e09f9d8e784851b44201493d128ec576c4b5a9abc88debf1ca78f8a12933e0cd0a6b495012fa951bb62ea5d92db11186b37747b8576174f
 EBUILD twython-3.7.0.ebuild 900 BLAKE2B 11d5468dfd9a83fee82fbab7edd46933235894218eaeb38285b40758c5fce52eb9b736109deae083b728082bde8667c91aef209cff9b8ef22bbfe60334cc7da3 SHA512 3561737b9e2e08c13e0c7a8355b14539de2c53069ab39533fb9f0661ce6999e4005077b45942cf73225e3917a38da503f656589d6b4aa65812e8289644d17797
 EBUILD twython-3.9.1.ebuild 1191 BLAKE2B 63f4650af8fe26f89cff21a7098bbd670b4a1894e8a9bf98b44ab936e1a6f92d39ad3e225a9106a59907e8ab052a285be2d141f08077865957d23f98645873f4 SHA512 ef1e309c82e5fb6d689309c46e75eee7a1f5b028af3408a077f482761770cdd46000872c853b9e04b4809c0d193f9a7a45ff52324a9d89213999d7fbf0925034
-MISC metadata.xml 381 BLAKE2B 8c4300189076c3f5cb8498a4aae6ce79751ccc3b51295ac6c75b8b290f71cc9f0aea946a7d7c4e75434372459aedcf7d0286c31039221c06e48b945904e35814 SHA512 6ba06a2be42b96f85609cc2a10637ff911228a8f0a5b5fa1debc3d4c6ba6d9e57462f09cdcb96e12f75544fd3a161d5e3ecb5a89e8f50fa152dc7ccc795048f6
+MISC metadata.xml 406 BLAKE2B 229b135b37fa704f8fb087c5d5e34f5c3356b7d3d91f0463cd154d6cc98acb374a3b1728424274b6aba31a227a21a14fb90e4c9f954442ff8263657a78e44722 SHA512 b0d7435356be5301babc3c458964c55ce0f26564d4caf68566c06bcdb19ff8846512a7f95114c2c0b47cbbc902fdb192da475bb90bff719193c610de6172617f
diff --git a/dev-python/twython/metadata.xml b/dev-python/twython/metadata.xml
index 2c06c1edaa41..639a0a72164f 100644
--- a/dev-python/twython/metadata.xml
+++ b/dev-python/twython/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">ryanmcgrath/twython</remote-id>
     <remote-id type="pypi">twython</remote-id>
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index 4ae2961b2aec..1086d4811e06 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1,3 +1,7 @@
+DIST ubelt-0.10.0.tar.gz 213813 BLAKE2B f44798dee470ebbdaedba4af6ef03c663f47e171258877c70c99b4dceabb991d2b142815965cdf873aceb9d34e248e341fd88e6b8d2c2554309f6d8d1302e2bd SHA512 dc6b1193838c7def5e3ab8f64b2708cb857bca52c2debe7b32f4fb80453904fe2dd6060383b73ae09b4ef6cc63bd45be1ff3d64bb4db72149046c89b39243a1e
+DIST ubelt-0.10.1.tar.gz 216033 BLAKE2B e481b2cf61788b50038ad69f0e2b637dfa0259d24ecca1a5587fe283d2270de205cb085112b9285cf57f664ce8a9d107f08b9b6735c8bea6fb97f6f48935dba9 SHA512 c15af249e6b94f69050703a4004307d91854e2ac7e25c5ac8d467b5b5f3363989f93bf2917eaf3c0f2485258b3530d7317f39449d5ac7ad5ed9b4615d916decb
 DIST ubelt-0.9.5.tar.gz 193739 BLAKE2B 90597750c9ae1c1a4aa9d3180119665a6d1bf9fddb57f220d8ab6d8d0daf521d4e2648247753446e0e285b9f24f57c35d10abdcdd06e566fdd3415c77f10e50d SHA512 fbe17001c03da513238ab2ae101a9ac8c334943e88bf3037243c8ad4998e42a38e2907a408866a8acf2f7e2061c86a186b7955429564a6245ffca2bed25b8e54
+EBUILD ubelt-0.10.0.ebuild 775 BLAKE2B 5e7006b75c8b72ca38c30dc33a724ff3c2fcb542082751d2ad2d3afe4fbf6c5b8bc8792789cfa5bf5cc1baab341e4473eafa74bcc5914b3da7d686525190943f SHA512 8bcbecaa55aa653608069d2274307338aa9765cdb5030598b9cd6553bcdabcba3cb09eba97c93ef54aae483e2b122f3d6c742ffe0a0b9b775b1a1847936e7bff
+EBUILD ubelt-0.10.1.ebuild 775 BLAKE2B 5e7006b75c8b72ca38c30dc33a724ff3c2fcb542082751d2ad2d3afe4fbf6c5b8bc8792789cfa5bf5cc1baab341e4473eafa74bcc5914b3da7d686525190943f SHA512 8bcbecaa55aa653608069d2274307338aa9765cdb5030598b9cd6553bcdabcba3cb09eba97c93ef54aae483e2b122f3d6c742ffe0a0b9b775b1a1847936e7bff
 EBUILD ubelt-0.9.5.ebuild 776 BLAKE2B 2b81bb522dc0523e362221f3048a4b68d4139ff66361e97825425c571fb2f916637d9a43914a2869ddef62dd9dcf513cc22f4a66873c37d04f2d96d2288306e4 SHA512 677336d086985942cbc5f47b64a31b1172eaf9ce7a5c474e534b19201e364e11b0a5bc11b76fec4f0add76efbea875655263bd81e983ecef0cb6ba5f5b140e26
 MISC metadata.xml 321 BLAKE2B 9fadac1ff4e3774c664efafe500d280bb5573ab07b9a3c8a03cc7ea27327d18c4e570fe2f65694ac53240f5a0952df896d54fa3ad86594f201837e88a19d22cb SHA512 bfd89aad2ec12d1a6b364344b3b11d4d78eee4b97d3a0505cf0271ac884b20a5561985752045819046979fa74760c482766adf86de034f2cc553d2a53f6ebc71
diff --git a/dev-python/ubelt/ubelt-0.10.0.ebuild b/dev-python/ubelt/ubelt-0.10.0.ebuild
new file mode 100644
index 000000000000..aad8e9f06c5c
--- /dev/null
+++ b/dev-python/ubelt/ubelt-0.10.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
+HOMEPAGE="https://github.com/Erotemic/ubelt"
+SRC_URI="https://github.com/Erotemic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/ordered-set[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# relies on passwd being equal to ${HOME}
+		ubelt/util_path.py::userhome:0
+	)
+
+	epytest ${deselect[@]/#/--deselect } tests
+}
diff --git a/dev-python/ubelt/ubelt-0.10.1.ebuild b/dev-python/ubelt/ubelt-0.10.1.ebuild
new file mode 100644
index 000000000000..aad8e9f06c5c
--- /dev/null
+++ b/dev-python/ubelt/ubelt-0.10.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
+HOMEPAGE="https://github.com/Erotemic/ubelt"
+SRC_URI="https://github.com/Erotemic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/ordered-set[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# relies on passwd being equal to ${HOME}
+		ubelt/util_path.py::userhome:0
+	)
+
+	epytest ${deselect[@]/#/--deselect } tests
+}
diff --git a/dev-python/uncertainties/Manifest b/dev-python/uncertainties/Manifest
index 5bb3aa6ca52a..8c4e31f0d82c 100644
--- a/dev-python/uncertainties/Manifest
+++ b/dev-python/uncertainties/Manifest
@@ -1,5 +1,5 @@
 DIST uncertainties-3.1.4.tar.gz 148897 BLAKE2B 3e94b61ff6aac42a7910cafebee5b440541a020c58bc2ce402d0a056b5d278205f4a6556bf49073f5ded305cfa73ba7e9095e71d3963fd9b73e2e9e19ec360b5 SHA512 209ebbed1f9cf99e3263f6470b04fc737c6d34d878f7eb1d2a7df7e63d4d42b0460391a08f99d8fe09df8f7f0e1de8a8e6c2cbecaedc7f0373ab06d05fbeb955
 DIST uncertainties-3.1.6.tar.gz 158419 BLAKE2B 09582936a9b982efeee6cf3c99de568ebc820940ca2bfa1e4fd10edbcbd9447e7711158f8b98567a506d6c5a9ecf63b6e21d296c7f8d8dcbbaf4c2fb6a571355 SHA512 8835ed851d00bbe830770e57bc89ce57acf291e6cef2fca59897adb75e1e2de456da3631f73242ade20f567358b1d727b2b7f5df02e2f3e0cd8d861e81a6a211
 EBUILD uncertainties-3.1.4-r1.ebuild 794 BLAKE2B 3b880adc7f3f46c37a4b22253978397d653c609fb01cb38dc1405ac61ccfd476e2954e0cc0e0d699feae47145fbb105e7b26b3fcaf06184621d76d170aedb8b7 SHA512 e67922cf772593baf0b094ef05f46b4858f929f35b2443f0165a392a1a24990f7f7b8f4ae56d3ecab8928aa94285f671333c8048117783be3d3e846f09feaa4b
-EBUILD uncertainties-3.1.6.ebuild 793 BLAKE2B 12202195860e0a3ebf7d4f8743e27738b0f14efadbfb9f5ef4a1b1b430933aeaeac76c2cabaf00b6ca3a470c0d40eea30eb5873f61ec98062704e6a8b9ae9289 SHA512 e712ab8d227501f2014c146a26b5561da08e2e9421646dd7fd258804e60ceb69076081d642fac56ca4928e350e307912373146e1738b253e070d86394938af3f
+EBUILD uncertainties-3.1.6.ebuild 668 BLAKE2B 0b387a85d90f1747c800cfd635fcac300c131322028424ad6aec80fdd296add92c5c0ea48ef2b4acaf38dddb3fc0b4161f130c3c781fe8825abce91c1026d524 SHA512 85b3879624d8ea6baec85c6ef2dba6e7e409dd11bcd788584bcbd443fe3e19700f650f447352bd138f66b3e7274404268ec609dcf834cdc037cf37d4c9efc303
 MISC metadata.xml 859 BLAKE2B 54ae46c343fada9aabb973c5297eccb0abe7299a2a1f0009df1d083698c91ce25339cf63d77857febee0798b27a84ba83dde95e19255f45f8cb0141c6a009954 SHA512 833af2fd16f097d61942c7f9323d8e38688eead6d5d10ae8e7f2547c950cd53ab6ce28f434d2c1bb2f15b71ec55bfc30b8bd53a94a0c5f02e824e3ecb08ecc89
diff --git a/dev-python/uncertainties/uncertainties-3.1.6.ebuild b/dev-python/uncertainties/uncertainties-3.1.6.ebuild
index 96b4e0d8f983..c7a176fb8e25 100644
--- a/dev-python/uncertainties/uncertainties-3.1.6.ebuild
+++ b/dev-python/uncertainties/uncertainties-3.1.6.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Python module for calculations with uncertainties"
 HOMEPAGE="https://pythonhosted.org/uncertainties/"
@@ -13,24 +13,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
 
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (	dev-python/numpy[${PYTHON_USEDEP}] )
 "
 
 distutils_enable_tests nose
+distutils_enable_sphinx doc --no-autodoc
 
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( build/sphinx/html/. )
-	distutils-r1_python_install_all
+pkg_postinst() {
+	optfeature "numpy support" dev-python/numpy
 }
diff --git a/dev-python/unittest-or-fail/Manifest b/dev-python/unittest-or-fail/Manifest
index b1eeb1d6aa2b..4ab4fc783bb6 100644
--- a/dev-python/unittest-or-fail/Manifest
+++ b/dev-python/unittest-or-fail/Manifest
@@ -1,3 +1,3 @@
 DIST unittest-or-fail-1.tar.gz 2739 BLAKE2B 781fff33d12e2ebbf408875d8677a73fe3d5025c6d7e5e67ce23e1f5a36479e7680ffafc9ec73830a70114ddb8bb0c784095f15e8ee13fcf95fe4712c2d8a080 SHA512 c58a2b6a3723d1327d74fb528a5742f576a70453c81bcd55b551a6eac05bb6af4555b9274ca939df70ada85a0be42edd258ea7644ab1d24fbf897a1e96b23055
-EBUILD unittest-or-fail-1.ebuild 827 BLAKE2B 0840aa9cfa1a83500675e008b9c3dae61735058e824d6722d7d5b50c255b100113f6e70d1fc4dd095d1dfbe4e997e2060d538ae8d78edb948391a393f43107fa SHA512 f58e3d5ad954d7b4745443379ea767652ca96873c0b4f5f9846b86a88566404a77061e3c34357f56f3169a4ad06f840bf8b882cfabda98a2296a6163475aea88
+EBUILD unittest-or-fail-1.ebuild 833 BLAKE2B f9b234dde5611921d9affee30c40bfbed9320ad2129d8403041ea52c594c995ace1e7624843cd1bc6a8a5c9d6ac3824e7a95c2bfeff1d3fa326a76cf84a4df85 SHA512 6ea5dea2655328c5911989f2f457bf9b2ad31e76f34c08ed2af9c07dc7227bf2f16750a95dd0489fcaf0a6a7bd38f491df6a4b8089b066f4b3cdaa1a2cd875ed
 MISC metadata.xml 372 BLAKE2B e34273d2456e517c83d2ed1933ccdcce21d22ce96cff97c691d920c144e921b4f49b0018b4d9d5dd72a7fb0f2578dc0ed9d4958915fb386d0db3bb134d592df5 SHA512 da8ea65057ab402c29eab6fe2bb7fcc6f82052cb4fbacaac99c955da80da7286cd837bf0489420f04bf41aac1789a349ea50f624bb105f44021dabb92340d1e3
diff --git a/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild b/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
index f5359c5ac03d..b77f5a5cfc0a 100644
--- a/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
+++ b/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Warning: do not use distutils_enable_tests to avoid a circular
 # dependency on itself!
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 49c1584a4b13..46a9ff634d1b 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,3 +1,3 @@
 DIST urllib3-1.26.6.tar.gz 289927 BLAKE2B 197b0df759b27fc4906c565426e9c7b533fad56f10695ab5ae6c6c4d05d5c889dba906be526d8b8f41405f29696046b7db6e2cbb2fa16843af80e072138cc35f SHA512 19eb4b88b7a575db717db420ff79b304769d9a6d2b576a236d69719101c4d52d6b0079bd049c885e630f0dfd60471f8bb33836847e0569652cddece910ec2979
-EBUILD urllib3-1.26.6.ebuild 2022 BLAKE2B 38e8f4475be139ddf6f9d111c39aaf1c900a8d95a5066ca9694d03dcc80fd44e80a517d22417e75131558b99e144d96cfed4ce48b4b79367527ae919133fe5c0 SHA512 b34d56c725bb5fc23e7970b9312ec8055a3676c0ebf0e7cb2c17fa462a9e97a68baaa634951eebd212f9c2741ea8e8a11b7cdc60cdf3753f8db6fe45ecb00a33
+EBUILD urllib3-1.26.6.ebuild 2028 BLAKE2B 8379275480943cdeb822db1904e5e3e5fd80d4a7899e4590091848f0ebb59ff0c3071fbd047dddfbfaf327cd66875f39303f22e4250b1ff7fa1d951e77f59b5b SHA512 344c80564c9e63aed9095fbad65ddf85bf117ba88d47bc4369dfdc9525b533c648a322ce52443e46724e5060349f68bfc3b84655ff1816b245004793063b9705
 MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e
diff --git a/dev-python/urllib3/urllib3-1.26.6.ebuild b/dev-python/urllib3/urllib3-1.26.6.ebuild
index 4ea114ec7e7e..5502af18524b 100644
--- a/dev-python/urllib3/urllib3-1.26.6.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/utidylib/Manifest b/dev-python/utidylib/Manifest
index 161af3f1bc17..d440d1910790 100644
--- a/dev-python/utidylib/Manifest
+++ b/dev-python/utidylib/Manifest
@@ -1,3 +1,5 @@
 DIST uTidylib-0.6.tar.gz 15771 BLAKE2B 9d4fe57d985ea6e52680bd528862d3236137221227a23fe05b886d01d240e21d7159dbf7d6da3af8020009ca45c60c2297e374bb7aa05cb6b5a8eaf444710c58 SHA512 a85506ef8824f66ee326ad651020dc3b4e00190e20dcd3814984fa27ff319f492fe5bac781b7c43c8694cbfc63409e3abda18981969c9be2c3cd023fe7a4f2f8
+DIST utidylib-0.7.gh.tar.gz 15203 BLAKE2B c32f23ab3a94191423655f9b6a99bd85aca7072fcfea7507c5d4efb19c4ee22114afe136c6299e8322e15195c4f938094e49483b1a40d05522f2d232dd9a6acd SHA512 69b22671223cc9e1888a1be19b418e883baa79401bcf3856fa48cca441ae7fa414047c296f8fc9ff35aa7407901fa64cd8ddfcc56657a98e8e188073dfc72172
 EBUILD utidylib-0.6-r1.ebuild 943 BLAKE2B 70eb05e1997d5a7e0ab0331e756328ef06655ea6ddb1bd1f1175a288dca9ea809ecc122bf53848020b2514891cf8e547bb655790f866ddab9df57c8d42de28a0 SHA512 af0b3a382796d6627d778d06355e61e61ab92f72f7aa9af57b2a011abbef0d07bc79bfb29bd7ed742068a7855e4cbce93b0f54e89c36f4a094daf28aff591bb5
+EBUILD utidylib-0.7.ebuild 714 BLAKE2B 7dd4b6d2d182f40aa7e3cf41580307049948f62050a64f3dcbe2f4d3a8f530b93846b952f6e513449187ceb055fd8d2273b102e396df1fc92a44d77eb865566b SHA512 2c4213025c698dcd319cdb2a8217ea404b80df446fd52568a05fafa521674eb6a1a0c7b0508f826ce5bfc85983a7e4d66024d2c4672583905885047026636353
 MISC metadata.xml 365 BLAKE2B e85ac3e7839fe863c3eb5cb648892afc63567c05a598e8c43345cf45774faf16c849ea3d82ff89af078640f7e54c0a40c04631c537564920b4f69bd17fb39516 SHA512 b90faf30a65ec1dd177f16a969cc11372d0af82948aa2c4833be23109453b4019be87995fe80d7323cf0e62bd6ef4157b22b85a643222463daeaad91881662e8
diff --git a/dev-python/utidylib/utidylib-0.7.ebuild b/dev-python/utidylib/utidylib-0.7.ebuild
new file mode 100644
index 000000000000..bf5039557621
--- /dev/null
+++ b/dev-python/utidylib/utidylib-0.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+MY_P="uTidylib-${PV}"
+inherit distutils-r1
+
+DESCRIPTION="TidyLib Python wrapper"
+HOMEPAGE="https://cihar.com/software/utidylib/ https://pypi.org/project/uTidylib/"
+SRC_URI="https://github.com/nijel/utidylib/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="app-text/tidy-html5"
+DEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
+
+EPYTEST_DESELECT=(
+	# https://github.com/nijel/utidylib/issues/9
+	tidy/test_tidy.py::TidyTestCase::test_missing_load
+)
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 421c36375797..380075af0a85 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -2,7 +2,9 @@ AUX watchdog-2.1.2-big-endian.patch 2861 BLAKE2B 05849a6c6a23b4ef55c5f92a46ab57c
 DIST watchdog-1.0.2.tar.gz 91796 BLAKE2B 001cbe82ff8aff0c4e56e4d1f02519047580cccb48466566ad7c9c1f462f90a9a036cf90846eb38ec4fb24ff1df2a1ddfec20b3f0587afdc1f938ada1bb0b1ef SHA512 e87a0955ce822daabd7d030804876698f98ed2aad58486e26a94585763655302063f091b653abd385ea99642361b6253d8e051d96019b243a77b078ba86b0d6e
 DIST watchdog-2.1.2.tar.gz 97407 BLAKE2B a847089409537391287a146670864c7721344ba8a6378c89483e9e08abe3f61690bfca48016f628ab0e6b0ff317679db3c72e27594e049ea03334dd20c305008 SHA512 2a127faffebb35f0b14d578570a4c5a7c27d6bd38042e34ea50f4b654be1ca07b193dfa72dfe25442d3e6da746f1cfbdda71c38be1386cc5a3e69204843c16f1
 DIST watchdog-2.1.4.tar.gz 98695 BLAKE2B 2a15b362c6e776146df4738096fe0cd8ec49894c6b767e86ed5749c2f97447fb890f172ec989a17140594070eefa1fa2b40275aff5ba9d212f77a059ac3ead25 SHA512 88bed725c045f59091902a1fe4673036a679d263c71269e36125df2a4c851864bddee0cf4f8c3f20bfc2d5f735804b7c7b1ff07a3d89d8649bfa16d3e7e1fe21
+DIST watchdog-2.1.5.tar.gz 98791 BLAKE2B b7663e5aa8918321d570c842abf7c70647712d2045f3cc06ccdff86e305fecc5b95c93048aae9f0a7b2629c2c4f10911ef21077a570b9fb0c3eb03e9597f555f SHA512 850feaf4f5d61b8c8f1521464853df65b72af80c86c63fa87769d17f2bc464112daf3e09a8d83e30474d398315ce854e5a45703c5eabad8b0f5f98f6840d2590
 EBUILD watchdog-1.0.2.ebuild 965 BLAKE2B 35bf7d74d9da00f8a7b69e6394619867c4cf6947e5c14d8aa833ea1a099515529f7bdb5bb02a59a76c5629e7e38dfd560df0fc63d23fef5210d5b42ac0dd9a7e SHA512 a709f107fce0b758f9a4e522052fc8a6b7bcc0c7b87aa79fb53cf8c8ce035bdd4141df117b983d869f21af7410c7d6cc373fb65069f74c049e2b703863c06fbe
 EBUILD watchdog-2.1.2.ebuild 1105 BLAKE2B 1761e1cf618be7b611c7483a13a3fc399b0164f064a138361bc4226ac2a7d329dd48aee62afaa4e57776f146c78a8ff960b556ceee0e42a1fb0791e2bf33f6a3 SHA512 98532227f30ee84a91005b303e959cd720aa2cfa508d7c7392a969482e7d1b4917b846a0f358a5f3103a0e937a224d0d2d2e1562aa5f2d249b72806ec9942d42
 EBUILD watchdog-2.1.4.ebuild 1046 BLAKE2B 52b42d15c8a712005fa02dd9ab5405ceaecf2f86eff9f56f227b2df05dc00979d7aae4a73ac320806180f1168ba6a67334080b9297173ead2571485f175b9c34 SHA512 ecd0f21a72849edd23828b5bbd45546e90eb855679a9773e59beb635167ea2a9614f21e3d42a825c6d672bf0baf24d5377168c95def22d8588fb3d37557c61ff
+EBUILD watchdog-2.1.5.ebuild 1046 BLAKE2B 52b42d15c8a712005fa02dd9ab5405ceaecf2f86eff9f56f227b2df05dc00979d7aae4a73ac320806180f1168ba6a67334080b9297173ead2571485f175b9c34 SHA512 ecd0f21a72849edd23828b5bbd45546e90eb855679a9773e59beb635167ea2a9614f21e3d42a825c6d672bf0baf24d5377168c95def22d8588fb3d37557c61ff
 MISC metadata.xml 462 BLAKE2B b18ac987fd2ea50f8f05f5ada3cf82db92cfedd0e032759b0063407d54acdf3ace017ac4321af37cdcc5a4d2a2872185db22971226aebe1914596e5f8bbbf580 SHA512 46c75850890be381d2d45d00c5118d862aa97ccbac569fa3b44a85d880de2a2c6a6c0d266d518826f4e4206003d2aedc508707258890b60c5e42c2a564459ab2
diff --git a/dev-python/watchdog/watchdog-2.1.5.ebuild b/dev-python/watchdog/watchdog-2.1.5.ebuild
new file mode 100644
index 000000000000..7b9fe168c229
--- /dev/null
+++ b/dev-python/watchdog/watchdog-2.1.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="https://github.com/gorakhargosh/watchdog"
+SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/argh[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	test? (
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' setup.cfg || die
+	default
+}
+
+python_test() {
+	local deselect=()
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_inotify_buffer.py::test_move_internal_batch
+	)
+
+	epytest -p no:django ${deselect[@]/#/--deselect }
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 0443e6e23de1..65c68312a657 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,5 +1,5 @@
 DIST websockets-9.1-python-3.10-support.patch.gz 6940 BLAKE2B e4835c7d5efaf956d07b884c85e0b95f26674bf36164fa8362d1c1a564a959bde761d25e747333c58864f74a5ea1b199f228a46ec6a1647c5495ea032020c179 SHA512 7fb4b298a9167c8d913e293fa7549b21d5acb333a5b97e0624a22cb83548ef548b819ac23750c40295140b6f83a701c73a81fdcaed3ab8e704dbee8e17d22f1d
 DIST websockets-9.1-src.tar.gz 191813 BLAKE2B cb3807f01e1a4c22a40bf5150d1e8b21ca786dc5bc4da8f3e6602971f3f7c79b57092f5ddfe3ee52ec00e7fd15f3a992fdbb94b5e26599f2621a7f51434ba6dd SHA512 ff2907a913ff0b8ced6dda72b6fc6512a2ece3ffded2e2dcb8ff6805de9ad504430cc1871c1f6e02ab8069e7b96b2e7609afaf3c9c25f9271b28e2daa72bd3ac
-EBUILD websockets-9.1-r1.ebuild 936 BLAKE2B 0a9c53c5a15a9b6d6b4ad2a16cb31dfd3c445346d7352bae307f4a6334cb06e869f7dcf55704d1a1e08319d0bacb5899436e2529bc4919a14f2f1acca51092db SHA512 93acf9b63835c187a0a79c1ea66a1f116aab90f77570a799de887680436d9215062fc2358f5a7e368d5a8442b9423d123c01d7d55091033cdef4ceb3c1b8662e
+EBUILD websockets-9.1-r1.ebuild 943 BLAKE2B 257821bd57c0a592ee40b50b5c8a7a31d3f192bff5113cfc068ad885831ae80c38b438621044e254f514ae32cbda80b09150b026c7972394c237c054651f9b0e SHA512 7571618127d29c5d9596cd176676f2e03e4b4d6ea0ca61ce0d04981ff31a9093629958bf9d060861d6fb067ead7942f3a94e6fa6472772e819a108bb421eb7b1
 EBUILD websockets-9.1.ebuild 711 BLAKE2B 76b5e96b67135d5173709b1ea9ebd459595a26986fe8f522434a8b744fa5b7faf21e80480323b0573ceb4b4656c9e65d3ee91000937d184a99a50c5bc5697c78 SHA512 c097db15bf8ece86b4595078699f9644ab2026dd215288fdf202aff356c88d3bace38539cc280f4efcd2c467d0d17d26e4ca1ad278e4b7f89498fa2fbf034f93
 MISC metadata.xml 487 BLAKE2B 7d67f4b4e650d1cc83e80eb7ad5020ef997f92997d94f19274b7e0c794f9efdb3d085faa8582321f0732cf489a5358310368a2e22b8e471d815bc9b09a16f47e SHA512 6b88582ba918dd95faa5b7e3d4aeb59f7ff455a509c018c61f61a1d2e9f69734c9d02c9d666447ea787f771fd13b44f7a54b0e6147703187a7a9fe9fccf186e2
diff --git a/dev-python/websockets/websockets-9.1-r1.ebuild b/dev-python/websockets/websockets-9.1-r1.ebuild
index 4fe1b8159c40..a68c4559025f 100644
--- a/dev-python/websockets/websockets-9.1-r1.ebuild
+++ b/dev-python/websockets/websockets-9.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/websockify/Manifest b/dev-python/websockify/Manifest
index e38e28d3fa6e..e602a5cc1847 100644
--- a/dev-python/websockify/Manifest
+++ b/dev-python/websockify/Manifest
@@ -3,4 +3,4 @@ DIST websockify-0.10.0.gh.tar.gz 53402 BLAKE2B e909dc316d6dd0ee03ee23b07ca2d78cc
 DIST websockify-0.9.0.tar.gz 58493 BLAKE2B 622a36979ec083dd3ea747b43cd8fec0916f9eb6f1a2b8f9b7acabd38f41aec839b2101c5261fdf2474bc40ebbbef61c9ba51d2e57f749f1e1a1c46879fb5d65 SHA512 d2251f653a40dc6dca0e5541845565d968c60be96a20a9b70b0305c4b7578f7fe205d4b98a94bb77d7c9383a396833af90fe92a6ade7e1a6f2d9bf8513d372c8
 EBUILD websockify-0.10.0.ebuild 862 BLAKE2B 3c24a2475a86246095229c6593749a9bf4255976ad479a17283e3c9c3312b98bb8bcdba3d71486b6d5821bb54f4b12e04476458e14a5856cc7b00a9a97a03891 SHA512 54581f42f9066d514af9efece8df6d9296da674bca00b59dc12860eb42e89af73a8a3de88c9245788c07b44203aac706bdebd6e06a57c4bee022139c88e4edae
 EBUILD websockify-0.9.0-r1.ebuild 772 BLAKE2B 164a5f4e6511a4ccdf068371a366c2c35b652a576ffb723013c76352aa046707f543d782b7cedf38c93ef8a08a055ac5b0b0ea9d4c6cb605e27d31fcd57223db SHA512 9efe158b128ae165c550a0180db533f681e85bf0b59901bb9d041f1370ee4dbcf4b5e82661d5d39d1a14f056753d86ba461092251df3e44f27843a254858b098
-MISC metadata.xml 484 BLAKE2B 27feb7f45e7ff325c6f8a774f75d861bbc96dd26b89bfa24eb7bbbeee78aae7dd6c8c8b03ce24323712e906ec064cb1e486bb0564747b36e76b3209c37ebb969 SHA512 9010dc54f71cfa3aa9a7670ce24e2404d8f615f0dbfc98a8b88cc0d248a8716a384f09eb80132cc3a9b9595b4f52fd5b4cfc20041a3d2b7cba0bdfab38355fd4
+MISC metadata.xml 508 BLAKE2B 8c53ab1a244787d503297d949b8c9a4632287a561b2f84b372bd2e59aa51c7415ef8f67c940147278f29346af8ac35945614476465010c0dc8418855b884b2a9 SHA512 5cafc32b0272a14cd1c9c6db9dc5a378e428edbe929e3d174827cce1fab6c563a2f92027676673f739efe9893061b01ebb243a6d21a36acf7c9fc9c9b2766733
diff --git a/dev-python/websockify/metadata.xml b/dev-python/websockify/metadata.xml
index 3f9398bb2f8c..57686330f5ba 100644
--- a/dev-python/websockify/metadata.xml
+++ b/dev-python/websockify/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">novnc/websockify</remote-id>
 		<remote-id type="pypi">websockify</remote-id>
diff --git a/dev-python/xdg/Manifest b/dev-python/xdg/Manifest
deleted file mode 100644
index 8950b2b8c292..000000000000
--- a/dev-python/xdg/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST xdg-5.1.0.gh.tar.gz 20801 BLAKE2B b59edb9bbd32b19a5d875a541a26b27746e964098570f14fc233c9cbcfe76b8fdd8105b925adfeab4dc519787985848f2acf3be3ef88dc5c2a4acfb6d10d7059 SHA512 37c1f45c4900d26df592da0bd02bd10fc4d132e68dfb76d30723f37e1a72d68bf7e8fe6e64ba17d37f008046726f803268dee4b3a74ca05d0b823d0dd969d3c2
-DIST xdg-5.1.1.gh.tar.gz 22662 BLAKE2B f25e1e0aed9d14d244452bb9c71194016ac2b92d663ec20fe0a4aa6aa041fe99551b9c8952c6d7ddc7d8aea85d2010a072dfd7a7efeb8fbe37a58e965146ecbc SHA512 aaf3600703762dc9876c603e90fffb7cbdb57d73e3cc2726a9381d211ccb02af9ac6a7a055d8380ee206c8afa58bb1c20cfa56d780a6bd279efaa76b9465380f
-EBUILD xdg-5.1.0.ebuild 588 BLAKE2B 7da2b8712e71ac552b1357e9c044d4e52a82c1a071a903abe977da8391ae44af5715acd80b7632eccdf00bb9d0e2270aa5840dfdabb0aede7a061923efecc775 SHA512 77803bd3fc3388626d2efd09a1cf4bb967f19a30c4f84ac52dd05d7419e12b50c421dd2f637c7ff463e9cbe7813a81af5994f35ba75f506d0a249efaef3644e2
-EBUILD xdg-5.1.1.ebuild 588 BLAKE2B 0c772dc130376dc757bfb2c0ebfb750d107ada194f8a8286b03cbd432f24902fdf006fe934b2951f3cbe0b2b0d17cfdfbbbd03816cd685187da638eaa2b0d59b SHA512 31705bffb5fd76b2c7ff1b6739b1cc7fb4d0b58a367a6ed24d84136851471bc332f3399c5bb26ca1d4f60fec019a868b2a22a66a7931a68a8d946d420399e7d1
-MISC metadata.xml 621 BLAKE2B 5a3cbf7eafa16a4c1b3fb84a6d81e1082543df391109ae16527afa59aad4e9301e4ac103582221da5e215ebdd0dd9a07bc98236a861e62195f044b03e387743b SHA512 da8000528c3702d3737d357ad3f3ce05a04090568506012811debb4bc68a15d00345f1c92e2535dacc3f48f000db57045ec91c6caf2222549732d959d2f248af
diff --git a/dev-python/xdg/metadata.xml b/dev-python/xdg/metadata.xml
deleted file mode 100644
index 420cce7cc4fd..000000000000
--- a/dev-python/xdg/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<name>Kalin KOZHUHAROV</name>
-		<email>kalin@thinrope.net</email>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">xdg</remote-id>
-		<remote-id type="github">srstevenson/xdg</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/xdg/xdg-5.1.0.ebuild b/dev-python/xdg/xdg-5.1.0.ebuild
deleted file mode 100644
index 6f45c65fcd8c..000000000000
--- a/dev-python/xdg/xdg-5.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Implementation of the XDG Base Directory Specification in Python"
-HOMEPAGE="https://github.com/srstevenson/xdg/ https://pypi.org/project/xdg/"
-SRC_URI="
-	https://github.com/srstevenson/xdg/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# https://bugs.gentoo.org/773415
-RDEPEND="!dev-python/pyxdg"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xdg/xdg-5.1.1.ebuild b/dev-python/xdg/xdg-5.1.1.ebuild
deleted file mode 100644
index f690901578f6..000000000000
--- a/dev-python/xdg/xdg-5.1.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Implementation of the XDG Base Directory Specification in Python"
-HOMEPAGE="https://github.com/srstevenson/xdg/ https://pypi.org/project/xdg/"
-SRC_URI="
-	https://github.com/srstevenson/xdg/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# https://bugs.gentoo.org/773415
-RDEPEND="!dev-python/pyxdg"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 3b653ca08013..3bc7d5994c52 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,5 +1,5 @@
 DIST xmlschema-1.6.4.tar.gz 369270 BLAKE2B f3b98f0b8b4446dfa67da778c6b63585a894f4dcc9fd7ea98637ccd54b26e63aebc7f3fbc00e13ce43730b88da0f773a491917d5eae9301b5d22f6efe620473b SHA512 7e13d20a6add1cc5b6d0f732e672be3eeeb2f107fd2031cd5c22d1059d24b7d818c534817ea115d0c5f011727175bdcae71a0b8d55f1d6bd263a7e38286c26fc
 DIST xmlschema-1.7.0.tar.gz 370433 BLAKE2B 0270151705ca65d4b0f587e2ac75f7273a20242a0a315b4b954a6ccad6d46d7d093330a4c40d74a44c0c55af021da1c4ddde85f8431e0779d30e2164a599a335 SHA512 c4620f205cbdccef95a38eab6e6a5d6082681e3ff71708376f0ddeecd75a5c53f686fd740a41e98afd2ec5ec0f14be913b6c65bce80fab0143fa5fe1cc8a2ab6
 EBUILD xmlschema-1.6.4.ebuild 779 BLAKE2B b122698cef27e5e87ea640ba5c33838efbec2ed1f70373637046b666ac829fdf8583368d4ac325a02f782eb0b25771f7aabffcf3b2b5a2c4f281ec97c7e27f26 SHA512 392c42ad67bf932549a56d1f2de75871cf8f49739c110d84e4d61f5db02ed410d3374ecd2612288552b07dc87f0a0d7ee1af2d5c3f763c521031f14c2a9b00ec
-EBUILD xmlschema-1.7.0.ebuild 787 BLAKE2B 03aa4c39550d304c71c4a17be07df8ab34db4e86f6678d68bcd6a855e86c861109fa6efe4049a2f95862c78cdc20c1c6eb53d04f6a7592d38a6a1bdeeb68f5a8 SHA512 8c3306d60dfcdd48515c7f3968c4c3c424793428f5b5e2121d77fed159ea6b3cf6a38d5a1207f22964543e7002f66a4e65734d57d796374d2162ccd19d9871c0
+EBUILD xmlschema-1.7.0.ebuild 793 BLAKE2B a30244fe7c4063b7573351a7190ab44124f5eeb96cd8dbf3fc56e408f84a0b601db1e0dc7cbcdd6f221f48c0937a84643e8482cc893490f834bb0a01c90c6c90 SHA512 52417d911c4f7a3738422db216e0c0f28901a26595512ac47e300ef7f3396619808535b94db4679c069c8bdb9c3f06ba30157952291b0984b67405161a46ff29
 MISC metadata.xml 375 BLAKE2B 16a422a1beab981008ef66eccca94cace74cb244fb6123d2495e13045b4c786bf00f2807d3ac73e98f1c962fc0ccb7f7aa84f565dff54e2ef2077776a85bd479 SHA512 db2b030851d7357aea0b41066bcfa36b9ae81c745f413a3cdc1a528a38f2ea1a8c7876abff7f139801185f075be9e841d637f238b9d3bc37fa212f13c06ec411
diff --git a/dev-python/xmlschema/xmlschema-1.7.0.ebuild b/dev-python/xmlschema/xmlschema-1.7.0.ebuild
index be89448c38aa..19b2c2736c27 100644
--- a/dev-python/xmlschema/xmlschema-1.7.0.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xmltodict/Manifest b/dev-python/xmltodict/Manifest
index d8b08ccca52c..224f5b1d64df 100644
--- a/dev-python/xmltodict/Manifest
+++ b/dev-python/xmltodict/Manifest
@@ -1,3 +1,3 @@
 DIST xmltodict-0.12.0.tar.gz 18481 BLAKE2B f7b7b71a6eaacc833a54369be38aa988b5c27845b19001c1d13e955df1f3a26c04dd2a1b45f0c0e704c4df6f4d380abdda7189944cc45b001eeef55405c43299 SHA512 1ec3de3ebd05adbe032ca569a71048e72097c0f5fc864b63f168d661f72d13d0981e6e62bb9ca2ffe925a3b2f7c2fb90a44177427d4bdf68137842342a9cd2c8
-EBUILD xmltodict-0.12.0-r1.ebuild 495 BLAKE2B 4d58f2e5d7d55b12d8bcbe4993c07bc6a906b061f6a9fc88b33e08da09a505c492ea582be164c2ddc3909df9078ea1afc2c2d4459851b4da4208fc8b05587f19 SHA512 13145ab495cd642b16fd490386fc713c014aa7504c06cce6266a37dfcb60dd29033220e4c39b65fdd61fec0317375f043292f028ce520b7bb9b853c1980286d4
+EBUILD xmltodict-0.12.0-r1.ebuild 501 BLAKE2B 5b13b4af0619620a5a5ff99cc98bd05e8b0abd1f4b68b0e45575796cad1cf1f2c6f5d85e0e66807c0ed0126bab3199562b0bfffdd495ab2f4f6d8c76b73ec37d SHA512 bb05ed1172c858e8e0e722843337e079c26c8fe49312a3e261e658f3f47eb961b36713125769c67f5eb6e5bd1a17ffbf5b3a5b44c2866f597baa1eb9ae44c8bc
 MISC metadata.xml 385 BLAKE2B 6df98f89bbc4f9ce1e05dc86970c81d31f70559d4b87fd4d3908ceb1183906c1195544b2e99e96931ee26985f5e02b7fb4b036d8e6cd03c389cbe5764b964111 SHA512 ad748afd533651881c58295101e82097a0c4f4c15b205f4836315832ea3c08ee7cbbe18f652d09048c08532a3fe03b5fdd1f9da48d3378fac8624984c74df794
diff --git a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild b/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
index e3e01a5c686c..78918e86ec58 100644
--- a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
+++ b/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 
 distutils_enable_tests nose
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 45374d2627b1..965fa6dadb3e 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index 02dc1e667dcb..58141a2351e4 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,3 +1,4 @@
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
+EBUILD qdoc-5.15.2-r1.ebuild 624 BLAKE2B 5ea2d3296a79b8f3c69b4fba87d46b7ae106e01ae04259de3cc17fceb7e02584d8eca51ddd4e6ae6390248f562bf51a2ab132ca977dcffe80253ee8cd495dd86 SHA512 a5f46fe3a14d8181068161679724f0bde3989de6191539e91cc791f9c02b95958992b0d794453d3478f7ee5e652bdc283b89654cd0ee0710a6885abd68458645
 EBUILD qdoc-5.15.2.ebuild 543 BLAKE2B 049d072f3fe6f36d4703150ebe4326f0ade72c2e415743da40bd2015dfe9818595f606ecd4e7ed543fd9175b2f1df77da811c3a655dae4112f816f901e3771f8 SHA512 4de93172b553430ff0507f32519b22e4668e024ada835c938defec5037f95f9752dc6f58951f6d3a3167586083f20679ba1eadf5927abcd6b3e2ab15de7824b8
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/qdoc-5.15.2-r1.ebuild b/dev-qt/qdoc/qdoc-5.15.2-r1.ebuild
new file mode 100644
index 000000000000..09d86b11c1d4
--- /dev/null
+++ b/dev-qt/qdoc/qdoc-5.15.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt documentation generator"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="qml"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}:5=
+	sys-devel/clang:=
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+# TODO: we know it is bogus, figure out how to disable checks, bug 802492
+DEPEND="${RDEPEND}
+	~dev-qt/qtxml-${PV}
+"
+
+src_prepare() {
+	qt_use_disable_mod qml qmldevtools-private \
+		src/qdoc/qdoc.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 406036b47382..0579daf387fb 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,3 +1,5 @@
+DIST qt3d-5.15.2-7edec6e0.tar.gz 86196121 BLAKE2B c6009fa8b94da1a498e14f61680be40cbc5e32e390d89911b5a7b7d19bae7c66e048101e6f3b6c1f7e5cc4e64da7ea801f4bf95c346b35d28a49866d9541e146 SHA512 73941c2052aeb9611cf24bbb7b3ba317e53207c080070bb5d602c9f2725d2ab305674e0f29b737ea62ff7a285b362ec53b3588b31c18635e250bc90081d9b5e7
 DIST qt3d-everywhere-src-5.15.2.tar.xz 81925416 BLAKE2B 358a071f775d460d794ce3451ea6904f9d1ac0a388176ba62f7d6c7c574621cdcd3db8f7af3aaa361e5ac172056e8e8a32b894b401720e93ae2a2cfad4282da3 SHA512 38da6886b887f6d315dcb17192322efe184950716fdd0030df6c7d7c454ea43dc0250a201285da27683ce29768da6be41d4168e4f63c20adb0b5f26ae0934c1b
+EBUILD qt3d-5.15.2-r10.ebuild 881 BLAKE2B a7e98ce905f5055640fc797d71d8d33159079975783b5a58408cdccfc52620d42c20d1a318c00cf073f9d0143882fe7905c7a45753faac28d3eff1b37ce7da1e SHA512 2eeaa8e7243aee5298410c77e56f3e466483f35989d8ec188a50dc84c6d21ab7a15378d72a1fd03b7f0dd09f41f2238a76cf910020e3de34df3a59261771c500
 EBUILD qt3d-5.15.2.ebuild 880 BLAKE2B bcd097060dbb5e6673b7f5c4fd314a58c0f4d3412ece2b8542f83565d9ee0a0ad0df189e7af927bf836f8c200ccdfa689c366408720c069e21d093ab33fdf4ca SHA512 77f8a1f095598e798479a1e7d62e6b40188bbcc662da7948898364b0b5cd61bbf8b560a271969ae15e7a9f4fa4c49edc064a85cea1e1ae04a0a2778b7bd43d4b
 MISC metadata.xml 699 BLAKE2B 45b5458bd903a90a1da6277922d4e0077dbdbede5e4bdfed523d5926abd59147a3085ce007075afe7c50c5256f37d827d3ec6c5287fb7910031198f14c6dbc4e SHA512 c055619fd9c01e39f707dc13bfc5f805b4e3777e3ef0841d1cb52f2fa0f58eafd684a9e911ad7aa8e938f4f42a1cbad205f9cd854c4eaeaa08918db6d64e174b
diff --git a/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild b/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..b8fd6b8313f6
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=7edec6e014de27b9dd03f63875c471aac606a918
+inherit qt5-build
+
+DESCRIPTION="3D rendering module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+# TODO: tools
+IUSE="gamepad gles2-only qml vulkan"
+
+RDEPEND="
+	~dev-qt/qtconcurrent-${PV}
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}:5=[vulkan=]
+	~dev-qt/qtnetwork-${PV}
+	>=media-libs/assimp-4.0.0
+	gamepad? ( ~dev-qt/qtgamepad-${PV} )
+	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
+"
+DEPEND="${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+src_prepare() {
+	rm -r src/3rdparty/assimp/{code,contrib,include} || die
+
+	qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtchooser/Manifest b/dev-qt/qtchooser/Manifest
index f13863183989..66491f7796a5 100644
--- a/dev-qt/qtchooser/Manifest
+++ b/dev-qt/qtchooser/Manifest
@@ -1,3 +1,4 @@
 DIST qtchooser-66.tar.xz 32008 BLAKE2B 1faf4a44406655621e65132289af6a8b0d23f0c1027a3b99017c3951705378bebcfbc3cb32aa59975a101f21294ff701ca6eb6ec18ce977b714a426be0fbcd6d SHA512 0c7d3588ddd7b21e6e9d799204924e06e0b0950c898dfd23088f1e7657b7f821a35579aa062658499809f9d9757e82c3c592591aa2e5ec453463929bf2b33bac
+EBUILD qtchooser-66-r1.ebuild 1475 BLAKE2B f3d1494004ab280f42e2bd439a3832012ebb69b175faa806135478f9bb95441a2bf18aba0ce988381b06ba04ea48448f4e2f0f56c9c34244fc991647c19ba92f SHA512 9d67d5c439565e31593babed7ea27aa838cba849bb592c0c6ba9ada00a68959b926c3234db40a81cb530f988d5c7d6a775b6b000ff49ef454c901812171a13b3
 EBUILD qtchooser-66.ebuild 977 BLAKE2B a28e55c2c6f55082c93f8d7ba3e1e0d4b5cc378663ae94cd0026a46745625e1f7240cba603458ab756ced69950c3059a8bb63b94b7b45f96f0d783d542f9c823 SHA512 a10663af25e02e9f59bf3d9bf93ce5662bce5dd489382916e7396350d7dd738cea432ae8aaede433bee6a3db378e79d23ce0a8af063d7d5c2f99c5c6887c1765
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-qt/qtchooser/qtchooser-66-r1.ebuild b/dev-qt/qtchooser/qtchooser-66-r1.ebuild
new file mode 100644
index 000000000000..46e2087883e4
--- /dev/null
+++ b/dev-qt/qtchooser/qtchooser-66-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils toolchain-funcs
+
+DESCRIPTION="Tool to quickly switch between multiple Qt installations"
+HOMEPAGE="https://code.qt.io/cgit/qtsdk/qtchooser.git/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://code.qt.io/qtsdk/qtchooser.git"
+	inherit git-r3
+else
+	SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? (
+		dev-qt/qtcore:5
+		dev-qt/qttest:5
+	)"
+RDEPEND="
+	!<dev-qt/qtcore-5.15.2-r10:5
+"
+
+qtchooser_make() {
+	emake \
+		CXX="$(tc-getCXX)" \
+		LFLAGS="${LDFLAGS}" \
+		prefix="${EPREFIX}/usr" \
+		"$@"
+}
+
+src_compile() {
+	qtchooser_make
+}
+
+src_test() {
+	pushd tests/auto >/dev/null || die
+	eqmake5
+	popd >/dev/null || die
+
+	qtchooser_make check
+}
+
+src_install() {
+	qtchooser_make INSTALL_ROOT="${D}" install
+
+	# install configuration file
+	cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die
+		$(qt5_get_bindir)
+		$(qt5_get_libdir)
+	_EOF_
+
+	(
+		insinto /etc/xdg/qtchooser
+		doins "${T}/qt5-${CHOST}.conf"
+	)
+
+	# convenience symlinks
+	dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf
+	dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf
+	dosym qt5.conf /etc/xdg/qtchooser/default.conf
+
+	# TODO: bash and zsh completion
+	# newbashcomp scripts/${PN}.bash ${PN}
+}
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index af445dc58de9..7788f4ae1d8d 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,4 +1,8 @@
+AUX qtconcurrent-5.15.2-gcc11.patch 1709 BLAKE2B ee8a0a0a591fcbd242406bc37a5b29959d4a82cba78dd5650b60e0526316a1ac511c2f4e053db29d365394f38cf481772e659f194576f58aa2cb4d50ba240c51 SHA512 895c35ee745ff34cc939463c1d0b433d4bcf53c78af3b6c14304608ff282cb77ef292c63a1368885c7b3db5ec7c4acbff1827a014f08a768fdc50fc87dc64222
+DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
+EBUILD qtconcurrent-5.15.2-r1.ebuild 640 BLAKE2B 6b92535edb473b634658302c1863569c147b9271e016a77c88bed6bec845612f520fb68f426476600e3473ff66c87ffb1420015aba12ccb606d8dd330639022a SHA512 01ad79d9fd101c42eba17851270ef6058f167204e515016b47bbf8001fffce94c23ee909c496ac73d5d38c0a71ac03c1ccf0dc006082516114343164b4e2d2bb
+EBUILD qtconcurrent-5.15.2-r10.ebuild 510 BLAKE2B 0fcb89440457be88a2b74faa4c2cbd73f7ee772bcbf6b6bf940b74f7ed62989a1e312271af795e6cee8098123acfe2e8b2fc8ca48452a6113e1a11cb3583c4f4 SHA512 8855c7b09da4234e02359b515f0cde02917d8482257c1883b22a6e4407e7fc82dfd762815f9579b6ba3e2322f33758c47f0f9f2bb7f1eb1b7581fcddd1067105
 EBUILD qtconcurrent-5.15.2.ebuild 593 BLAKE2B 44f6a1c8dac390908bb2d5d8f9ffaabd96333ffc07a680ec4ae65a0d4ddd737c24eb376d99afb9cffef954d7b0daa2fa4436c80ea839a43db71f4fc6edf30f7e SHA512 abca397ab254a2d3fcecf6d7ba04814f15184a1589c3fa2e26c8c4bb2fa965f2b9437ad2a0874fea44ea97490320e8589f596b26c91a0af17a10cbd30f16b296
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch b/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch
new file mode 100644
index 000000000000..b27ac767b064
--- /dev/null
+++ b/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/764977
+https://invent.kde.org/qt/qt/qtbase/-/commit/c9543da6998b0827fb75ffe22327c99e2da7d364
+
+From c9543da6998b0827fb75ffe22327c99e2da7d364 Mon Sep 17 00:00:00 2001
+From: Sona Kurazyan <sona.kurazyan@qt.io>
+Date: Wed, 17 Mar 2021 16:04:00 +0100
+Subject: [PATCH] Remove the unnecessary template parameter from the class
+ specialization
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This seems to cause errors when compiling with gcc-11. Although this is
+most likely a compiler bug, specifiying the template parameter type in
+this case isn't necessary.
+
+Fixes: QTBUG-91909
+Fixes: QTBUG-90568
+Change-Id: Ib231257ccb2e16cc533f23ca5840d31e26a66d53
+Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
+(cherry picked from commit 659f7a06e91c04b239e3f4c0bcfccbe3581af1c3)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+(cherry picked from commit 049e14870c13235cd066758f29c42dc96c1ccdf8)
+---
+ src/concurrent/qtconcurrentthreadengine.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h
+index af413707e4..a4c8548cc4 100644
+--- a/src/concurrent/qtconcurrentthreadengine.h
++++ b/src/concurrent/qtconcurrentthreadengine.h
+@@ -247,8 +247,8 @@ template <>
+ class ThreadEngineStarter<void> : public ThreadEngineStarterBase<void>
+ {
+ public:
+-    ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine)
+-    :ThreadEngineStarterBase<void>(_threadEngine) {}
++    ThreadEngineStarter(ThreadEngine<void> *_threadEngine)
++        : ThreadEngineStarterBase<void>(_threadEngine) {}
+ 
+     void startBlocking()
+     {
+-- 
+GitLab
+
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild
new file mode 100644
index 000000000000..f0ecb6cd1f63
--- /dev/null
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}:5=
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/concurrent
+)
+
+PATCHES=(
+	"${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012
+	"${FILESDIR}"/${P}-gcc11.patch # bug #764977
+)
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..1cff28e1874a
--- /dev/null
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}:5=
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/concurrent
+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index a4a62b7a8338..cdbf3e1d3324 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -4,7 +4,10 @@ AUX qtcore-5.15.1-timezone-2.patch 1933 BLAKE2B 479f82c90d2132291bc298491d61d714
 AUX qtcore-5.15.2-fix-UB-in-QDateTime.patch 3707 BLAKE2B 7b1ed1b539d04e299b3148acf85d69c014a8a76882a682910b323117e176c68dab8b48de12c0a5c885508dd6d97a4ae9da4a27162323ba743d25f9a83319b367 SHA512 62beec1be070ff6136f1b52c1789e31f877bf728ca12c54c90de6302f6c35008d0d9e939f99a92465ca14ee977faed507b2acdea553d8904eb201aed41a97805
 AUX qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch 1944 BLAKE2B 71f3a02d89e3604cec0f021fe28bddc0ab43e242742d0f5af17a46bbfdc444f7d3244fe995195ef0c1c9119313a472bd7e64a6fd02986f7cb6cb544553fbd36d SHA512 6f9f57eb2b374b56576fe0046518810e07482aae1a74f45c9692ffbd797ad1653aedfcd896d89909ade4572564164e92698de64da9f98ce876952c2c96b15aa3
 AUX qtcore-5.15.2-gcc11.patch 1002 BLAKE2B 5104165920881f0ec960a96b5e82430acf32eaf2a3b2a1724844c18a2b0661d71820401d4f6c8d25e56b3a5dfb99cc47f024a96c8fc48f9ddcb1fb8dacc8a90d SHA512 658169f8d7fa42d492f69b44feadd369bccf9a76d01989fd8b14991f97cdf3c8291ff316e195a05a8bb015bae477d5c49d495eefcfc4f3e25dbc58f33688854e
+AUX qtcore-5.15.2-revert-3a273ac4.patch 2373 BLAKE2B 4033cac8d0f4f1e96a519cf8ff524e40462fad2c5ff7e83a412108c2e4296db0e759fea93dd01835d1b9552041d15cb4ca0eccc01ef05aba14ade60cb542c478 SHA512 425f141a3a756721ef35191262885d52a3da948b079cd5f31c2c24a5eba76e0154e64486633758802f60912f0332b9814d11685b92bd2188ee08f4cf920a02ff
+DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtcore-5.15.2-r2.ebuild 2609 BLAKE2B 5ba2d7be01a791bfc9afcbe4d7cb7589df58b8ce5d343e9c35c7b69ff1ec2f80d701209e18bc2966fb154314e397b7577759b2bfa9271bb576558e6fa5ec2b49 SHA512 f4b64260fb2c66fdd106db7f464b212b7f63b506d4c3026cdbb15402a88f89f95742bc616f86bd6d92cfa4900b98e85dd50b9cfe9d49f3965c8df8fdeee42c51
+EBUILD qtcore-5.15.2-r10.ebuild 2511 BLAKE2B c19f10a822863507b7d36faf243b538a74f666e5655e801222daba051136455311789ab8063ef30fc274a491d1bd89869c7556c46502900258562a0286f6bb17 SHA512 a5926114d78dd1ad39b507e5a0c063617aad21514090874094fadd6d48ee95ef0490e99daa1674db58b934307027105c6b201fa5729dad4807eeebe8668575c2
+EBUILD qtcore-5.15.2-r3.ebuild 2609 BLAKE2B 5ba2d7be01a791bfc9afcbe4d7cb7589df58b8ce5d343e9c35c7b69ff1ec2f80d701209e18bc2966fb154314e397b7577759b2bfa9271bb576558e6fa5ec2b49 SHA512 f4b64260fb2c66fdd106db7f464b212b7f63b506d4c3026cdbb15402a88f89f95742bc616f86bd6d92cfa4900b98e85dd50b9cfe9d49f3965c8df8fdeee42c51
 MISC metadata.xml 832 BLAKE2B 20f3ca80bc8aea1203ca8c3f34314fb599151eed5639cb9ba6cee97b70a04152ce8c06a4bf1f41058515a3a9d32242bcdf84b6fc75b68b7183951f7c9747396d SHA512 ea1c7dfef8c3afeda436a1de09ee2002441b7d13b3aa40bda02324668f3664fceafcf276f87c897e83f49e246e9fb3ffcefa95098ccb2f5a8b503779686e1b3e
diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-revert-3a273ac4.patch b/dev-qt/qtcore/files/qtcore-5.15.2-revert-3a273ac4.patch
new file mode 100644
index 000000000000..a29e1b5256d4
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.15.2-revert-3a273ac4.patch
@@ -0,0 +1,56 @@
+From d9a85af5f24d0608c79b2d87b01213833bee01e5 Mon Sep 17 00:00:00 2001
+From: David Faure <david.faure@kdab.com>
+Date: Thu, 19 Aug 2021 15:07:13 +0200
+Subject: [PATCH] Revert "QString::lastIndexOf: fix off-by-one for zero length
+ matches"
+
+This reverts commit 3a273ac47f20e82a1f2f63411b210025ca0f4495.
+
+See QTBUG-94215
+
+6cee204d56205e250b0675c9c6d4dd8a2367f3c4 for qtbase/dev changes the
+behaviour even further, I'm pretty sure we don't want that in Qt 5.15.x,
+see discussion in https://codereview.qt-project.org/c/qt/qtbase/+/365179.
+
+Change-Id: I663d74e0d44ebf46291fe0e8a7dc609be82eedc6
+---
+ src/corelib/text/qstring.cpp                    | 4 ++--
+ tests/auto/corelib/text/qstring/tst_qstring.cpp | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
+index 02a9fe3a30..e6e7cbaad4 100644
+--- a/src/corelib/text/qstring.cpp
++++ b/src/corelib/text/qstring.cpp
+@@ -4558,13 +4558,13 @@ int QString::lastIndexOf(const QRegularExpression &re, int from, QRegularExpress
+         return -1;
+     }
+ 
+-    int endpos = (from < 0) ? (size() + from + 1) : (from);
++    int endpos = (from < 0) ? (size() + from + 1) : (from + 1);
+     QRegularExpressionMatchIterator iterator = re.globalMatch(*this);
+     int lastIndex = -1;
+     while (iterator.hasNext()) {
+         QRegularExpressionMatch match = iterator.next();
+         int start = match.capturedStart();
+-        if (start <= endpos) {
++        if (start < endpos) {
+             lastIndex = start;
+             if (rmatch)
+                 *rmatch = std::move(match);
+diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp
+index 8f53824050..4c4a8f0416 100644
+--- a/tests/auto/corelib/text/qstring/tst_qstring.cpp
++++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp
+@@ -1674,7 +1674,7 @@ void tst_QString::lastIndexOf()
+     QCOMPARE(haystack.lastIndexOf(needle.toLatin1(), from, cs), expected);
+     QCOMPARE(haystack.lastIndexOf(needle.toLatin1().data(), from, cs), expected);
+ 
+-    if (from >= -1 && from < haystack.size() && needle.size() > 0) {
++    if (from >= -1 && from < haystack.size()) {
+         // unfortunately, QString and QRegExp don't have the same out of bound semantics
+         // I think QString is wrong -- See file log for contact information.
+         {
+-- 
+GitLab
+
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..d8791013a67c
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+QT5_MODULE="qtbase"
+inherit linux-info qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+SLOT=5/$(ver_cut 1-3)
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="icu old-kernel systemd"
+
+DEPEND="
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/libpcre2[pcre16,unicode]
+	sys-libs/zlib:=
+	icu? ( dev-libs/icu:= )
+	!icu? ( virtual/libiconv )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtchooser-66-r1
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/corelib
+	src/tools/qlalr
+	doc
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	!:network
+	!:sql
+	!:testlib
+	!:xml
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306
+	"${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
+	# Revert to 5.15.2 (upstream Qt release) behavior, QTBUG-94215
+	# See also: https://invent.kde.org/qt/qt/qtbase/-/merge_requests/46
+	"${FILESDIR}"/${P}-revert-3a273ac4.patch
+)
+
+pkg_pretend() {
+	use kernel_linux || return
+	get_running_version
+	if kernel_is -lt 4 11 && ! use old-kernel; then
+		ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
+		ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
+	fi
+}
+
+src_prepare() {
+	# don't add -O3 to CXXFLAGS, bug 549140
+	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
+
+	# fix missing qt_version_tag symbol w/ LTO, bug 674382
+	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		$(qt_use icu)
+		$(qt_use !icu iconv)
+		$(qt_use systemd journald)
+	)
+	use old-kernel && myconf+=(
+		-no-feature-renameat2 # needs Linux 3.16, bug 669994
+		-no-feature-getentropy # needs Linux 3.17, bug 669994
+		-no-feature-statx # needs Linux 4.11, bug 672856
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	local flags=(
+		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
+		OPENGL OPENSSL SSL WIDGETS
+	)
+
+	for flag in ${flags[@]}; do
+		cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+
+			#if defined(QT_NO_${flag}) && defined(QT_${flag})
+			# undef QT_NO_${flag}
+			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+			# define QT_NO_${flag}
+			#endif
+		_EOF_
+	done
+}
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r2.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r3.ebuild
index dadcd5585a58..dadcd5585a58 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r3.ebuild
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index f3ece3ca0370..c4295ad6ce15 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,4 +1,6 @@
+DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtdbus-5.15.2.ebuild 856 BLAKE2B 3a6ba7d726b81e51b26b27a542b583fd7a539bfff572d1a2a4ac8679efadc7e2b7316afa92d43ae9950a31df07a543d124d58c55f1600fb8e08d0553bc52acb5 SHA512 01ac379102445c5150cb0d74314eed7f8dc805103ae7e71907451fad5211baee5b9cd70e9f0061ad297f728dc13cc51ec99dbf29f011442db026fdb2ee80e383
+EBUILD qtdbus-5.15.2-r1.ebuild 856 BLAKE2B 3a6ba7d726b81e51b26b27a542b583fd7a539bfff572d1a2a4ac8679efadc7e2b7316afa92d43ae9950a31df07a543d124d58c55f1600fb8e08d0553bc52acb5 SHA512 01ac379102445c5150cb0d74314eed7f8dc805103ae7e71907451fad5211baee5b9cd70e9f0061ad297f728dc13cc51ec99dbf29f011442db026fdb2ee80e383
+EBUILD qtdbus-5.15.2-r10.ebuild 754 BLAKE2B bebd5ecb5058cf5c351925fe99fa38059fcc91079932daa9033af80df826b16443c1c0c1d54c3f0613420776e48bf756ac822bb66d6363a05948a313cd183d02 SHA512 9e99c9032d229b1158286de4154d8e30d6c50209f99d7a0b63aa8ac71493735f72b917b26a20012b3d696e7f1883112e55c63213802d43fc05eb937066e011c7
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtdbus/qtdbus-5.15.2.ebuild b/dev-qt/qtdbus/qtdbus-5.15.2-r1.ebuild
index 3cc9ecda38d2..3cc9ecda38d2 100644
--- a/dev-qt/qtdbus/qtdbus-5.15.2.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.15.2-r1.ebuild
diff --git a/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild b/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..23d8e42b7219
--- /dev/null
+++ b/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}:5=
+	>=sys-apps/dbus-1.4.20
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/dbus
+	src/tools/qdbusxml2cpp
+	src/tools/qdbuscpp2xml
+)
+
+QT5_GENTOO_CONFIG=(
+	:dbus
+	:dbus-linked:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:dbus
+	:dbus-linked
+)
+
+src_configure() {
+	local myconf=(
+		-dbus-linked
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index e3c8b80af002..a0ea28600407 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -2,6 +2,8 @@ AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b643
 AUX qtdeclarative-5.15.2-gcc11.patch 950 BLAKE2B 06677d7c96c045eef941279f7bd263ad27fee355ce0c394c9c50a0609a024be3da546e38ac44345202845d151da16b119bbf2c99cbc5feff4062f7973f844e94 SHA512 8c6cc7314f4976f84a3232ab006592136fafe94100c4cd463a5ca94c36705072a7fcf7963ba3d316304bd1085b5b8abfe5af028591a6f95dd9b715083db67ebd
 AUX qtdeclarative-5.15.2-riscv-atomic.patch 426 BLAKE2B 163aecf69229482ca4909ff8e618324388f80314520671a254a265e102cdaf3ae25ab9ed64cac25bb4d04377fb110fce3f38f00660efabab5d2ee0b463edd81c SHA512 3450a3e7676b7e56a97771ecbd6c835bdb2f77e4fd0802927b90d5fecc4c55abe5d9ea2d7a576e3668d8f23d838cf7a5dd25ca77cbdad789056c0fe37b9b5a8f
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
+DIST qtdeclarative-5.15.2-92225b72.tar.gz 24341895 BLAKE2B 049220433ac3339b41a4c43267b54b02c2383571c5abc9e77377d7d404a95c081b874ad906340ccd408ca491c04e7c017dcb7dd1dd7794f73bde7d729f64e06a SHA512 b83345747c87ddadea6581ed2803f15900678ee004dc43078529771eb9de12d643567b9349bb531d54d086097d80f7bdd7a88b604b347e8bfea89039b211f026
 DIST qtdeclarative-everywhere-src-5.15.2.tar.xz 21559880 BLAKE2B 07fa82a55f79c081cf3cb713e6b90274f2b2c420eba958042f58989502e2ae572294c4cd02eb73767e87d84c9173fb154e45370c043f6adfc7fb1a93377e2edc SHA512 a084e4ace0d6868668c95f1b62598a7dd0f455bfb0943ac8956802d7041436686f20c7ccdde7d6fd6c4b8173c936dd8600cf3b87bf8575f55514edfbb51111d3
-EBUILD qtdeclarative-5.15.2.ebuild 1369 BLAKE2B fb3857c567472d259b15bdfb2cdf15f9d2b36cf237a8839051e5dcb1d64310a5760ee180c90b3880e68c6f74b38911f7f9aa7cadbfa596a6d88dfbf9f7d8766d SHA512 fe359a279c42693905970ebbacacd69a246b7710e443b82ec12f781ca667fcdc5b4173887fb19c5c1882cd56a4adac98b444216e320a1af1654eb3b312271ae3
+EBUILD qtdeclarative-5.15.2-r1.ebuild 1369 BLAKE2B fb3857c567472d259b15bdfb2cdf15f9d2b36cf237a8839051e5dcb1d64310a5760ee180c90b3880e68c6f74b38911f7f9aa7cadbfa596a6d88dfbf9f7d8766d SHA512 fe359a279c42693905970ebbacacd69a246b7710e443b82ec12f781ca667fcdc5b4173887fb19c5c1882cd56a4adac98b444216e320a1af1654eb3b312271ae3
+EBUILD qtdeclarative-5.15.2-r10.ebuild 1379 BLAKE2B fb99b50cfc388b008e561dd9c0ecbb37624414904822942c7f198d89ecbc838906655878312a6aab01864bcc51ea84896a34aeabeb369c98f6033a85fa9fdd0e SHA512 e13cc3bf7bdd763de1aac61cfe4cfba5f1589dc7a02f13458a1f2d7306766c05a33e8487e0ce8661557b1f81eb757942f26a890d1f5bb2cd03de74057a7beaf2
 MISC metadata.xml 700 BLAKE2B 80c5bfdd7c6acd05795c20b36d062b76458fc4b3f83835eef83ed2f304e70dbae9dfe81908bf33e41fd944de4cc754e5f839451cf4c8ef4f06063817730b7cf6 SHA512 f1fbc57d96dc5b481d08da8c73ab9d1e183045ecefeb075a7ee8f1d6733583589077e3650ad5b2d52e4cafc67bf0894ae62fd4500e1974053e46d6a89377f3fd
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r1.ebuild
index 643829a93cc1..643829a93cc1 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r1.ebuild
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r10.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..fd87062686a7
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2009-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=92225b72b9ca6b1efc9bc7bb0c12dd7487e900a7
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="The QML and Quick modules for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="gles2-only +jit localstorage vulkan +widgets"
+
+BDEPEND="${PYTHON_DEPS}"
+# qtgui[gles2-only=] is needed because of bug 504322
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}:5=[gles2-only=,vulkan=]
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qttest-${PV}
+	localstorage? ( ~dev-qt/qtsql-${PV} )
+	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
+	"${FILESDIR}/${PN}-5.15.2-riscv-atomic.patch" # bug 790689
+)
+
+src_prepare() {
+	use jit || PATCHES+=( "${FILESDIR}/${PN}-5.4.2-disable-jit.patch" )
+
+	qt_use_disable_mod localstorage sql \
+		src/imports/imports.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/qmltest/qmltest.pro \
+		tests/auto/auto.pro \
+		tools/tools.pro \
+		tools/qmlscene/qmlscene.pro \
+		tools/qml/qml.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		-qml-debug
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest
index 6b8ef6370a12..5fed2de430b0 100644
--- a/dev-qt/qtgamepad/Manifest
+++ b/dev-qt/qtgamepad/Manifest
@@ -1,3 +1,4 @@
 DIST qtgamepad-everywhere-src-5.15.2.tar.xz 387084 BLAKE2B bced25244afb2f97adb7b05dbe68021923c45083abaeec92ff405a8c65b89910803dcfe28f4982f9d54dacab616b9917c7cd04b475ac7c36e8002bb6cbbc9b6a SHA512 67f299d36f70ac3205a136117bec7f983f889b6a1f7d0ff97eb03925f4789d9d90a7197f5e186a6d04aa486880c60f0f623ab56a8bd78e4682e84c7ff6cc9fe1
+EBUILD qtgamepad-5.15.2-r1.ebuild 699 BLAKE2B 0caabcdc4664dab4e6f7dbbc5bcb2b3bb98f675730e791b2d3890165355fe5ffee29f7ad109710c56953fe7665ce7183a701638dde701980722a7e91b7022e0e SHA512 a28f98d7877210f57fee7896f261f044ef5baf00116a827febaf76ef6a0380a8a10283323e465af8ba6e84d43277c7f63d558e22cfde33f1c69fb590d5825590
 EBUILD qtgamepad-5.15.2.ebuild 694 BLAKE2B 5dd4717b94e9f59004d45ebbd1874c9efc179cf2bd5f3795aaef22b60265d7588b21a18ef34de0feb430982051dbd42cfdcdc43613f5d5184d6e66a07765f347 SHA512 6832fc14111778b914d687cb4986ef682eeb5c2d8d47d1b2f98c9485260c3e2a5c22ec78b90ee5c9f863e292298b1f46b6f7176b1e9919adbf8bfe3c25e8e48c
 MISC metadata.xml 612 BLAKE2B 9f8eb8c418b79633ebe1df1ba6423de74232787ae4eadea6fb217657fc2dd3ece81e73294ba21f2c0c57596a43e918a812670a5dda271dd7f2721ea0600445b5 SHA512 8593354f9a345ddaedcf0f962877ee7b40db413123226804ef5ea3664c98cc14d7d7f60d63911166e06e3e4fe5b907b1e2ae7a3dc4df527a975f92051b504f8c
diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild
new file mode 100644
index 000000000000..70434d09b66a
--- /dev/null
+++ b/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="Qt module to support gamepad hardware"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+IUSE="evdev qml sdl"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[evdev?]
+	evdev? ( virtual/libudev:= )
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+	sdl? ( media-libs/libsdl2 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick \
+		src/src.pro
+
+	qt_use_disable_config evdev evdev \
+		src/plugins/gamepads/gamepads.pro
+
+	qt_use_disable_config sdl sdl2 \
+		src/plugins/gamepads/gamepads.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 3b069a90da5a..1a471b66f668 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,7 +1,9 @@
 AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff
 AUX qtgui-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
 AUX qtgui-5.15.2-bogus-xcb-util-dep.patch 2685 BLAKE2B d281ae95f88f853cf902438680c73b1660aa0e4df384c1b5b96fcf63d5ccef8f97acda57a077ec1bdf20fef64eca7be8bc1e329f90fd4d59e40b746c394725b4 SHA512 b4a7c65cdca80ec3ea9ee17db2bc07b69cee5da82b11ab6ae32cb7e05b6288e3d3ec8a82d91887e86a96286bea2c5918796131c71c5c5a076577dedd4b82189a
+DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtgui-5.15.2-r1.ebuild 4248 BLAKE2B 245ccc465ffa0a68ef3e0811072052511b28ec7b864567545f3bf2c35437a680d260c3f7fc9e44cb770186937fcb9e7641516efa3f485f4c18d486295b6afb56 SHA512 b3ec9c89421bbe6605c1f0b9f97706879274e675306d218975dd24352044850cd543df73c15e85f2e50462bd5c4205fddf45dc2a3bb265c53f4272a0b3521101
-MISC metadata.xml 1302 BLAKE2B 898227fe66d379fb08154a190b9eec68d98e452cf412ee56ccb9a879511d27ab44cdac45174c5fd674e080a7cf782ee64ea0eeb515d5bcee52491b685c01fd98 SHA512 5d0bd8b7c3cefa4d01005473022fee1ee49e845f56c003480edd09bf68ed07ff406160e26232d7febe21cdd5b10de0ec480d1d89d977d546756e437185204e2c
+EBUILD qtgui-5.15.2-r10.ebuild 4058 BLAKE2B 2468327e66a462fc65698d17ad62e2a9f44d9ee371721ebe91342dcfef470df007bfacc7c1fb31daf46ff61f69fddcbe4bc8ec4b92c795fa068e088315e0613c SHA512 ccc0621ed188e2621defbe2209e5354d887b3a9fd8f30034f292496d6aada2dc7af91748fec727532e9a6db8d388458c4953db85276860cd8a30fa1d066e1ea5
+EBUILD qtgui-5.15.2-r2.ebuild 4248 BLAKE2B 245ccc465ffa0a68ef3e0811072052511b28ec7b864567545f3bf2c35437a680d260c3f7fc9e44cb770186937fcb9e7641516efa3f485f4c18d486295b6afb56 SHA512 b3ec9c89421bbe6605c1f0b9f97706879274e675306d218975dd24352044850cd543df73c15e85f2e50462bd5c4205fddf45dc2a3bb265c53f4272a0b3521101
+MISC metadata.xml 1386 BLAKE2B 5665c961dab9a1f53b848454ecba47f9fb3e62b4f903495522cdf0c6fcb848b5a279038bd2961d7dff39742145612b19d6fd274a367fe29c12bf6b8218556d37 SHA512 f37e88e0869d7048f6faa841f85402a38a03131ba8f1a08dbf308954b76fb4c0a07fe1f8c032ae1aa3d08f97b07af7340562457abfd8966f9ec21a1e86cb743d
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index cfa040fbec83..4efe433f2c84 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -11,6 +11,7 @@
 		<flag name="evdev">Enable support for input devices via evdev</flag>
 		<flag name="ibus">Build the IBus input method plugin</flag>
 		<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
+		<flag name="linuxfb">Enable Linux framebuffer support for embedded devices</flag>
 		<flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag>
 		<flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag>
 		<flag name="vulkan">Enable support for Vulkan</flag>
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r10.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..010d71704eb4
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.15.2-r10.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 707658
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
+	+libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
+REQUIRED_USE="
+	|| ( eglfs X )
+	accessibility? ( dbus X )
+	eglfs? ( egl )
+	ibus? ( dbus )
+	libinput? ( udev )
+	X? ( gles2-only? ( egl ) )
+"
+
+RDEPEND="
+	dev-libs/glib:2
+	~dev-qt/qtcore-${PV}:5=
+	dev-util/gtk-update-icon-cache
+	media-libs/fontconfig
+	>=media-libs/freetype-2.6.1:2
+	>=media-libs/harfbuzz-1.6.0:=
+	sys-libs/zlib:=
+	dbus? ( ~dev-qt/qtdbus-${PV} )
+	egl? ( media-libs/mesa[egl] )
+	eglfs? (
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+	)
+	evdev? ( sys-libs/mtdev )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	jpeg? ( virtual/jpeg:0 )
+	libinput? (
+		dev-libs/libinput:=
+		>=x11-libs/libxkbcommon-0.5.0
+	)
+	png? ( media-libs/libpng:0= )
+	tslib? ( >=x11-libs/tslib-1.21 )
+	tuio? ( ~dev-qt/qtnetwork-${PV} )
+	udev? ( virtual/libudev:= )
+	vnc? ( ~dev-qt/qtnetwork-${PV} )
+	vulkan? ( dev-util/vulkan-headers )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		>=x11-libs/libxcb-1.12:=[xkb]
+		>=x11-libs/libxkbcommon-0.5.0[X]
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+"
+DEPEND="${RDEPEND}
+	evdev? ( sys-kernel/linux-headers )
+	udev? ( sys-kernel/linux-headers )
+"
+PDEPEND="
+	ibus? ( app-i18n/ibus )
+	wayland? ( ~dev-qt/qtwayland-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/qvkgen
+	src/gui
+	src/openglextensions
+	src/platformheaders
+	src/platformsupport
+	src/plugins/generic
+	src/plugins/imageformats
+	src/plugins/platforms
+	src/plugins/platforminputcontexts
+)
+
+QT5_GENTOO_CONFIG=(
+	accessibility:accessibility-atspi-bridge
+	egl:egl:
+	eglfs:eglfs:
+	eglfs:eglfs_egldevice:
+	eglfs:eglfs_gbm:
+	evdev:evdev:
+	evdev:mtdev:
+	:fontconfig:
+	:system-freetype:FREETYPE
+	!:no-freetype:
+	!gif:no-gif:
+	gles2-only::OPENGL_ES
+	gles2-only:opengles2:OPENGL_ES_2
+	!:no-gui:
+	:system-harfbuzz:
+	!:no-harfbuzz:
+	jpeg:system-jpeg:IMAGEFORMAT_JPEG
+	!jpeg:no-jpeg:
+	libinput
+	libinput:xkbcommon:
+	:opengl
+	png:png:
+	png:system-png:IMAGEFORMAT_PNG
+	!png:no-png:
+	tslib:tslib:
+	udev:libudev:
+	vulkan:vulkan:
+	X:xcb:
+	X:xcb-glx:
+	X:xcb-plugin:
+	X:xcb-render:
+	X:xcb-sm:
+	X:xcb-xlib:
+	X:xcb-xinput:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:gui
+)
+
+PATCHES=(
+	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
+	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
+)
+
+src_prepare() {
+	# don't add -O3 to CXXFLAGS, bug 549140
+	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
+
+	# egl_x11 is activated when both egl and X are enabled
+	use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
+
+	qt_use_disable_config dbus dbus \
+		src/platformsupport/themes/genericunix/genericunix.pri
+
+	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
+
+	qt_use_disable_mod ibus dbus \
+		src/plugins/platforminputcontexts/platforminputcontexts.pro
+
+	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
+		src/plugins/platforms/platforms.pro || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		$(usex dbus -dbus-linked '')
+		$(qt_use egl)
+		$(qt_use eglfs)
+		$(usex eglfs '-gbm -kms' '')
+		$(qt_use evdev)
+		$(qt_use evdev mtdev)
+		-fontconfig
+		-system-freetype
+		$(usex gif '' -no-gif)
+		-gui
+		-system-harfbuzz
+		$(qt_use jpeg libjpeg system)
+		$(qt_use libinput)
+		$(qt_use linuxfb)
+		-opengl $(usex gles2-only es2 desktop)
+		$(qt_use png libpng system)
+		$(qt_use tslib)
+		$(qt_use udev libudev)
+		$(qt_use vulkan)
+		$(qt_use X xcb)
+		$(usex X '-xcb-xlib' '')
+	)
+	if use libinput || use X; then
+		myconf+=( -xkbcommon )
+	fi
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r1.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r2.ebuild
index 34d58b305ba0..34d58b305ba0 100644
--- a/dev-qt/qtgui/qtgui-5.15.2-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2-r2.ebuild
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 4785d1e9656a..64086e26d73d 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,3 +1,5 @@
+DIST qtimageformats-5.15.2-cb82c743.tar.gz 2366626 BLAKE2B 76edd4d0fc2908d466e4b7f9af1e93c50cae086c1da1144d4b8230d19163e2c43704365e396769d9ba10d48f46b42a1ce793e49686d6757790c32a1c0ff4db2b SHA512 f202f3abcdea0b49ae4f286fd50c1855c8b84d502b89f8350666828c6e29c4fa0bafd72b891513330e2541dc407d298076ffb519a030b4bb50517b5196ff9a3f
 DIST qtimageformats-everywhere-src-5.15.2.tar.xz 1806740 BLAKE2B 11da7926a50c17d5a36259d15a5c7e6af68f9f2e7e26626b7e04a031ae428a8d220daa8fa4461efd4b8db85bcbaa1ccf24b72271f3599c7298a4d1a49c25f9c3 SHA512 3c821fac83b8d6177af256dc1d68aca14ae6d5cbdedb8d8665158ebcec0f6e6fb790b5d210a1aa8b0679ecff60fafd4e5d1387c6954498b41409ea44177e0d7e
+EBUILD qtimageformats-5.15.2-r10.ebuild 738 BLAKE2B cca51ad9c31450265a5237391b88d63e0f9ecc9f57e6ed7372367fdf8e2f761743a047b0658a8acf070225029c4c8103a0dbfbbcd535982116a0bc9594ba8c76 SHA512 9757bf04a61843b4d9d54e972dcd31715be317eec6160f6371fcb3669e802c4f882a4cc391a2119e79875f6ce79af82ed4fe5f404973589ddd58ec49d661c0d4
 EBUILD qtimageformats-5.15.2.ebuild 677 BLAKE2B c4c31cdf56a20dc88b7af4040528090da9cd7a5a15b89756037e800c2029ccb869c6effd57afddf039a16e65ad3b2abd348fef90dea165be2078f8fa29fbf439 SHA512 2ad09118bcf970992efc7881429074fa4128af92ca8008cd14242bf09109a78712e5330ed03c494cfc2f8789e7997f57dc3cd09e8dbdb626c0213e4f27db4bef
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..4931c3669313
--- /dev/null
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=cb82c74310837fe4e832c8ab72176a5d63e4355f
+inherit qt5-build
+
+DESCRIPTION="Additional format plugins for the Qt image I/O system"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="mng"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	media-libs/libwebp:=
+	media-libs/tiff:0
+	mng? ( media-libs/libmng:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	sed -e 's/qtConfig(jasper)/false:/' \
+		-i src/plugins/imageformats/imageformats.pro || die
+	qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 871dd035f022..05f633477881 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,5 +1,7 @@
 AUX qtlocation-5.15.2-qsg-render-thread-crash-1.patch 2445 BLAKE2B 17e043da1710ee64979310b1b37ed1364d9688c62e4a61b68b0f5cb92b0a19b7f00266a571fdfbe164c2d7cd7e9d2aa89424a67af4276b0a9f07a541003399ee SHA512 45124a3607a69d01f63cff705d1ce19e5e996f2b0aa39dc23bb65337c77889775e2d885a39e6fdded7604c4018cbfd3bb3a74b2d46c889f6917dd5aa0b6e753f
 AUX qtlocation-5.15.2-qsg-render-thread-crash-2.patch 5154 BLAKE2B f93fab080a63bbdd3e0fc78667291d4201ca1f93668185adf73f2fd918df02e210cdc367b006dea0275b8f38c1a34372efe796ec3bf11f161f62b421d4a6ec87 SHA512 344660f52eb13981832cbc384beafce79627e0d4c7d54920ec04a302915848a0e069d483f9f6a2005beaba40bf5e540822ecbc96542fccb9fa29f399cc02d3fd
+DIST qtlocation-5.15.2-861e372b.tar.gz 5431120 BLAKE2B c66e81f7e726b53000a0f8a4eafa9a4a6168aa08c89d4d0e2ef11b02e3598fd0b3f30dbd21e6c5436814bb88fa69c96d141b0d0d79f13239ec61396269af089a SHA512 b7cac8cd42185504c6140f1dcd4e8c0c749e3d8f22bf9977e97268e0ad6fbd3733e571a255ab7824eba31e30e707e804b07317f2ec9b7be15a4a5756c78c9e41
 DIST qtlocation-everywhere-src-5.15.2.tar.xz 6556764 BLAKE2B a322f35ece266fff6428da9090f02c0d5749a4750ff0655ef09695f147d88d667b5917335e44d0f8721cc56f425c171fb11d0f34342aff005327518e9c1d6db8 SHA512 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f
 EBUILD qtlocation-5.15.2-r1.ebuild 1177 BLAKE2B e9c5790ce4fc44188864161a0b7847a7ed3ea644bc63bb68d251a34b23735ee7bf84e66fe7dfd59dbee214c8137d766622920b130b5653fb760378ece611344e SHA512 4b35636ef302f41210086bf92c55db50fd0e93b04f00688b558462b1f2d5bcd81b3e426b18b2e170c4b1b6bb3cfc91014aae6d79a5d5cd609045d4630b7229a2
+EBUILD qtlocation-5.15.2-r10.ebuild 1155 BLAKE2B 61311b4344ca62a5bd7ac784a01292d7106bd16494a84233fe2b2a4b5eeb779ed4e61b958b9c7e31cb1ba0b97cf3e91d6adac34e4f0ebee9c9455fb210118251 SHA512 0a5551862d2e52f1ca2cf76412932564708d3a787e93b824ec94194e9112a92468f797c2f3050ee379d9246d633c1c1f9bc95610c72111c28049cfc35a11eba6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild b/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..f5324144a067
--- /dev/null
+++ b/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=861e372b6ad81570d4f496e42fb25a6699b72f2f
+inherit qt5-build
+
+DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	dev-libs/icu:=
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtpositioning-${PV}[qml]
+	~dev-qt/qtsql-${PV}
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	~dev-qt/qtconcurrent-${PV}
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/3rdparty/clipper
+	src/3rdparty/poly2tri
+	src/3rdparty/clip2tri
+	src/3rdparty/mapbox-gl-native
+	src/location
+	src/imports/location
+	src/imports/locationlabs
+	src/plugins/geoservices
+)
+
+src_configure() {
+	# src/plugins/geoservices requires files that are only generated when
+	# qmake is run in the root directory. Bug 633776.
+	mkdir -p "${QT5_BUILD_DIR}"/src/location || die
+	qt5_qmake "${QT5_BUILD_DIR}"
+	cp "${S}"/src/location/qtlocation-config.pri "${QT5_BUILD_DIR}"/src/location || die
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 1a9f23375ee4..76d36be221c6 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,5 +1,7 @@
 AUX qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch 2104 BLAKE2B 2fdeae57b0751f68273e79edb602b90c96d9a3287dec43c1fb3cf1e3b5cf17ae1570e62bc59b330748938cd1ca2b9326062ee61415114d1f08211235dcdae7a6 SHA512 880cab4279a663e4709f93aedf875f2fd3c17dcfd45fe57aa9b75887fbee981b13ff899d9223a37186f2c93493823ca36d4128500f2943b7ca67e409e6523ed3
+DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
+EBUILD qtnetwork-5.15.2-r10.ebuild 1669 BLAKE2B 72015a1cb1e1e612e9dffc22554adef8b773ba6dd13dc217b315d87ef9110085795134634a16c3b696a82d6781c1be06a0825703eb4fb69f441cea15afa69d68 SHA512 3838d35dd549f8fdd35ed39834281bf676549a794daf93cfb9da01b5e9617825fbd6938e1e29dde1bd9d0f92493f2ab1d0634ffc2c25e87aa9d0eb4e9b421ad4
 EBUILD qtnetwork-5.15.2-r2.ebuild 1835 BLAKE2B 683c4b2d419a041c89c08975db612d0e2c40d6c1969c7ce77640fd1c3259b39772485d89114fe71ceb7f3232ccb4b9cda9d3e2aded1b62ea8bd191116ef28e39 SHA512 2c58ed1f755b4a2b982534644aab38f0d59017ebc0168b79e77e1b3f6450f922edeff12a54f7701952baff278e02569b5cd41ae960b49b6fe0292b773109d6e4
 MISC metadata.xml 957 BLAKE2B 5c888322d402a3f037e194bd13001ff3a7e449fe423b8b4661c4b1365263a63e105be92ab0bd6a99ae79e7e8062c65e52e9e04763f9c15c50cb28c1215a06b0d SHA512 aa07869c984c4c2d7653820213b94fa4db247e4e30f0efad8df64c09b2578cd2143ab81890584521e1f561953312abb36d8e049dabd42893fecefea4182f176a
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r10.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..15b485299326
--- /dev/null
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.2-r10.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Network abstraction library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}:5=
+	sys-libs/zlib:=
+	connman? ( ~dev-qt/qtdbus-${PV} )
+	gssapi? ( virtual/krb5 )
+	libproxy? ( net-libs/libproxy )
+	networkmanager? ( ~dev-qt/qtdbus-${PV} )
+	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
+	ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist(-)=] )
+"
+RDEPEND="${DEPEND}
+	connman? ( net-misc/connman )
+	networkmanager? ( net-misc/networkmanager )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/network
+	src/plugins/bearer/generic
+)
+
+QT5_GENTOO_CONFIG=(
+	libproxy:libproxy:
+	ssl::SSL
+	ssl::OPENSSL
+	ssl:openssl-linked:LINKED_OPENSSL
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:network
+)
+
+pkg_setup() {
+	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
+	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
+}
+
+src_configure() {
+	local myconf=(
+		$(usev connman -dbus-linked)
+		$(usex gssapi -feature-gssapi -no-feature-gssapi)
+		$(qt_use libproxy)
+		$(usev networkmanager -dbus-linked)
+		$(qt_use sctp)
+		$(usev ssl -openssl-linked)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+	# workaround for bug 652650
+	if use ssl; then
+		sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \
+			-i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die
+	fi
+}
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index c1e504278bda..a46cdf369b3e 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,4 +1,6 @@
+DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtopengl-5.15.2.ebuild 827 BLAKE2B f0cdf498740c5fa109d2700284f5476c85c9dee0bee3708c8777360bab704b88b0d04387523a5a31f246acd40178caca6a17faf60e01c1ce05d19f95ca6e11e5 SHA512 8df750310b2f177a529d36061589756e36cd387fd935174c94e47af5bab79ceec631a3bf7b2d94ec8f3c82048d2b11dcbd47e9c8d9d1ebc873eb0d6f96a2e00d
+EBUILD qtopengl-5.15.2-r1.ebuild 827 BLAKE2B f0cdf498740c5fa109d2700284f5476c85c9dee0bee3708c8777360bab704b88b0d04387523a5a31f246acd40178caca6a17faf60e01c1ce05d19f95ca6e11e5 SHA512 8df750310b2f177a529d36061589756e36cd387fd935174c94e47af5bab79ceec631a3bf7b2d94ec8f3c82048d2b11dcbd47e9c8d9d1ebc873eb0d6f96a2e00d
+EBUILD qtopengl-5.15.2-r10.ebuild 744 BLAKE2B 4551b8c6519f789566cf85dcb7edad18f422d1748b7591940b3236d19e97b4e496408a1c70c9ba451554decb9422c8e4c3fdc61dc7741903080f5f843e273d9b SHA512 050be84aede1f8bd320b92c6caf3122b55b376f8596861ae9ab3c1ef20213bc41554f8a0c29885f18a336e48f3cfeb1e6da96fab6cf5b696bc09f635b38efab8
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtopengl/qtopengl-5.15.2.ebuild b/dev-qt/qtopengl/qtopengl-5.15.2-r1.ebuild
index 916bc3174710..916bc3174710 100644
--- a/dev-qt/qtopengl/qtopengl-5.15.2.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.15.2-r1.ebuild
diff --git a/dev-qt/qtopengl/qtopengl-5.15.2-r10.ebuild b/dev-qt/qtopengl/qtopengl-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..f17a22b05e76
--- /dev/null
+++ b/dev-qt/qtopengl/qtopengl-5.15.2-r10.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="gles2-only"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}:5=
+	~dev-qt/qtgui-${PV}[gles2-only=]
+	~dev-qt/qtwidgets-${PV}[gles2-only=]
+	!gles2-only? ( virtual/opengl )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/opengl
+)
+
+src_configure() {
+	local myconf=(
+		-opengl $(usex gles2-only es2 desktop)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index 776374e6896d..900d1b15d3d9 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,3 +1,4 @@
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
+EBUILD qtplugininfo-5.15.2-r1.ebuild 426 BLAKE2B cd2f205d6f6a94c88ab13b10ecb6b773d58f8f2f5fba3d180da8cc7fadf25a69e9ac1fc1a926169b09c770e94bd03791aa79335ad45bbd69802c8d5ac6fc5448 SHA512 c99099c40a76e4032f113081562f78cc9c315ee2ec1bc9655bcc30e5bed4ae3dc642f29ad82380c5ab20835537188c70d13865bb1395cba2b4d8d841cdc62225
 EBUILD qtplugininfo-5.15.2.ebuild 347 BLAKE2B 27ff111ca6151127fd562c56bfb79b374f2d19137106b703b925ff0925749ff5a18eb411d5905766aef55761235c4dfc08ddfb8f3dae73306cfa3d26e1fef0d4 SHA512 35fb6f758b7aafbcf3c30fda07afdfdd7f25da0ad6d872fc8047074dd532b07553b2a460d1fd966ced4a44569b9db77e071d85a8a0993a4e07b78a6164d47154
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.2-r1.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.2-r1.ebuild
new file mode 100644
index 000000000000..064b136fc6ac
--- /dev/null
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.15.2-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt5 plugin metadata dumper"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+"
+# TODO: we know it is bogus, figure out how to disable checks, bug 795237
+DEPEND="${RDEPEND}
+	~dev-qt/qtxml-${PV}
+"
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index e563350e2f4b..58bb11391f3c 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,4 +1,6 @@
+DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtprintsupport-5.15.2.ebuild 935 BLAKE2B 9e0b3c43b40a0613178bf7f982af94fe26bbfbb9206991c302d9de1bcd393cf23184b459630a78f8cd0807c28fee37d32761146c1305037012cb7839cc46253f SHA512 359e813b072edd78d404f0d889120a9b571cdfbd2f34a0b5b194e62da3d262f2769b81503965e83aa22dd6b81821fce60fd880b21d7a45033b451ada58f0ebad
+EBUILD qtprintsupport-5.15.2-r1.ebuild 935 BLAKE2B 9e0b3c43b40a0613178bf7f982af94fe26bbfbb9206991c302d9de1bcd393cf23184b459630a78f8cd0807c28fee37d32761146c1305037012cb7839cc46253f SHA512 359e813b072edd78d404f0d889120a9b571cdfbd2f34a0b5b194e62da3d262f2769b81503965e83aa22dd6b81821fce60fd880b21d7a45033b451ada58f0ebad
+EBUILD qtprintsupport-5.15.2-r10.ebuild 852 BLAKE2B 1d15182024d18a1cb7030bacc39244091ccc7aa32d6cff16879e952c477decb4f67e687413f6962ba9232818c04a8740586405e1776f6cef93783ae46506cc31 SHA512 8ba709592cee060e56457f81f2abdd85236ad84b0e6f5dab1f4e8a166faaf03cf67fdff53108be93955ad2fe12f4b2dd7bcbce6e4638e9390273f46cefd69b1f
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.2.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r1.ebuild
index 6442c1d07e48..6442c1d07e48 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.2.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r1.ebuild
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..d0d45ab1e674
--- /dev/null
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Printing support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="cups gles2-only"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}:5=
+	~dev-qt/qtgui-${PV}[gles2-only=]
+	~dev-qt/qtwidgets-${PV}[gles2-only=]
+	cups? ( >=net-print/cups-1.4 )
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtnetwork-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/printsupport
+	src/plugins/printsupport
+)
+
+QT5_GENTOO_CONFIG=(
+	cups
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use cups)
+		-opengl $(usex gles2-only es2 desktop)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 2b55abadb09a..08419dd927e2 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,3 +1,5 @@
+DIST qtquickcontrols2-5.15.2-a2593ff9.tar.gz 9243099 BLAKE2B 56a3b57e4f70ae18fd91afae6bd1a5242e0a582aa386ecce2d9b682dd97f8d044e2bec23295a7945206aa4346344cc294eace0f5ceed1e8654af2de5a79f2759 SHA512 915b873850d042580c3de1641d916f778da89f4b0dd7763254891fb48c99daece1c1c6888f9f8560d73617edce41e7ef4e712af965f12d29179a0bc70627556b
 DIST qtquickcontrols2-everywhere-src-5.15.2.tar.xz 8284692 BLAKE2B c5c4550ff75bf655969b8601f36c38a0d5a6c9dbe406bc03d431c133f8f0b83a89098c3a64afa4073e4810ee73016a19e11fde1685732c3a9124ddaa2b21393f SHA512 5af506fd5842c505ae5fbd04fdd2a467c5b6a9547b4cea80c9cf051e9dea49bbf17843d8bc12e69e95810e70119c2843c24171c84e0f5df62dd2f59a39903c8f
+EBUILD qtquickcontrols2-5.15.2-r10.ebuild 673 BLAKE2B 432969fba3ee4b17b1cc005abc88309294c16e5542b41e8bd05721cb9608f831acdec13f4ecd2c187392482e92a3fef451b29cca232e78ce5677ab00c2721a73 SHA512 e99d7edfc475214b3b553fd86b73d13bf5d78e0d7d5eee0113bc9ff4299debd63bb3b05cd6bc613655edd3c892e4c0855dbdcd0062162e96fa5aad917841280a
 EBUILD qtquickcontrols2-5.15.2.ebuild 613 BLAKE2B da66e8d09b01a0818ad23e32fd627b955c8cde3a86130c349da5f1ce301036eb2339b48aed95545275b290df55fce18c23598d7ee08e8b7db3cfa3c380e46532 SHA512 d272f73610dd55378ae08e9df01a3ecf59903924ef01c2e05c7d33976ad2655cbf747ca7ff70d8ddbb5b27561be7a37fa1548a536e9103a1068c62b46859b4ef
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r10.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..eb0d955e9421
--- /dev/null
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r10.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=a2593ff9cf5d0af885c20c2e9f9faa6ca4f1c1a3
+inherit qt5-build
+
+DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="widgets"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+RDEPEND="${DEPEND}
+	~dev-qt/qtgraphicaleffects-${PV}
+"
+
+src_prepare() {
+	qt_use_disable_mod widgets widgets \
+		src/imports/platform/platform.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index b52dc51d3221..d96dea8a88a8 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,3 +1,4 @@
 DIST qtspeech-everywhere-src-5.15.2.tar.xz 101940 BLAKE2B 0b100fddac7bc880b79914be54a8618e3e31e9a2486e8cd4ab9f65eabaec605d9aba7c66f71569466798b9cc94e97a2e136868a6f8eda3208f9d0a9515e71ac9 SHA512 78a13218a639276c9b253566a1df52e2363847eac76df3962ba2a7178800206beb57859d22c7c99fa1579cb3aa7ab94baed1a6319ba946d4a64cba9e3bf52b05
+EBUILD qtspeech-5.15.2-r1.ebuild 708 BLAKE2B 5806590e374d1dedc4e15fa6ce20ccb005b88b57e5d3c60ff2e53b8febd429d5723358dbe09c19437dd7eabdcb18c1a0692cd1c0b172e06700bf4d3c0bbf1475 SHA512 c3ddc274d5489515c090bd227b81736ba859d8446b0a1d83aaf7e0bd44044ee9c0083bffd222067e8fbb4b50a72cff6f67fa932a2e8901a638e917f6d5c4adb3
 EBUILD qtspeech-5.15.2.ebuild 446 BLAKE2B d8cf7215bbd9c6b02a30ffe0bf0a9ebb13a2a75b5abab9a3ebd73be44284a4a64ada8c752ead883eeb45319a12a325b84ef51a28e4970c10cf78b94fb64c396f SHA512 677c652115cd8bfc1d6a538330900d0da041ebfa4c331687a6ab70457d3055eed85e831da31602ab29c569e9c2aa7b5028b01a82952810e21c01b8411162c52b
-MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
+MISC metadata.xml 613 BLAKE2B 1d7666f8f547ea9280be482adff1bfa19d9c777f85c2adcca397216e34830dd1f38ca1c2f936e72fe1ffbe88d1f144aea670786e47f6d4b880e5d8730384d8b0 SHA512 58a0d89f5dddf0b832fe405e372d5e05cf4ce2e0e3ba4edadc0ed619a051786dc1bcb834b31feab187bdfebf7db6f5c4a5fb0a264e93a00a9ef8db387e8841c8
diff --git a/dev-qt/qtspeech/metadata.xml b/dev-qt/qtspeech/metadata.xml
index 32568f62fb8e..020b892fa8e6 100644
--- a/dev-qt/qtspeech/metadata.xml
+++ b/dev-qt/qtspeech/metadata.xml
@@ -9,6 +9,9 @@
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
 	</upstream>
+	<use>
+		<flag name="flite">Enable text-to-speech synthesizer plugin using <pkg>app-accessibility/flite</pkg> engine</flag>
+	</use>
 	<slots>
 		<subslots>
 			Must only be used by packages that are known to use private parts of the Qt API.
diff --git a/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild b/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild
new file mode 100644
index 000000000000..c2273fe433d1
--- /dev/null
+++ b/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="Text-to-speech library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="alsa flite"
+
+RDEPEND="
+	>=app-accessibility/speech-dispatcher-0.8.7
+	~dev-qt/qtcore-${PV}
+	flite? (
+		>=app-accessibility/flite-2[alsa?]
+		~dev-qt/qtmultimedia-${PV}[alsa?]
+		alsa? ( media-libs/alsa-lib )
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	qt_use_disable_config flite flite \
+		src/plugins/tts/tts.pro
+
+	qt_use_disable_config alsa flite_alsa \
+		src/plugins/tts/flite/flite.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 6c32fd4f3c9d..ed3b17020ac3 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,4 +1,6 @@
+DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtsql-5.15.2.ebuild 1393 BLAKE2B 36b8a1f0d9aeac4b52438806b083313ac05085a08c05587e968e51a6fa22c42b70b02a20dc0bb358755cd241e080c95cb906df071c0ebc8fb67e649e68622bcd SHA512 bec25ca39a193fcfaf39fc14e98c18623ca12fd35b3eeead00a4dff8664a51af3408c913b988481f68ccd1003c0e718b7dd06125f8808271cf9fb842fc2dbcee
+EBUILD qtsql-5.15.2-r1.ebuild 1393 BLAKE2B 36b8a1f0d9aeac4b52438806b083313ac05085a08c05587e968e51a6fa22c42b70b02a20dc0bb358755cd241e080c95cb906df071c0ebc8fb67e649e68622bcd SHA512 bec25ca39a193fcfaf39fc14e98c18623ca12fd35b3eeead00a4dff8664a51af3408c913b988481f68ccd1003c0e718b7dd06125f8808271cf9fb842fc2dbcee
+EBUILD qtsql-5.15.2-r10.ebuild 1306 BLAKE2B 411d0c6ef6aef7c63602e32957778d630aaf290f5d202a6c5e7fcbf041912cdf3f376f60350bc280d5f8b6884dee76b484e417f95387db1f6ea001c4109d4d1e SHA512 1414ffb49477493ccef6b383bef5d6214c3b42308de34c764c097a78d3a10414bd362a42a895eb11821e8e8d528a01dc68fd77dadbb533cf2db5331af6d302db
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsql/qtsql-5.15.2.ebuild b/dev-qt/qtsql/qtsql-5.15.2-r1.ebuild
index f94643be7b4b..f94643be7b4b 100644
--- a/dev-qt/qtsql/qtsql-5.15.2.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.2-r1.ebuild
diff --git a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild b/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..9d3b4783f467
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="freetds mysql oci8 odbc postgres +sqlite"
+
+REQUIRED_USE="
+	|| ( freetds mysql oci8 odbc postgres sqlite )
+"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}:5=
+	freetds? ( dev-db/freetds )
+	mysql? ( dev-db/mysql-connector-c:= )
+	oci8? ( dev-db/oracle-instantclient:=[sdk] )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/sql
+	src/plugins/sqldrivers
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:sql
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use freetds  sql-tds    plugin)
+		$(qt_use mysql    sql-mysql  plugin)
+		$(qt_use oci8     sql-oci    plugin)
+		$(qt_use odbc     sql-odbc   plugin)
+		$(qt_use postgres sql-psql   plugin)
+		$(qt_use sqlite   sql-sqlite plugin)
+		$(usev sqlite -system-sqlite)
+	)
+
+	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index bc11fa313a0f..0ad4be45dcfa 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,3 +1,5 @@
+DIST qtsvg-5.15.2-cfc61697.tar.gz 2779382 BLAKE2B cd75575741b05cb1ec1b206d1d338c011c718923339d1cb169f0f537f21931e32042f10574e70b5c64d4fc352dfa56adc8b852dafa5131198630afe6bb806580 SHA512 1f8b52c713b4c6d4974af46ebe6519ea597f72ac0c4b80e061f714ff30449e6fdae94eb9705f3c1b857c5ad0647e5875260ee40051cec78321caf7b944fd3d70
 DIST qtsvg-everywhere-src-5.15.2.tar.xz 1886268 BLAKE2B fee60a9d769e4c8962d084e98cd4c1a958ba926c8b4482f5b60b596a34944576cddfb46c4e04bd4a67cba7dfbdc7e29e61d8b5025cc7d2a1ae063f81eb31a114 SHA512 101e9c8fc05b1bb9c4e869564bff8e5723dd35f0ef557185e56e9dc12fdce74c531522c9642cdff639900eccf7ed0e04bfa48142741259697dded990fb481730
+EBUILD qtsvg-5.15.2-r10.ebuild 521 BLAKE2B 70e7e19749d0b4f3647a9cceb8c4a6f9b254e42ebb0f3ee9175e90757858dbccc610ebee8e14e0da693d9616072d3860669fe05802963e731c3e2eb6e1db7b0f SHA512 f8207f9f21291cc7a4e898a17343974f8cc87c3ab0c80d5a1766e7be19ff2a7e1de49e682adfbfda209486c2b8e6aa1d99a37777aa84bb86dabfb55394c93cdb
 EBUILD qtsvg-5.15.2.ebuild 458 BLAKE2B 3fa6e46aac4007ea9782431d2d2e617c759dfad9f213547498491040aec9e02dea2950579a30cdc6dd11c4ecf7cf7917e2adde85cf5acf93ba2c1ab8d9340fcf SHA512 64a55df0f387cfdc90783c82b99de271fbf7daf8e26a6c41f083a0f222b6099c28d2341aee009568f985653fe656c462a0bca2e695bf27be13a8b4edbf74a6a0
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild b/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..8ec99ee64424
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=cfc616978b52a396b2ef6900546f7fc086d7cab3
+inherit qt5-build
+
+DESCRIPTION="SVG rendering library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+	sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtxml-${PV} )
+"
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 005485da3a25..1fc10ab4c540 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,4 +1,6 @@
+DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qttest-5.15.2.ebuild 691 BLAKE2B 3852d081c2279581918d42ca0642e73665b33614e8c5b77f779495c2699aad9f6ea433cc9fb7e5b6fc264f19df633d5dcb420c7d11d3a7712ad2c476be86d035 SHA512 ac8cb0afbbac1ebb7be0767d6dc298ae555d2ea4f8a4b7fc49035e7c6d935ce37ab29ad424e17280db95d55b285736210f2ff501cac8bef0458d2f5f338b8419
+EBUILD qttest-5.15.2-r1.ebuild 691 BLAKE2B 3852d081c2279581918d42ca0642e73665b33614e8c5b77f779495c2699aad9f6ea433cc9fb7e5b6fc264f19df633d5dcb420c7d11d3a7712ad2c476be86d035 SHA512 ac8cb0afbbac1ebb7be0767d6dc298ae555d2ea4f8a4b7fc49035e7c6d935ce37ab29ad424e17280db95d55b285736210f2ff501cac8bef0458d2f5f338b8419
+EBUILD qttest-5.15.2-r10.ebuild 608 BLAKE2B 4770ddf9ce0ecd482012a0596ef9ffb6b66e6cc0aaa9ca5e580cde17f57578e926add02bf5eac0c4e6a4bdcc62e6aeccc06279abb616ae8b0057e07616359ffc SHA512 b136752ebb9b0b30a34d7294eb2d8192e951912485166230fc53f0ffb5834c265357f8e145756525149ec2ca8f0e2293aeed80681c8ea4ce9a4ab5c9065c65c7
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttest/qttest-5.15.2.ebuild b/dev-qt/qttest/qttest-5.15.2-r1.ebuild
index dc827fd108a5..dc827fd108a5 100644
--- a/dev-qt/qttest/qttest-5.15.2.ebuild
+++ b/dev-qt/qttest/qttest-5.15.2-r1.ebuild
diff --git a/dev-qt/qttest/qttest-5.15.2-r10.ebuild b/dev-qt/qttest/qttest-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..877cc61a3040
--- /dev/null
+++ b/dev-qt/qttest/qttest-5.15.2-r10.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Unit testing library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}:5=
+"
+DEPEND="${RDEPEND}
+	test? (
+		~dev-qt/qtgui-${PV}
+		~dev-qt/qtxml-${PV}
+	)
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/testlib
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:testlib
+)
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index 5f4a9ec9a057..84d035c40119 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,3 +1,5 @@
+DIST qtvirtualkeyboard-5.15.2-2f0e9f98.tar.gz 13693484 BLAKE2B 88cd048af73c208772115a10b7c4eb7fb78f8598bcb4ecea297e5b7115aa5eda21e47ee062c26c810781de22af4e9abeec67a55761443a89cf381fcce3ee4df8 SHA512 67afa86666aa6f55263053f9b9e76fde94232cd65c44b0edcc91f4f2c1866f699f60122b31a97d5e577b1d9986211fa5e1e0bc0b2ea86cec488a07a462e88e40
 DIST qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz 10955076 BLAKE2B 629068b92f58e825060410c84906edbcb9d83f942f1d4acfc1aab9404eb69e0ffeca0b5ca69a3d4b07033efb80ef161f23474e0a19ae6d9c4efb7698ba0a0d75 SHA512 3ba04d171756a5434424833c5198a23e0df53eeebe9ea542047e094f83f38492d93f901cac67cf7e55aca6a71289ce3c6f5d8ac10a8d051b291155ebb8432016
+EBUILD qtvirtualkeyboard-5.15.2-r10.ebuild 1268 BLAKE2B e9140ba0bebadc24e250b980b4d2502f0f5c6389f9bd2aefd3c67a944c94cf25eaf83d5aae93e3ece2354ee1727ca394f5a5de269a9378027a61be89e1a30f99 SHA512 834beb8c202fb3137d8fee0b69f9b27a783a46de8d925f29920d8fe741efe236f8d43dab862f506eb50069316c99a2af1e1cb402f9e4fd1b5afd44aebc0c3b73
 EBUILD qtvirtualkeyboard-5.15.2.ebuild 1208 BLAKE2B 9dd8f4af6e11c38e20eed246826c773dc39627d1c94841586124a89002a1fbe89aa948806b1462c0c283d6bdd46d472200ddf87e701da58fb5537bda67cafc22 SHA512 1551e08535a9e02bbd7beac31f6c73ff153f68dba53e4681432962d6a7e4cc2114e3515757fe34f209c1cb14337415ea80acf131751c585d575a5550a7d68723
 MISC metadata.xml 579 BLAKE2B 831918738315acf3bdb4e5f0b7946cfda2c0a2c772f586e2605af277111b21eb32f818d73388f965c204d0b263faf500f44ea270155b15069de4be454d69ac92 SHA512 96b897699828afe8027d30da6a77ab6ac2ffb40c4496564a1f0d7db51078303bc5af940c462ebaa4409c0aaeb70e3215584f0d8fb664837757603f7a535868e3
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r10.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..5b16d81a99bc
--- /dev/null
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=2f0e9f98c6c6fdac09f762d41fddcc114f64b28a
+inherit qt5-build
+
+DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+# TODO: unbundle libraries for more layouts
+IUSE="handwriting +spell +X"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtsvg-${PV}
+	spell? ( app-text/hunspell:= )
+	X? ( x11-libs/libxcb:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myqmakeargs=(
+		$(usex handwriting CONFIG+=lipi-toolkit '')
+		$(usex spell '' CONFIG+=disable-hunspell)
+		$(usex X '' CONFIG+=disable-desktop)
+		CONFIG+="lang-ar_AR lang-bg_BG lang-cs_CZ lang-da_DK lang-de_DE \
+			lang-el_GR lang-en_GB lang-en_US lang-es_ES lang-es_MX \
+			lang-et_EE lang-fa_FA lang-fi_FI lang-fr_CA lang-fr_FR \
+			lang-he_IL lang-hi_IN lang-hr_HR lang-hu_HU lang-id_ID \
+			lang-it_IT lang-ms_MY lang-nb_NO lang-nl_NL lang-pl_PL \
+			lang-pt_BR lang-pt_PT lang-ro_RO lang-ru_RU lang-sk_SK \
+			lang-sl_SI lang-sq_AL lang-sr_SP lang-sv_SE lang-tr_TR \
+			lang-uk_UA lang-vi_VN"
+	)
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index d99af6cab169..683bd45b1b3a 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,4 +1,6 @@
 AUX qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch 1650 BLAKE2B 37091d2be8194d023af6463130879d6d4649f802539d77b897bca222bfae13761f82213118d41d8dbaef91b63c05ca4ab140cd071e749baf78852287ff522508 SHA512 5a4f287731231fe11e755648aff54bc99f25e3d4bc274eac94511497af9d2d0e287760d52a5f103554e505450ad304f378a5f53ebde9bbf742c8bbc2beab1f09
+DIST qtwayland-5.15.2-d4c41797.tar.gz 829183 BLAKE2B 2a185e724dc4bb409d588664adf956fc16ab2115f5f2a5217c7654312f320402ef5b247aae44ec021c274b2a070698b2e6771135d604baf8308d8d33deffc55f SHA512 2e8e6149f6ffd5379075c235ea334aac0663e1c888291a564467c46f8073503d6b6c3c0cf9080cfa98c1d8742a6295c9b9aff877afcf06e8efccd0b54b1b9389
 DIST qtwayland-everywhere-src-5.15.2.tar.xz 564884 BLAKE2B 472effd3e9f3fd5470e0449703a52d45f2fd823770880b5ad15d8bf99196eee5d8511ca2bc9e23df6e27c933551d1853928ba79b4b1e5fa6e53334c54c04a463 SHA512 e8657ed676873da7b949e6a1605d025918a03336af9c68f32741945ec3c71a604def55bb00737ba4d97b91c00d0e2df1a83cdcedcf5795c6b2a1ef2caa21c91c
 EBUILD qtwayland-5.15.2-r1.ebuild 916 BLAKE2B c319d05e9293595a50613e687f2242da18a8b49af854f9c4f46356642472762cd7659d6ec0f3b3c41eedc5d40a631001c88dd6435aae9eb94c32d7ee4233d322 SHA512 ed27a404fe9fa2a9d2ca5216cd017c9fcd2ba40f7d55758a5337ddc9040d3df9d5cc0c3610561551e0b640cd5902cefd2cb978f7e2003fa77aab4e0b57ae59e8
+EBUILD qtwayland-5.15.2-r10.ebuild 901 BLAKE2B 50e9082ee8e1e252cb8ae783434f11c875ecc5f92fb691e608332e5571b4582d0bb11cb24f45a2d6126da21567ebc7f43c40139d1e2602a63c2797a17af57140 SHA512 411065fc4ff4a86ce1e0a57beeb91f52060fdb06c62ca168200fb1b4b118dfc3937ddf7dcf14be048be574aee55fec80adf2e03bd635434dc7112c2438c303b0
 MISC metadata.xml 583 BLAKE2B 2f04d6e39831120e7a38de5172b26f29bdb19e4677588595e5281000b14dc5ebcc0984fde5e99330807f8c400b7abb3c0cfbdaa7f131c815d60680259532cd3a SHA512 3b76305c692c7e9b2f0d82862ced25a4a306fc23611f7c22dfed3b19d55072373cca7bf2d4e6bfc14276986082cebfe19e7637c780acde1f421bb1baaf95f27a
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r10.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..a93d716f58e2
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.15.2-r10.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=d4c41797b61a5a8da47c5821711aca72e756dcbf
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="vulkan X"
+
+DEPEND="
+	dev-libs/wayland
+	~dev-qt/qtcore-${PV}:5=
+	~dev-qt/qtdeclarative-${PV}:5=
+	~dev-qt/qtgui-${PV}:5=[egl,libinput,vulkan=]
+	media-libs/mesa[egl]
+	>=x11-libs/libxkbcommon-0.2.0
+	vulkan? ( dev-util/vulkan-headers )
+	X? (
+		~dev-qt/qtgui-${PV}[-gles2-only]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
+		$(qt_use X feature-xcomposite-egl)
+		$(qt_use X feature-xcomposite-glx)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index ebb6be48b773..592471399b18 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,3 +1,5 @@
+DIST qtwebsockets-5.15.2-e7883bc6.tar.gz 434705 BLAKE2B f8c8fbb0e369ad5ceed40ca62c2a7d6d2cdb3cb74037e9ecb487b0ec31757aae10ed6f61790c566e4431b59585fee423047c4687b41cdfc08e96dd46c2f964b6 SHA512 35b1caed6462083014bbb83c6aa81b441f67da7f0e3813fc47997ca4fecfe5423eaef5dd4ed3c37f42dd311eded0e6b36cce6725c7028047ca21b454ded9257f
 DIST qtwebsockets-everywhere-src-5.15.2.tar.xz 259000 BLAKE2B 1bbc4d5451e70a94b6fb8377a60e43e2fa1aeb0d1224dd04486fcafd7821c3918a887297860e7cfcd18f3afd8dd02a903cf16fb69aeb48a52557af539c79458e SHA512 1b23b79bff4289e785daf51441daaecf6de66ca5a3febfdd8fdb8ce871471bca4faf7663d68b23aaf562b1ebd6e9c8c27b3074f4b93bc9fcd3a0c54f7f79a9c4
+EBUILD qtwebsockets-5.15.2-r10.ebuild 607 BLAKE2B ab417ea7326832382d00a9133ee2a63ec051a8f5fc5c3b38dfeb379d6bccce1b92b35cf32409fe94ab82a0584ac4f2fb22a3cfc646bb66523fbbaecf11bb71af SHA512 2d99018dbf4e75e19f5f3ac5c52d8e674c5e198a7fc3d0572f2b5bc0781c281068f1b299dc22cda28b5614889a9af41dfc44a57ed58c7ee146567e87cd35efa9
 EBUILD qtwebsockets-5.15.2.ebuild 545 BLAKE2B 048aa5d3965f2b03d73cfc0dac6d183419c2dc422f3cc6f8f7e88ce9d916a0995b0aefa1606c3876ee12fc74721fb7bbb60b6e81858042df7fa176c6177ac9d7 SHA512 bf768df2dafbdfe3b866596c5e12d3ab47da1248413e92cd46f032499f5bd2af4911f5d6b2ff8aa7a6fe338304d165a31cc4b27035d925747a85f4002995ee67
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..5910e9c5d92c
--- /dev/null
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=e7883bc64440b1ff4666272ac6eb710ee4bc221b
+inherit qt5-build
+
+DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="qml +ssl"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}[ssl=]
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 57b965ffd7ee..8759875ee6c3 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,4 +1,6 @@
+DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtwidgets-5.15.2.ebuild 1188 BLAKE2B 9c2992011433a9f903dc6380f012f07ae16359e6eeb8b765ca2023c8fe46cf7c4e7d83a9959d0e652c8e75555e76abd17a8e1fe3fbc26a5562ff821fce0ec1b9 SHA512 fb7d0ef11ae6a8a1306c1ff86f47946049280a0de772eca84aab5c003eb5adfba9fd1a65881c2645bcf6ced24910646e67fe8ba199d1020b7964ec6e06e75fc9
+EBUILD qtwidgets-5.15.2-r1.ebuild 1188 BLAKE2B 9c2992011433a9f903dc6380f012f07ae16359e6eeb8b765ca2023c8fe46cf7c4e7d83a9959d0e652c8e75555e76abd17a8e1fe3fbc26a5562ff821fce0ec1b9 SHA512 fb7d0ef11ae6a8a1306c1ff86f47946049280a0de772eca84aab5c003eb5adfba9fd1a65881c2645bcf6ced24910646e67fe8ba199d1020b7964ec6e06e75fc9
+EBUILD qtwidgets-5.15.2-r10.ebuild 1083 BLAKE2B e4a33a34bfe6cae0822e933f14c1ed771600a28d57b482aa899c9dbc20dd8df9620e47384103dcc60820ec03dbf44c2b38c55597d722831792758346a832cdcf SHA512 61f3fb70d6f1a0fe2635c78b4926c3fdc952144f4845a731bdc6b936c44ccb4930271e1ebfec195f7ccac01d956634369ca91605438a2715752a31be7c011544
 MISC metadata.xml 558 BLAKE2B c7089423680ebf689b6367ece6366ed03a25424b5b85ccecbfbbf0086d3d9bcd36a4fca1c5f4e3fce1c1502c2444d94f30b7b3d0addc1019452aa206d661bf51 SHA512 013a8a653ae20d070ce0cf42797ae05b89510e600b40fd061541c634d4faa24040c3d486ac8c4fe39ba918af57c2aa5d3954f35d3fd4f850dc732521f5a699c5
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2-r1.ebuild
index 3332a278e385..3332a278e385 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.2-r1.ebuild
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r10.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..ebc81a5c757a
--- /dev/null
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.2-r10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2-only gtk +png +X"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}:5=
+	~dev-qt/qtgui-${PV}[gles2-only=,png=,X?]
+	gtk? (
+		~dev-qt/qtgui-${PV}[dbus]
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/pango
+	)
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/uic
+	src/widgets
+	src/plugins/platformthemes
+)
+
+QT5_GENTOO_CONFIG=(
+	gtk:gtk3:
+	::widgets
+	!:no-widgets:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:widgets
+)
+
+src_configure() {
+	local myconf=(
+		-opengl $(usex gles2-only es2 desktop)
+		$(qt_use gtk)
+		-gui
+		$(qt_use png libpng system)
+		-widgets
+		$(qt_use X xcb)
+		$(usev X '-xcb-xlib -xkbcommon')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index 88b143314b2f..77edbfec6427 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,4 +1,6 @@
+DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtxml-5.15.2.ebuild 646 BLAKE2B 97826addb6a8226423dffb1e2cbbb9ee05e8f036e5969f122cf451f7642822609974d9478106a1e338672658473c746699f5f52ccd3ff6c979b618ecfba3c916 SHA512 bde3c112a69299b9e5f0588f6909b0364b34940b31ef2104d2ee4187f0cc7f7d999724108170d2fc705cabf631eae00145547081c28eefc425a69d992934de91
+EBUILD qtxml-5.15.2-r1.ebuild 646 BLAKE2B 97826addb6a8226423dffb1e2cbbb9ee05e8f036e5969f122cf451f7642822609974d9478106a1e338672658473c746699f5f52ccd3ff6c979b618ecfba3c916 SHA512 bde3c112a69299b9e5f0588f6909b0364b34940b31ef2104d2ee4187f0cc7f7d999724108170d2fc705cabf631eae00145547081c28eefc425a69d992934de91
+EBUILD qtxml-5.15.2-r10.ebuild 563 BLAKE2B 0eb2cd0df2820981fc556843afc9f4627b26fbe2245c71731d5e9ff13fa38e1899adecd8c30505edfdb99ceef485e805848dc43542afdd930c9f7f8d6fa20919 SHA512 c81279277373e0fda7c987e599527105d616f3475e316fade72c57e54b7dc6fcdbaa80eb344748e93c008ab90aa90a9ce0bb62ca180e84ec4d1ea63bdacf8b33
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxml/qtxml-5.15.2.ebuild b/dev-qt/qtxml/qtxml-5.15.2-r1.ebuild
index 16d360c85c55..16d360c85c55 100644
--- a/dev-qt/qtxml/qtxml-5.15.2.ebuild
+++ b/dev-qt/qtxml/qtxml-5.15.2-r1.ebuild
diff --git a/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild b/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..20df4c58c38a
--- /dev/null
+++ b/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}:5=
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtnetwork-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/xml
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:xml
+)
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 06bd83e6f09c..065410422901 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index c93ca03c0c62..d63b692db5b7 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -2,6 +2,6 @@ DIST backports-3.15.0.gem 152064 BLAKE2B a2c2a1f35ab6f682be23a5189bafec563a2d028
 DIST backports-3.20.2.tar.gz 178633 BLAKE2B 2e2f2f31099763bb218f3ada9f9d040d4b41fc842bbc8b91d703e91b89bab9d6e7bbf3aae1ecfe34abe6099d6cb34929ae72ba66d4ee473841563257fa85cf3c SHA512 a91a2c9186315fca8e0b33554ef26986abe8565e08a79b9f150f8115f998b2a7a440bbc64b92f89c4e95e1c5e852bfeea6ab337804cf017517e77229f10820e5
 DIST backports-3.21.0.tar.gz 178706 BLAKE2B b895655fbbd15e99021f3d9d4f5efe84957c43cffc4e6442a286494624af3d9afa50933cb9f46d86a752c2aa1f52e867d4063e5f8357c969c7ade75b38566f52 SHA512 9d3a5315d412f16c28172121f7b64b424d3728e76c2b9b4466937572bc922f595f5b56caa265e9b03ed44ca64643c36086d60ddc1ff8799e11d953dc75aaee65
 EBUILD backports-3.15.0.ebuild 667 BLAKE2B f38afb21d4795a224fcc909db22086980b3d2a135dd7652bcb03839e34a485a183614d2e42628d18cc1368254ade263d43a26e68dd9ca3d120f1e130bca05d1f SHA512 26542cdf65e3141ad22773e0fd6f7413a8f7e066c8c434c20b626066f0cd69fa8608ad8f49a9ffb0d3289a87a438de475f39a64c5fcc4ccf6ba8d59ace3bf531
-EBUILD backports-3.20.2-r1.ebuild 795 BLAKE2B b5314ce2b6e8bff484b3a6ab29caa115bf091dd8c5a7e48cefa0a913762ecd1bb271c7e5462fa187ac11126bf4fd89e865c41dc0629ad5d6e9d57505d403184d SHA512 5246b4b54a043fdf81d60d46979c3f9983709a3e7d45a526d04ba19f292811c6ffbb082a5bb1ebc1a19b7bec7cddeb2e35f90d8a01b88f44bd9c33e2c7bae1dc
+EBUILD backports-3.20.2-r1.ebuild 794 BLAKE2B eaa38f2bd3c9c2bfb13b8351be6d791748bc3e36373a3cc7597bfdeeedda2af9c27e8d52ea51eebb29ac7b4961eac09de8ddc43504c12d54d31187a86eb2ae2a SHA512 c501dca1d09de9ba1c204586d5a6784a6f70b5c81b59ba73f279799ed5cd2919a1122fb53d5d3392c86acb733cb2f5743f2bcf57eba4de94668363ea82065072
 EBUILD backports-3.21.0.ebuild 792 BLAKE2B 0c9e5d2b2f54c1e5c7965bd4267e4ee1e13a459753f047ced428342fe299910350ed0c75552db811a12129bead6f1478bb5a8c1f16b7d82735610c24368850ad SHA512 d147eddd18ee7abc4b630bc298141bbea1fd38e24bb2ad1b12228e943d79fba7d70296999ce2236a7d2485b2715c028e43110a8808e1486e3532bfd56fc896d6
 MISC metadata.xml 335 BLAKE2B 23e6e33c417bb055592549fdd07fd02a2d97b613095e42248f501ee6ea71e3d4b2a2e25796060d3448900ba0d2fe66d0c44307be97b89834711ed153751126c3 SHA512 2850da756cf7d97e70667e06587ab9a37869e4a77417c12386edff4ab09d380641a4573a7ecaa6eec5809fe85106ca53844b4b25fbeb6cef8e451fef2803ae19
diff --git a/dev-ruby/backports/backports-3.20.2-r1.ebuild b/dev-ruby/backports/backports-3.20.2-r1.ebuild
index e597f31326c9..9f993ca37007 100644
--- a/dev-ruby/backports/backports-3.20.2-r1.ebuild
+++ b/dev-ruby/backports/backports-3.20.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~s390 sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 1f7a7f0a7b7b..bf7e4124cfc1 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -6,7 +6,7 @@ DIST capybara-3.35.1.gem 371712 BLAKE2B 1c389896b3d5a4f188829ab43394ca5aab108aa8
 DIST capybara-3.35.3.gem 371712 BLAKE2B e50c892897cf2838cafb77cb7cfcb54e5fc52c3cdaf11489b60168511f3a213d2ad7f94c67ad236e6177b849f99445733aa4de9691755011bd32f524e5c440b3 SHA512 90507b2254fdd7aff375a305c1112b878d5f0a7c909e7d95b62c6728acc340f73d244304efc07c3dcc707825afcd9b23b088e5d889717efe4edc2dab4dd38d2a
 EBUILD capybara-3.32.2.ebuild 1789 BLAKE2B 0144d4405f871d24f715b1ee0e8e6797b37178939ad921f64d83e033256aa8228900ace9df68358e1d1222ff0ae7adcae830e8cd9e8b6d4a5f521224c618ed71 SHA512 502598533960c4d2fb06e8bec9859067246321ea625c1961c7ef115c44664b3f9b533cedb6c630c9c7dd5093cf873e0d16ea80d3d2d704db950e22bd9a980601
 EBUILD capybara-3.33.0.ebuild 1783 BLAKE2B c9be1ebcbae6b2141e9c0f967d92284c736c57046a30eee07705567e16aa065033ee307ad722aafe07bbe8080e9bb56636f16b0596d8b7a03c48dfc4a091bb0e SHA512 83c5ba82043668977392824b28125859ccaf75fef8cd4dcf829cb163c09b3f5e7603def865ba66dcd2a5a88b7016146e819ab6df58316df11269f463bb95c92c
-EBUILD capybara-3.34.0.ebuild 1795 BLAKE2B f58693cdc2d74c42a46497a13691fba12c1bb909ed6ee5d62bab41651acf2c39bcc0ca80f361861cb838299228f849be80efe3407b979c2010893e854df7571a SHA512 fe7d6b9ddbc73e9c2d884c7942584596a7d010183e85747c250170d32dc6e3c4065a40a0cf83e3cca04bb18e994d1347550106f8d1533287bb1ded850db1f9ac
+EBUILD capybara-3.34.0.ebuild 1794 BLAKE2B cbe19d886f901c9fc0a186132d980e2377b7c424431756bc35b5a3d5359d4f3a7fe87eec19d959ee5e6ad5ec5ca8546637b4497f8d90875d66ed85648c5e8c4d SHA512 39c4ef7cdb464e47d5dc693abf081580367bac0efcdeb7f96c8750bdeb5915934f06a6424f8dde815260749dbce6c8c5b0fa4c9b99d28a43c74b8ce8644cb14f
 EBUILD capybara-3.35.0.ebuild 1795 BLAKE2B 597cff05c9947dbdc205f1542be43773db1217868752c08ff8937b75df9b5f4141b4e76fdf6d4437216e330878765fdf3b73d7ab551f69637d31dbfaa36ec326 SHA512 190ce0d107f781e723cfe44e37eaac19b8d01c798e48c2adccd28869534086f018489639de1ac1b3fb2c4e8cc3ab7cfecc4a1dcacd6b84662f10e0ba83ef2157
 EBUILD capybara-3.35.1.ebuild 1795 BLAKE2B 597cff05c9947dbdc205f1542be43773db1217868752c08ff8937b75df9b5f4141b4e76fdf6d4437216e330878765fdf3b73d7ab551f69637d31dbfaa36ec326 SHA512 190ce0d107f781e723cfe44e37eaac19b8d01c798e48c2adccd28869534086f018489639de1ac1b3fb2c4e8cc3ab7cfecc4a1dcacd6b84662f10e0ba83ef2157
 EBUILD capybara-3.35.3.ebuild 1827 BLAKE2B 04b6929165470992dd39ae4f8652d73362670efe1bfcbfb8bb281e2df42e69053ccfd29cd3a28fcd76172527ac4fd451b05e1b2bada430f8c7fd02655aa163e0 SHA512 73ff788d0092bea50148f0df28a126bb8c3e2360ca504409efcf3d7a85ea46ca175aa47ee043066e8d94dbd5fde1a8e7ab5315fce705ab1d5152a9773d0bbcdd
diff --git a/dev-ruby/capybara/capybara-3.34.0.ebuild b/dev-ruby/capybara/capybara-3.34.0.ebuild
index 00ff91a83b97..46b9bcfc0572 100644
--- a/dev-ruby/capybara/capybara-3.34.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.34.0.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
@@ -15,7 +15,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/faker/Manifest b/dev-ruby/faker/Manifest
index 16a3e4ce0456..886073a7ca4e 100644
--- a/dev-ruby/faker/Manifest
+++ b/dev-ruby/faker/Manifest
@@ -1,9 +1,5 @@
-DIST faker-2.14.0.tar.gz 1150487 BLAKE2B 51343e8d45d2615d180fac4845d2cc8a6509b3710528c2770e52f2e4203e458ba07e3fa4f8f7559704598379b54fe38d8d557fc6cc0b614f3695cee8265adc49 SHA512 3a65a65c587f9e2a12c0d7a1e5ecbb12d059146cfda944d5bca950dd2b8cbdb509722b7b181fc619f395ebb526c3f99461ed74803a79cda1b74df83c203db518
-DIST faker-2.15.1.tar.gz 1213822 BLAKE2B dd627078ce1edab63a3f16a5e893c29911b9bf8d88b6d490a368ec16a633e7138124ee66d439738c4f2a8e14b6d0815611ed744d5323817873a0e13f2bddfb06 SHA512 de3721290683a86f985c2783c749be530c3306be73d929517fb54dcde2f64b124cedfa6b10c51e390a38a0b5ac81e2feb0b491c165d0bae9f017463596794fbf
 DIST faker-2.16.0.tar.gz 1234511 BLAKE2B 99c53c85094022b33f2213af20b642fafb885ae9cb99169aa2684697e3af9d393b73476ebcd4e7e0541777d0648a53570cd93c352316a7f86c7a2026bf02b47c SHA512 b33054414ad57dd34ce0448d3b8a411d71a14bdbd66fd969007267d1969b40dc37b8d1b6622f81dfe1ed9d38b95cdd9dec699e3233195cfcdb9289d309c0a6f8
 DIST faker-2.17.0.tar.gz 1268170 BLAKE2B 560fe5ebe8384121e720b540d0375aa50cfb40717e2ea4d438cce1918a7996fa3414a01344c26c65e2e0ac6115b3694985355543290b89500359ddc523e47304 SHA512 fd5e3726d881d6378c21932d97c5d92c23e8cf0e36289f6707d76474dc5ee843a731ea6c6a29bfe33564bd7521c91e1a90adff0c205c19a77b0a944766b1d159
-EBUILD faker-2.14.0.ebuild 794 BLAKE2B bf8cbf0dc5a7992dd7bf20b2352783abbd1d23e71e7ad710641473820fca5ea3e8828f132edefcac7b1c0d992230bc4da6166c0c29386214324fd90af4d0f1d3 SHA512 a953537117984f3169944b80a4707901a654f46f64240f94bda20676de0927ce2be8946412c27dd8599c6d59f49df88e0d6f919decb870bce69fff50e1182a1f
-EBUILD faker-2.15.1.ebuild 800 BLAKE2B 2bb2848c765ef5979b3168ccaab019cb9986f21e39a9b24df18d28956380745caaa32965ab6f6099dfb8a1b8c02aa259d03615f52162d9fb6547537dab065651 SHA512 e9b4b50fdabd07315493fb58cc96cdbe038706337ca8ff0107028bc38a20eebd306c945cce884a882cd86892e1926231897029619f3b42d24e7c5f2f6be049d6
 EBUILD faker-2.16.0.ebuild 800 BLAKE2B 48abf91e902c8827ce02aaf335a2b00b3be49a46be0c5f2d99b0b41102ca91c038b1f66a07c0d2ce9ce954c4b3d1aa511b492729423dceeabeeae4518faf5c15 SHA512 012926c832369b208e0011dbbe61ef176686db5d580953063618a8c4ded8729d81388c260f081a8a70e4015cb62310bb5afeb1d293166fbf9a0139c4e8b7c150
 EBUILD faker-2.17.0.ebuild 800 BLAKE2B 48abf91e902c8827ce02aaf335a2b00b3be49a46be0c5f2d99b0b41102ca91c038b1f66a07c0d2ce9ce954c4b3d1aa511b492729423dceeabeeae4518faf5c15 SHA512 012926c832369b208e0011dbbe61ef176686db5d580953063618a8c4ded8729d81388c260f081a8a70e4015cb62310bb5afeb1d293166fbf9a0139c4e8b7c150
 MISC metadata.xml 452 BLAKE2B 70c3af75cc74dd28d3af9df670a4f2f0d898c702a5d5421d46e598ad14c380e288cec076d2a3aaa08e85a198b12daa2d69249feccffe24f07d6d73fea1010fcc SHA512 1c525fb78b733e6301acad7092799dcbba462c471cf3719f5634069a83c67bbb27a705c2ec6a27b8d431842efebef3209d7ca4167f8dda7e6439b1c0cda09eea
diff --git a/dev-ruby/faker/faker-2.14.0.ebuild b/dev-ruby/faker/faker-2.14.0.ebuild
deleted file mode 100644
index e02e94be8040..000000000000
--- a/dev-ruby/faker/faker-2.14.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
-HOMEPAGE="https://github.com/stympy/faker"
-SRC_URI="https://github.com/stympy/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/i18n-1.6:1 !!<dev-ruby/faker-1.9.6-r1"
-
-ruby_add_bdepend "test? ( dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|rubocop\)/I s:^:#:' Rakefile || die
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/faker/faker-2.15.1.ebuild b/dev-ruby/faker/faker-2.15.1.ebuild
deleted file mode 100644
index 9ae0563a25d2..000000000000
--- a/dev-ruby/faker/faker-2.15.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
-HOMEPAGE="https://github.com/stympy/faker"
-SRC_URI="https://github.com/stympy/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/i18n-1.6:1 !!<dev-ruby/faker-1.9.6-r1"
-
-ruby_add_bdepend "test? ( dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|rubocop\|yard\)/I s:^:#:' Rakefile || die
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/ffaker/Manifest b/dev-ruby/ffaker/Manifest
index 4c2da5a91cc2..1088529573be 100644
--- a/dev-ruby/ffaker/Manifest
+++ b/dev-ruby/ffaker/Manifest
@@ -1,9 +1,7 @@
-DIST ffaker-2.15.0.gem 437760 BLAKE2B 6da52a04d0b5ef6b048155ea84985c3a8ca707d58cdc90514dbc0840180a7f35772120ec195ba92aae387141d314985a25222cf71e1ccf8dd1f370e34755c49a SHA512 2eb01af79e0520f0272c59f69cfd7e24c6391bd29f8f183ed05282d154105118242a816e8599808b2532a9e4c6175a767b9ef1bade8382259741feb7ddb8d9c1
-DIST ffaker-2.16.0.gem 437760 BLAKE2B fefa8b93509d16f144e25ef334cbcd6f4abd22be56cc1dea570a47aa78fbc4d4951fd976ae555d8732b69c8387e56a311943e32f79d7ce5866db08f70a5cc7ac SHA512 3f51c9a6c0dedf79695d6915f2c44d8bfcb2808bac130ae988e0b66792aa85da12cb2ea36af09c9cacef55abf0c12bef869166df8c69f19b9b508b49767da90d
 DIST ffaker-2.17.0.gem 438272 BLAKE2B 620abe73efeb7f076804b17129d18eef491969e13833308468faffc86fbbf5dff358ea159219b8bf78c1ad69f57e4c2d3248759be4dec7ad96de6da41f52e734 SHA512 af6a04d6e960af23962c5596d58c097b078eb43ab72fc61997b4e4c30a459ef959508e13b1bc0a7cbfa2d83dddf7b684d6bf97b69cbed1fbb0994890a3e6dd6c
 DIST ffaker-2.18.0.gem 445952 BLAKE2B 3a0d9bc201810f6055417283e821655e70d45916282e6b01530c3221826ce555ad3670ab81cc21e14739c53b3fbb2940d9eb0d45b7613e9374f10d15df138515 SHA512 d57f1baa5fa40ab8d7ac7aec21d18a2ae2611f960b2e59f2deb41c2d1319f546ed18eda0f3ba02f58c34dc80f00da2487c7ec7940cb213f55dc6c900e44ff934
-EBUILD ffaker-2.15.0.ebuild 534 BLAKE2B 38bff78db9e6a0c5aa608e93ca6995e3cca68cf6f4c1d3f1e54e6d0e3a8960d3d77404209af89bca7f6e07e52b75960a10e0d69634bd17f8821bfe4ee12b96f6 SHA512 b4ef47802c9d78704f6d94d73a9169c7fad13325ea49eaa84b3844f3f71ee1d86ec3dfaa3705737a321d7f1c7ebfea691ca18344f1454604362cd221a1e6fce5
-EBUILD ffaker-2.16.0.ebuild 527 BLAKE2B ef36a197ea7715596a160dadb13e3f1c92ab0b7aa7abb565872bf8aec0605cfc6759eaaecf7d542e2492a3df3793b72f2fe2d5cbd244c325002e5536bcbd4fe2 SHA512 e2c7e88d226893ef8e9a4b054f5e99b13de034fcaaee45da5baa08ad801860521d9f70bb473d3b67fe5a8da6d66b03ac2bda55f68c8496c8fe613a04a1d55595
+DIST ffaker-2.19.0.gem 461312 BLAKE2B d80ae70604fcd579ad42b268e6139e3395dcc10aa90e828d4ac8b402624b6391e88d25ed233db699c953feb279348de95e9f731455e10b58970069feebd72bdf SHA512 2de34cdfae50bcb460dc8fb6eb7cd5ee69034de4b66e97a408e5c6265efd9370eb3c38e5a61eefdc42b67e5e569e6ba3a1f7621ffe1a8cf6beb76fad40bf5d6e
 EBUILD ffaker-2.17.0.ebuild 527 BLAKE2B ef36a197ea7715596a160dadb13e3f1c92ab0b7aa7abb565872bf8aec0605cfc6759eaaecf7d542e2492a3df3793b72f2fe2d5cbd244c325002e5536bcbd4fe2 SHA512 e2c7e88d226893ef8e9a4b054f5e99b13de034fcaaee45da5baa08ad801860521d9f70bb473d3b67fe5a8da6d66b03ac2bda55f68c8496c8fe613a04a1d55595
 EBUILD ffaker-2.18.0.ebuild 527 BLAKE2B 99007936ee18a985435ba157a82d79cb6c5406f2d10b55895e4b4a818d9d3f1c14b3e738fe43eb9681a2eb108f65de408fa17a71edfcdc9178a7689cf242539e SHA512 eee17304c6fc80e3b44fae6d58cccff4f1db15728828263f2f6c056ef16f0f5e75870dc1a11f2773772b272f7026633ec217c899c4340fb3c23cc9f2d91b7b9e
+EBUILD ffaker-2.19.0.ebuild 527 BLAKE2B 912549da872e6c71a5c21cc166889c56ba2d5202c761d8d4a366d390fb9190f4f4447829d5db754b217eb236e30fd0285466a6e2b87715c4571ccaef13de0df5 SHA512 01e332d8b52f720486125f4bf9d805872f84f3a864324b7aad9282dddb7913929f5ae28722a985d3c0eea4ed195ad2832600faee551f021536751f26aafa385d
 MISC metadata.xml 344 BLAKE2B 35517e20c0036d8a175e81240ba0ea29799e0a00ddcc7dbb3b71822c4bd1d2ab64795a967dda9b2c9d207c18ffa090aab11dcfc6fe910e74b60f20413f65c001 SHA512 24ac57014a8aecdcc405060fc2e5f7ad3017cf07d022c55988bf7386bb50a79158dcf88f64e27141a4c44542f60c6d0e3b82d94f99dea71213cf6b914e717ada
diff --git a/dev-ruby/ffaker/ffaker-2.15.0.ebuild b/dev-ruby/ffaker/ffaker-2.15.0.ebuild
deleted file mode 100644
index 488b7c9e7f91..000000000000
--- a/dev-ruby/ffaker/ffaker-2.15.0.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
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Faster Faker, generates dummy data"
-HOMEPAGE="https://github.com/emmanueloga/ffaker"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	sed -i -e '/test_image_file/aomit "network"' test/test_image.rb || die
-}
diff --git a/dev-ruby/ffaker/ffaker-2.16.0.ebuild b/dev-ruby/ffaker/ffaker-2.16.0.ebuild
deleted file mode 100644
index 267c5520faf5..000000000000
--- a/dev-ruby/ffaker/ffaker-2.16.0.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
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Faster Faker, generates dummy data"
-HOMEPAGE="https://github.com/emmanueloga/ffaker"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	sed -i -e '/test_image_file/aomit "network"' test/test_image.rb || die
-}
diff --git a/dev-ruby/ffaker/ffaker-2.19.0.ebuild b/dev-ruby/ffaker/ffaker-2.19.0.ebuild
new file mode 100644
index 000000000000..d2dfeeaaf3a1
--- /dev/null
+++ b/dev-ruby/ffaker/ffaker-2.19.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faster Faker, generates dummy data"
+HOMEPAGE="https://github.com/emmanueloga/ffaker"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/test_image_file/aomit "network"' test/test_image.rb || die
+}
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index b3107a9a3992..7c88b4da44a0 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,6 +1,8 @@
 DIST haml-5.1.2.tar.gz 126059 BLAKE2B 5d805f29c28d0f6355f7b79e5724ec1639a808cfae75c26633edddcc82d964a48dbc1654b780fb706529ca22abcaba953a1af6f483386c336035c079a719e585 SHA512 405976de297bfdbd6f010442d940205c404f057a54cd7162feb400b1831af3e4e60fd05a637a2f480204428512ca7dd66c02aca22b0006d6d515c06968eb08a3
 DIST haml-5.2.1.tar.gz 129795 BLAKE2B f561d8969fd4b49f1bbbf943c612a5cd3205a1b3a1ef544b4939dec5746d6e04b438f8bf69a320b95455fb15ab5a8d6c4c7ffef0aeec3d0698d46e6ef0d37e34 SHA512 b7a034604346b6e62f7cf13cce5582d53d81644bd4fc3b178b4c1e175fbea2160a562a6a2b539d810288ccfbca2d12099694a314d9df4286aac33ed1e0e22fa5
+DIST haml-5.2.2.tar.gz 129833 BLAKE2B d68c24c7a3c817d6d364b2ec92b84b4f56f4fffa48b99d17b2df27da35f50b1fb1f69b184a7b21d899c476e0d4c8ad2b940a7cb2995ec24ecdafab8ef61fe393 SHA512 1aec59fab20d8139a5dfedde2007fa8137a377a345e4d30229f9d1140d56cdf970c8ae70e2647e6a408d7fa543a16050f66a8a636efa6a6b1f91ee1ffcc136c1
 EBUILD haml-5.1.2-r1.ebuild 1680 BLAKE2B cb73b65a6f73e3e555a34b4f59800ef7338eb3ef0ac3e40b9b64b6252781b1f715b4bf9ceb2a12fdec6bdbcd5830b2f5efd3b72cc388d8333e1dab180d24e809 SHA512 06ca53ab7ed464657aed8c5b4c09d7357ac47e58f9f38c922d4addf257e3d7e16506244fab6328112f93e8004f675bdee49ea02abe97d894b937e251095e1f19
 EBUILD haml-5.1.2.ebuild 1659 BLAKE2B e9a2581d41907f0b6a587829ce8243e57c9f4582ad09f4e90eeaf02bcddf2704c9f96a0a384a14cefb9b4a1d93979df7a398cf7e69d1bd7e7b9bb42ed9b34aae SHA512 dba0fa00d2eb9b29acdcb2e707132b9a8f23a25e254cce611e04dad239eb8f8f885801cf52212880105f176fa96a0ac7e31337d3c59f2cf38a528855db241d38
 EBUILD haml-5.2.1.ebuild 1674 BLAKE2B b282fa4a7f509f560e41770f3fabc73c0203ee48f82a10ad6673565dc10ad2fb71d750f260e2a98b41fbe00d290059ecbd500fc8628e2bbe443b985223f14ed7 SHA512 24eb0d0616e6de073391615c1ea15261230c7f60da21cd2e8087ca1c90215a0fed91259063d1da09129a3a31020f174f09bb56b4271730327960dae629df1a87
+EBUILD haml-5.2.2.ebuild 1675 BLAKE2B a33ecf2b28be5ef1e5073d11de6cb336edf9ff8b86432cd2b01bc17b1d8ab783316efbfe4c138339ac6a3ac946f47058b188c9bb1e55e089cc2b7f170ee482bb SHA512 10872d599561b70f2ccefea97a8415eb4b51caa7704cf27e9e224345016cb9bbc3af62aecec1b026647f819eeb38c946072da216f9d1ae2fac963c4f8d526400
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/haml/haml-5.2.2.ebuild b/dev-ruby/haml/haml-5.2.2.ebuild
new file mode 100644
index 000000000000..30d93b2b370b
--- /dev/null
+++ b/dev-ruby/haml/haml-5.2.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true RUBYLIB=lib test"
+RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby web page templating engine"
+HOMEPAGE="https://haml.info/"
+SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="doc test"
+
+RDEPEND="${RDEPEND} !!<dev-ruby/haml-4.0.7-r2"
+
+ruby_add_rdepend ">=dev-ruby/temple-0.8.0 dev-ruby/tilt:*"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest:5
+		dev-ruby/nokogiri
+		dev-ruby/railties:6.0
+		dev-ruby/activemodel:6.0
+		dev-ruby/actionpack:6.0
+	)
+	doc? (
+		dev-ruby/yard
+		>=dev-ruby/maruku-0.7.2-r1
+	)"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/bundler/ s:^:#: ; /Bundler/,/end/ s:^:#:' Rakefile || die
+	sed -i -e '/bundler/I s:^:#:' \
+		-e '/simplecov/I s:^:#:' \
+		-e '1igem "actionpack", "~>6.0.0"'\
+		-e '1igem "activesupport", "~>6.0.0"; gem "activemodel", "~>6.0.0"'\
+		-e '1igem "railties", "~>6.0.0"'\
+		test/test_helper.rb || die
+	# Remove test that fails when RedCloth is available
+	sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,/^  end/ s/^/#/"\
+		test/filters_test.rb || die
+}
diff --git a/dev-ruby/jwt/Manifest b/dev-ruby/jwt/Manifest
index 685c9241a8d0..954e9d426773 100644
--- a/dev-ruby/jwt/Manifest
+++ b/dev-ruby/jwt/Manifest
@@ -1,3 +1,6 @@
+AUX jwt-2.2.3-ec-test.patch 852 BLAKE2B fd489a9c7153da73ff21cd9a2f627285bd072e3557f52cee1ee8a7a7dd6112ce68a5e0c331bb395145dea8c5083cfc3bc02146597826164371cebb506eb62773 SHA512 c6a02444b12beeb6d357edef7f7d0352f48638ebcee4795561c3fae0a829268b46324c968291e53bf5cc0a074218d8e8a5adf4e9005751590c4cd387850d5f9d
 DIST jwt-2.2.2.tar.gz 43084 BLAKE2B 998c2770e50cc65b5cb687f99f76b64a6a8d58a5c4312c32b642c7280abcf268f43588f7a8421d05c892072f7e39a6b48c1eb57dde950e92372f2bfe5eda9083 SHA512 04ac42afb09ad8648e2c428cb7493f738b1944e5fd273723cd2fc2550d6ab3486c2f3be5ae5bac7e36664e58d2fa913e5b38ba34361a98ebe1259d18008341b9
+DIST jwt-2.2.3.tar.gz 50675 BLAKE2B 904a2b9be80ece10cc046d35df784ecc4991c3b09a79c2e2e461003596e9212409ed5840282ce632d3ff499754c505cd899ca95945f562883869ff3c50c4399a SHA512 ebefbf8f825afc1a78329088012118ed681a61bdf9e1c6a3fa125d46105092f1f26a4bc88791788c0290009dbc0427128d655a301c034ac07caf14216744962c
 EBUILD jwt-2.2.2.ebuild 777 BLAKE2B 392b81dba214db80fea2276c86d8a8ea2c92f55e4f96a138c1b1abc38cb84af81b11be686e3c5de33563f5fc84bda7e467bc3c4815b01ebad3d1fff5b0cd6281 SHA512 305b51f60e0f496771402a401d2ad2207fdbf4ce9e64aeed8fe7e4089e465a7cef9a2d3a25408a93388ba32b20ec7d92d35817ff66a649d7af4ec03f227732e0
+EBUILD jwt-2.2.3.ebuild 849 BLAKE2B 34447bb74c1c066e60365a371c254c9ac7c23f4fad60f246e6be2b3edf91fdf0eb7862401e59118c9e63adebb0c3f49ce57c402c909970492af3831abc18d8b6 SHA512 ebf4384b52ec03620adf4b141ffe9533ac0f8cade3222d9926c2417e40e0d6b67e17cda12d619629c195d1082a1d77ad10c976c7a90b139fae4711baa4d5515e
 MISC metadata.xml 338 BLAKE2B 685874339b4dce29aaee7a4ff92e7df63ebced85bf94bd9011e0f4b6e1ba3fafc0fa0e701bf25fa8c1dec357ebf27f373742d45b12320ff28a496405982860f2 SHA512 700a3cfc122774c85bb6047a68539139d53dd6abe814b20bad12fb65233280e9aeba45bce0551920b0de550adb2744f4ee7e2eb0ba39e98efeea7a23c63e4428
diff --git a/dev-ruby/jwt/files/jwt-2.2.3-ec-test.patch b/dev-ruby/jwt/files/jwt-2.2.3-ec-test.patch
new file mode 100644
index 000000000000..18f69cf8d44d
--- /dev/null
+++ b/dev-ruby/jwt/files/jwt-2.2.3-ec-test.patch
@@ -0,0 +1,22 @@
+From c444ac978013a9e199c968fefc3c413f37c93351 Mon Sep 17 00:00:00 2001
+From: Joakim Antman <antmanj@gmail.com>
+Date: Wed, 23 Jun 2021 10:55:29 +0300
+Subject: [PATCH] Fix OpenSSL::PKey::EC public_key handing in tests
+
+---
+ spec/jwk/ec_spec.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spec/jwk/ec_spec.rb b/spec/jwk/ec_spec.rb
+index 3a94976..d8258bb 100644
+--- a/spec/jwk/ec_spec.rb
++++ b/spec/jwk/ec_spec.rb
+@@ -15,7 +15,7 @@
+     end
+ 
+     context 'when a keypair with only public key is given' do
+-      let(:keypair) { ec_key.tap { |x| x.private_key = nil } }
++      let(:keypair) { OpenSSL::PKey::EC.new(ec_key.public_key.group).tap { |ec| ec.public_key = ec_key.public_key } }
+       it 'creates an instance of the class' do
+         expect(subject).to be_a described_class
+         expect(subject.private?).to eq false
diff --git a/dev-ruby/jwt/jwt-2.2.3.ebuild b/dev-ruby/jwt/jwt-2.2.3.ebuild
new file mode 100644
index 000000000000..bed4ee7f5a63
--- /dev/null
+++ b/dev-ruby/jwt/jwt-2.2.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="ruby-jwt.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
+HOMEPAGE="https://github.com/jwt/ruby-jwt"
+SRC_URI="https://github.com/jwt/ruby-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="ruby-jwt-${PV}"
+
+PATCHES=( "${FILESDIR}/${P}-ec-test.patch" )
+
+ruby_add_bdepend "test? ( dev-ruby/rbnacl )"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/ s:^:#:" \
+		-e '/^SimpleCov.start/,/^end/ s:^:#:' \
+		spec/spec_helper.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index fb67eb41d939..dd616fd0e328 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -1,9 +1,9 @@
 DIST listen-1.3.1-git.tgz 35521 BLAKE2B 6b93daff2b3ba221d0c0f196c67353963e983610dd9deb3409c8ad270f7221d50e9eefee826c16c51ac0361cf7f5da727db216b1bd92a02077b0bee580fa368c SHA512 4676d030a3e676249a221cf4a136ce69651009ce5855821924be184460e404e4f33026627c9d524156a89344c826b48a690a249f1059493d7d214b922381bdd0
-DIST listen-3.3.3.tar.gz 52994 BLAKE2B 95831a65a75cae28b767696bbe5969cd7115657fa56e01701f3b17d5bd727a053cbac16928d8c7c2a19ad24ea3c99afdadd1e9ebbae0a66d03a511ded7d32734 SHA512 73ad762086e7961e45f1245e5aa32c738824736b7d373c31565832c3acf25f91cbc9c25d7bdffb27cf953cb2b2bb37adfddcc6888f3a1b317f70cba75c2ce67c
 DIST listen-3.5.1.tar.gz 56236 BLAKE2B e74186532d5aa9fa7488d0734867d7ec7218036b10769667b8818d057af4d8a973204ce68f687fa508d5d2ed879b0ba6287c3b93fb05eaedfc63a8dc251523b9 SHA512 d7475e295b5123c5a8f166891e866de60379f28d61ab0610774bdf499bcf0859807ea2abb31fd6e708c106f926282376aec94ce268e6709884a63852e820ae74
 DIST listen-3.6.0.tar.gz 56134 BLAKE2B 6826426c5e46fa10145148d545ebdda278af080c4ddda8b055189a9aec91c26302c991ba69199d2616ae171ac85cb0ec6cef657980e6b984bc09513adabf3d16 SHA512 32b93ee98333657f8dfcaa8e5c9aa291d5413ddfadac3c3ff34edd2a2273e119922dee71825d6b06a6e86951deb96a676a8b9cdd98431fd21c55557a154702ee
+DIST listen-3.7.0.tar.gz 56192 BLAKE2B eb7d154dc0e608d43b6751db630f0b99e89fbfefd61e718aa99cc6a03c47e1a4aaaa55d42f1ae75351f4397c60902dcc78d8c9e8250899f075c351a7fd781069 SHA512 86942d60cc57a0a960ba813c3b90ca33c47513bb609c1861c792ce2b9b37371998859c0d6e1cd979d4a3427319d3a75454dfffa068ca1dec22d38497add1335c
 EBUILD listen-1.3.1-r4.ebuild 972 BLAKE2B c8062f42d923c5dfc3b352bd14c96a5afc6d79b1b4756a3fc0e6792f89179e454bcdbba2d2697433b33180c0edbbb503a81a1b252109ea8a3cc1b7c7d302c8f8 SHA512 31c83048aee128b6e90303e7eea9f8fc16faa0814db329283a58adb9dcac275efb1586814a5ce999f0525fe7829130dcf8bd2fdfb32e5efaf197517400bfe444
-EBUILD listen-3.3.3.ebuild 1201 BLAKE2B 5db4e313fc8bc0a67e5ba7a2b8a14330ed78e02ea82989981c64ef3398e30d9f12b555eda9e11cceb242302daff8252b6f2772a843ffb8f3f3147ddc2bdfb1ef SHA512 2715c9493641cff9f1d980cc298b7ce85d8b6e27d776c7461e273e85a8327a57ebfd81ff522bdfac1b8dade7fb47c161a0dd7cead9fc08965bcdcebeb65c4c0d
 EBUILD listen-3.5.1.ebuild 1208 BLAKE2B efc9f7ccc344a4272fa0879b6de1652b88041fc2bea9f8b174dfe3bc3daa11fcf773792bb9c55df41f997cc516c4574efce310a592e8519fd0092e5b84c594f9 SHA512 1788a9eaef1d08d9a5c2f09e3e0285daf0f603feeefd6c04db54992d55a2a52e82cfb5d73e7a11380512b295be187ec70d1615a79b0a22884feeed599ab30e19
 EBUILD listen-3.6.0.ebuild 1202 BLAKE2B a1645e77dc86ed485abeada0b52e2876ec7b14ba8bbce9c6bdddfca2c22d65a9ed980f7fafe30fa4312da5c3f56de45e8a760eb5933b48d055dec96378308bf7 SHA512 c0ca51bfac9dcd1270a0f3ae2b6d722bec329675270821717d8283b353c2712ea614e1f988361426ea1b70f95c798a85bd00a716be1f3fcac2a1b3cb348fa4ac
+EBUILD listen-3.7.0.ebuild 1202 BLAKE2B a1645e77dc86ed485abeada0b52e2876ec7b14ba8bbce9c6bdddfca2c22d65a9ed980f7fafe30fa4312da5c3f56de45e8a760eb5933b48d055dec96378308bf7 SHA512 c0ca51bfac9dcd1270a0f3ae2b6d722bec329675270821717d8283b353c2712ea614e1f988361426ea1b70f95c798a85bd00a716be1f3fcac2a1b3cb348fa4ac
 MISC metadata.xml 338 BLAKE2B aa66734c1150c6a7b21e1c018d4303311955fb6e1eadcdfe16c3ca514b3aad663e4c16399a75b091e614ed87a86b6958577771e040700e01590447d33bd77dab SHA512 f4035107afc1bcbab797e116a0f39e49c9a4034f838878ad448efea9eba8d2fbc4db074db73871550a42c175c9e36a220877d2ed50580828c3180fcc50913288
diff --git a/dev-ruby/listen/listen-3.3.3.ebuild b/dev-ruby/listen/listen-3.3.3.ebuild
deleted file mode 100644
index 5b598d3c025b..000000000000
--- a/dev-ruby/listen/listen-3.3.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Listens to file modifications and notifies you about the changes"
-HOMEPAGE="https://github.com/guard/listen"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-# Block on other packages trying to install a /usr/bin/listen
-RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
-
-ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
-
-ruby_add_bdepend "test? ( dev-ruby/thor )"
-
-all_ruby_prepare() {
-	rm -f Gemfile || die
-	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
-	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
-	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
-}
-
-each_ruby_prepare() {
-	mkdir spec/.fixtures || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	rm -rf spec/.fixtures || die
-}
diff --git a/dev-ruby/listen/listen-3.7.0.ebuild b/dev-ruby/listen/listen-3.7.0.ebuild
new file mode 100644
index 000000000000..5d10bd2e1352
--- /dev/null
+++ b/dev-ruby/listen/listen-3.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Listens to file modifications and notifies you about the changes"
+HOMEPAGE="https://github.com/guard/listen"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+# Block on other packages trying to install a /usr/bin/listen
+RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
+
+ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
+
+ruby_add_bdepend "test? ( dev-ruby/thor )"
+
+all_ruby_prepare() {
+	rm -f Gemfile || die
+	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
+	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
+	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir spec/.fixtures || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	rm -rf spec/.fixtures || die
+}
diff --git a/dev-ruby/mini_mime/Manifest b/dev-ruby/mini_mime/Manifest
index cc6c22cfe77d..9b3d5b6a7352 100644
--- a/dev-ruby/mini_mime/Manifest
+++ b/dev-ruby/mini_mime/Manifest
@@ -1,7 +1,9 @@
 DIST mini_mime-1.0.2.tar.gz 31971 BLAKE2B b2783f9376d5299ba77d1cab0326f706cc671a96aac58e8c65879f9180cf3f1f359eba1b8ed4028c775728d4d633d6e8cce06acee90cfe9b60cde2e53f9a2360 SHA512 644eefdc9277642b8b94ce8071826ec993f7da1a5bc8903bd17ece05a374f286014d05b5765ec5a5f7f0fa9252b56d3bdd03109a3702075f6e8ccb68a4cef98d
 DIST mini_mime-1.0.3.tar.gz 33554 BLAKE2B 7be4a7b8ee066a1106a42ff28ab57684460d061dc9205a992af471f5e9024be080388451f6f0d171c09b96f53c4748c9490afcfa23a82f478c5e96b559c8c97d SHA512 d8259b81821d35ddb8f9038ad2f672816f20e098ff74d8245fdc2a8a6e4be6918b865a25372348ef8dd777483883238919293a683df064d15ac7045f9b40bb0e
 DIST mini_mime-1.1.0.tar.gz 33748 BLAKE2B b804cb6c9c321dcb43a56fecaa04202a88a6233399ca0343c2e101bc3e583071ba5c0ae68bf5f89b220ce338ce6995c41c11ff7e05dd2dd657686ecdba107a88 SHA512 14f369a8a0d35c474691abf71b58597b31ed82d29083173b2c03e6e36d7b20cccf3e3f653c6d53b8abf21aec7d7f3198115238dd27b0e49e1bc9c65426d0dfb4
+DIST mini_mime-1.1.1.tar.gz 33747 BLAKE2B 2b18012d611157c1ace9211e99f2c6b41931a932ed9161b24367def3bf70d5780287a0b855ac32aae202e32a1158d08c7004515841e3baa1a2789d296bdf928e SHA512 b59e5d5a94b80eae62c9be2722e2fa8306620e8b4f54e3c7d020961a89b3d796e26b18a92b6da29677c3822ab68783874486cd1080ca552c9c2fcd3acb13811f
 EBUILD mini_mime-1.0.2.ebuild 1077 BLAKE2B e5350813078cead7f195cc419a44fe18c00423043ddd21b57943e02481b038ce7eb704e9aee5001f201ca7e3abf5d6f17c11e3bec344c197d19c8bde27d5c05c SHA512 97e4af23d1f278e58060e21e8e72f4df6039ae62ca24ef2e5349fa3f3200db539ec5f274be8120dd5d38a0b6d299ef5f6c46476c36e40e0de65e7ff3593b7682
-EBUILD mini_mime-1.0.3.ebuild 1047 BLAKE2B 1f8901cd09e28c20ec0695e373f0c78b4851d3c4563702ef91c7c996c42df19baf9ac189b4b3dd26963512de32fa203f10731757ffd4cba47147f16153238718 SHA512 bea01071f5a8e1b9fa4ff6a668408f345c142c79d2a67585ba0d1d140ebd92981b93b18c1fa3ce8597edd70e3dc9b40bf1f78da63ded495d180c3442aadd78a6
+EBUILD mini_mime-1.0.3.ebuild 1046 BLAKE2B e33497a70f7b14d03d7b243c66feb00732747df3b20a29308d090f5753a561572c4c99f9b7b7747db0f9f8507939b2b4ea55e8df6cceef5ab1aae784986e7053 SHA512 b5aace95732949cf447da4fa1ef44edae876dd58e8b809351c101d17f961b3a0967221c4cd3ba46f757ec41f9bd73362176a98f4e81cf357ff41fb012ac1d9ee
 EBUILD mini_mime-1.1.0.ebuild 1047 BLAKE2B 1f8901cd09e28c20ec0695e373f0c78b4851d3c4563702ef91c7c996c42df19baf9ac189b4b3dd26963512de32fa203f10731757ffd4cba47147f16153238718 SHA512 bea01071f5a8e1b9fa4ff6a668408f345c142c79d2a67585ba0d1d140ebd92981b93b18c1fa3ce8597edd70e3dc9b40bf1f78da63ded495d180c3442aadd78a6
+EBUILD mini_mime-1.1.1.ebuild 1040 BLAKE2B 3e9aee8ab15f94b2947b29ba5caf2634b622bb34dc3e26390fd4ba4de56f94980eca7168d20a3042549a6c983f7899a40799c8fba8e2b7a16931b13ddd25282a SHA512 b11df6ab1ced7c84cfd35d174041d53c136e0b053b229df7dffe10663bbc22b29b849f3731aa1e70d3ed76ff6d19f9698911191bf060490a0d57f7451c6fb8eb
 MISC metadata.xml 345 BLAKE2B fc6de1be1e40f5e450d784f3e2e2be6f0339687cf728fd6b63bf6f4fd1927200f3a5262a2fca9bfa5a33310cfffdab9fbb817ea40072dfcecffc963b5193107e SHA512 bbffbfd689e60f39f73d5117f6327b250a917446edc6d0dc14cb43a5fbb00dbeaf6ebd92c090f3e7b2168dfc0c409c58be287acad9243a420bd5bbde64f80c43
diff --git a/dev-ruby/mini_mime/mini_mime-1.0.3.ebuild b/dev-ruby/mini_mime/mini_mime-1.0.3.ebuild
index 806ae30061f1..7580ae2fc414 100644
--- a/dev-ruby/mini_mime/mini_mime-1.0.3.ebuild
+++ b/dev-ruby/mini_mime/mini_mime-1.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/mini_mime/mini_mime-1.1.1.ebuild b/dev-ruby/mini_mime/mini_mime-1.1.1.ebuild
new file mode 100644
index 000000000000..a83b462374f9
--- /dev/null
+++ b/dev-ruby/mini_mime/mini_mime-1.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="mini_mime.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A lightweight mime type lookup toy"
+HOMEPAGE="https://github.com/discourse/mini_mime"
+SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid comparison with MIME::Types because types may vary over time
+	# as they get reclassified leading to random harmless failures.
+	sed -i -e '/test_full_parity_with_mime_types/askip "gentoo"' test/mini_mime_test.rb || die
+}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 21773590d695..756fa5194155 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,5 +1,5 @@
 DIST puppetdb-termini_7.4.1-1stretch_all.deb 21552 BLAKE2B df93159a7dc9f6a6735f44531306a2b1c7a1bf9d8b88dbd4c9784367e949a83b0cb42dd8172880df9e7f4cbc1d3bcf9da570cdf2fa0437e525452d1f2468551d SHA512 4ffdf5e2019400dbaa5bb1fee22fd66fa430ab395a42d25cca2c61feaf68168b44eb1d29c0a9984a2cb669eff4ffadd9f9c64c6c19ea21bd3ceead392ad6d26b
 DIST puppetdb-termini_7.5.0-1stretch_all.deb 21542 BLAKE2B 903a3290f3f10a199d53e5721fdac58aa771b2f9843037250be223df1f4db8328f4164c9f9756013bb5eba81d03fc13ef95b6806f64f6ecd70b7af8aa7336277 SHA512 d6179dbb4192ecfc1d082d32a978bb4d0c89f47db9c335ff70fc75bc81f41e3b0e78fa9fcd80ed3254ce57600e82f75ebefc217069dca8e0ea4014041878052b
 EBUILD puppetdb-termini-7.4.1.ebuild 670 BLAKE2B 39d3c3e8ec65d40e3807cfd36658711dfb27cde4b55f8848708bb40b85ee07b69de9a61bc29350d4bad1298179676fec40870a32e45ab3d831eac3d462715d66 SHA512 72fdb6d39a682c8228e2fb6141ef6af93d6773bf3bec50bb468499266e60f9a36fd8f5f2f26626aeb47ff5791de8e4c16f1cee93ccfca16c5ea78d46e6a2fbc2
-EBUILD puppetdb-termini-7.5.0.ebuild 672 BLAKE2B 6f9b12dd3d6dc426e0a3a067f864087010c3fc001cb66dad08317eedda34e493441b1ecb4767373d84bf30d12f6e2d108ee93a19c6dc431ed6dfb59c76f8b793 SHA512 197da62a5fb778b148cb32282953173b6bed803cce7b526b4ba1b89406d4c1ed9369e3644afc0886dbe519d70a592ff8062c6b879940f2c316fef9b27564d8a6
+EBUILD puppetdb-termini-7.5.0.ebuild 670 BLAKE2B 39d3c3e8ec65d40e3807cfd36658711dfb27cde4b55f8848708bb40b85ee07b69de9a61bc29350d4bad1298179676fec40870a32e45ab3d831eac3d462715d66 SHA512 72fdb6d39a682c8228e2fb6141ef6af93d6773bf3bec50bb468499266e60f9a36fd8f5f2f26626aeb47ff5791de8e4c16f1cee93ccfca16c5ea78d46e6a2fbc2
 MISC metadata.xml 366 BLAKE2B f03ce821e0baae11d699365e190751fd1c9d233935e46d31ed9f19105ce6b66b1c4ef56697f5e5581022261e4b45bacd4f04368c3e6f74a12b15ee4dabecf869 SHA512 96ba26c725e5fd36269acc3556a7ad6b89d26010e376ff76cffd2a99481b2d3c9c76595f5ee4cba585c3dd7ac76e121aa4f7fbc0efa80d760748e9f81c998655
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.5.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.5.0.ebuild
index a7cef96b4b13..759e7aabae62 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.5.0.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.5.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND+=""
 DEPEND+=""
diff --git a/dev-ruby/rails-html-sanitizer/Manifest b/dev-ruby/rails-html-sanitizer/Manifest
index 0aeba55c3c16..81cd3c137951 100644
--- a/dev-ruby/rails-html-sanitizer/Manifest
+++ b/dev-ruby/rails-html-sanitizer/Manifest
@@ -1,5 +1,7 @@
 DIST rails-html-sanitizer-1.3.0.gem 16384 BLAKE2B ae0b9acfd4ffc53b84b92cb42c149022312112f90d64866de916be2b91b680ecfbbdc94d278626c992cc90b0061705c11c9a604f6d9e91092e1117e40e003e6d SHA512 01d67f750ffc6ac857e4dc47b77d66e02acc4488f353af97e2fc367590fe85107b631aaf8b32f61f9e1f375c93e1b24fbf966f738e35483f5174880a0ffe5ddb
 DIST rails-html-sanitizer-1.4.1.gem 17408 BLAKE2B 4d503bad7a84aefe3bfbb1121eebe768ecf388f502e9ee58f2daf9d1a497ecfea2ad29e7bdd7c2b06e6914355b8eeaf2eeb730aadbceadebdd5a342b9fdc0969 SHA512 c778189fd3fdbdca4a586938d0f22b600f499a174d4d0e34567f0a2a92b8095a2c6c544e47cca3bd7d1f8ae09916898c200d4462de2d31f6bb8eb2c920ab69b4
+DIST rails-html-sanitizer-1.4.2.gem 16896 BLAKE2B 97f09d43ad99c13c07c34c0f5c47e3b34983b94773923cf7d131d1115d818ede619fc0ef268c5523524c53178afde2c9ee2652617add6b4efc282d190591be80 SHA512 9f0872f1000c758918f66a889322d3393ec678604eb3b01fc21bbb861189ec04fcf05f5c9487bd5eeb63ce6d99a80064718c82bfce2daf25c07754979a2ed747
 EBUILD rails-html-sanitizer-1.3.0-r1.ebuild 877 BLAKE2B 2bc799214a4ce012915610d1841cca4a0546e09acf63a53dd6b61487fe203855f80f596ed5681cd7e633e84aa7517fdd1fd3e001eb49aa68fbac00f91d3beb4b SHA512 f12689e221ded779f61a170de97adee0e921d5a9d2b0f01623b02ea5477d1201fdf51157701c022d43e29a972dc6479d98cb1d4fcd0892d01834d6072e620c4f
 EBUILD rails-html-sanitizer-1.4.1.ebuild 833 BLAKE2B 10204e476bbbd51d7118b665a0372492dff5bea48d01a1921c1864b4f98ff9361d9f7c9466025bb38f55cb479d51a0693e6989e585121f3bd33a249f0ddeab88 SHA512 dec76a800c3150c1209d1673b888a5efad1027fcd3a486090ec686c50f7a239ebb4edd4b208e0a3b4fe1bc471d5b4d59086fa9f8f9211211d48a7ec1d606f2cf
+EBUILD rails-html-sanitizer-1.4.2.ebuild 833 BLAKE2B 10204e476bbbd51d7118b665a0372492dff5bea48d01a1921c1864b4f98ff9361d9f7c9466025bb38f55cb479d51a0693e6989e585121f3bd33a249f0ddeab88 SHA512 dec76a800c3150c1209d1673b888a5efad1027fcd3a486090ec686c50f7a239ebb4edd4b208e0a3b4fe1bc471d5b4d59086fa9f8f9211211d48a7ec1d606f2cf
 MISC metadata.xml 359 BLAKE2B f227b45aa66e29d5ad9fe902cbd05ff8d41b6ad06ea0acbf812595b936897db899436a788fb0af5143303f0ebe6f18de1f2d265c337e57d616bdbfc7b1fdfcd5 SHA512 a7b934bec0d958559083b417dac76c3ffee71d9efa912b6bab2c2c01e6aa9acf39a46d71fff54a9b750afe6f59a8eb4b12c10b5cbee62fc5f32dab29911f4bd5
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.2.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.2.ebuild
new file mode 100644
index 000000000000..144833b644b3
--- /dev/null
+++ b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Sanitize HTML fragments in Rails applications"
+HOMEPAGE="https://github.com/rafaelfranca/rails-html-sanitizer"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/loofah-2.3:0"
+
+ruby_add_bdepend "test? ( dev-ruby/rails-dom-testing )"
+
+all_ruby_prepare() {
+	# Avoid tests that depend on nokogiri patches to libxml2.
+	sed -i -e '/\(name_action\|attr\)_in_a_tag_in_safe_list_sanitizer/askip "libxml2"' test/sanitizer_test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/sfl/Manifest b/dev-ruby/sfl/Manifest
deleted file mode 100644
index 1ebcb66a42fe..000000000000
--- a/dev-ruby/sfl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sfl-2.2.gem 8192 BLAKE2B 631712748d0f58a9d76087a194cd889c4cc95696df2ac755a13357e7055f0277a146f6f3df58e678f95134ec9fa1d5ecf720c702b2bf2c7e4385d443381b3cdb SHA512 9b64a966ec4125ae39d273e9ea1529f422dd17bfe2c4696574ab7725c0aad42f974febe7359dafa073c2291b47c6e351e1d549e145d247ed7c2ea6ebc5c73932
-EBUILD sfl-2.2-r2.ebuild 605 BLAKE2B 8e9a10ccb7c89daaeb7fe08a1acd2273a0dff544d7fcc01c940082ad6399242636bcbd353501b89ea4b331dd2fb1660abaf37f8ac1fa8ddca7b26796f12b25a9 SHA512 e7318884b0586d47c59099c3015cb2bdba32689522e61630c3a99d3d6209f1d909e5f5c449b920be0190cf25e40df34f45dd68e7f516b64e87d473945eb14ec6
-MISC metadata.xml 350 BLAKE2B 1e4b5ed1332607b056a79f85f6929b2f5a7705055127e0d0de3cbdccb851cde6f9f4f4462285e4c22847dc6ac807a5a9269b8dc9d8af840ad4f1e59391e5c055 SHA512 91539030961ec4d6d9b70ac65fc3b8236521dec596bc06f865e07f2aab3b0ba80584a2a49d07d4b008a7c5ae41e9c17017a1a309bb08af5d72df15509cff8dbc
diff --git a/dev-ruby/sfl/metadata.xml b/dev-ruby/sfl/metadata.xml
deleted file mode 100644
index 111c94609266..000000000000
--- a/dev-ruby/sfl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ujihisa/spawn-for-legacy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/sfl/sfl-2.2-r2.ebuild b/dev-ruby/sfl/sfl-2.2-r2.ebuild
deleted file mode 100644
index bf0d43ccff3a..000000000000
--- a/dev-ruby/sfl/sfl-2.2-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library providing spawn() which is almost perfectly compatible with ruby 1.9's"
-HOMEPAGE="https://github.com/ujihisa/spawn-for-legacy"
-
-LICENSE="|| ( Ruby BSD-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE=""
-
-all_ruby_prepare() {
-	rm -f Gemfile* || die
-	sed -i -e "s:/tmp:${TMPDIR}:" spec/sfl_spec.rb || die
-}
diff --git a/dev-ruby/tty-screen/Manifest b/dev-ruby/tty-screen/Manifest
index 643e683f568d..7cb381f8166d 100644
--- a/dev-ruby/tty-screen/Manifest
+++ b/dev-ruby/tty-screen/Manifest
@@ -1,5 +1,6 @@
+AUX tty-screen-0.8.1-ioctl-test.patch 1650 BLAKE2B e7e6e59a494d4e450ff5c7e4c6f0ac8ea33975b4820d8195e0f65d5d4e98ba65bafeac0f9cdffb17a3a74663ae90df213bd5effdb004acbf1bb2b618efdfe533 SHA512 eb6bd0137116d6ea18691451da2818297677171a74a2e0d42b8e53a184b69c55879c3ef6afce6c1dba7897f73b49b6fc64f7160479283e1459f82b80e9763d8c
 DIST tty-screen-0.7.1.tar.gz 11377 BLAKE2B 485b5610bc81524cfe525f8a837e99d13788da499dd8fa0f7c3be3f580ada63861f04652031e84817ef6ee49ce099c5fa97104b6634fc306d9ee0bbed0828ac3 SHA512 1ef5ce12cdd6337c47f09e5b6ae116985a80efe9f493d52c404496319f1377d4308cd829343d84f5c653b70327c033955232ca62fc8a134503a87a33a264130a
 DIST tty-screen-0.8.1.tar.gz 13019 BLAKE2B 9c9ccb49ae323ebc67c5bca918303586fb749813539aed32a892f3135aa392f6c77b078bab2c7bd116d9f152ee2745d72aae38a91cf4292d1f360085d88060ba SHA512 b0a01c49bb0c56f23c8b384a2d4f4b5c7168863a35c3ab7160d0f34c7d63a2b10b3b9f0f54c6d56e2424a8b16e6ba74268ac81af631976876fb37eb9c347c393
 EBUILD tty-screen-0.7.1.ebuild 735 BLAKE2B 60f62ca1543f4d20e1ba4531de9bed610e43d3021c1f8a75605c38e3e61fed8499dd8eeffadbe35137ef2ffc7a8522fd981959ee03bfa82bf8ea6ed1b76af657 SHA512 26715c2e8d7cd957a81b3651b85006f428b28ab90011cc34a73790d15c8a161a34eca8d69731e2aca67eee30b97233f1c8407f71a137b391e3bd0388d79c96b2
-EBUILD tty-screen-0.8.1.ebuild 792 BLAKE2B 569d09b269c5dc4d11117dda5e6c976bdd7459b3adb57c94f82eee3ff4aa5fb2913b0e5b7c7bacc12b90a71901f583612adc6f1cca879e41cbccf4c4e548730b SHA512 5186b35223e2aae31b281a08fbb7d83e27c398d7aee42486f6fe3cc75c92ad28bec113daf611c7ffd7b632e8fff4bc7ec0ed3d705e42145af64f74684326e7eb
+EBUILD tty-screen-0.8.1.ebuild 841 BLAKE2B b4220f2cc17940db87f46d58254c811a7d6d20047daa6217dc82e58befe3f0ea7bdd1827093dd538df20a544fda2892b5f73ffc65ce02c5e4ddb6eef05e9d135 SHA512 c3eaadffdcd5d6df92355f01b4b39eb7cd0f412776dd7439a193f5497baead047fc13cc29acf59935d30121fc0f819c576605033595378618a251aa3492c0881
 MISC metadata.xml 338 BLAKE2B c7415669713e2429d8d7cf1a727208f00e860e959481199e88e03b8bb3eb47d1250d4815cd2c38ff544cf3dc53c5ccd05e717312f004eeb7cab716565e1db8c3 SHA512 d192914129dea0f28d740a3e0754b738c96791302af9efcecaae0de3d9a3845a37827d23876c9f5eac4f6533976f06cc070fea375b1b795c9928e651765577da
diff --git a/dev-ruby/tty-screen/files/tty-screen-0.8.1-ioctl-test.patch b/dev-ruby/tty-screen/files/tty-screen-0.8.1-ioctl-test.patch
new file mode 100644
index 000000000000..0933f1f611b0
--- /dev/null
+++ b/dev-ruby/tty-screen/files/tty-screen-0.8.1-ioctl-test.patch
@@ -0,0 +1,55 @@
+From dba351b178ae06b56985cc77a291918a0fc4aff4 Mon Sep 17 00:00:00 2001
+From: Piotr Murach <pmurach@gmail.com>
+Date: Mon, 16 Aug 2021 22:13:27 +0200
+Subject: [PATCH] Fix ioctl call test to stub terminal size encoding for
+ big-endian systems
+
+Fixes #13
+---
+ CHANGELOG.md             | 6 ++++++
+ spec/unit/screen_spec.rb | 8 +++++++-
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index 91dd6ab..0f369bd 100644
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -1,5 +1,10 @@
+ # Change log
+ 
++## [v0.8.2] - unreleased
++
++### Fixed
++* Fix ioctl call test to stub terminal size encoding for big-endian systems
++
+ ## [v0.8.1] - 2020-07-17
+ 
+ ### Fixed
+@@ -136,6 +141,7 @@
+ ### Fixed
+ * Fix bug with screen detection from_io_console by @luxflux
+ 
++[v0.8.2]: https://github.com/piotrmurach/tty-screen/compare/v0.8.1...v0.8.2
+ [v0.8.1]: https://github.com/piotrmurach/tty-screen/compare/v0.8.0...v0.8.1
+ [v0.8.0]: https://github.com/piotrmurach/tty-screen/compare/v0.7.1...v0.8.0
+ [v0.7.1]: https://github.com/piotrmurach/tty-screen/compare/v0.7.0...v0.7.1
+diff --git a/spec/unit/screen_spec.rb b/spec/unit/screen_spec.rb
+index 3666a3c..de78ff3 100644
+--- a/spec/unit/screen_spec.rb
++++ b/spec/unit/screen_spec.rb
+@@ -6,8 +6,14 @@ def winsize
+       [100, 200]
+     end
+ 
++    def big_endian?
++      [1].pack("S") == [1].pack("n")
++    end
++
+     def ioctl(control, buf)
+-      buf.replace("3\x00\xD3\x00\xF2\x04\xCA\x02\x00")
++      little_endian = "3\x00\xD3\x00\xF2\x04\xCA\x02\x00"
++      big_endian = "\x003\x00\xD3\x04\xF2\x02\xCA"
++      buf.replace(big_endian? ? big_endian : little_endian)
+       0
+     end
+   end
diff --git a/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild b/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild
index 7f105f6ddd56..24ccfbc41f77 100644
--- a/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild
+++ b/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild
@@ -23,6 +23,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~riscv ~sparc"
 IUSE=""
 
+PATCHES=( "${FILESDIR}/${P}-ioctl-test.patch" )
+
 all_ruby_prepare() {
 	echo '-rspec_helper' > .rspec || die
 	sed -i -e 's:require_relative ":require "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 1dee4ee219d1..8e9bfb1634cd 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/build/Manifest b/dev-util/build/Manifest
deleted file mode 100644
index 532c6373ed9e..000000000000
--- a/dev-util/build/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST build-0.3.10.tar.bz2 73647 BLAKE2B 90a6d2cac1d34cb5a11bd476011c352f4073fffcb55adb62890938bbbe36d9088c6900a9297f08af3aa564569d09a36662288a9a624e9cc44a9f1b2e5dd289fe SHA512 5836da9347714d602162e050471e27330caf398cf4daf008db174797013d8c353e23f41e393166181ff0fdb08359b434cb7ca2ae6bf789376f8340046abb195f
-EBUILD build-0.3.10.ebuild 756 BLAKE2B a7b06c46cc24186dc0c447bfe1dc23341f3447aaa9b946452dc8f21cd7b5b0920f5285fab7ea37cb13873c0a489d039a9750d49552bc5884bf5cbdd994f56c05 SHA512 a4ff71aba6a8bfa9b1e20cb0a597f98c019fe0f24aebeb6cba4f39f04e16d2809e051f1b5e6221c2db6598d97653ec178138f3962f54d2ab7908d12a22819120
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/build/build-0.3.10.ebuild b/dev-util/build/build-0.3.10.ebuild
deleted file mode 100644
index d5ebc1b8dfc7..000000000000
--- a/dev-util/build/build-0.3.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="A massively-parallel software build system implemented on top of GNU make"
-HOMEPAGE="https://www.codesynthesis.com/projects/build/"
-SLOT="0"
-SRC_URI="https://www.codesynthesis.com/download/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND="!dev-util/build:0.3"
-
-src_install() {
-	emake install_prefix="${ED%/}/usr" install
-
-	HTML_DOCS=( documentation/*.{css,xhtml} )
-	einstalldocs
-	dodoc documentation/[[:upper:]]*
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-util/build/metadata.xml b/dev-util/build/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/dev-util/build/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-util/clippy/Manifest b/dev-util/clippy/Manifest
index 33dbc246a753..730190543a84 100644
--- a/dev-util/clippy/Manifest
+++ b/dev-util/clippy/Manifest
@@ -1,3 +1,5 @@
 DIST clippy-7.5.1.tar.gz 6746148 BLAKE2B e6a8d38bac1323852d933ca9eaac681df8824407af008bb0170937a01564b3fb9fb081418630b7540f3ccdb899ac0948121d63accfa65ae0fd3fd6933fdafd6d SHA512 cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e
+DIST clippy-8.0.tar.gz 8195258 BLAKE2B 75d8d4410a5377dae3bf6938c3b095b163ad87776420a16c07d461bb3f635d623de642fa0ae483094788369c9dc6a04d5424107bf60c848ac54756c4bdb20c97 SHA512 fdf1e68c16e266a74221fb194851ef47c888e90324de2e42a4ca68b9dbce1ba6f45d73b9830bdb17774ecdde736111fa562201a5763c49092b6ce1f0a4d4865a
 EBUILD clippy-7.5.1.ebuild 693 BLAKE2B 8f25cab95ebdeae3d04fa3d20ef2a26fb6cd3084e0789a2056b62213239b34494e077125eeb1b2125abbac4f365400be984c04959c1e2a82c77552827ac7282f SHA512 ea6c83082e703656eda9b00f746852e013ab7ddf0db9a57b5da5cc9db4f03badb2900e9dc4707f649f902400066be39d9512386c322dbbf222c73fa9216c8c98
+EBUILD clippy-8.0-r1.ebuild 714 BLAKE2B 9cc4ed111762f760c54d498bef0043316637b0b32dd91121c622dc2d07fac470520047bcd40e8e154cf7af7b55e6b0ba9fdab42b36679ac6e68505d507a6a099 SHA512 4143b7b0def8ee431f4a36c96c88ae669900100d5dc622c4f3cc9cca3396900d1a0b642582865716e9fb8708debd1ff046ba469a5c0ac8200c485d8ba26948c1
 MISC metadata.xml 446 BLAKE2B 050a4ea6898765738509df146963825bdf388360aa8f759c14ca2f2fe26e8e011ec12043064d1831f5e33547a3b2bbd6ffc46e805554203171146b1c94b54415 SHA512 aba1be4aaf36e608df0219f928275379a88690791c0985d13531557bd2586f57354af45cbaf28c52a08ab852bb880c1efa3e0d6f189547428e0e7eb98d410cc0
diff --git a/dev-util/clippy/clippy-8.0-r1.ebuild b/dev-util/clippy/clippy-8.0-r1.ebuild
new file mode 100644
index 000000000000..43689631b4e9
--- /dev/null
+++ b/dev-util/clippy/clippy-8.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="frr-${PV}"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools python-single-r1
+
+DESCRIPTION="Standalone clippy tool built from FRR sources"
+HOMEPAGE="https://frrouting.org/"
+SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/frr-${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	virtual/libelf:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/flex"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-clippy-only
+}
+
+src_install() {
+	dobin lib/clippy
+}
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index f58110e6b0d8..58f35620d2d5 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -3,5 +3,5 @@ DIST dialog-1.3-20210530.tgz 562950 BLAKE2B 2aa33c4e2568f91a08d173c3a02d0d64f3b0
 DIST dialog-1.3-20210621.tgz 563430 BLAKE2B 8ffb630ed67f303facd79ca72aaca89d32c55a2b504293105a72c596409828fffd3e5e5f603fb5bec7f8748358a03ddadc7f1cd6fb989d1b31af1fd8f1078d97 SHA512 bde13aaf215127d143aa0d37989e0bacb6bc23f007681aeff27683efa01a483106710ff756358e396c23e4c1f0355cd8a2b3bb362ae1c3a1a997e00835d53c2b
 EBUILD dialog-1.3.20200327-r1.ebuild 1183 BLAKE2B 1d0444786f3f407017ccffcf3b44bef2bd72ae9aaa8a318ebc8c875efb02e2ef2140582b61b9c4c499e2fd02d6aa1713208a61818f812a054257473e2a70303d SHA512 0360d757aafb6df51c48171b198b9a4be9e693b6faa88a9a587141e9a879a2d63d0e7436008022eb213ecb85cc7f6afa11c07957c4689bd9cc98467bbd292fbd
 EBUILD dialog-1.3.20210530-r1.ebuild 1288 BLAKE2B cac0fb5481a56a82bfc72811b63044cd0c79d2dfcdc0dfa2371e34af141076dfb4a06618229897924c6b8d971ead2ffb0634bb2385a3e24cd28c1420f5de67c6 SHA512 054319ff13d7bf219700d700456ed1b2120a6d2abaababd45ab481c68213db55d241cbd935c75ff7cb7677d0e46d9ec426839e651e65b463ee8ce5008eddadd5
-EBUILD dialog-1.3.20210621-r1.ebuild 1282 BLAKE2B 4f13703b79c6ce2c1061b2df634dd200e27784c1dc21964239f5866dd74cccb1c29c0984245213ac65146ccf9f65a5808289d4f59e07d012747049d307d31890 SHA512 8b9379be685cb76c7e37e74285106ae1fea945203801beaf50a70eb876fd515c553cae9bb12fbf7c3cfbfab369ebbeef9181549829bd31ad8473e6355e5b3a41
+EBUILD dialog-1.3.20210621-r1.ebuild 1281 BLAKE2B 8a61eabdbfcbbc3459b9cf2d5b7bcd9efa4b043f9435cb7328e56487b432915af61163e44cb6283b7e19de230fb00cea34228e7bced62c1a5b9809dfca63d2be SHA512 9012faba9de2703ea8f0b1418b81e76498d407edeeef5810c9d57894022dd5e1f082695f2824b717b378cd3e12880cf7e8a60af3c2a1b9d306009dd68a520b28
 MISC metadata.xml 460 BLAKE2B 2a2b2180cab325004ef2543c1e4cde0d98ce338beaad156c6b114f0ef49b3d726ad8f85974a681b596e8c68dd2433aae64ce38d8b47e0d52441bc1581bc35149 SHA512 f1c8215f8865105bba71efe5516742f694988b4421a3ea3ec07569f5e40cb50caddfe478c2bd5bae1b0579316fb7fc3ae361d19c3b33c6572e31239d927b3fc6
diff --git a/dev-util/dialog/dialog-1.3.20210621-r1.ebuild b/dev-util/dialog/dialog-1.3.20210621-r1.ebuild
index 531ba73853c8..6b64f320a88e 100644
--- a/dev-util/dialog/dialog-1.3.20210621-r1.ebuild
+++ b/dev-util/dialog/dialog-1.3.20210621-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples minimal nls unicode"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode(+)?]"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 24b5226972b4..48175055ec09 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,7 @@
 DIST diffoscope-177.tar.gz 1590984 BLAKE2B 94daf9528c8fd0ad6ed89bdbee7b21352bf33dcef2ae7e526ea3b1036d92b6fecefcb0da46b7eedf7af1c8bd7995e73b8f0a5104c02f4db534f7bcc465c803aa SHA512 674a5cc364927437a79420b0965eb6958bd09df58a1238ea4d953bb2bc0fbdde75e42817370dd3cdab0bcc59551e1cff70db72298087af551d5dfaee57995811
 DIST diffoscope-180.tar.gz 1600542 BLAKE2B 0cc34106f039e0682b32de284b3ce1be90e8629fb4ba18cffa31d7c970a9d18392060f37b201d4ee9ab3f4f65401684c72edf2d00d56827cbaacbfde0ce81d11 SHA512 abf2c514b9f3b074a5b9a6e19f09a474a8ba58e00974a48ebd860cc31547204fb4690224cb752b4248a0674d979bd20c6d4c77ffb912f2b85499d48d90affeb4
+DIST diffoscope-181.tar.gz 1602420 BLAKE2B ae5f40b7a687c6425444df816b0583e50a0c86a4c31b44034a365c18e448765587a093794d3aab930b979706655a661a3cd8b398e34604c7f3e556a9f918406d SHA512 de4132b936ce6c79e333ab5c835f4dfe30951fc91b70848f9ecc91cb5323b81a47fa25a6cec562cfd3d059d96809bd85dbe1b37971fffdc15303ac504514759a
 EBUILD diffoscope-177-r1.ebuild 3325 BLAKE2B b11da425c3c3f5cbf6b6c654bc203c3d6bf56908e2dbdf35d9262a1e5b969655a62aab9aadf7501d6ffcf5c51a7c27a088dca858e81d6b041b72c52d53323da0 SHA512 137eee2580e2693c71fdc72c6cad6499c8be5bc5bb9c3eb302ae95578cbcd15b91a003357eca753392c69aa726797a8e550d7665811370b76fa54dc67bf3a55e
 EBUILD diffoscope-180.ebuild 3302 BLAKE2B 63d8be7f8341bc5088ecd613c32fa1b3b60459e17928f820135a60adb4570f3230473a3339db2e984835d13f0c18646ebc5c1495acf1b2ef4504b45171a7df34 SHA512 e988c61c2b60dc92b391ffa66f54673bd09d1e5d96fc8e3273e01a45242e9a12fd2a8387a753207dbadf58307fcdcf3401e3137d8ad8de529da6203f91167451
+EBUILD diffoscope-181.ebuild 3302 BLAKE2B 63d8be7f8341bc5088ecd613c32fa1b3b60459e17928f820135a60adb4570f3230473a3339db2e984835d13f0c18646ebc5c1495acf1b2ef4504b45171a7df34 SHA512 e988c61c2b60dc92b391ffa66f54673bd09d1e5d96fc8e3273e01a45242e9a12fd2a8387a753207dbadf58307fcdcf3401e3137d8ad8de529da6203f91167451
 MISC metadata.xml 2077 BLAKE2B 2f4d188accf1f75c139a388f564ef5130ea8e74e403072871e4b73b848eaf405076bae7190565f374c193cb4f3fd0be16e3c781ac73df1d1cfb36101142b59eb SHA512 683e181724871d636610c7cfa93c714ceddba7e95b80fda8837e04b396f63049307b23b0471cfc19c46de5bd8b6f7bc868412f8f1c817933ac9507e7280b2272
diff --git a/dev-util/diffoscope/diffoscope-181.ebuild b/dev-util/diffoscope/diffoscope-181.ebuild
new file mode 100644
index 000000000000..086eecc95294
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-181.ebuild
@@ -0,0 +1,112 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar test tcpdump zip zlib zstd"
+
+RESTRICT="!test? ( test )"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		app-text/docx2txt
+		media-libs/libcaca
+	)
+"
+RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( app-cdr/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	lzma? ( app-arch/xz-utils )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	zip? ( app-arch/unzip )
+	zlib? ( app-arch/gzip )
+	zstd? ( app-arch/zstd )
+"
+# Presence if filemagic's magic.py breaks imports
+# of dev-python/python-magic: https://bugs.gentoo.org/716482
+RDEPEND+=" !dev-python/filemagic"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local exclude=(
+		# test seems to use different tarball
+		tests/test_presenters.py::test_text_proper_indentation
+
+		# needs triage
+		tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+
+		# needs triage
+		tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+
+		# img2txt based failures, bug #797688
+		tests/comparators/test_ico_image.py::test_diff
+		tests/comparators/test_ico_image.py::test_diff_meta
+		tests/comparators/test_ico_image.py::test_diff_meta2
+		tests/comparators/test_ico_image.py::test_has_visuals
+		tests/comparators/test_jpeg_image.py::test_diff
+		tests/comparators/test_jpeg_image.py::test_compare_non_existing
+		tests/comparators/test_jpeg_image.py::test_diff_meta
+		tests/comparators/test_jpeg_image.py::test_has_visuals
+
+		# docx2txt based falures, bug #797688
+		tests/comparators/test_docx.py::test_diff
+	)
+	epytest ${exclude[@]/#/--deselect }
+}
diff --git a/dev-util/hfstospell/Manifest b/dev-util/hfstospell/Manifest
index 3da7b5144d80..8f67736de020 100644
--- a/dev-util/hfstospell/Manifest
+++ b/dev-util/hfstospell/Manifest
@@ -1,3 +1,3 @@
 DIST hfstospell-0.5.2.tar.gz 152115 BLAKE2B 667c01672fd6fd6ee743a6542677ffe74e3900c27ab2754f8fa7dcc57081074bd98e8d82827fe176b2a6c9abc4565efcb3204df43110906f5a333405ec8a6bf2 SHA512 307aff3aec91ac6ffed3ebabdc2baa1a6e913431f57a80a0d0254be57fbd72e28d7592c35e0d72e5979f7e0b4c585f11b8eb91183b0877f9670a9cd5206c0140
-EBUILD hfstospell-0.5.2-r1.ebuild 950 BLAKE2B 743afaa19d978f2771bfae28e3da7e8c27d9cb9f94a4d1ea741ba0ebfe53bd97ad3a818aefd9895aa638d151e272a14d8576e43980377c573e080e790dd02d6c SHA512 3e15fafc1b2c6316a3bdf8a551218a8b8ba082d2fde0187a56284d06c7c9444762365c2456a8049841e301c9c79831be5ad6aee81d8ab3abad002d2d7daa9933
+EBUILD hfstospell-0.5.2-r1.ebuild 957 BLAKE2B ecb8813098753b38185bdc36a19a0d96659b1edc7461853b32c8f415ad464eeca8ba8f063e218a0a80cab347a0097a24f7f70c0d6986b7e8455931783c6b17d8 SHA512 dcc7a336da1abedc4f11e0d70363e7965009ab1fe5af36d7be39f3dc25a71a44786883aa8e282b1ed8e8f4a5f9f5a6ba6d9f7dd2b8a81cea5be6fbd491924f52
 MISC metadata.xml 350 BLAKE2B 7ee5a7e4724c7a13a1f607e8134f95fcbcf40989b972002d0ae488a8d378d9dee83939948c7c1f8c6c124ca2e7927620ea906a804a5ebe16690ddd20415392d4 SHA512 77662d70afc9c6c6fcd7a1e12aeb3c26c49f5263088cccc0c587cb30d41592c65e63009dde1c36ffeca978b2f96628a6fba08ec909f4dad99fc7d9457aba9473
diff --git a/dev-util/hfstospell/hfstospell-0.5.2-r1.ebuild b/dev-util/hfstospell/hfstospell-0.5.2-r1.ebuild
index 4a2e9cb7a114..5d44b4da283a 100644
--- a/dev-util/hfstospell/hfstospell-0.5.2-r1.ebuild
+++ b/dev-util/hfstospell/hfstospell-0.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hfst/hfst-ospell/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="clang"
 
 DEPEND="app-arch/libarchive
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 852b6af6b87e..5e0a7a49e7c3 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,8 +1,5 @@
 AUX idea-community-jdk.patch 379 BLAKE2B ac892a7e52d5c592b193d80a7933529f15e21982feb4c4a4b5c8286c7479a342a0121e5b464922cac68e9b7c8e3f7a4293df42d30e6907365116e736d9c862b6 SHA512 f984855440d2d4b495d8bf1b1c3172c9842c096e8fda148d8b2d1980bc3d03061954db06f73513998e52bc161c35abdcec2b88e3b31b4e36605714cb85a66fa4
-DIST ideaIC-1.3.211.7628.21.tar.gz 650820635 BLAKE2B fc313ac46f2b8acd791cd434568ee8f0ca38071df167c514e4fbcad11cc204b2cb78d525ec123389a086c6b947177d58cee359c0f67e981e65ac25f46db31027 SHA512 c4f8d5c6e79b3e77385334496855e1743dec5dc67c9c3ee9205596b437b5d863286bf36f75e802dc8b39057113c5044e122a9fe1f41c47e129db4ea5849e7eae
-DIST ideaIC-2.212.4746.92.tar.gz 666332731 BLAKE2B 0ae035f39692b27e764f2ca20fa61c3e48623f35091ccf74a8f6894bb2e52937c96b54edeb9db513df3932f89447e34265c102b89c2ec8676ca32707b541d395 SHA512 29a92199606beb13c39cba7b26a2b1cbafd1be62be9bc80dd923581d741272cb114f3dcc004946500d365063076ea199d25665d1fd26fc69eefb27dae204d8a3
-DIST jbr-11_0_10-linux-x64-b1428.2.tar.gz 291458469 BLAKE2B 371467d94b5a77eb91859297eaf409e2cbfd3b5b0fdf75216bd3ffe65426b7ebb6e8ca86e43a8d5a15ad41ef8be07e4cd94ba507bdd98c8c68aaa25601a0613c SHA512 89b63a8f2b9cd9e2d2e598b82575c294cb756e772acd625c0412bc8c4dcd65649e84d100e1569cca318589d3d622c2380c980dc1a490c4812463f9a663eaad29
+DIST ideaIC-2.1.212.5080.55.tar.gz 666677177 BLAKE2B c34c07dd12beea83bcc0bb14426f9fe7f98802e5e74f56ea671167506ccdfde0ca2f420ecc43a087b722627ee25ff2de20f8663ed7b3216166a4c463323ac39e SHA512 49c1ca4a6af3f2aa9c35cb1fa110f848f6945c6d6ce6e5fb6eb90addc7f15eb09fee7b1819331c0a46f0cd11e14b7c47be7187264d7819ea8399d7604877c8c1
 DIST jbr-11_0_11-linux-x64-b1504.12.tar.gz 294383766 BLAKE2B e34675acc196352ece761906ad4d3dbf4ead00f0e008f9da6cc27ee057384ed418ac914e521d3db1e61ab7d62e9187674aa188da447957124276e3ace7f2f37c SHA512 3e0e464090af6f3ddb9e7b0f3711a950488b3e9b98c13761d92de2b8e29850208fa389589316300606887ff943511f8efe6bff0d6b478ce8c548984b811b1968
-EBUILD idea-community-2021.1.3.211.7628.21.ebuild 4163 BLAKE2B d82c511b8e1cacb65f2a3dd61c9451f900d7bb543c6481164de0694423c1d2cc0e34ab3f202846c4e935fc3052f32bdf5ed11793588207013415830afe78af10 SHA512 f5aebb9216a04d2ec02539514a51318238873c8bddcc457dda6f9f43bd61330b63313908c2ba642b8d7c3c4ef55ec51245c38f9dd51f5b7b65a7f3516c183040
-EBUILD idea-community-2021.2.212.4746.92.ebuild 4275 BLAKE2B 7578d4fbccc0f81d2a76cf76e0a0f591ab0f4107d76cbf8dd318b0060f03247e3fca4452b5b9fe91d4f5d1ed5817f4dd318d8ec1d6d6441c71b4e0a1f0b43255 SHA512 b73b2452217c7020789f99d8db55f2e2df8165cdb23f871cf592c4935df8fd6d41374a01f0542de9e43d44bba1e46c2af0ee62fc896273ebe7f04cf0a1e9c7d9
+EBUILD idea-community-2021.2.1.212.5080.55.ebuild 4272 BLAKE2B 3e3c5055f1c6667c8ebd690c02cf488e4921b41066034f05b9536e515b29d310476dd70bfbf5834bf7a26ce509a50236c2e197366a042ed1b9a0a098804bfa44 SHA512 28aa54601b0b351b038a42c45d427010f7c324642fa9b6ddc64895f368c456b61fac209b9184829e13ca69128ad86d1273eed1021194ceb84d29959f572558fc
 MISC metadata.xml 453 BLAKE2B f244aa814b9eb5c6b00f6fea725a344a7413710b1fae03edc4590dfa9c102872e0e4d1cdb669f739854d7fac351002f7819aec371f3bd0eeef2fdd4aa2c8f60b SHA512 e6c5f1094ca8ba70b9bfd5b028f11542c8150cea0b543b939da144887043e4ee20ddf6cc89641329bde7456492d6def6f0e72092b7fa21095463a20aba9e0b03
diff --git a/dev-util/idea-community/idea-community-2021.1.3.211.7628.21.ebuild b/dev-util/idea-community/idea-community-2021.1.3.211.7628.21.ebuild
deleted file mode 100644
index 712c611a5ae4..000000000000
--- a/dev-util/idea-community/idea-community-2021.1.3.211.7628.21.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils desktop
-
-SLOT="0"
-PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-2).$(ver_cut 3-3)"
-MY_PN="idea"
-# Using the most recent Jetbrains Runtime binaries available at the time of writing
-# ( jre 11.0.10 build 1304.4  )
-JRE11_BASE="11_0_10"
-JRE11_VER="1428.2"
-IDEA_VER="2.23517177.257203969.1622674002-682219170.1619910833"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
-	# upstream EAP
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz?_ga=${IDEA_VER}"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~arm64"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz?_ga=${IDEA_VER} -> ${MY_PN}IC-${PV_STRING}.tar.gz
-		amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
-	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
-	GPL-2 GPL-2-with-classpath-exception ISC
-	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
-	MPL-1.0 MPL-1.1 OFL ZLIB"
-
-DEPEND="
-	|| (
-		>=dev-java/openjdk-11.0.11_p9-r1:11
-		>=dev-java/openjdk-bin-11.0.11_p9-r1:11
-	)"
-RDEPEND="${DEPEND}
-	dev-java/jansi-native
-	dev-libs/libdbusmenu
-	media-libs/harfbuzz
-	=dev-util/lldb-10*"
-
-BDEPEND="dev-util/patchelf"
-RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-jdk.patch"
-)
-
-src_unpack() {
-	default_src_unpack
-	mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
-}
-
-src_prepare() {
-
-	default_src_prepare
-
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
-
-	rm -vf ${PLUGIN_DIR}/libavplugin*
-	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
-	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
-	rm -vf "${S}"/bin/libdbm64*
-	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
-
-	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
-		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
-		do
-			if [[ -f "$file" ]]; then
-			  patchelf --set-rpath '$ORIGIN' $file || die
-			fi
-		done
-	fi
-
-	patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
-	if use arm64; then
-		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
-	else
-		rm -vf "${S}"/lib/pty4j-native/linux/aarch64/libpty.so
-	fi
-
-	sed -i \
-		-e "\$a\\\\" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
-		-e "\$a# package manager. See bug #704494" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
-
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
-	if [[ -d ${JRE_DIR} ]]; then
-		for jrebin in $JRE_BINARIES; do
-			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
-		done
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-
-	# remove bundled harfbuzz
-	rm -f "${D}"/lib/libharfbuzz.so || die
-}
diff --git a/dev-util/idea-community/idea-community-2021.2.1.212.5080.55.ebuild b/dev-util/idea-community/idea-community-2021.2.1.212.5080.55.ebuild
new file mode 100644
index 000000000000..64e642093054
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2021.2.1.212.5080.55.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 2-6)"
+MY_PV="$(ver_cut 1-3)"
+
+MY_PN="idea"
+# Using the most recent Jetbrains Runtime binaries available at the time of writing
+# ( jre 11.0.10 build 1304.4  )
+JRE11_BASE="11_0_11"
+JRE11_VER="1504.12"
+IDEA_VER="2.28899775.2679204.1629809316-850001349.1629809316"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+	# upstream EAP
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz?_ga=${IDEA_VER}"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~arm64"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz?_ga=${IDEA_VER} -> ${MY_PN}IC-${PV_STRING}.tar.gz
+		amd64? ( https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
+	GPL-2 GPL-2-with-classpath-exception ISC
+	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+	MPL-1.0 MPL-1.1 OFL ZLIB"
+
+DEPEND="
+	|| (
+		>=dev-java/openjdk-11.0.11_p9-r1:11
+		>=dev-java/openjdk-bin-11.0.11_p9-r1:11
+	)"
+RDEPEND="${DEPEND}
+	dev-java/jansi-native
+	dev-libs/libdbusmenu
+	media-libs/harfbuzz
+	=dev-util/lldb-10*"
+
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-jdk.patch"
+)
+
+src_unpack() {
+	default_src_unpack
+	mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+}
+
+src_prepare() {
+
+	default_src_prepare
+
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+
+	rm -vf ${PLUGIN_DIR}/libavplugin*
+	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
+	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
+	rm -vf "${S}"/bin/libdbm64*
+	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
+
+	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
+		do
+			if [[ -f "$file" ]]; then
+			  patchelf --set-rpath '$ORIGIN' $file || die
+			fi
+		done
+	fi
+
+	patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+	if use arm64; then
+		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
+	else
+		rm -vf "${S}"/lib/pty4j-native/linux/{aarch64,arm,x86}/libpty.so
+		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/x86-64/libpty.so || die "Unable to patch libpty for libc"
+	fi
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
+
+	eapply_user
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier}
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	if [[ -d ${JRE_DIR} ]]; then
+		for jrebin in $JRE_BINARIES; do
+			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+		done
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+
+	# remove bundled harfbuzz
+	rm -f "${D}"/lib/libharfbuzz.so || die
+}
diff --git a/dev-util/idea-community/idea-community-2021.2.212.4746.92.ebuild b/dev-util/idea-community/idea-community-2021.2.212.4746.92.ebuild
deleted file mode 100644
index 97f0372a2996..000000000000
--- a/dev-util/idea-community/idea-community-2021.2.212.4746.92.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils desktop
-
-SLOT="0"
-PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-2)"
-
-MY_PN="idea"
-# Using the most recent Jetbrains Runtime binaries available at the time of writing
-# ( jre 11.0.10 build 1304.4  )
-JRE11_BASE="11_0_11"
-JRE11_VER="1504.12"
-IDEA_VER="2.8475829.1475113311.1627561399-1267779196.1624449062"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
-	# upstream EAP
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz?_ga=${IDEA_VER}"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~arm64"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz?_ga=${IDEA_VER} -> ${MY_PN}IC-${PV_STRING}.tar.gz
-		amd64? ( https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
-	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
-	GPL-2 GPL-2-with-classpath-exception ISC
-	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
-	MPL-1.0 MPL-1.1 OFL ZLIB"
-
-DEPEND="
-	|| (
-		>=dev-java/openjdk-11.0.11_p9-r1:11
-		>=dev-java/openjdk-bin-11.0.11_p9-r1:11
-	)"
-RDEPEND="${DEPEND}
-	dev-java/jansi-native
-	dev-libs/libdbusmenu
-	media-libs/harfbuzz
-	=dev-util/lldb-10*"
-
-BDEPEND="dev-util/patchelf"
-RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 3-6)"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-jdk.patch"
-)
-
-src_unpack() {
-	default_src_unpack
-	mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
-}
-
-src_prepare() {
-
-	default_src_prepare
-
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
-
-	rm -vf ${PLUGIN_DIR}/libavplugin*
-	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
-	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
-	rm -vf "${S}"/bin/libdbm64*
-	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
-
-	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
-		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
-		do
-			if [[ -f "$file" ]]; then
-			  patchelf --set-rpath '$ORIGIN' $file || die
-			fi
-		done
-	fi
-
-	patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
-	if use arm64; then
-		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
-	else
-		rm -vf "${S}"/lib/pty4j-native/linux/{aarch64,arm,x86}/libpty.so
-		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/x86-64/libpty.so || die "Unable to patch libpty for libc"
-	fi
-
-	sed -i \
-		-e "\$a\\\\" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
-		-e "\$a# package manager. See bug #704494" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
-
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier}
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
-	if [[ -d ${JRE_DIR} ]]; then
-		for jrebin in $JRE_BINARIES; do
-			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
-		done
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-
-	# remove bundled harfbuzz
-	rm -f "${D}"/lib/libharfbuzz.so || die
-}
diff --git a/dev-util/intel-graphics-system-controller/Manifest b/dev-util/intel-graphics-system-controller/Manifest
new file mode 100644
index 000000000000..56b54315948d
--- /dev/null
+++ b/dev-util/intel-graphics-system-controller/Manifest
@@ -0,0 +1,3 @@
+DIST intel-graphics-system-controller-0.2.3.tar.gz 124505 BLAKE2B 50bfaf5dee2fd55d92cd7e544faa8c26930f809b1f4d6dbdc332aec0ace0ced9e21817479c87c4ec12d1117209696b2146c2c6aeb1cfde4ad654d065547e8a6b SHA512 a3ecac36170b0f5c508e077c35336f5c2122d4cc2917e68237af3c92fb82b5f080deee4dded68cb36922cb9edd4d78f7b7a6ed2295649a538ab83ad30c280761
+EBUILD intel-graphics-system-controller-0.2.3.ebuild 1096 BLAKE2B f4cb6fb876fc92b6386fcb1fd2156a156270857e210842b56b47971bf1adb517674fcde0178831865aba34747cd9f094b776e806d9160e004476224c7212fac9 SHA512 1fa4b90b5b15901534c9b2217b7d0d31458352372568bffcb44eefad1932f25825503cff6cba1a45f12d7e9b684b37e9948501791d486d357c438e082bc03d3c
+MISC metadata.xml 673 BLAKE2B 02fb8a2d3c440c4b0082ea695f223e7affd011bd8021a32dd50774373896a672f0b95f164b4f9c0b5fbc16d3bc192097da95324d9220252c3ff3c0dc65280b58 SHA512 647a7e680227c3afbd0b2422039649bd43ceba67cbf0ef8c7053fbae8a6f781247e7903373fc5fb8e25b9623f9f4348de70f8a0184f133fbcf7049c9f28de062
diff --git a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.2.3.ebuild b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.2.3.ebuild
new file mode 100644
index 000000000000..632531f54bc9
--- /dev/null
+++ b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.2.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="igsc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="Intel graphics system controller firmware update library"
+HOMEPAGE="https://github.com/intel/igsc"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+cli doc"
+
+RDEPEND="dev-libs/metee"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		app-doc/doxygen
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+	)
+"
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CLI="$(usex cli)"
+		-DENABLE_DOCS="$(usex doc)"
+		-DENABLE_ENUM="ON"
+		-DENABLE_PERF="OFF"
+		-DENABLE_WERROR="OFF"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DENABLE_TESTS="OFF"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/intel-graphics-system-controller/metadata.xml b/dev-util/intel-graphics-system-controller/metadata.xml
new file mode 100644
index 000000000000..dbc97950ff38
--- /dev/null
+++ b/dev-util/intel-graphics-system-controller/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>gentoo@taujhe.de</email>
+		<name>Jan Henke</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<use>
+		<flag name="cli">Build CLI tools for flashing manually a firmware upgrade.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">intel/igsc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 0ee46be70a5f..d180a5aeab7d 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -2,9 +2,13 @@ AUX kbuild-0.1.5-gentoo-docdir.patch 358 BLAKE2B 978d4081821098a4e035fdd41b801c7
 AUX kbuild-0.1.9998.3407-glibc-2.32+.patch 1402 BLAKE2B 4dabbf9ccb5cd60aa7998d36a3766edc5a89992ae10606375774d4cf648478187ffa88aac9016b65acb77353b25d445c1f8b3f2cf17bc60106a9fcf83d2df7fe SHA512 fae4058b85da11fe8934323501193d2947e17e6b36baf83487c7543b0c6b7a4382682159d789a0f661f5cb346ed6e4b4609573255f3b5f244733049353497528
 AUX kbuild-0.1.9998.3407-gold.patch 590 BLAKE2B 654459b94017d4bacae37151c71d4b43b3d9a76d934a2a220bada87e0b96e2a8a13a6f446199eb5475faf604129966bcca6e3e34691e588df6b40fe65e4e4ded SHA512 3cf6827b482661704a8cdcdcf3152fa07d18c80a6e9cbe8979b732173f0127a5bc5009590c5cc155cdd11bed1e95d918835e697b6fecc1a1bc51127d2f13845f
 AUX kbuild-0.1.9998.3407-unknown_configure_opt.patch 697 BLAKE2B 5f974bc451a12f4b4c02656b501d07515c14499c53ee1fca00aec00cf28d6dd5faf690f262b79f34861a3bfd317a5bd37eb78cbeb61ce833d8117c2cd74e7813 SHA512 63435effcf109b40390574da09453314ffac109ffee79419cef81705b4f7ceb145f692c9a81b54dd0d58f69a1a6f80b9dc412baa5d416066f05300cc9eccc11e
+AUX kbuild-0.1.9998.3499-gold.patch 934 BLAKE2B 486b6154eeba1541f87856e0d4bddd89ee689393669161f60ae9f6b5ce3a199cf72187ac77d766e5c26b707af79b63b13f2cc597e7ee15ee1c46972401fe80d3 SHA512 5e885b504c095c062da0c2ed7836821c5ab95aa6b90e847070a87228a3e1456b9ae2dc2c463e0771552a504f0f309569e762667cd11aa891f5236b5402b77a08
+AUX kbuild-0.1.9998.3499-kash-no_separate_parser_allocator.patch 374 BLAKE2B 9ea9ac286217760b6933821ec3901a4e102bf8fe98517805b23e19e86a8ac86a81c93c72c13d69490d91c80c2e01581b5926f358f988b6b0de8e04ed0ba93820 SHA512 f83bcd523241d3b6bda3038d1c2a6a18ba2497d166f5a9704ba5f4a96b2d6857ea810ab2969b931b60b5818b69ea24cbeab2068cb92765704f7666874751e27d
 AUX kbuild-0.1.9998_pre20110817-kash-link-pthread.patch 296 BLAKE2B ffa7b0167e4a65c59510e20089a63d5c1949b5f14ce167725ee057d9ab75369758e491727d939a111de5bd63719b53a7744b08efe84d34cc81b4d7bba80a3522 SHA512 178da856a83631ca4d86a9b8c20e74b75b76426c177b87c26d4c4b3df86e72f3b6339e8f61948498ab9c4bf047119588f3df8ce78448160afa0840b2cf3aeabb
 AUX kbuild-0.1.9998_pre20120806-qa.patch 292 BLAKE2B 628ee52d1c147864dba48e37ae25a2ff9e82e38bc907f2771ee3599e9401b26e5b5d4e53a3958a4f8edb2a7c35794677bae141561cf515fd3587b9ac095a7bdd SHA512 2a311e2e79c1e85c3c2c26b3d187355167c237c334687494a8e532b84232340df44b0d896fe6638bf1a9d4ba1c5f1efb29978de3bac0490fe04f2e57f7fb1874
 DIST kbuild-0.1.9998.3407-src.tar.xz 2351596 BLAKE2B ed562a739831c465ba66b2c357b1ab52cb072e61fa597d96d9e66e1b57a7f790c7e37fc82ef7ff49114b0cb4cb623e558d96864e98ca36bd42fe16e58e863dc7 SHA512 0a1fddff595f7ccfdb65a1a660c82860f132796b42149b8b40808d0df489312dcd96402236150c8ec5ec32c1cc142ce7af1150e10fdb83bf798e4d690dd64314
+DIST kbuild-0.1.9998.3499-src.tar.xz 2371580 BLAKE2B 847c5c67ded37ca87228ff7164d6c7f2f670a57f2fd94d6d0bf4f8896266e7fe5442666c03dbda016564a52dc91d10be83f0d4b0ef5093db0f5210ac8d5f3aaa SHA512 eebdcd1d2fa71313edd764d45a4aa3580078af22d7c5fed32d3d139a4f41c4e028282fdfdda0ee9b617ed0e8e63b8f5d065b3cf6647f08fe446560938b7577fc
 EBUILD kbuild-0.1.9998.3407.ebuild 1780 BLAKE2B 52b4b1e13d6049fddc6e11edcbb3d881ba8abb1af48dfa6853331b5eec5a0d346d435f0a3e4e6ea747d1a27fcf6df190bbdfb950b12845c7192fbddd0fae6f16 SHA512 59976d3b48a2b65c2ac1d9e28e4a216bc641b1b0a6b64c0107ea864a57a95dee41d813cc5433e626b9223cee92151e7c361fee37bd7420fc20f03c7a74f49c8b
+EBUILD kbuild-0.1.9998.3499.ebuild 1861 BLAKE2B eb486e38f6aba3fc8ba7720dcb61e5cc57dff157b9fdf6a667e42e4f4fe91d2b6f50913fee503e06b806ef74dc1b41b2ff957b2f42f4de57b94e7c8f8a433c08 SHA512 e1169d7823d609b56bcfdfffcb6afbac8dea6211a63d480b42b8eff886ad389365392f742823b5da93392f8d2af2c1e5175ea4200104ebec0039945da055db2e
 EBUILD kbuild-9999.ebuild 1879 BLAKE2B 6bf91d0a78367e10cac290e72c3311a47b5ff4b6d147f231aa8e27ecfc7b507e12782dcf57a8824751abbc73de64709ebda1d250a4927c757886801c605c13de SHA512 beee49f9b3528eb2e69af67736b7ff6a3f1608517ce4821d3c0d2dede2df774206d892c6ae70c149eac718de4c6dec98d2d9228af1a9a55ad0ed616aaf1763bd
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3499-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3499-gold.patch
new file mode 100644
index 000000000000..ee870da2ee55
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998.3499-gold.patch
@@ -0,0 +1,15 @@
+--- kbuild-0.1.9998.3499/src/kmk/Makefile.kmk
++++ kbuild-0.1.9998.3499/src/kmk/Makefile.kmk
+@@ -60,9 +60,9 @@
+ ifneq ($(KBUILD_TARGET),os2)
+  TEMPLATE_BIN-KMK_INCS += glob
+ endif
+-TEMPLATE_BIN-KMK_LIBS       = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL)
+-TEMPLATE_BIN-KMK_LIBS.x86   = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS.x86)
+-TEMPLATE_BIN-KMK_LIBS.amd64 = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS.amd64)
++TEMPLATE_BIN-KMK_LIBS       = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread
++TEMPLATE_BIN-KMK_LIBS.x86   = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS.x86) pthread
++TEMPLATE_BIN-KMK_LIBS.amd64 = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS.amd64) pthread
+ ifdef ELECTRIC_HEAP # for electric heap (see electric.c).
+ ifeq ($(KBUILD_TARGET),win)
+  TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3499-kash-no_separate_parser_allocator.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3499-kash-no_separate_parser_allocator.patch
new file mode 100644
index 000000000000..24265b96e137
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998.3499-kash-no_separate_parser_allocator.patch
@@ -0,0 +1,11 @@
+--- kbuild-0.1.9998.3499/src/kash/Makefile.kmk
++++ kbuild-0.1.9998.3499/src/kash/Makefile.kmk
+@@ -35,7 +35,7 @@
+ kash_TEMPLATE = BIN-THREADED
+ kash_NAME = kmk_ash
+ kash_ASTOOL = YASM
+-kash_DEFS = lint SHELL SMALL KASH_SEPARATE_PARSER_ALLOCATOR
++kash_DEFS = lint SHELL SMALL
+ if "$(KBUILD_TARGET)" != "win" || defined(KASH_WIN_FORKED_MODE)
+ kash_DEFS += SH_FORKED_MODE
+ else
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild
new file mode 100644
index 000000000000..574abc5324a7
--- /dev/null
+++ b/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+MY_P="${P}-src"
+DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
+HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
+#SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# We cannot depend on virtual/yacc until bug #734354 has been fixed
+DEPEND="
+	sys-apps/texinfo
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	|| (
+		dev-util/byacc
+		dev-util/yacc
+		<sys-devel/bison-3.7
+	)
+"
+RDEPEND=""
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.1.9998.3407-unknown_configure_opt.patch"
+	"${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
+	"${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch"
+	"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3499-gold.patch"
+
+	# Please check on version bumps if this can be removed
+	"${FILESDIR}/${PN}-0.1.9998.3499-kash-no_separate_parser_allocator.patch"
+)
+
+pkg_setup() {
+	# Package fails with distcc (bug #255371)
+	export DISTCC_DISABLE=1
+}
+
+src_prepare() {
+	default
+
+	# Add a file with the svn revision this package was pulled from
+	printf '%s\n' "KBUILD_SVN_REV := $(ver_cut 4)" \
+		> SvnInfo.kmk || die
+
+	cd "${S}/src/kmk" || die
+	eautoreconf
+	cd "${S}/src/sed" || die
+	eautoreconf
+
+	sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
+		-i "${S}"/Config.kmk || die #332225
+	tc-export CC PKG_CONFIG RANLIB #AR does not work here
+}
+
+src_compile() {
+	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
+		|| die "bootstrap failed"
+}
+
+src_install() {
+	kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
+		|| die "install failed"
+}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index a74ee6881ab9..c89149ec8f3a 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,3 +1,3 @@
 DIST kdev-python-5.6.2.tar.xz 1072212 BLAKE2B 06f75d55a6c4171f6f2cfd219cfb5c54308db82dead25e9b79538ff04c7a0edd05ca5135121a923e7e169317a124d64f53da52e2226d59793d9a6c3c1ddfa6d3 SHA512 c0ecf9c075fe8c18e31152b774e76596367bb5eca8bb5ec976e9ce90ce78512d9e42bc95daea0f1de18474ef4deee430674e186263736df0de67d7d26c81f6a0
-EBUILD kdevelop-python-5.6.2.ebuild 1263 BLAKE2B dacec10c605ac5f2ec3f141181cc1b60a29642e032bddd8b47e2d22ecd17046b8a0bb56cb6d84ef7b81904ded84db7549a924654f1e0a5e785ceec51f36fd937 SHA512 be531cd721d8635b7d931d20ddc407cffe25a0a508393541c432829e47a86ff24bffd588414e57aab2ba875f91d128e0528424af3b66ab5dc1e10264bbb63f6e
+EBUILD kdevelop-python-5.6.2.ebuild 1265 BLAKE2B bdeffd5c1dbef7b54f53b1719635eca579fc8181ae01cc03df67e4524e0a279a8de11947113b6234d821ae096ebd8595e687073752d6ca4e9eac4ef6ebc85ae7 SHA512 bae0b2c330d183805c0464b0018e32224521ee2d7a12ff6c7fdfe98688e863a10cf019fb9b268934880141ec1e57c169ad045af3cec681c14e1bc547f9e93763
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.6.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.6.2.ebuild
index 35d6e1973aed..fad21df3fc4a 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.6.2.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.6.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_TEST="forceoptional"
 KDE_ORG_CATEGORY="kdevelop"
 KDE_ORG_NAME="kdev-python"
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 KFMIN=5.77.0
 QTMIN=5.15.2
 inherit ecm kde.org python-single-r1
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 521a32ca76c5..6f38c0a72fdd 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,8 +1,8 @@
-DIST meson-0.57.2.tar.gz 1853721 BLAKE2B 9c167a21745719589a165e7ffc31007bd6307b347027f390fd660b2f44b5a2e6d8f36e999e15fa4b28ae269ddb0bb3897e0297288c59b62cc493aad058126293 SHA512 a3b0bf3d5e1d1b7ac7c97313f43046c94aa2a6b21964958569c89764dfda08db166adb89d48cbfad735bd472114587a71089d5e8b4f0fce04c3289da21b3f40e
 DIST meson-0.58.1.tar.gz 1896205 BLAKE2B d42e04b262c6715ba2776f64d2e616016381303b07e609c804becf72db2ebd8ef08030c969f43813b2072552cb76974b2ed84f2da6d6c809ad612169d580395c SHA512 64ac1a9bcc642fb6d37c4b677d8b7db16d821f852f927a980d3fb1c149d680b7ff2c8d03676c6772666d46a33b6ce8674220433d302fcd92d13d9818558d6453
 DIST meson-0.58.2.tar.gz 1899464 BLAKE2B 48c4c0cec2cb1c55e51cd56e08461ad7d95211d83bb60085f32493cb8d53cfeb00234fa1ab62ba8fbf3baf726231c7e9b098a0630281fda63402a860337528e0 SHA512 31496da729ede0813d5b6cfcc891e8376108252ee8a8148d23e8a4c2a4109b9b0dbc7e9e59acd954fb7de38ceb35f05c3a916eb6d4e106656d9ea8e7536ac4b1
-EBUILD meson-0.57.2.ebuild 2303 BLAKE2B f05ddd144872cd4a01891b089af2adec6e53bd6bf69707557dba5f7770385062d0111b0706e328aa5b21fb2acde9efb136221fbd651828ec16e902f5b7c878d1 SHA512 5bfdeeb4ed0542917ae6bc1780e06ff7733c1e03b9c1fb8816d6ffa26fc18b843008a3a32aa5ca1e596d219a0a7fdcf2984e9fabeb34f7ea793798239ab46653
+DIST meson-0.59.1.tar.gz 1944678 BLAKE2B 08dee8ada7824faf93b730bd8cf86113fe85ecf57c53a7ee4be89371004e13b99e14933761398e6db5a359c5aad07a96f99c0b5be144a75c749e40d153cefa7f SHA512 c45e29869dc681675b2643c37c892e7fff365c051edce4f2ec278fc6cee25bac6818add819e4db69d2fe3c1ba9572fc55bb8f67fe791cdc9c187627c71b01963
 EBUILD meson-0.58.1.ebuild 2678 BLAKE2B f4969a73c757f7b64d673bab442d07aac6de77fc015c340fea9f7ec4383d0049d051e1eeae09ef9ddffc029245483c336b17a837d5af3df89e7566c0e58f193d SHA512 d14b5bcdb990c0124e5e625b8b8501782c6247e38265b9ab2570ab92cac8546c0f14dd636e951ade6574b3c2872c6fed6e2f249dbfac408bb25ff57cc5df49ab
-EBUILD meson-0.58.2.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
+EBUILD meson-0.58.2.ebuild 2678 BLAKE2B f4969a73c757f7b64d673bab442d07aac6de77fc015c340fea9f7ec4383d0049d051e1eeae09ef9ddffc029245483c336b17a837d5af3df89e7566c0e58f193d SHA512 d14b5bcdb990c0124e5e625b8b8501782c6247e38265b9ab2570ab92cac8546c0f14dd636e951ade6574b3c2872c6fed6e2f249dbfac408bb25ff57cc5df49ab
+EBUILD meson-0.59.1.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
 EBUILD meson-9999.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
 MISC metadata.xml 423 BLAKE2B d5ccfb020cc6bd4c163a6807d27528e6035ef59d0e0a7122c0a194da25126408ed5d5a1d97effb6e7e4721eaa20d15efb2bccb48db4215c3c5609cdcb58938ef SHA512 88f01def35adfd916e55aea1abf8234108338f1b692c1702e64b1fdeb6354f50965651e741b347cf792cd9ae90897ee4451060115d757af6b6235469f8d9aef0
diff --git a/dev-util/meson/meson-0.57.2.ebuild b/dev-util/meson/meson-0.57.2.ebuild
deleted file mode 100644
index 718d9c7fe89c..000000000000
--- a/dev-util/meson/meson-0.57.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2016-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-
-python_prepare_all() {
-	local disable_unittests=(
-		# ASAN and sandbox both want control over LD_PRELOAD
-		# https://bugs.gentoo.org/673016
-		-e 's/test_generate_gir_with_address_sanitizer/_&/'
-
-		# ASAN is unsupported on some targets
-		# https://bugs.gentoo.org/692822
-		-e 's/test_pch_with_address_sanitizer/_&/'
-
-		# https://github.com/mesonbuild/meson/issues/7203
-		-e 's/test_templates/_&/'
-
-		# Broken due to python2 wrapper
-		-e 's/test_python_module/_&/'
-	)
-
-	sed -i "${disable_unittests[@]}" run_unittests.py || die
-
-	# Broken due to python2 script created by python_wrapper_setup
-	rm -r "test cases/frameworks/1 boost" || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		# https://bugs.gentoo.org/687792
-		unset PKG_CONFIG
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		# 'test cases/unit/73 summary' expects 80 columns
-		export COLUMNS=80
-
-		${EPYTHON} -u run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.58.2.ebuild b/dev-util/meson/meson-0.58.2.ebuild
index e2a175666ca3..3056c22a3bd1 100644
--- a/dev-util/meson/meson-0.58.2.ebuild
+++ b/dev-util/meson/meson-0.58.2.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.59.1.ebuild b/dev-util/meson/meson-0.59.1.ebuild
new file mode 100644
index 000000000000..e2a175666ca3
--- /dev/null
+++ b/dev-util/meson/meson-0.59.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2016-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+
+python_prepare_all() {
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# https://github.com/mesonbuild/meson/issues/7203
+		-e 's/test_templates/_&/'
+
+		# Broken due to python2 wrapper
+		-e 's/test_python_module/_&/'
+	)
+
+	sed -i "${disable_unittests[@]}" run_unittests.py || die
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		# 'test cases/unit/73 summary' expects 80 columns
+		export COLUMNS=80
+
+		# If JAVA_HOME is not set, meson looks for javac in PATH.
+		# If javac is in /usr/bin, meson assumes /usr/include is a valid
+		# JDK include path. Setting JAVA_HOME works around this broken
+		# autodection. If no JDK is installed, we should end up with an empty
+		# value in JAVA_HOME, and the tests should get skipped.
+		export JAVA_HOME=$(java-config -O 2>/dev/null)
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index c788fe2b3168..169ea8efc087 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -10,5 +10,5 @@ EBUILD nvidia-cuda-toolkit-11.1.1-r2.ebuild 6238 BLAKE2B f658446f6f597fabcf7314e
 EBUILD nvidia-cuda-toolkit-11.2.2.ebuild 7119 BLAKE2B cb904f01e369415a5386873c6da3d4d89dbad96e998c47190fc5f6eef2261df4d7bc96c508eb19031fc15a6dd7fd5340bfeb544f79f4fa1b7fdcb7109c1f764d SHA512 366005e64ce6ab58d61956a341dbf654df9876003581ef500dafb3e35c7a86af120267390365de55c91927bcb4edea08722708385be32fce0bad34cd7cc7b070
 EBUILD nvidia-cuda-toolkit-11.3.1.ebuild 7121 BLAKE2B 4e1a8edfedd8972445ec7eb413b86707f6accc3acfdda75620a4e14a36376205843cc73872b8e35845e6526cb147e64132d7c4cdc29e3ae218b559e67c3fda39 SHA512 46b28a75e4adea42d6ef06065a38aa13c4bb0acd1ff924b0e81ddf2f8b437b1e18bef85b81d3c40cb58e05934fa645ec08dbea5c2972d09bb0998f0c7a36eb4b
 EBUILD nvidia-cuda-toolkit-11.4.0.ebuild 7121 BLAKE2B 0db4166fc71c33c2bdf52c56e3ba17d502dbd20fbebb6ac65ba5887cefac8504e9af40584e3cd354fd25ee4f4c49eb39c87f04df418e2aabbda7838c937c3931 SHA512 99eea9176c4b611fa769c7be7da58afbad579eb2c732490136bd218d5aea73217fd4b4bb0259d00eb150617fbf6d4c76433cf528c6f7ea1381a1ee30227376a1
-EBUILD nvidia-cuda-toolkit-11.4.1.ebuild 7121 BLAKE2B f982e4c79ef4a748a91d0c12af77b3ed60fa1925bb992ecbc57e73521e9ba86d0183966756b81f2ba6ebc383ed229654e2b4d6893bb62902357d7479c550845f SHA512 a5d720bc4b784aae3db46d4c5455f5d8bd74304fed8d4539b38be63d6f696b0aea5e8727f6a2814347c67744cbbdb99f52bc10ef1bd54b168a28487e766037e6
+EBUILD nvidia-cuda-toolkit-11.4.1-r2.ebuild 7122 BLAKE2B 3aaf5c625aa3ee20306a1e483714e7f94fbe6c2637006effad3b73faba1a0f42da28dfb60332bd76ad8ab59f11816f10dbd561be7cb4488238a2593614ff3276 SHA512 05b06040654889ed9b597de17ffce0c26dfdf9400fb3af90e07bf6479f2cafbf40af50ce4524df0fa48e27c9329064641fb9f7b6b974dd0b278f1c26ac91a415
 MISC metadata.xml 724 BLAKE2B fd9e30ae430f56599bab7004b9cd46a79bd9b94e75b0a4574ae393d8979b5e40862bf30d110d5d47186d74e629f035f854cea720d8393709d95a9c14b1185a26 SHA512 3a77849ec1bf2e61da35ffd76c20464b5de745c73abd14ffcb7e7d3b2f52e7d114c7d4630292ea219a23e327f1b6a0a8ec488a8cbdaf763a73554f17f50c2f7f
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.1-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.1-r2.ebuild
new file mode 100644
index 000000000000..1bb05e3bd743
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.1-r2.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs toolchain-funcs unpacker
+
+DRIVER_PV="470.57.02"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+S="${WORKDIR}"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger nsight profiler vis-profiler sanitizer"
+RESTRICT="bindist mirror"
+
+BDEPEND=""
+RDEPEND="
+	<sys-devel/gcc-12_pre[cxx]
+	>=x11-drivers/nvidia-drivers-${DRIVER_PV}
+	debugger? (
+		dev-libs/openssl
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses-compat:5[tinfo]
+	)
+	vis-profiler? (
+		dev-libs/openssl
+		>=virtual/jre-1.8:*
+	)"
+
+QA_PREBUILT="opt/cuda/*"
+CHECKREQS_DISK_BUILD="6800M"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	# ATTENTION: change requires revbump
+	local cuda_supported_gcc="8.5 9.4 10.3 11.1 11.2"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+	local pathextradirs ldpathextradirs
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install standard sub packages
+	local builddirs=(
+		builds/cuda_{cudart,cuobjdump,memcheck,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx,thrust}
+		builds/lib{cublas,cufft,curand,cusolver,cusparse,npp,nvjpeg}
+		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti" "")
+		$(usex vis-profiler "builds/cuda_nvvp" "")
+		$(usex debugger "builds/cuda_gdb" "")
+	)
+
+	local d f
+	for d in "${builddirs[@]}"; do
+		ebegin "Installing ${d}"
+		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
+
+		if [[ -d ${d}/bin ]]; then
+			for f in ${d}/bin/*; do
+				if [[ -f ${f} ]]; then
+					dobin "${f}"
+				else
+					insinto ${cudadir}/bin
+					doins -r "${f}"
+				fi
+			done
+		fi
+
+		insinto ${cudadir}
+		if [[ -d ${d}/targets ]]; then
+			doins -r "${d}"/targets
+		fi
+		if [[ -d ${d}/share ]]; then
+			doins -r "${d}"/share
+		fi
+		if [[ -d ${d}/extras ]]; then
+			doins -r "${d}"/extras
+		fi
+		eend
+	done
+	dobin "${T}"/cuda-config
+
+	doins builds/EULA.txt
+	# nvml and nvvm need special handling
+	ebegin "Installing nvvm"
+	doins -r builds/cuda_nvcc/nvvm
+	fperms +x ${cudadir}/nvvm/bin/cicc
+	eend
+
+	ebegin "Installing nvml"
+	doins -r builds/cuda_nvml_dev/nvml
+	eend
+
+	if use sanitizer; then
+		ebegin "Installing sanitizer"
+		dobin builds/integration/Sanitizer/compute-sanitizer
+		doins -r builds/cuda_sanitizer_api/compute-sanitizer
+		# special handling for the executable
+		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
+		eend
+	fi
+
+	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
+
+	if use vis-profiler; then
+		ebegin "Installing libnvvp"
+		doins -r builds/cuda_nvvp/libnvvp
+		# special handling for the executable
+		fperms +x ${cudadir}/libnvvp/nvvp
+		eend
+		pathextradirs+=":${ecudadir}/libnvvp"
+	fi
+
+	if use nsight; then
+		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${ncu_dir}"
+		mv builds/nsight_compute builds/${ncu_dir} || die
+		doins -r builds/${ncu_dir}
+
+		# check this list on every bump
+		local exes=(
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
+		)
+
+		dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
+		eend
+
+		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${nsys_dir}"
+		mv builds/nsight_systems builds/${nsys_dir} || die
+		doins -r builds/${nsys_dir}
+
+		# check this list on every bump
+		exes+=(
+			${nsys_dir}/host-linux-x64/nsys-ui
+			${nsys_dir}/host-linux-x64/nsys-ui.bin
+			${nsys_dir}/host-linux-x64/ResolveSymbols
+			${nsys_dir}/host-linux-x64/ImportNvtxt
+			${nsys_dir}/host-linux-x64/CrashReporter
+			${nsys_dir}/host-linux-x64/QdstrmImporter
+			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
+			${nsys_dir}/target-linux-x64/nsys
+			${nsys_dir}/target-linux-x64/launcher
+			${nsys_dir}/target-linux-x64/nvgpucs
+			${nsys_dir}/target-linux-x64/nsys-launcher
+			${nsys_dir}/target-linux-x64/sqlite3
+			${nsys_dir}/target-linux-x64/python/bin/python
+		)
+
+		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
+		eend
+
+		# nsight scripts and binaries need to have their executable bit set, #691284
+		for f in "${exes[@]}"; do
+			fperms +x ${cudadir}/${f}
+		done
+
+		# remove foreign archs (triggers SONAME warning, #749903)
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-glibc_2_19_0-ppc64le || die
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
+		rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-armv8 || die
+
+		# TODO: unbundle qt5
+		# TODO: unbundle boost
+		# TODO: unbundle icu
+		# TODO: unbundle openssl
+		# TODO: unbundle mesa
+		# TODO: unbundle libz
+		# TODO: unbundle libstdc++
+		# TODO: unbundle libSshClient
+		# TODO: unbundle sqlite
+		# TODO: unbundle libpfm ?
+	fi
+
+	# Add include and lib symlinks
+	dosym targets/x86_64-linux/include ${cudadir}/include
+	dosym targets/x86_64-linux/lib ${cudadir}/lib64
+
+	newenvd - 99cuda <<-EOF
+		PATH=${ecudadir}/bin${pathextradirs}
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
+	EOF
+
+	# Cuda prepackages libraries, don't revdep-build on them
+	insinto /etc/revdep-rebuild
+	newins - 80${PN} <<-EOF
+		SEARCH_DIRS_MASK="${ecudadir}"
+	EOF
+	# TODO: Add pkgconfig files for installed libraries
+}
+
+pkg_postinst_check() {
+	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	local b="0.0"
+	local v
+	for v in ${a}; do
+		ver_test "${v}" -gt "${b}" && b="${v}"
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt "${b}"; then
+			ewarn
+			ewarn "gcc > ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+
+	if use profiler || use nsight; then
+		einfo
+		einfo "nvidia-drivers restrict access to performance counters."
+		einfo "You'll need to either run profiling tools (nvprof, nsight) "
+		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
+		einfo "a modprobe configuration file "
+		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
+		einfo
+		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
+		einfo
+	fi
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.1.ebuild
deleted file mode 100644
index 70aa06012a1a..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.1.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs toolchain-funcs unpacker
-
-DRIVER_PV="470.57.02"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
-S="${WORKDIR}"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger nsight profiler vis-profiler sanitizer"
-RESTRICT="bindist mirror"
-
-BDEPEND=""
-RDEPEND="
-	<sys-devel/gcc-11_pre[cxx]
-	>=x11-drivers/nvidia-drivers-${DRIVER_PV}
-	debugger? (
-		dev-libs/openssl
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses-compat:5[tinfo]
-	)
-	vis-profiler? (
-		dev-libs/openssl
-		>=virtual/jre-1.8:*
-	)"
-
-QA_PREBUILT="opt/cuda/*"
-CHECKREQS_DISK_BUILD="6800M"
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	# ATTENTION: change requires revbump
-	local cuda_supported_gcc="8.5 9.3 9.4 10.2 10.3"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-	local pathextradirs ldpathextradirs
-	dodir ${cudadir}
-	into ${cudadir}
-
-	# Install standard sub packages
-	local builddirs=(
-		builds/cuda_{cudart,cuobjdump,memcheck,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx,thrust}
-		builds/lib{cublas,cufft,curand,cusolver,cusparse,npp,nvjpeg}
-		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti" "")
-		$(usex vis-profiler "builds/cuda_nvvp" "")
-		$(usex debugger "builds/cuda_gdb" "")
-	)
-
-	local d f
-	for d in "${builddirs[@]}"; do
-		ebegin "Installing ${d}"
-		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
-
-		if [[ -d ${d}/bin ]]; then
-			for f in ${d}/bin/*; do
-				if [[ -f ${f} ]]; then
-					dobin "${f}"
-				else
-					insinto ${cudadir}/bin
-					doins -r "${f}"
-				fi
-			done
-		fi
-
-		insinto ${cudadir}
-		if [[ -d ${d}/targets ]]; then
-			doins -r "${d}"/targets
-		fi
-		if [[ -d ${d}/share ]]; then
-			doins -r "${d}"/share
-		fi
-		if [[ -d ${d}/extras ]]; then
-			doins -r "${d}"/extras
-		fi
-		eend
-	done
-	dobin "${T}"/cuda-config
-
-	doins builds/EULA.txt
-	# nvml and nvvm need special handling
-	ebegin "Installing nvvm"
-	doins -r builds/cuda_nvcc/nvvm
-	fperms +x ${cudadir}/nvvm/bin/cicc
-	eend
-
-	ebegin "Installing nvml"
-	doins -r builds/cuda_nvml_dev/nvml
-	eend
-
-	if use sanitizer; then
-		ebegin "Installing sanitizer"
-		dobin builds/integration/Sanitizer/compute-sanitizer
-		doins -r builds/cuda_sanitizer_api/compute-sanitizer
-		# special handling for the executable
-		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
-		eend
-	fi
-
-	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
-
-	if use vis-profiler; then
-		ebegin "Installing libnvvp"
-		doins -r builds/cuda_nvvp/libnvvp
-		# special handling for the executable
-		fperms +x ${cudadir}/libnvvp/nvvp
-		eend
-		pathextradirs+=":${ecudadir}/libnvvp"
-	fi
-
-	if use nsight; then
-		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
-		ebegin "Installing ${ncu_dir}"
-		mv builds/nsight_compute builds/${ncu_dir} || die
-		doins -r builds/${ncu_dir}
-
-		# check this list on every bump
-		local exes=(
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
-			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
-			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
-			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
-		)
-
-		dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
-		eend
-
-		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
-		ebegin "Installing ${nsys_dir}"
-		mv builds/nsight_systems builds/${nsys_dir} || die
-		doins -r builds/${nsys_dir}
-
-		# check this list on every bump
-		exes+=(
-			${nsys_dir}/host-linux-x64/nsys-ui
-			${nsys_dir}/host-linux-x64/nsys-ui.bin
-			${nsys_dir}/host-linux-x64/ResolveSymbols
-			${nsys_dir}/host-linux-x64/ImportNvtxt
-			${nsys_dir}/host-linux-x64/CrashReporter
-			${nsys_dir}/host-linux-x64/QdstrmImporter
-			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
-			${nsys_dir}/target-linux-x64/nsys
-			${nsys_dir}/target-linux-x64/launcher
-			${nsys_dir}/target-linux-x64/nvgpucs
-			${nsys_dir}/target-linux-x64/nsys-launcher
-			${nsys_dir}/target-linux-x64/sqlite3
-			${nsys_dir}/target-linux-x64/python/bin/python
-		)
-
-		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
-		eend
-
-		# nsight scripts and binaries need to have their executable bit set, #691284
-		for f in "${exes[@]}"; do
-			fperms +x ${cudadir}/${f}
-		done
-
-		# remove foreign archs (triggers SONAME warning, #749903)
-		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-glibc_2_19_0-ppc64le || die
-		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
-		rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-armv8 || die
-
-		# TODO: unbundle qt5
-		# TODO: unbundle boost
-		# TODO: unbundle icu
-		# TODO: unbundle openssl
-		# TODO: unbundle mesa
-		# TODO: unbundle libz
-		# TODO: unbundle libstdc++
-		# TODO: unbundle libSshClient
-		# TODO: unbundle sqlite
-		# TODO: unbundle libpfm ?
-	fi
-
-	# Add include and lib symlinks
-	dosym targets/x86_64-linux/include ${cudadir}/include
-	dosym targets/x86_64-linux/lib ${cudadir}/lib64
-
-	newenvd - 99cuda <<-EOF
-		PATH=${ecudadir}/bin${pathextradirs}
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
-	EOF
-
-	# Cuda prepackages libraries, don't revdep-build on them
-	insinto /etc/revdep-rebuild
-	newins - 80${PN} <<-EOF
-		SEARCH_DIRS_MASK="${ecudadir}"
-	EOF
-	# TODO: Add pkgconfig files for installed libraries
-}
-
-pkg_postinst_check() {
-	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
-	local b="0.0"
-	local v
-	for v in ${a}; do
-		ver_test "${v}" -gt "${b}" && b="${v}"
-	done
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		ver_test $(gcc-version) -gt "${b}"; then
-			ewarn
-			ewarn "gcc > ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-
-	if use profiler || use nsight; then
-		einfo
-		einfo "nvidia-drivers restrict access to performance counters."
-		einfo "You'll need to either run profiling tools (nvprof, nsight) "
-		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
-		einfo "a modprobe configuration file "
-		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
-		einfo
-		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
-		einfo
-	fi
-}
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index dbd953118633..f0a641510a14 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -1,7 +1,7 @@
 DIST patchelf-0.10.tar.bz2 158604 BLAKE2B 6aed9c2e7f37ff0330ca517a9491c46a93212140367b720bf94da4e4ec29a4978c920b53ce306ec333b3f7ac0216ff59637048c6997cfea4a34a87f2a0448796 SHA512 647ad13b7d45b3c5d20683ef8fe9760cb7f213e879231b6c5780bf32771adfbf7c5e5ce694c08e5681dceda63857d7d8a2d53efb60f799d3e7290cebc02ab501
-DIST patchelf-0.11.tar.bz2 159046 BLAKE2B 48d8dd986c681facd8d925d8f471ed6b4cae6a06472d66c1c22a32ded796f50be8d30cefc2847890558c2799707c33beb64ffc5d09f6d142120363bea5e40456 SHA512 ad3a99db6952412a2dac27256640cb9152b8bf5d189f1685b7478b9773bb612e06621511fc7338b2defc435bcdc26f67f79c2d830570a6da70f9d280b123d977
 DIST patchelf-0.12.tar.gz 103075 BLAKE2B 8ea71eb75bcc40e18a168c1e65856809fcceb8f68a9939e5248464d8c2e5d14d4eb1278965727417a26e70734712121d057c3da689be397f93bdb5234a11d5ba SHA512 2563a5b22b90392d5755d9a08022daf8570fa1b741becbbca92548d0a2f82f7ee21175a2c34816a4653c89c2219bf59b1440304b0fa2d49842e398ab18b9923c
+DIST patchelf-0.13.tar.gz 117997 BLAKE2B 5db88c9ff9103f2e4b8e15d7dc0d677c3956a85ce5e86e371c4c32a21c3bc219990edd71a20a6b650342eff1068c0ba0976529d62d21dcc17dfc020abf7167ec SHA512 0b4cb41dc1b76d1c0f46655d8b1c56187d2bf18fa12fad9ad6e8acd321a98df372713a92c6649479498bb5939c91ce16a1032ec03afc5a2f7c92cd68882c2bd9
 EBUILD patchelf-0.10.ebuild 614 BLAKE2B f8746020ed527d88057d36d819def0266112d58f56f0ac1f7d66b529aa4cabbc17041ea6659cd46a53c6f941920540481d6d4ee4e81973d82fcbf3b24ddefb8e SHA512 9cc306c95e5b5cc72ec93645c829c10df6263d7929b26274c02cd1fda973812dfef85b1ba8f0437a6318a57573f1eabfaf10b318a44a7b40a46eac0fdb38eeb6
-EBUILD patchelf-0.11.ebuild 657 BLAKE2B 805020e7cbd692b91b3db4632a30dab086701bcaffe733ec0f1701c4a9c490188ccf41f3531e7fcffcbe11e317d52fd69137933fd6636e89357a9dd7d0ffa184 SHA512 ea4ddebad53558f5bf31905f55fe2d6147182e673059caf584358731780b3d2db87aa8866a2ab655da8b5dc3efd25f1881e7a8ea9035e05095e43c0849c6e118
 EBUILD patchelf-0.12.ebuild 635 BLAKE2B 998794cc15441f8ef5415e9b965bbb6b8928f53318b4ab13c50002886b4dcaa3efc30bb7e69d24ceb7ecfc013d9105a62d39c0f2e1569b3d35383031af78b6d5 SHA512 1cd4597ae1e09feecbaa9c21c09a270f3422d543795be318775ed90ee888279ab83ad4b3b9be4fa72b5167f6af51c8577eed10fe8a5e7366aea8786873b2ff5b
+EBUILD patchelf-0.13.ebuild 556 BLAKE2B 03bd4f6b419acab732445f7f6f58a3143fb9d0c6f9dc6d75682ecd00a072e27121f63818e392384d23f9fa05788b4f9c2cbd284e25a222b20796c6b0a054c216 SHA512 12149ee8fd8f796472c63812f8ece7c3636f9b51bd6039f482a593d581ea749f7cbe95241690633f3aedcb2e430f46708bd326048ec5781a46ea62fccb1b2aa8
 MISC metadata.xml 220 BLAKE2B 65b0d9db11c166b2887e1a22962830e288eb917a7f15d0ffcecb3c86a1845491cbcbf4ebc7e661ac7041443a8144b218123b4db7a962191a9e9f894ac086a4ed SHA512 512eee7a953300d5e721b64bade8be9bd1b62984e543552b58a7a72b42cb90973c8c6d557ecfe08c2355cab45f640c88dcd31ab8d116815bc01680a65c7a132c
diff --git a/dev-util/patchelf/patchelf-0.11.ebuild b/dev-util/patchelf/patchelf-0.11.ebuild
deleted file mode 100644
index ec5c769e0af3..000000000000
--- a/dev-util/patchelf/patchelf-0.11.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables"
-HOMEPAGE="https://nixos.org/patchelf.html"
-SRC_URI="https://nixos.org/releases/${PN}/${P}/${P}.tar.bz2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-3"
-
-S="${WORKDIR}/${P}.20200609.d6b2a72"
-
-src_prepare() {
-	default
-	rm src/elf.h || die
-
-	sed -i \
-		-e 's:-Werror::g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_test() {
-	emake check \
-		  CFLAGS+=" -no-pie" \
-		  CXXFLAGS+=" -no-pie"
-}
diff --git a/dev-util/patchelf/patchelf-0.13.ebuild b/dev-util/patchelf/patchelf-0.13.ebuild
new file mode 100644
index 000000000000..e66de9a4aec2
--- /dev/null
+++ b/dev-util/patchelf/patchelf-0.13.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables"
+HOMEPAGE="https://github.com/NixOS/patchelf"
+SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-3"
+
+src_prepare() {
+	default
+	rm src/elf.h || die
+
+	sed -i \
+		-e 's:-Werror::g' \
+		configure.ac || die
+
+	eautoreconf
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 73f24fa08380..ab32b1d6dc98 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,18 +1,8 @@
-AUX pkgcheck-0.9.7-py310-update.patch 7845 BLAKE2B c530448d0019af7ba7d2f3866ed4a8d12fc84a4dfd7fdf7260fe8d84fe4f9539e116c60190bff80b518abcc6c8dfeeda2a7c46c74b1d4b999a4b4fb81efdf6e7 SHA512 e976a8cab6196b738073491b407a431611fda0bfe0c6202a3b799c8608a6404b9d607c1d4b472e051ebee23f7fc1b97caad31ef7f80144bd1280ebf2562e173b
-DIST pkgcheck-0.10.0.tar.gz 453555 BLAKE2B aeb211619f400b729a9f5e7e1ffa787c33c1c8cf592d9d25aaf3a82e5ca44711b9da6a012f0aa000e7269a40be387efb271f981b038fc29c497f2f660dead74e SHA512 2b702d269e899a4643f40397414a32f78af611cccc0d4a3d816b978bc63dc09d5e0086aebf11711c8d80703fa7e78d36eb884de6908ee548791a0d934569ded9
 DIST pkgcheck-0.10.1.tar.gz 454051 BLAKE2B ba0e91fee539d0a41c27da08c91e1c65078eaebea33b8254cbad38d49feb91a4aa490992a5d88bd96ce0570d89f9f8343d0ff0a2d7368f09d55637b2597aad6b SHA512 044067928bc1c1280a95e785def80e6ebb289e0882f9a61b18d1d75ddc22c4f7eea1da4a4621fd5a598c3e7ee75ece2adedb936086f3c3cbc92c23ab93419215
-DIST pkgcheck-0.10.2.tar.gz 454643 BLAKE2B 4585a72ce9675a23a3bcd7228ac811bdf45bacf2a25d91b9665f833de6dffbac5c4e11405b112bd5dd6e643fc51c3f57cf7dda989c2521c11e279324a02740c7 SHA512 0151d6fb81f800d46b65bb02bd5474ae36e8e4dc35376f1abfaa1c8be61e3429e527947b42f76c9f6da5ede648617d58f6b9ac44a93ff58175b748dfd9a43cbe
 DIST pkgcheck-0.10.3.tar.gz 454953 BLAKE2B 5ee2c13cb1ca5b13bfcd8434700c69e6839c5dc2f25dec4060020f8477159ff071b1487a446ba7e03bf1b8d139e8c65a1cd21a777d8bfe3ce677bbfe39b8d85f SHA512 edef25fc1542c3d3fb89c0c1546ebfa736b6ad4b113b0e6bc9ede379b0a5cb9ece5dd8b79ddb2df2cfeaf7f67f290e96a8baee1f2dfcc3bcebe32d9dcf4c264e
-DIST pkgcheck-0.10.4.tar.gz 455252 BLAKE2B 3fb8183120b8a45569a007e4c9e521e5b070554523c5c2fbf44c383996896924800d42f79f9809e0fcc3b04363b2c50a8894b547376a8c030f4d0451c7f943bf SHA512 f5f01340ff4ac882da8e56cbb44440425dcb42c5ed6a9ab102c435a61cfca6861a421ee294039f055fec5b93cae338ea4ba23237f1ba509e6e24bdba351427eb
 DIST pkgcheck-0.10.5.tar.gz 458314 BLAKE2B 143a397f5374b3f84d957953d0915b6ae7107b81f85af4e37e75289ed0edc5bdf16bdc00213860fdf0bdf53be953b80d514839c6568c3a70d2cdd61401e8dc73 SHA512 3902560099c7e5570be2b86b6e7d56427b6ef9cc893dafe5327b6773b92ca44cc787725a0d2e81d4b779ae71dc2acaeceaaff4d5de50fc99aab4c0dc0ab03bfa
-DIST pkgcheck-0.9.7.tar.gz 453478 BLAKE2B 486bae68af1757fbdb4b109b34cea836cb6dee258d4e53b4c3818c1aa6194da86e7ee339335ac6f2a1c2fb89a547f46658fadd88706fa807a9fdce2bb82a5c65 SHA512 e8fc02997d558af1e8e89a13130076b4db59e9c2a8ea383d0dca9a57375dae1fb315619593178d67c89d30e7b16810905694c838ea4ec608eaee195fa4797569
-EBUILD pkgcheck-0.10.0.ebuild 1507 BLAKE2B 70f6f537fa953ec59c3ed9b0ea017bec0fb7c569e6006b066e35a2b2b868a4e75da078c5bd60faba16a9c80f8e011a565366e611b9202628f073a27fc4e47aee SHA512 07dbe05c8d6a60d411bbd2d07e890b914c85703e024822ad7b6720818d15e6843ea05f95bfeda54b3f4c1f8db96948d25e719bf5d415082ad9c038a0403c50af
 EBUILD pkgcheck-0.10.1.ebuild 1507 BLAKE2B e9faf1f21afbd8a9846f54cb795083ecdc48853e47e171b9cbb9e7a9e668a3b09caaf1870a31830d33488c4841e04c3fedfd8c2b1219cb391f74c981dcd999ae SHA512 0b1b30f6e5fea0bc8175206903e90ef60e65d0456fdfb14448342abc811e4e9d0333000e8cd6fd79974e22803673f64349cc8404c1ed8dbff4e3f54b58ddf3b2
-EBUILD pkgcheck-0.10.2.ebuild 1515 BLAKE2B 6e00b9da5d1ebedf1d4d9e540b5cf88df6a6a17c3c313fc451eba46cedfb469528e971d821fb80cf5bd0975e0e73a0146c4a7df39c6b90b9dbc13af2e81e62a2 SHA512 64688636b07fa3c35788a10a130e8b9897cecd82b185b9e5c14f3ea2c540f13fcfc7a945d994b08fbd4c873829ee6fce425e242c82dbff18a5236c0adeec4646
 EBUILD pkgcheck-0.10.3.ebuild 1508 BLAKE2B f7e417191f84d5fd4fda320278831cc847dd356816556b3bdb7b55138d667d64696d20135537616f21de9c331c4e063c612000198663b3d1337904ae90c6113d SHA512 a2d1fdc2fa45f2f1be07066d798145eb185f8616c96170d5436ce58b6f67840374f73e0bc9424121b914aa8a18d5830639580550ca3a1cd991355a9bc3513fb8
-EBUILD pkgcheck-0.10.4.ebuild 1515 BLAKE2B 6e00b9da5d1ebedf1d4d9e540b5cf88df6a6a17c3c313fc451eba46cedfb469528e971d821fb80cf5bd0975e0e73a0146c4a7df39c6b90b9dbc13af2e81e62a2 SHA512 64688636b07fa3c35788a10a130e8b9897cecd82b185b9e5c14f3ea2c540f13fcfc7a945d994b08fbd4c873829ee6fce425e242c82dbff18a5236c0adeec4646
 EBUILD pkgcheck-0.10.5.ebuild 1516 BLAKE2B 044cf7af3749601b64a8766f28d4c972b396e99576d44c856cd7b3b96e5b3c51ae8eb0e340eeff61508c73b99a7d9f2fcb1f1fa18f56af3558e5694f3b9cb925 SHA512 4dabfdd73300eac1b2a6ffe74fef17c82615e84eb19c5c59202360523a9e6170cf37b6a8190937b857499865427821ee5c5eceb5055f74cd7124aba85021096f
-EBUILD pkgcheck-0.9.7-r2.ebuild 1544 BLAKE2B 7bea3bcebc9b0397682d6ea9c39798a59857ea9276095548927e6fc6f09c606e60504b7a6ebba401fd00c55238489211889744b6480e559b897d7824fa33bbd7 SHA512 1de34366c44024ea677d6ae3e41a2a71819490d22a7f0813307f790ae3f3b019daa07d259ebc2ffe39121588dfc3a9183f46cbc7858d1c17e631ff2f6668bc50
-EBUILD pkgcheck-0.9.7-r3.ebuild 1604 BLAKE2B 0e6042b6fe93f617544b08d728eb1bbc4217e6e1b675c4069990c02f99937c9ba5668a68f3b5b595c688eddad5a47a96140f58daf9ca94a803eec7b933dd874b SHA512 6a3dd00c5158e8d004a002e820dc4553294c6faa2759ed672dc91f8664725bf6e7eaca8c1f7417a6d232566fe6031dac8df045307beba52137d003d8a1b76b28
 EBUILD pkgcheck-9999.ebuild 1515 BLAKE2B 6e00b9da5d1ebedf1d4d9e540b5cf88df6a6a17c3c313fc451eba46cedfb469528e971d821fb80cf5bd0975e0e73a0146c4a7df39c6b90b9dbc13af2e81e62a2 SHA512 64688636b07fa3c35788a10a130e8b9897cecd82b185b9e5c14f3ea2c540f13fcfc7a945d994b08fbd4c873829ee6fce425e242c82dbff18a5236c0adeec4646
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.9.7-py310-update.patch b/dev-util/pkgcheck/files/pkgcheck-0.9.7-py310-update.patch
deleted file mode 100644
index 8bee592b228e..000000000000
--- a/dev-util/pkgcheck/files/pkgcheck-0.9.7-py310-update.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 443c0aab158e34196399073e801ae19ae0dce4dc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 9 May 2021 10:59:18 +0200
-Subject: [PATCH] python: Fix treating python3.10 as newer than python3.9
-
-Fix the sorting logic to use a combined lexical-numerical sort, in order
-to sort python3.10 as newer than python3.9.  This fixes
-PythonCompatUpdate check.
----
- src/pkgcheck/checks/python.py                 | 25 +++++++++++++++----
- .../PythonCompatUpdate/expected.json          |  6 ++---
- .../PythonCompatUpdate/fix.patch              |  6 ++---
- .../profiles/desc/python_single_target.desc   |  1 +
- .../python/profiles/desc/python_targets.desc  |  1 +
- .../stub/python-dep1/python-dep1-0.ebuild     |  2 +-
- .../stub/python-dep2/python-dep2-0.ebuild     |  2 +-
- 7 files changed, 30 insertions(+), 13 deletions(-)
-
-diff --git a/src/pkgcheck/checks/python.py b/src/pkgcheck/checks/python.py
-index ed922215..7f0e9be4 100644
---- a/src/pkgcheck/checks/python.py
-+++ b/src/pkgcheck/checks/python.py
-@@ -1,4 +1,5 @@
- import itertools
-+import re
- 
- from pkgcore.ebuild.atom import atom
- from pkgcore.restrictions import packages, values
-@@ -28,6 +29,18 @@ CHECK_EXCLUDE = frozenset(['virtual/pypy', 'virtual/pypy3'])
- IUSE_PREFIX = 'python_targets_'
- IUSE_PREFIX_S = 'python_single_target_'
- 
-+TARGET_SPLIT_RE = re.compile(r'([0-9]+)')
-+
-+
-+def target_sort_key(target):
-+    def iter():
-+        for x in TARGET_SPLIT_RE.split(target):
-+            try:
-+                yield int(x)
-+            except ValueError:
-+                yield x
-+    return tuple(iter())
-+
- 
- def get_python_eclass(pkg):
-     eclasses = ECLASSES.intersection(pkg.inherited)
-@@ -281,14 +294,14 @@ class PythonCompatCheck(Check):
-         for target, _desc in repo.config.use_expand_desc.get(IUSE_PREFIX[:-1], ()):
-             if target[len(IUSE_PREFIX):].startswith('python'):
-                 targets.append(target[len(IUSE_PREFIX):])
--        multi_targets = tuple(sorted(targets))
-+        multi_targets = tuple(sorted(targets, key=target_sort_key))
- 
-         # determine available PYTHON_SINGLE_TARGET use flags
-         targets = []
-         for target, _desc in repo.config.use_expand_desc.get(IUSE_PREFIX_S[:-1], ()):
-             if target[len(IUSE_PREFIX_S):].startswith('python'):
-                 targets.append(target[len(IUSE_PREFIX_S):])
--        single_targets = tuple(sorted(targets))
-+        single_targets = tuple(sorted(targets, key=target_sort_key))
- 
-         self.params = {
-             'python-r1': (multi_targets, IUSE_PREFIX, None),
-@@ -327,8 +340,9 @@ class PythonCompatCheck(Check):
-         try:
-             # determine the latest supported python version
-             latest_target = sorted(
--                f"python{x.slot.replace('.', '_')}" for x in deps
--                if x.key == 'dev-lang/python' and x.slot is not None)[-1]
-+                (f"python{x.slot.replace('.', '_')}" for x in deps
-+                if x.key == 'dev-lang/python' and x.slot is not None),
-+                key=target_sort_key)[-1]
-         except IndexError:
-             # should be flagged by PythonMissingDeps
-             return
-@@ -355,4 +369,5 @@ class PythonCompatCheck(Check):
-             except IndexError:
-                 return
- 
--            yield PythonCompatUpdate(sorted(targets), pkg=pkg)
-+            yield PythonCompatUpdate(sorted(targets, key=target_sort_key),
-+                                     pkg=pkg)
-diff --git a/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/expected.json b/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/expected.json
-index ab7d9b01..f3476eac 100644
---- a/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/expected.json
-+++ b/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/expected.json
-@@ -1,3 +1,3 @@
--{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "0", "updates": ["python3_8", "python3_9"]}
--{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "1", "updates": ["python3_9"]}
--{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "2", "updates": ["python3_9"]}
-+{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "0", "updates": ["python3_8", "python3_9", "python3_10"]}
-+{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "1", "updates": ["python3_9", "python3_10"]}
-+{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "2", "updates": ["python3_9", "python3_10"]}
-diff --git a/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/fix.patch b/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/fix.patch
-index c63184e9..9be4952a 100644
---- a/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/fix.patch
-+++ b/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/fix.patch
-@@ -4,7 +4,7 @@ diff -Naur python/PythonCompatCheck/PythonCompatUpdate/PythonCompatUpdate-0.ebui
- @@ -1,5 +1,5 @@
-  EAPI=7
- -PYTHON_COMPAT=( python3_7 )
--+PYTHON_COMPAT=( python3_{7..9} )
-++PYTHON_COMPAT=( python3_{7..10} )
-  
-  inherit python-r1
-  
-@@ -14,7 +14,7 @@ diff -Naur python/PythonCompatCheck/PythonCompatUpdate/PythonCompatUpdate-1.ebui
- @@ -1,5 +1,5 @@
-  EAPI=7
- -PYTHON_COMPAT=( python3_{7,8} )
--+PYTHON_COMPAT=( python3_{7..9} )
-++PYTHON_COMPAT=( python3_{7..10} )
-  
-  inherit python-single-r1
-  
-@@ -24,7 +24,7 @@ diff -Naur python/PythonCompatCheck/PythonCompatUpdate/PythonCompatUpdate-2.ebui
- @@ -1,5 +1,5 @@
-  EAPI=7
- -PYTHON_COMPAT=( python3_{7,8} )
--+PYTHON_COMPAT=( python3_{7..9} )
-++PYTHON_COMPAT=( python3_{7..10} )
-  
-  inherit python-any-r1
-  
-diff --git a/testdata/repos/python/profiles/desc/python_single_target.desc b/testdata/repos/python/profiles/desc/python_single_target.desc
-index da5be2fd..3c39a224 100644
---- a/testdata/repos/python/profiles/desc/python_single_target.desc
-+++ b/testdata/repos/python/profiles/desc/python_single_target.desc
-@@ -3,4 +3,5 @@ python2_7 - Build with Python 2.7
- python3_7 - Build with Python 3.7
- python3_8 - Build with Python 3.8
- python3_9 - Build with Python 3.9
-+python3_10 - Build with Python 3.10
- pypy3 - Build for PyPy3 only
-diff --git a/testdata/repos/python/profiles/desc/python_targets.desc b/testdata/repos/python/profiles/desc/python_targets.desc
-index b2be59ca..8e55f2da 100644
---- a/testdata/repos/python/profiles/desc/python_targets.desc
-+++ b/testdata/repos/python/profiles/desc/python_targets.desc
-@@ -3,4 +3,5 @@ python2_7 - Build with Python 2.7
- python3_7 - Build with Python 3.7
- python3_8 - Build with Python 3.8
- python3_9 - Build with Python 3.9
-+python3_10 - Build with Python 3.10
- pypy3 - Build for PyPy3 only
-diff --git a/testdata/repos/python/stub/python-dep1/python-dep1-0.ebuild b/testdata/repos/python/stub/python-dep1/python-dep1-0.ebuild
-index 9eebedfd..55c455d9 100644
---- a/testdata/repos/python/stub/python-dep1/python-dep1-0.ebuild
-+++ b/testdata/repos/python/stub/python-dep1/python-dep1-0.ebuild
-@@ -1,5 +1,5 @@
- EAPI=7
--PYTHON_COMPAT=( python2_7 python3_{7,8,9} )
-+PYTHON_COMPAT=( python2_7 python3_{7,8,9,10} )
- 
- inherit python-r1
- 
-diff --git a/testdata/repos/python/stub/python-dep2/python-dep2-0.ebuild b/testdata/repos/python/stub/python-dep2/python-dep2-0.ebuild
-index 9eebedfd..55c455d9 100644
---- a/testdata/repos/python/stub/python-dep2/python-dep2-0.ebuild
-+++ b/testdata/repos/python/stub/python-dep2/python-dep2-0.ebuild
-@@ -1,5 +1,5 @@
- EAPI=7
--PYTHON_COMPAT=( python2_7 python3_{7,8,9} )
-+PYTHON_COMPAT=( python2_7 python3_{7,8,9,10} )
- 
- inherit python-r1
- 
--- 
-2.31.1
-
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.0.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.0.ebuild
deleted file mode 100644
index afa31791177f..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.2.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.2.ebuild
deleted file mode 100644
index 9a255efb0571..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.1[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.4.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.4.ebuild
deleted file mode 100644
index 9a255efb0571..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.1[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.7-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.7-r2.ebuild
deleted file mode 100644
index 7cf93d2ab9c2..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.9.7-r2.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
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		<sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.7-r3.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.7-r3.ebuild
deleted file mode 100644
index 70f186fd2538..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.9.7-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		<sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py310-update.patch
-)
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index 4ae7e7afcde2..0e7776e157ef 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,7 +1,4 @@
-AUX visualvm-r2.conf 1243 BLAKE2B a1e97a1e1ee914620a29bd68580043654304b9cff29edbb700de02473113a7984f3ec910cbff674465ccab6f1deac4da5412ade9a8069918b4acae839ba8d731 SHA512 0f826859bba484e8eae20750e4c3f021ce129cd06dc6c19cf2724b0c2c3d4c68a4370788bdc5cf7e0859348197466382c877c885937c0a87c0e8467944160bf7
 AUX visualvm-r2.sh 423 BLAKE2B cdc5db4465a339735ccff5f37bed89d76da2f2d514f522b7768fa37aad46804997d267285b09d6346674d43964d0ef0a0cadb24d28e9b90256a593d7420aab4a SHA512 eb7356e10a94db048fb471215b2115b93764931ed4178594bca5a1aac480f2262ef361b2f53fc23dbcdb4d44e1aeab678204c50583abb8016696a7d87288a9bb
-DIST visualvm-2.0.7.tar.gz 39155599 BLAKE2B 8a460cb161357114d829d41a7e4b2306e9e0023a6995aceed89cc12fc0b54d5e05402bc1b8c72d4cb3caba5a4844bfbebb4734d7f7c5663343dfb3bd4470945a SHA512 d75217fb1b2a8c4d1c44b600dc42d488be8447fc569f78c10c59954c7c64f8e1ccdeef2e6a7936e7708b9392bbd7634d7149c6d6cc797df1f0036c6c473398ff
 DIST visualvm-2.1.tar.gz 37175908 BLAKE2B 2bc435b09af9061122eb62a8de4b4b9ce47bb8cc2b7e2bfba57767bee380f6db041ec758a54f5a90e21d9ee3a5e6db5af8c0f89fc347d8e49322caeb07db4233 SHA512 ae662df96224a366c54210b85d6a859fd7412ea6ebbbb4d6a5e6b1a75c04a8060ac08a524d8e58aa9a037ecebf7ada142d9633db389cd5332742a21d26e5ed17
-EBUILD visualvm-2.0.7.ebuild 1903 BLAKE2B 612e393a06c26225c1f0e76925dfc447d41e7843e63b26a0019126f674b4a09b418fa10dd7b1b8471000b1573fd211e8ea778b08fd55ac986cc48ea34eddc83e SHA512 8123f7999a45111a745f7e8e38fde858d7af3cea4032c8d72cd3e46e91d412c128b2541082960fb212f45592aaabfbdf08c9e14083b8c463f7b9635d6a85d0df
-EBUILD visualvm-2.1.ebuild 2347 BLAKE2B 8a095af10ab1e2020e23b95e09721e67afbcd33419387394c4155a50d0dc9dee5237082c2d2e6fe198c9325611ce8251cbf4fa8d9e63cc42bf639f459001220e SHA512 12bc18fad16a35bced42e2104a36975870d2efb79b689c127c7536a7d8e3aeb70963c019bcb59f70180dad5524e1c39ddb8fd783915cb4c2f9121ed9369fc0f9
+EBUILD visualvm-2.1.ebuild 2346 BLAKE2B 83c206de83fb911a40a8a9178d58c29fd2e46d71e7d3e3c005a4c741f8289f0c93c43e55faf4ba1c92d4bf1810a6e5962cc847fd870588670b7cfe8bb63a1395 SHA512 13b79c21cea9f1f5ed0d269604924544b77711b0d0bc597c4d8894b02140b58e9b01498a41c5e603b0fcc521c91fe846eb3526e3e5dd9cad84288910f88aaf07
 MISC metadata.xml 316 BLAKE2B ad191b52b75273728dec1af289e8df2ee7d538cde7dd30b2c8facd2623a6984de090356891a9e9f992d99da4bff9ae48be15bc7257987e8b6419fe8beaa979d9 SHA512 46972dae3e0d778f11af43101b50944f9edd850d1e7eecca9f5bf08c4db438dd53415348f61b85f37f788435410867e61bb516960d4ceb6edb8e88fde71cb243
diff --git a/dev-util/visualvm/files/visualvm-r2.conf b/dev-util/visualvm/files/visualvm-r2.conf
deleted file mode 100644
index 214cb55b8674..000000000000
--- a/dev-util/visualvm/files/visualvm-r2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Default user directory
-visualvm_default_userdir="${HOME}/.visualvm"
-visualvm_default_cachedir="${HOME}/.cache/visualvm"
-
-# Default runtime options
-visualvm_default_options="-J-client -J-Xms24m -J-Xmx768m -J-Dnetbeans.accept_license_class=org.graalvm.visualvm.modules.startup.AcceptLicense -J-Dnetbeans.importclass=org.graalvm.visualvm.modules.startup.ImportSettings -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J-Dorg.netbeans.core.TimeableEventQueue.quantum=360000 -J-Dpolyglot.js.nashorn-compat=true -J-Dsun.misc.URLClassPath.disableJarChecking=true -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions"
-
-# JDK home
-visualvm_jdkhome="$(java-config -O)"
diff --git a/dev-util/visualvm/visualvm-2.0.7.ebuild b/dev-util/visualvm/visualvm-2.0.7.ebuild
deleted file mode 100644
index 001ed43cc6e0..000000000000
--- a/dev-util/visualvm/visualvm-2.0.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-NBV=113
-NBT=27102020
-NBZ=nb${NBV}_platform_${NBT}.zip
-
-inherit java-pkg-2 java-ant-2 desktop
-
-DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
-HOMEPAGE="https://visualvm.github.io"
-
-# Netbeans plattform is already included in the main archive this time
-#    SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-#       https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ}"
-SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-# it does not compile with java 11
-DEPEND="
-	virtual/jdk:1.8"
-
-S="${WORKDIR}/${P}/${PN}"
-
-QA_PREBUILT="
-	/usr/share/visualvm/platform/modules/lib/amd64/linux/libjnidispatch-nb.so
-	/usr/share/visualvm/cluster/lib/deployed/jdk1[56]/linux-amd64/libprofilerinterface.so
-"
-
-EANT_BUILD_TARGET=build
-INSTALL_DIR=/usr/share/${PN}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}" || die
-	# unpack ${NBZ}
-	unpack "${S}"/"${NBZ}"  # archive is included in the main archive
-}
-
-src_prepare() {
-	default
-
-	# Remove unneeded binaries
-	rm -rv netbeans/platform/lib/*.{dll,exe} \
-		netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
-	find libs.profiler/lib.profiler/release/lib/deployed/jdk1? -mindepth 1 \
-		-maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
-}
-
-src_install() {
-	# this is the visualvm cluster
-	insinto ${INSTALL_DIR}
-	doins -r build/cluster netbeans/{harness,platform}
-
-	# configuration file that can be used to tweak visualvm startup parameters
-	insinto /etc/${PN}
-	newins "${FILESDIR}"/${PN}-r2.conf ${PN}.conf
-
-	# visualvm runtime script
-	newbin "${FILESDIR}"/${PN}-r2.sh ${PN}
-
-	# makes visualvm entry
-	make_desktop_entry ${PN} VisualVM java "Development;Java;"
-}
diff --git a/dev-util/visualvm/visualvm-2.1.ebuild b/dev-util/visualvm/visualvm-2.1.ebuild
index d72289ba971a..a89ec0c061aa 100644
--- a/dev-util/visualvm/visualvm-2.1.ebuild
+++ b/dev-util/visualvm/visualvm-2.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="7"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=virtual/jre-1.8:*"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index fdc43f4fedb0..b6aa376f60c0 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-sizer/Manifest b/dev-vcs/git-sizer/Manifest
new file mode 100644
index 000000000000..90b977633f8b
--- /dev/null
+++ b/dev-vcs/git-sizer/Manifest
@@ -0,0 +1,20 @@
+DIST git-sizer-1.4.0.tar.gz 40928 BLAKE2B 97ed9042b2c4cd44f11a6cd2dde072855bc84c2a8208eb2ffc9fffe64a083289b7917618a65819d90233d3fad51c6c560f295f1525605f745f6aeb05c0807c74 SHA512 4ef10ab9b01e3228a6899972a4964d9fb0a5ea4b8f1516f3753cb92f12de346a95908046a89b491fa766afd262c1befd15d7f5654701afb31faa1db07b0c96f4
+DIST github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.mod 40 BLAKE2B 7ab19e087a8058fa51d0e17ecfe123b7187acfddc96633385d54e68cd4522de69b5005da6f6f47970cf92a0c1f6164c2dfd439b620fa51c0d64d13dc0945bf05 SHA512 427d6b45641cc39b572963ab5d482860e50d5727ea8591598787d0bcdf00ca5cb12d24dd28bbbac45855f38d07d07bc686af5276f75ff5b0f6fc94eaffce150a
+DIST github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.zip 6901 BLAKE2B fefb4882a93946812fc98c20dbb38cc8172fd207742552d233f3a3076de1da102a58188662e14bb86cb1b1b1ff50b898e0642f151c42f3cb13eb19d02e83cd14 SHA512 7b037e25dcc46063606f753e419143a8baa19a817fead39f7322370f8f4cc8abb3937c8790db85799d8a86582c0dbd9e7f2ef74408d837ecc646f23bec2bc6ad
+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%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%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+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 gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 39844 BLAKE2B b3dab69dbd1ebb999938c12595de7007dce9431cfeaeb5e77aba80c49918d1a4edf7fb95279e9b66686cb45deaf57a011c083e55fb66ec2c614582ba323954da SHA512 97c96a92ec86372c2f06141c30bceaa86ed62c1db34696f9542f43f3411cb0a37dea654de923a5ee054e603198179b9048e3b477da140e4092ffadc4525b9241
+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.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920
+EBUILD git-sizer-1.4.0.ebuild 1447 BLAKE2B eb626c9cf9f2213313a879b5ee7f8050101cfaa45173a00b7a7bd124c88220c29d333bcf06983bf7a23085af9f8bcd0ab9aa8cd174589a78b7379920d84d1943 SHA512 72e11fc52c2c46f98db1473641ddbd22a4ccb91457a0ed57b657e6d9962a747ac33322d44c503f7ca55ad677c889c0608d40144bdc9ff39345253a5f0bd3a2ad
+MISC metadata.xml 303 BLAKE2B 678339128ac8fe579ba728fb45ed61cfceb1519995839c5d08c1050cc675e2fa64d5a3d9fd26f052e4ae5c05f7866b47b6e161662c0effb603be7d169b020bac SHA512 826406926ab62ed40812807d885b201e31ece9bfa97cabf10b374a9f9c230716c0688dd996b55e8ddb5a998e3cd5d575de12a8393cad07261d85b0b691249906
diff --git a/dev-vcs/git-sizer/git-sizer-1.4.0.ebuild b/dev-vcs/git-sizer/git-sizer-1.4.0.ebuild
new file mode 100644
index 000000000000..c6754888f716
--- /dev/null
+++ b/dev-vcs/git-sizer/git-sizer-1.4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+EGO_SUM=(
+	"github.com/cli/safeexec v1.0.0"  # BSD-2
+	"github.com/cli/safeexec v1.0.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"  # ISC
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"  # BSD
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.5"  # BSD
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"  # MIT
+	"github.com/stretchr/testify v1.4.0"  # MIT
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"  # BSD-2
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.7"  # Apache-2.0
+	"gopkg.in/yaml.v2 v2.2.7/go.mod"
+)
+go-module_set_globals
+
+DESCRIPTION="Compute various size metrics for a Git repository"
+HOMEPAGE="https://github.com/github/git-sizer"
+SRC_URI="https://github.com/github/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT Apache-2.0 BSD BSD-2 ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"  # tests work only in git repo
+
+RDEPEND="dev-vcs/git"
+
+src_compile() {
+	emake GOFLAGS="${GOFLAGS} -ldflags=-X=main.BuildVersion=v${PV}"
+}
+
+src_install() {
+	dobin bin/git-sizer
+	dodoc README.md CONTRIBUTING.md
+}
diff --git a/dev-vcs/git-sizer/metadata.xml b/dev-vcs/git-sizer/metadata.xml
new file mode 100644
index 000000000000..e302d8462331
--- /dev/null
+++ b/dev-vcs/git-sizer/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ulm@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">github/git-sizer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 03b0cecc0296..f6388b456804 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -119,7 +119,7 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST zstd-0.5.3+zstd.1.4.5.crate 26013 BLAKE2B 033e839622b8403268a1a98c2f525b4f6dc624378e64fd644e09cd1b11a8751c1097f134a5f40793a8a6b57635ad28ba3534dfc48e7ec818873dd4819311c80b SHA512 cb6d2adbb3d400ffec19ce7c942b47a0e5826ed62bb8de195b0e8817b4a1e00c1569a080457452180cf869b7bd99fdb150e4a981a992f977b2dbd03eb5a073ff
 DIST zstd-safe-2.0.5+zstd.1.4.5.crate 9002 BLAKE2B bf92884b629d5685dd563e481e63c67dd4c6aff52a402e0ec4f675cb40dad1f9e5ab675b45d4f326bfd0f75a22673ad8538b2924c4bb6220cb1fe23fce2262fe SHA512 cb4b33059da628e103a0fc9a83217fe96f5201cc9db0572b3c2d102b181dc29c346aea12ddec902ecf36886fcb6a2177155791d00ee2fbb267ddf84a48d3c2c6
 DIST zstd-sys-1.4.17+zstd.1.4.5.crate 2046794 BLAKE2B 40584094797d4cc479cff9d1b89abd1f7e800f774725dc03c531b67078027d5b82464984d4e2a76cabcd9d336234d245f93692d0111e2469ef21ca1ea6260d77 SHA512 89439b20e4e0bce6455d982fb7467c45436ee68572395db662d056eb2e09e95ad600947bf11c27ba60b161c2e2511e04cac8dcfacc5f85fcf9222d4a206bdc30
-EBUILD mercurial-5.8.1.ebuild 6567 BLAKE2B 2dcce7d10b14de07c75121905e7a350f3e634efa8c4ece5864bb062635045930f9b1aea928c38dd3fd280a600b3274e865370a92ebb10abcc9346ffa97f8b34a SHA512 8875884de5a50eaceb45ad82bed02275eae4ae0fff6c348e13885580dea9d03446c5101e436c072943a76a9f0c65f23f1fef652c947646e90b25d4a53a591025
+EBUILD mercurial-5.8.1.ebuild 6573 BLAKE2B db6593d8feeb6697eb8756008488629d637f6f54ae424b204012dcbbec25a822d7ee15141a3c0f8df1c39e98c041f7c3eee4708933add8d8cdb6532f570fe45e SHA512 7ecd993c98396298810f1fc4d1aea0c08ccd949ecd1e8805958525e996db7ffc3c24d57909d9b8510794b4037d31286f5923595288adc6df9d6d9d81278f0fd1
 EBUILD mercurial-5.8.ebuild 6725 BLAKE2B 58728901788b4055ca9283ecdad0bb1225baa98ae814c5807ed3bd2fb77100f2ba2e6678630bbc4736e9522254bd3098bcce5f0aa764d35f7187ed65fd958171 SHA512 570f8c6b535bc7d8d68da878f179388c15a75a6edb37ef4e0de0e78ef7ceaf32452ea603624ad980fb0f9bbbb32cc610f0e84897927ccc3351345ecc0961a67d
 EBUILD mercurial-9999.ebuild 4246 BLAKE2B 0e975acf5ad01cf1ff7fcba3e7ddf8a21752d72a35faf7cdee242f3dd579b48b7ecb8c745bb5da4fc713f4222ea2bb9c59134477723c2a4960a33148fea8ddb0 SHA512 0347db61939c870577c2beb0a67e6451d359cc7ba43c4a7217e0904680b90148a5d0093137c683333e6abce95623e13d8b9cc21c4112ef77c0e7de2600c4a079
 MISC metadata.xml 531 BLAKE2B a9536112ae921c160f7ac8535c50cb25743fa72bfa92529874eb5888c7d968d68080e4516c531143870cefdc7d78efa7e816b042c540bd0c7785a34dfcc133f9 SHA512 ee4dae2ce506e6c5968f1d917e43839366eefec2ba7ad3119b8a61ee527449fbeb87b51bea2b826ef184bfa322825b4e8bf7693d26d063e117773ac9d15fbc08
diff --git a/dev-vcs/mercurial/mercurial-5.8.1.ebuild b/dev-vcs/mercurial/mercurial-5.8.1.ebuild
index f189a3abc49a..2fffa7f4bcff 100644
--- a/dev-vcs/mercurial/mercurial-5.8.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.8.1.ebuild
@@ -137,7 +137,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz
 LICENSE="GPL-2+
 	rust? ( BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 ISC MIT PSF-2 Unlicense )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+chg emacs gpg test tk rust"
 
 BDEPEND="rust? ( ${RUST_DEPEND} )"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index c1b18d88ee20..900de55148fa 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index f94dd9c43982..58e0bae94eee 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -583,6 +583,7 @@ if [[ ${ETYPE} == sources ]]; then
 	[[ ${EAPI} == 6 ]] && DEPEND="!build? ( sys-apps/sed )" ||
 	BDEPEND="!build? ( sys-apps/sed )"
 	RDEPEND="!build? (
+		app-arch/cpio
 		dev-lang/perl
 		sys-devel/bc
 		sys-devel/bison
@@ -604,8 +605,12 @@ if [[ ${ETYPE} == sources ]]; then
 			[[ -z ${K_DEBLOB_AVAILABLE} ]] && \
 				kernel_is le 2 6 ${DEBLOB_MAX_VERSION} && \
 					K_DEBLOB_AVAILABLE=1
+		# deblob less than 5.10 require python 2.7
+		if kernel_is lt 5 10; then
+			K_DEBLOB_AVAILABLE=0
+		fi
 		if [[ ${K_DEBLOB_AVAILABLE} == 1 ]]; then
-			PYTHON_COMPAT=( python2_7 )
+			PYTHON_COMPAT=( python3_{7..10} )
 
 			inherit python-any-r1
 
diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index e87c5ec0cdb3..7e47a2e209d5 100644
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -741,7 +741,7 @@ linux-mod_src_install() {
 
 		einfo "Installing ${modulename} module"
 		cd "${objdir}" || die "${objdir} does not exist"
-		insinto /lib/modules/${KV_FULL}/${libdir}
+		insinto "${INSTALL_MOD_PATH}"/lib/modules/${KV_FULL}/${libdir}
 		doins ${modulename}.${KV_OBJ} || die "doins ${modulename}.${KV_OBJ} failed"
 		cd "${OLDPWD}"
 
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index bc5928d33140..2765fc46081f 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -6,7 +6,7 @@
 # qt@gentoo.org
 # @AUTHOR:
 # Davide Pesavento <pesa@gentoo.org>
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Eclass for Qt5 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt5.
@@ -16,10 +16,20 @@ if [[ ${CATEGORY} != dev-qt ]]; then
 fi
 
 case ${EAPI} in
-	7) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
+# @ECLASS-VARIABLE: QT5_BUILD_TYPE
+# @DESCRIPTION:
+# Default value is "release".
+# If PV matches "*9999*", this is automatically set to "live".
+QT5_BUILD_TYPE=release
+if [[ ${PV} == *9999* ]]; then
+	QT5_BUILD_TYPE=live
+fi
+readonly QT5_BUILD_TYPE
+
 # @ECLASS-VARIABLE: QT5_MODULE
 # @PRE_INHERIT
 # @DESCRIPTION:
@@ -27,6 +37,13 @@ esac
 # SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass.
 : ${QT5_MODULE:=${PN}}
 
+# @ECLASS-VARIABLE: _QT5_P
+# @INTERNAL
+# @DESCRIPTION:
+# The upstream package name of the module this package belongs to.
+# Used for SRC_URI and S.
+_QT5_P=${QT5_MODULE}-everywhere-src-${PV}
+
 # @ECLASS-VARIABLE: QT5_TARGET_SUBDIRS
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -59,41 +76,17 @@ esac
 
 inherit estack flag-o-matic toolchain-funcs virtualx
 
-HOMEPAGE="https://www.qt.io/"
-LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
-SLOT=5/$(ver_cut 1-2)
-
-QT5_MINOR_VERSION=$(ver_cut 2)
-readonly QT5_MINOR_VERSION
-
-case ${PV} in
-	5.??.9999)
-		# git stable branch
-		QT5_BUILD_TYPE="live"
-		EGIT_BRANCH=${PV%.9999}
-		;;
-	*_alpha*|*_beta*|*_rc*)
-		# development release
-		QT5_BUILD_TYPE="release"
-		MY_P=${QT5_MODULE}-everywhere-src-${PV/_/-}
-		SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
-		S=${WORKDIR}/${MY_P}
-		;;
-	*)
+if [[ ${PN} != qtwebengine ]]; then
+	if [[ ${QT5_BUILD_TYPE} == live ]] || [[ -n ${KDE_ORG_COMMIT} ]]; then
+		# KDE Qt5PatchCollection
+		inherit kde.org
+	else
 		# official stable release
-		QT5_BUILD_TYPE="release"
-		MY_P=${QT5_MODULE}-everywhere-src-${PV}
-		SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
-		S=${WORKDIR}/${MY_P}
-		;;
-esac
-readonly QT5_BUILD_TYPE
-
-EGIT_REPO_URI=(
-	"https://code.qt.io/qt/${QT5_MODULE}.git"
-	"https://github.com/qt/${QT5_MODULE}.git"
-)
-[[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3
+		HOMEPAGE="https://www.qt.io/"
+		SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${_QT5_P}.tar.xz"
+		S=${WORKDIR}/${_QT5_P}
+	fi
+fi
 
 # @ECLASS-VARIABLE: QT5_BUILD_DIR
 # @OUTPUT_VARIABLE
@@ -101,6 +94,8 @@ EGIT_REPO_URI=(
 # Build directory for out-of-source builds.
 : ${QT5_BUILD_DIR:=${S}_build}
 
+LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
+SLOT=5/$(ver_cut 1-2)
 IUSE="debug test"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
@@ -119,30 +114,7 @@ fi
 
 ######  Phase functions  ######
 
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm
-
-# @FUNCTION: qt5-build_src_unpack
-# @DESCRIPTION:
-# Unpacks the sources.
-qt5-build_src_unpack() {
-	# bug 307861
-	if [[ ${PN} == qtwebengine ]]; then
-		eshopts_push -s extglob
-		if is-flagq '-g?(gdb)?([1-9])'; then
-			ewarn
-			ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
-			ewarn "You may experience really long compilation times and/or increased memory usage."
-			ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
-			ewarn
-		fi
-		eshopts_pop
-	fi
-
-	case ${QT5_BUILD_TYPE} in
-		live)    git-r3_src_unpack ;&
-		release) default ;;
-	esac
-}
+EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm
 
 # @FUNCTION: qt5-build_src_prepare
 # @DESCRIPTION:
@@ -150,6 +122,15 @@ qt5-build_src_unpack() {
 qt5-build_src_prepare() {
 	qt5_prepare_env
 
+	if [[ -n ${KDE_ORG_COMMIT} ]]; then
+		# Upstream bumped version in 5.15 branch after 5.15.2 release but their
+		# 5.15.3 release is closed and this will never be more than a Qt 5.15.2
+		# with patches on top.
+		einfo "Preparing KDE Qt5PatchCollection snapshot at ${KDE_ORG_COMMIT}"
+		sed -e "/^MODULE_VERSION/s/5\.15\.3/5\.15\.2/" -i .qmake.conf || die
+		mkdir -p .git || die # need to fake a git repository for configure
+	fi
+
 	if [[ ${QT5_MODULE} == qtbase ]]; then
 		qt5_symlink_tools_to_build_dir
 
@@ -258,22 +239,23 @@ qt5-build_src_install() {
 			"${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \
 			|| die "sed failed (qconfig.h)"
 
-		# install qtchooser configuration file
-		cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die
-			${QT5_BINDIR}
-			${QT5_LIBDIR}
-		_EOF_
-
-		(
-			insinto /etc/xdg/qtchooser
-			doins "${T}/qt5-${CHOST}.conf"
-		)
-
-		# convenience symlinks
-		dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf
-		dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf
-		# TODO bug 522646: write an eselect module to manage default.conf
-		dosym qt5.conf /etc/xdg/qtchooser/default.conf
+		if ver_test -lt 5.15.2-r10; then
+			# install qtchooser configuration file
+			cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die
+				${QT5_BINDIR}
+				${QT5_LIBDIR}
+			_EOF_
+
+			(
+				insinto /etc/xdg/qtchooser
+				doins "${T}/qt5-${CHOST}.conf"
+			)
+
+			# convenience symlinks
+			dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf
+			dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf
+			dosym qt5.conf /etc/xdg/qtchooser/default.conf
+		fi
 	fi
 
 	qt5_install_module_config
@@ -647,9 +629,11 @@ qt5_base_configure() {
 
 	# a forwarding header is no longer created since 5.8, causing the system
 	# config to always be used. bug 599636
-	# ${S}/include does not exist in live sources
+	# ${S}/include does not exist in live sources or kde.org snapshots
 	local basedir="${S}/"
-	[[ ${QT5_BUILD_TYPE} == live ]] && basedir=""
+	if [[ ${QT5_BUILD_TYPE} == live ]] || [[ -n ${KDE_ORG_COMMIT} ]]; then
+		basedir=""
+	fi
 	cp src/corelib/global/qconfig.h "${basedir}"include/QtCore/ || die
 
 	popd >/dev/null || die
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index a3d43fcc9edc..52a2ea389619 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/atanks/Manifest b/games-action/atanks/Manifest
index 288e454aad35..658076923468 100644
--- a/games-action/atanks/Manifest
+++ b/games-action/atanks/Manifest
@@ -1,6 +1,4 @@
 AUX atanks-6.4-fix-build-system.patch 579 BLAKE2B 002bbbbba9981e010669f5b85cccb48816d35f1dfde0a35ef9c6cb1634cc75686b531572fa0c2163f78d49e56f15375b4cc0810798adb56b91e51e877ca3b279 SHA512 86b046c37de4ff24f30dce799f32674d33930605c9da32a1c95e8438f6573e66f46455cbf371f66a1b4d8240c608dd338376be150bab59d4048bb46326f82daa
-DIST atanks-6.5.tar.gz 6059648 BLAKE2B 8a5c3e77391d0e7b3dc8170f49e2cd24fb31eda6f29362851d29eba5dc10748d2b95bfb688771fbbdaac4aada253f06c5ce4064e293335ef59cc8accc43a64a0 SHA512 cb1456e06132da754ae5d9926e118ecb8ac7789747f0a3273bcb49311d79824610bb9cfc74fbba8c75bbefe905d63ae2e01d193ccb37a64759f5490328c8cc89
 DIST atanks-6.6.tar.gz 6220197 BLAKE2B ea9cd2ec736a2fb3f500cb8964a60549b1d28801b0b7c5ea742b3c6c18515df8c9dc6da95119a0d0fbcda2b61384737bd2402451cd7a223f31e69503c5d09da0 SHA512 dac0ef961bffda5e0f8b65d4cbbd46c2a93baea06a3cd453a5295491feda69781deb7a868fac11ffdfc29e9e2c5bbea11a309ea1af8d05e794ab184750a686f9
-EBUILD atanks-6.5.ebuild 769 BLAKE2B ae05f7af473380ea3fce2cdde1b0723bd7381843499951137168a795a92a801d0b19853e9eb56b7eef5e1610849ac75423d26aac0f890092c1fa6eef5ec5d25a SHA512 d0c9536e99e970be9f0bd99cac1f3fa3f620d6c06e823765b49f9f4567a670ca29cedbb6f0a91f827aa567fbb63b726ba7ae59000325097b57c73af2fe1b8a31
 EBUILD atanks-6.6.ebuild 769 BLAKE2B ae05f7af473380ea3fce2cdde1b0723bd7381843499951137168a795a92a801d0b19853e9eb56b7eef5e1610849ac75423d26aac0f890092c1fa6eef5ec5d25a SHA512 d0c9536e99e970be9f0bd99cac1f3fa3f620d6c06e823765b49f9f4567a670ca29cedbb6f0a91f827aa567fbb63b726ba7ae59000325097b57c73af2fe1b8a31
 MISC metadata.xml 329 BLAKE2B 7a85aeb104fe2068285701ff8f771f7337a7b5f884b33e683206be3d66aca6e1fbfc611b312e71288ec842c28790bf025b979235677387d72070aa85f0bf0adc SHA512 1dc2914fc7dfe5c7f87ac565b6183b50d281fdf768e05cf211309699a264fde8a3e434ed07049b984e6f116256fec2124ed458ccfc70374ff35ff3189ec57917
diff --git a/games-action/atanks/atanks-6.5.ebuild b/games-action/atanks/atanks-6.5.ebuild
deleted file mode 100644
index 0c043402a9a0..000000000000
--- a/games-action/atanks/atanks-6.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Worms and Scorched Earth-like game"
-HOMEPAGE="https://atanks.sourceforge.io/"
-SRC_URI="mirror://sourceforge/atanks/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="media-libs/allegro:0[X]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.4-fix-build-system.patch
-)
-
-src_compile() {
-	tc-export CXX
-
-	emake INSTALLDIR="${EPREFIX}/usr/share/${PN}"
-}
-
-src_install() {
-	dobin ${PN}
-
-	dodoc Changelog README TODO
-
-	insinto /usr/share/${PN}
-	doins -r button misc missile sound stock tank tankgun text title unicode.dat *.txt
-
-	doicon ${PN}.png
-	make_desktop_entry atanks "Atomic Tanks"
-}
diff --git a/games-action/beathazardultra/Manifest b/games-action/beathazardultra/Manifest
index a45ae064839e..e1a07eba43fe 100644
--- a/games-action/beathazardultra/Manifest
+++ b/games-action/beathazardultra/Manifest
@@ -1,3 +1,3 @@
 DIST beathazard-installer_03-08-13 183569201 BLAKE2B 769fffbfc752d9c924c26a0fab347297087787d4eb665440fd3aed1c315a6f93f8e0526dbe62219b6aff2bb6ad1b7d7a5ccdc16663e9ea32671ec5c28fc12ebb SHA512 273f550034473d43ac4ceb41018b540f6518393606249de490642a4e6f0dfb5f0b860d3a633db0f90f3b9fce1dc156cf4bd80d383f7e6eae91a5e7bd9e9427d4
-EBUILD beathazardultra-20130308-r2.ebuild 1804 BLAKE2B aed596870c7d119f88da433b85ebe4a005505e1b50f26238b9ccbe90ea0c13d237be4b5dab5e922d7e057287b336567b5da7a00ce789c06c89a1163f5b21b66c SHA512 abe98dd50609c92c758e914689a59adaa6ab1770dbe4e7e73b78c0b10acb5854e98dd5f51ac299f083033a26264361254acd6b2c7a7b98cab1faa527e21cf2ef
+EBUILD beathazardultra-20130308-r2.ebuild 1802 BLAKE2B c90bee8a3036ad08e4eb4d147199275aeb9d703e1a5559886cd9535eb89c974b12fc11d15615cf03f8b265a6e15ce989a008186ffbe8af524d52a7176756a19f SHA512 b01e154e294547fd43fb2de680a251e5166c4e49efa85d7cde0d19d9e8285ae58b4503b8a02bd28f20a2b148e84d5b0d78db3d03910fcb3b08cc52337ace5bf2
 MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-action/beathazardultra/beathazardultra-20130308-r2.ebuild b/games-action/beathazardultra/beathazardultra-20130308-r2.ebuild
index 514e0517d6aa..0e9ccb93a7b9 100644
--- a/games-action/beathazardultra/beathazardultra-20130308-r2.ebuild
+++ b/games-action/beathazardultra/beathazardultra-20130308-r2.ebuild
@@ -18,8 +18,8 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
 
 RESTRICT="bindist fetch splitdebug"
-QA_PREBUILT="/opt/${PN}/BeatHazard_Linux2
-	/opt/${PN}/hge_lib/*"
+QA_PREBUILT="opt/${PN}/BeatHazard_Linux2
+	opt/${PN}/hge_lib/*"
 
 BDEPEND="app-arch/unzip"
 RDEPEND="
diff --git a/games-action/crimsonland/Manifest b/games-action/crimsonland/Manifest
index 40f7dce7f846..8f630394ec10 100644
--- a/games-action/crimsonland/Manifest
+++ b/games-action/crimsonland/Manifest
@@ -1,3 +1,3 @@
 DIST Crimsonland-Linux-x86-1.3.5.tar 58620320 BLAKE2B c67f132390e1a1b9a1697e877370f91603d558ddba717608a7f3709bb8395fe5017f598dfed82312f670ed510e4bb307df77978769776de184d5ce72d8792a6e SHA512 14faeeeba2326ece9a88b32442f5c65e3aec8c0a6e7a486a034d2684a8a6bb9059a25c574cc6d8cb798733e5ecd1db8ad25b610ec1d1177c4ec6493f02953e06
-EBUILD crimsonland-1.3.5.ebuild 1073 BLAKE2B ef6b013a425e117b7cd5b6d5cbe0dfd2f7def6a7d97a69652fc0b3b6806b4d46e5af5dfa361c68dbb13f8b28d11250238a0eb7c7456acf0e98bfaa1fd736da87 SHA512 b9e80c553e3e7d34e886b9fa0e6ddb030294b445034e7d8111381a451d42cfc2f0b2fadd9cd8d8a1e9e322cb79b8a351d095fbee6aad6ec6efa1fd0fc66ca499
+EBUILD crimsonland-1.3.5.ebuild 986 BLAKE2B e9c2a91923bf8a4a8419b9a8939ef0d0f83e87470d359b44741624a9e8bcd441f4af828d3f6b9915d6050ebf72a0d0974bbd4cf6dcda7215e8d1c744af6c992e SHA512 f124c7dfe990d01cbc5fa046e66723d93c9d5946ee12923dbcd67c513bcbdc64e5a1ec65a009a39e18eee2d1d606acf76c04bc1bdddb12a6fbb2efa2a1402e2d
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/crimsonland/crimsonland-1.3.5.ebuild b/games-action/crimsonland/crimsonland-1.3.5.ebuild
index dc1f260f4e82..5017737b2b0c 100644
--- a/games-action/crimsonland/crimsonland-1.3.5.ebuild
+++ b/games-action/crimsonland/crimsonland-1.3.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop wrapper xdg-utils
+inherit desktop wrapper xdg
 
 DESCRIPTION="A top-down shooter with a touch of RPG"
 HOMEPAGE="https://crimsonland.com/"
@@ -22,7 +22,7 @@ RDEPEND="
 "
 
 DIR="/opt/${PN}"
-QA_PREBUILT="${DIR}/*"
+QA_PREBUILT="${DIR#/}/*"
 
 pkg_nofetch() {
 	einfo "Please buy and download ${SRC_URI} from:"
@@ -40,9 +40,6 @@ src_install() {
 
 	dodoc README.txt
 
-#	doicon -s 64 "${DISTDIR}"/${PN}.png
+	#doicon -s 64 "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN} Crimsonland applications-games
 }
-
-pkg_postinst() { xdg_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/games-action/descent3-demo/Manifest b/games-action/descent3-demo/Manifest
index f29ce0c0a82a..773710dca819 100644
--- a/games-action/descent3-demo/Manifest
+++ b/games-action/descent3-demo/Manifest
@@ -1,3 +1,3 @@
 DIST descent3-demo.run 45118289 BLAKE2B 7e64f03aa6cf75839d1eddf0116686c9d2a121f69a764cf416695455008b608579449ab7458177a2be11910ad361f707501153749d5c8b58dacc36e338251c1c SHA512 8f5e790257d0477e4238aae8fb5b4b1f21e23f188775cb53a5197baf0c174017d821e3a8dd696f9c0fd27838e08cff4bde0d6f5a9dca87a7e8af29cdc627d29c
-EBUILD descent3-demo-1.4.0a-r1.ebuild 1694 BLAKE2B 10b66347bc17656269a09b3206efe29ea1fff30762c552cdf65ab98788488824643b8f76a5b888d278216651b3dabe43f0122d1b58fd82800a77e98bc25c4eee SHA512 8b7b3a2742965809f59d53598346621b74d4208c8832470f8da53294a47a1c32b44fce6b26e98e9b2bf9a9f137dcad94c4547480448a5ecc9b14797dcccc503c
+EBUILD descent3-demo-1.4.0a-r2.ebuild 1700 BLAKE2B 7b27344c4f143a0e82074aac7d180b9e423295d26e4fbe8153f974071b68973114a4ba9db641403370a9e12c557df4840f88d3f0ff68f41a3f2120ff0c79a899 SHA512 78d097278c095271c95c2c79d4f8989b954b48f65954bd94f0aaa497bf6bd09b6d6d5f3e23aa555f03a79eb62552498a58df16f14104727f6af3bb87a9f96d41
 MISC metadata.xml 674 BLAKE2B 55ee8a8a4dddfca143c66a762de971984fcea130d085eb0f1d97d51eaa41e439cbbba1787a8700cf1018dd065a7126e1e206a7ea079bf6ed650905cd6c61580a SHA512 44cd0adf66a791a20af8eda38f8a7adef9aaeaf74b5a3db388d33efaec4bc14781ad9c8697fdbd18a2ff2188f848601409631b02537589bbae9eb9d8d0c5792f
diff --git a/games-action/descent3-demo/descent3-demo-1.4.0a-r1.ebuild b/games-action/descent3-demo/descent3-demo-1.4.0a-r1.ebuild
deleted file mode 100644
index c0be84464d16..000000000000
--- a/games-action/descent3-demo/descent3-demo-1.4.0a-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop unpacker wrapper xdg
-
-DESCRIPTION="Indoor/outdoor 3D combat with evil robotic mining spacecraft"
-HOMEPAGE="http://www.lokigames.com/products/descent3/"
-SRC_URI="mirror://lokigames/loki_demos/${PN}.run"
-S="${WORKDIR}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa pulseaudio"
-REQUIRED_USE="?? ( alsa pulseaudio )"
-
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	sys-libs/glibc
-	>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-	alsa? ( media-libs/alsa-oss[abi_x86_32(-)] )
-	pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )
-"
-BDEPEND="games-util/loki_patch"
-
-dir="opt/${PN}"
-QA_PREBUILT="
-	${dir}/descent3_demo.x86
-	${dir}/netgames/*.d3m
-"
-
-src_install() {
-	local \
-		snd= \
-		demo="data/demos/descent3_demo" \
-		exe="descent3_demo.x86"
-
-	loki_patch patch.dat data/ || die
-
-	insinto ${dir}
-	exeinto ${dir}
-	doins -r "${demo}"/*
-	doexe "${demo}/${exe}"
-
-	# Required directory
-	keepdir "${dir}"/missions
-
-	# Fix for 2.6 kernel crash, bug #151148
-	dosym ppics.hog "${dir}"/PPics.Hog
-
-	if use alsa; then
-		snd="aoss "
-	elif use pulseaudio; then
-		snd="env LD_PRELOAD=\"${EPREFIX}/usr/$(ABI=x86 get_libdir)/pulseaudio/libpulsedsp.so\" "
-	fi
-
-	make_wrapper ${PN} "${snd}./${exe} -G -o" "${dir}"
-	newicon "${demo}"/launch/box.png ${PN}.png
-	make_desktop_entry ${PN} "Descent 3 (Demo)"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "To play the game run:"
-	elog " descent3-demo"
-	elog
-	elog "If the game appears blank, then run it windowed with:"
-	elog " descent3-demo -w"
-}
diff --git a/games-action/descent3-demo/descent3-demo-1.4.0a-r2.ebuild b/games-action/descent3-demo/descent3-demo-1.4.0a-r2.ebuild
new file mode 100644
index 000000000000..b23a9ee52d79
--- /dev/null
+++ b/games-action/descent3-demo/descent3-demo-1.4.0a-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop unpacker wrapper xdg
+
+DESCRIPTION="Indoor/outdoor 3D combat with evil robotic mining spacecraft"
+HOMEPAGE="http://www.lokigames.com/products/descent3/"
+SRC_URI="mirror://lokigames/loki_demos/${PN}.run"
+S="${WORKDIR}"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa pulseaudio"
+REQUIRED_USE="?? ( alsa pulseaudio )"
+
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	sys-libs/glibc
+	>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	alsa? ( media-libs/alsa-oss[abi_x86_32(-)] )
+	pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )
+"
+BDEPEND="games-util/loki_patch"
+
+dir="/opt/${PN}"
+QA_PREBUILT="
+	${dir#/}/descent3_demo.x86
+	${dir#/}/netgames/*.d3m
+"
+
+src_install() {
+	local \
+		snd= \
+		demo="data/demos/descent3_demo" \
+		exe="descent3_demo.x86"
+
+	loki_patch patch.dat data/ || die
+
+	insinto ${dir}
+	doins -r "${demo}"/*
+
+	exeinto ${dir}
+	doexe "${demo}/${exe}"
+
+	# Required directory
+	keepdir "${dir}"/missions
+
+	# Fix for 2.6 kernel crash, bug #151148
+	dosym ppics.hog "${dir}"/PPics.Hog
+
+	if use alsa; then
+		snd="aoss "
+	elif use pulseaudio; then
+		snd="env LD_PRELOAD=\"${EPREFIX}/usr/$(ABI=x86 get_libdir)/pulseaudio/libpulsedsp.so\" "
+	fi
+
+	make_wrapper ${PN} "${snd}./${exe} -G -o" "${dir}"
+	newicon "${demo}"/launch/box.png ${PN}.png
+	make_desktop_entry ${PN} "Descent 3 (Demo)"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "To play the game run:"
+	elog " descent3-demo"
+	elog
+	elog "If the game appears blank, then run it windowed with:"
+	elog " descent3-demo -w"
+}
diff --git a/games-action/heretic2-demo/Manifest b/games-action/heretic2-demo/Manifest
index f89bbff60696..d78d3e51d0ce 100644
--- a/games-action/heretic2-demo/Manifest
+++ b/games-action/heretic2-demo/Manifest
@@ -1,3 +1,3 @@
 DIST heretic2-demo.run 55065564 BLAKE2B d4d2e3383a14633d215f4cc7c979dc737e56a743998f10b36d0b9cbc3787df86cc0943802ce700e2123791f9d44cea9fd37d891b7c0562dbca1a4264e3eb48cc SHA512 62aba7b4569b76bf9a01864652da7be8e268ad3cad4eb5b986b7e84adbd88e826799d021b141f9a7a1135520e440de4ce2e57c5be6ceaa85dc08295d5e3ad30e
-EBUILD heretic2-demo-1.06a-r1.ebuild 1283 BLAKE2B da4c90835280ef16eebf792cd68cd3f3422c00f5e5c93d3a0a8be655971fab1f77db58d871309764e11df2a75fe6399b6c730a5c8329dc1566e0bd9d66594c42 SHA512 e10d05f797eb8416af72bccaf869fb8956443941d5074cb287cfd2892b565f4860d632341fdf2a1aacc0a3c8bdc0e259bb43dfc379594e7d66a14c83ff159a65
+EBUILD heretic2-demo-1.06a-r2.ebuild 1286 BLAKE2B 59c3283df680951a02c1eee7ccb09a4b809ffc6162bf2c4a13437dfcd9f1007dfb6f933955529865c9c1d50e59f3c78573a3277f7c42bbdbd8bab4a0e3356d88 SHA512 18196f70ccf3d232a203457e1c0a627baceb91c65302f5d807c5dc59955979db7c5ced54aa20a9b8a007f44614774a0347dc9691acd237dfb653e68e3b233355
 MISC metadata.xml 710 BLAKE2B 2b9f13c1ebed41739b7700016440fbc43cb798906a68cd6c6c105218db4681863ebf1d711534967abed200c4e6ff2c5f42963b01fb33b63a6a1e6311e9f76c4a SHA512 3d5b818e953410bd3b51926173604c85ea1d74d6433e5ea52866153fa9da7d4627cd18adc844e10fa54cba1d156b505dca9364b22f6fe7d2d792127fa65b4586
diff --git a/games-action/heretic2-demo/heretic2-demo-1.06a-r1.ebuild b/games-action/heretic2-demo/heretic2-demo-1.06a-r1.ebuild
deleted file mode 100644
index 7afa4b008c9e..000000000000
--- a/games-action/heretic2-demo/heretic2-demo-1.06a-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop unpacker wrapper
-
-DESCRIPTION="Third-person classic magical action-adventure game"
-HOMEPAGE="http://www.lokigames.com/products/heretic2/
-	http://www.hereticii.com/"
-SRC_URI="mirror://lokigames/loki_demos/${PN}.run"
-S="${WORKDIR}"
-
-LICENSE="LOKI-EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="strip mirror bindist"
-
-RDEPEND="
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-"
-BDEPEND="games-util/loki_patch"
-
-dir=opt/${PN}
-QA_PREBUILT="${dir}/*"
-QA_TEXTRELS="opt/heretic2-demo/ref_glx.so"
-
-src_install() {
-	ABI=x86
-
-	local demo="data/demos/heretic2_demo"
-	local exe="heretic2_demo.x86"
-
-	loki_patch patch.dat data/ || die
-
-	# Remove bad opengl library
-	rm -r "${demo}/gl_drivers/" || die
-
-	# Change to safe default of 800x600 and option of normal opengl driver
-	sed -i \
-		-e "s:fullscreen \"1\":fullscreen \"1\"\nset vid_mode \"4\":" \
-		-e "s:libGL:/usr/$(get_libdir)/libGL:" \
-		"${demo}"/base/default.cfg || die
-
-	insinto ${dir}
-	exeinto ${dir}
-	doins -r "${demo}"/*
-	doexe "${demo}/${exe}"
-
-	make_wrapper ${PN} "./${exe}" "${dir}" "${dir}"
-	newicon "${demo}"/icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Heretic 2 (Demo)" ${PN}
-}
diff --git a/games-action/heretic2-demo/heretic2-demo-1.06a-r2.ebuild b/games-action/heretic2-demo/heretic2-demo-1.06a-r2.ebuild
new file mode 100644
index 000000000000..2390903325b6
--- /dev/null
+++ b/games-action/heretic2-demo/heretic2-demo-1.06a-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop unpacker wrapper
+
+DESCRIPTION="Third-person classic magical action-adventure game"
+HOMEPAGE="http://www.lokigames.com/products/heretic2/
+	http://www.hereticii.com/"
+SRC_URI="mirror://lokigames/loki_demos/${PN}.run"
+S="${WORKDIR}"
+
+LICENSE="LOKI-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="strip mirror bindist"
+
+RDEPEND="
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+"
+BDEPEND="games-util/loki_patch"
+
+dir=/opt/${PN}
+QA_PREBUILT="${dir#/}/*"
+QA_TEXTRELS="opt/heretic2-demo/ref_glx.so"
+
+src_install() {
+	ABI=x86
+
+	local demo="data/demos/heretic2_demo"
+	local exe="heretic2_demo.x86"
+
+	loki_patch patch.dat data/ || die
+
+	# Remove bad opengl library
+	rm -r "${demo}/gl_drivers/" || die
+
+	# Change to safe default of 800x600 and option of normal opengl driver
+	sed -i \
+		-e "s:fullscreen \"1\":fullscreen \"1\"\nset vid_mode \"4\":" \
+		-e "s:libGL:/usr/$(get_libdir)/libGL:" \
+		"${demo}"/base/default.cfg || die
+
+	insinto ${dir}
+	exeinto ${dir}
+	doins -r "${demo}"/*
+	doexe "${demo}/${exe}"
+
+	make_wrapper ${PN} "./${exe}" "${dir}" "${dir}"
+	newicon "${demo}"/icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Heretic 2 (Demo)" ${PN}
+}
diff --git a/games-action/hotline-miami/Manifest b/games-action/hotline-miami/Manifest
index 4581dc31a584..7a254babdf24 100644
--- a/games-action/hotline-miami/Manifest
+++ b/games-action/hotline-miami/Manifest
@@ -1,3 +1,3 @@
 DIST HotlineMiami_linux_1392944501.tar.gz 207632875 BLAKE2B 797143724dbc8229fb538cf3f9087b2cae3c6c5c7ebb6d863d935bd720f8ee38b06c1b28741cfe216e486f5dee9c77dfca80b808a76d83fc004358ff04567be2 SHA512 d1c1b7cbb910969ae120a12d982ed2ba7c935912bdc4e72e3a42b7aeb468b33c6536f4e43f97942155656be705e060d6fe9da37b04040c6aebf81ca80300d546
-EBUILD hotline-miami-1.0.9a_p20140221-r2.ebuild 2094 BLAKE2B 119e990ce3dc046bec1d9aba468659ba4b8f7ec3a7082a00baf6870ca3b61653a8de36a752c54683a5b6564d3e2c55521deff29106dc1c62f5f6317a80ee05f9 SHA512 c7279c41a39e28811c373aa43a2abd40127c3493d96c128f2ac8a49294ef85a32328f37a6e3251e881cab0c996c6f4bb92cf15dec1a9cb7735127af42c1e9642
+EBUILD hotline-miami-1.0.9a_p20140221-r3.ebuild 2095 BLAKE2B f54ef848ac0c4d0e51693691f793931f53c4865e0006fb8238a1360596a38f57f7caed933544417104c741e227115dad8007c4cd977688a04b3c4d0c2ba542ae SHA512 10eea198fa5e244025da9f6ed485317ddb42dc04f2a78651e2302543f66fb531bf66c13a33beade179447a442aa033c823a424fe9fe64e9a4160146a13ddd444
 MISC metadata.xml 377 BLAKE2B 474a88a7fa91f1024e794536a3a006edb921744be53dca4a2fc0febeffdc5067881d9129ecd8f064b49b6cc9312dc23032aa7601076de1f3d53cfc39a0acf8ab SHA512 ace6630c78a59dc9ee29d233621cd980f88d1140bccf565f19b6c41b206427fc6f7ce65ffcf44587873f497994b8436e7691eac44e0afd6ff81d057e5a257c5e
diff --git a/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r2.ebuild b/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r2.ebuild
deleted file mode 100644
index 1a6a8e0ef21e..000000000000
--- a/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop wrapper
-
-DESCRIPTION="High-octane action game overflowing with raw brutality"
-HOMEPAGE="http://www.devolverdigital.com/games/view/hotline-miami"
-SRC_URI="HotlineMiami_linux_1392944501.tar.gz"
-S="${WORKDIR}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bundled-libs +launcher"
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=opt/${PN}
-QA_PREBUILT="
-	${MYGAMEDIR#/}/lib/*
-	${MYGAMEDIR#/}/Hotline
-	${MYGAMEDIR#/}/hotline_launcher
-"
-
-# TODO: unbundle Qt5
-RDEPEND="
-	amd64? (
-		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-		!bundled-libs? (
-			>=media-gfx/nvidia-cg-toolkit-3.1.0013-r3[abi_x86_32(-)]
-			>=media-libs/libogg-1.3.0[abi_x86_32(-)]
-			>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
-			>=media-libs/openal-1.15.1[abi_x86_32(-)]
-		)
-		launcher? (
-			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-			>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-			>=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
-		)
-	)
-	x86? (
-		x11-libs/libX11
-		!bundled-libs? (
-			media-gfx/nvidia-cg-toolkit
-			media-libs/libogg
-			media-libs/libvorbis
-			media-libs/openal
-		)
-		launcher? (
-			media-libs/freetype
-			x11-libs/libXext
-			x11-libs/libXrandr
-			x11-libs/libXrender
-			x11-libs/libxcb
-		)
-	)
-"
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  https://www.humblebundle.com/store"
-	einfo "and move it to your DISTDIR directory."
-}
-
-src_install() {
-	insinto "${MYGAMEDIR}"
-	doins HotlineMiami_GL.wad *.ogg
-
-	exeinto "${MYGAMEDIR}"
-	doexe Hotline
-	use launcher && doexe hotline_launcher
-
-	exeinto "${MYGAMEDIR}/lib"
-	use launcher && doexe lib/libQt5*
-	use bundled-libs && doexe libCg* libopenal*
-
-	make_wrapper ${PN} "./Hotline" "${MYGAMEDIR}" "${MYGAMEDIR}/lib"
-	make_desktop_entry ${PN}
-	if use launcher ; then
-		make_wrapper ${PN}-launcher "./hotline_launcher" "${MYGAMEDIR}" "${MYGAMEDIR}/lib"
-		make_desktop_entry ${PN}-launcher "${PN} (launcher)"
-	fi
-}
diff --git a/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r3.ebuild b/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r3.ebuild
new file mode 100644
index 000000000000..a997d210ab6d
--- /dev/null
+++ b/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+DESCRIPTION="High-octane action game overflowing with raw brutality"
+HOMEPAGE="http://www.devolverdigital.com/games/view/hotline-miami"
+SRC_URI="HotlineMiami_linux_1392944501.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bundled-libs +launcher"
+RESTRICT="bindist fetch splitdebug"
+
+MYGAMEDIR=/opt/${PN}
+QA_PREBUILT="
+	${MYGAMEDIR#/}/lib/*
+	${MYGAMEDIR#/}/Hotline
+	${MYGAMEDIR#/}/hotline_launcher
+"
+
+# TODO: unbundle Qt5
+RDEPEND="
+	amd64? (
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		!bundled-libs? (
+			>=media-gfx/nvidia-cg-toolkit-3.1.0013-r3[abi_x86_32(-)]
+			>=media-libs/libogg-1.3.0[abi_x86_32(-)]
+			>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
+			>=media-libs/openal-1.15.1[abi_x86_32(-)]
+		)
+		launcher? (
+			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+			>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+			>=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
+		)
+	)
+	x86? (
+		x11-libs/libX11
+		!bundled-libs? (
+			media-gfx/nvidia-cg-toolkit
+			media-libs/libogg
+			media-libs/libvorbis
+			media-libs/openal
+		)
+		launcher? (
+			media-libs/freetype
+			x11-libs/libXext
+			x11-libs/libXrandr
+			x11-libs/libXrender
+			x11-libs/libxcb
+		)
+	)
+"
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  https://www.humblebundle.com/store"
+	einfo "and move it to your DISTDIR directory."
+}
+
+src_install() {
+	insinto "${MYGAMEDIR}"
+	doins HotlineMiami_GL.wad *.ogg
+
+	exeinto "${MYGAMEDIR}"
+	doexe Hotline
+	use launcher && doexe hotline_launcher
+
+	exeinto "${MYGAMEDIR}/lib"
+	use launcher && doexe lib/libQt5*
+	use bundled-libs && doexe libCg* libopenal*
+
+	make_wrapper ${PN} "./Hotline" "${MYGAMEDIR}" "${MYGAMEDIR}/lib"
+	make_desktop_entry ${PN}
+	if use launcher ; then
+		make_wrapper ${PN}-launcher "./hotline_launcher" "${MYGAMEDIR}" "${MYGAMEDIR}/lib"
+		make_desktop_entry ${PN}-launcher "${PN} (launcher)"
+	fi
+}
diff --git a/games-action/intrusion2/Manifest b/games-action/intrusion2/Manifest
index e24cba7e67cd..823244e60346 100644
--- a/games-action/intrusion2/Manifest
+++ b/games-action/intrusion2/Manifest
@@ -1,3 +1,3 @@
 DIST intrusion2-1370288626-bin 88713512 BLAKE2B 87d236dbba41a6b6cade2ea632c15c4f777fb245b7f1161f0b54ff931859b00f9326fa58d6207d5222c44faa6b6e6c44920b7409acc5bbd6b5f6aa920bcb2825 SHA512 ce3fc5c9dc388cd777e978c54b6696d102870f8111122e646637e12cb336767c60ffa8864ffa634012868f2b9ca231598e89438f226ca4465d8c4e936d492b06
-EBUILD intrusion2-1.024-r1.ebuild 1517 BLAKE2B 1c432665e441c12fe3a92a4346a6408c6a6fd965dbe796e30ea20580224ff6c02583f27c5bb986806340a01bbaa21e52eee07e131011055d5e0860fd03bd5012 SHA512 35de9d21fb4d4452ac2fb020b3c3ee0e636b11efb884013eac81d0ae1f814985f25129dfb23ea7f2806c29089d0a189f421e1a789786c785d15ab8adeacd2577
+EBUILD intrusion2-1.024-r2.ebuild 1517 BLAKE2B 5f8245fd3dce6b64af7072103f7cba005c336a71681100ac0f3d8ac87e010132fff91e53663324f427cf2eb50173e1939a209b4cd7ee2d3a499ff365e08c0f31 SHA512 532cd8e5362ccb834989f4c7d927a206a2399eb149573453f39ad7c6244acc85b947ac7f39e5d073af0ca41e07a855cc97aac65e30342746eeb0f91ed9e128a5
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/intrusion2/intrusion2-1.024-r1.ebuild b/games-action/intrusion2/intrusion2-1.024-r1.ebuild
deleted file mode 100644
index 144d88aeeae9..000000000000
--- a/games-action/intrusion2/intrusion2-1.024-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop wrapper
-
-USELESS_ID="1370288626"
-DESCRIPTION="Fast paced action sidescroller set in a sci-fi environment"
-HOMEPAGE="http://intrusion2.com"
-SRC_URI="intrusion2-${USELESS_ID}-bin"
-S="${WORKDIR}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist fetch"
-
-MYGAMEDIR=opt/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}"/${PN}
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
-	>=dev-libs/atk-2.10.0[abi_x86_32(-)]
-	>=media-libs/gst-plugins-base-0.10.36[abi_x86_32(-)]
-	>=media-libs/gstreamer-0.10.36-r2[abi_x86_32(-)]
-	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-	>=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
-	>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
-	>=x11-libs/pango-1.36.3[abi_x86_32(-)]
-	>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
-	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-	>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-	>=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)]
-"
-
-RDEPEND="
-	amd64? (
-		${COMMON_DEPEND}
-	)
-	x86? (
-		${COMMON_DEPEND//\[abi_x86_32(-)\]/}
-	)
-"
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to your DISTFILES directory."
-	einfo
-}
-
-src_unpack() { :; }
-
-src_install() {
-	exeinto "/${MYGAMEDIR}"
-	newexe "${DISTDIR}"/${SRC_URI} ${PN}
-
-	make_wrapper ${PN} "${MYGAMEDIR}"/${PN}
-	make_desktop_entry ${PN}
-}
diff --git a/games-action/intrusion2/intrusion2-1.024-r2.ebuild b/games-action/intrusion2/intrusion2-1.024-r2.ebuild
new file mode 100644
index 000000000000..8349f6edc125
--- /dev/null
+++ b/games-action/intrusion2/intrusion2-1.024-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+USELESS_ID="1370288626"
+DESCRIPTION="Fast paced action sidescroller set in a sci-fi environment"
+HOMEPAGE="http://intrusion2.com"
+SRC_URI="intrusion2-${USELESS_ID}-bin"
+S="${WORKDIR}"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch"
+
+MYGAMEDIR=/opt/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}"/${PN}
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
+	>=dev-libs/atk-2.10.0[abi_x86_32(-)]
+	>=media-libs/gst-plugins-base-0.10.36[abi_x86_32(-)]
+	>=media-libs/gstreamer-0.10.36-r2[abi_x86_32(-)]
+	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+	>=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
+	>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
+	>=x11-libs/pango-1.36.3[abi_x86_32(-)]
+	>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
+	>=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)]
+"
+
+RDEPEND="
+	amd64? (
+		${COMMON_DEPEND}
+	)
+	x86? (
+		${COMMON_DEPEND//\[abi_x86_32(-)\]/}
+	)
+"
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to your DISTFILES directory."
+	einfo
+}
+
+src_unpack() { :; }
+
+src_install() {
+	exeinto "${MYGAMEDIR}"
+	newexe "${DISTDIR}"/${SRC_URI} ${PN}
+
+	make_wrapper ${PN} "${MYGAMEDIR}"/${PN}
+	make_desktop_entry ${PN}
+}
diff --git a/games-action/swordandsworcery/Manifest b/games-action/swordandsworcery/Manifest
index 2789ebfe6263..534231409729 100644
--- a/games-action/swordandsworcery/Manifest
+++ b/games-action/swordandsworcery/Manifest
@@ -1,4 +1,4 @@
 AUX swordandsworcery-wrapper 641 BLAKE2B 3609da1a899e05c3291ff20f30e75a335ac4aee0b53fac8a59786ce9992cf2b6081a8286ff40384f652e1bf35c4768ed7d9b87e6fcca149afd7ac2a6a8344203 SHA512 a29ff0cfadfd537129f5561fe9fa6acd88630340da49cc754f219aa125d01b8f73be7500dcc636140bbf707d73d8376b229e1897017819614fe6f4f28df1a545
 DIST swordandsworcery_1.02.tar.gz 325277619 BLAKE2B 7e03350b31d2dc68c5ea3643d7e22ec7da1789729201c2e8aec9e06db8c28c0a38bc826de0769dcec78080f17435d90ae3b0441ee230d7b8a9545a66f6e0ec1f SHA512 1178492628e8b8196bbb57b3d4d7526d5545bd31d0da34bcbed92150753fbb768c8682f071e2a473b95f1b6ee7c3efb30ccb9fce2e3e319d76673b79617e47c0
-EBUILD swordandsworcery-1.02-r1.ebuild 2648 BLAKE2B 034bb06e7c45210496a669c0197bd5ddee141c97f64aa3fb0641c024e6bdd6c513adeb930325de1cd5f3585cc72dbed425a555d03cabd03bb2889fa6399af1c0 SHA512 fe199ac16f65558b5557249d89b77f4552c197197767624f86bc1b0fa3ba817b39272594607eff5969b87e29aa7d2660034431f33d97f1387dea6ec39c52f8fd
+EBUILD swordandsworcery-1.02-r2.ebuild 2649 BLAKE2B 33957bb80fed48dce48ffa1aebe4ddc74ddd310292fc9561e8fd20f71e6b1af1da3aeb0f8c3e4e88accb516ac4a128a1d7ff7fcdc0445b9c7bd601053ede80ec SHA512 35592e15b36d757fefa95c5783401abfb7b7951c7ced1dcb8d361de13e5a7a97ebdf4b42737a8fe974624c5b56ebea8debb6fcfccf70be22c843f27b8ac2f9bd
 MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-action/swordandsworcery/swordandsworcery-1.02-r1.ebuild b/games-action/swordandsworcery/swordandsworcery-1.02-r1.ebuild
deleted file mode 100644
index 6481b751c3b8..000000000000
--- a/games-action/swordandsworcery/swordandsworcery-1.02-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop
-
-DESCRIPTION="An exploratory action adventure game with an emphasis on audiovisual style"
-HOMEPAGE="http://www.swordandsworcery.com/"
-SRC_URI="${PN}_${PV}.tar.gz"
-S="${WORKDIR}"
-
-LICENSE="CAPYBARA-EULA LGPL-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libs"
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=opt/${PN}
-QA_PREBUILT="
-	${MYGAMEDIR#/}/bin/*
-	${MYGAMEDIR#/}/lib/*
-"
-
-# TODO: unbundle liblua-5.1 when available for multilib
-# linked to pulseaudio
-RDEPEND="
-	virtual/opengl
-	amd64? (
-		>=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)]
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=virtual/glu-9.0-r1[abi_x86_32(-)]
-		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-		>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-		>=media-libs/flac-1.2.1-r5[abi_x86_32(-)]
-		>=media-libs/libogg-1.3.0[abi_x86_32(-)]
-		>=media-libs/libsndfile-1.0.25[abi_x86_32(-)]
-		>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
-		>=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)]
-		>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
-		>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
-		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-		>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
-		>=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
-		>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
-		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-		>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-		>=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)]
-		!bundled-libs? (
-			>=net-misc/curl-7.36.0[abi_x86_32(-)]
-			>=media-libs/libsdl-1.2.15-r4[X,sound,video,opengl,joystick,abi_x86_32(-)]
-		)
-	)
-	x86? (
-		dev-libs/openssl:0=
-		media-libs/alsa-lib
-		media-libs/flac
-		media-libs/libogg
-		media-libs/libsndfile
-		media-libs/libvorbis
-		media-sound/pulseaudio
-		sys-libs/zlib
-		virtual/glu
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libxcb
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXtst
-		!bundled-libs? (
-			net-misc/curl
-			media-libs/libsdl[X,sound,video,opengl,joystick]
-		)
-	)"
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to your DISTDIR directory."
-}
-
-src_prepare() {
-	default
-
-	if ! use bundled-libs ; then
-		einfo "removing bundled libs..."
-		rm -v lib/libcurl.so* lib/libSDL-1.2.so* \
-			lib/libstdc++.so* || die
-	fi
-
-	sed \
-		-e "s#@GAMEDIR@#${MYGAMEDIR}#" \
-		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
-}
-
-src_install() {
-	insinto "${MYGAMEDIR}"
-	doins -r bin lib res
-
-	dobin "${T}"/${PN}
-	make_desktop_entry ${PN}
-
-	docinto html
-	dodoc README.html
-
-	fperms +x "${MYGAMEDIR}"/bin/${PN}
-}
diff --git a/games-action/swordandsworcery/swordandsworcery-1.02-r2.ebuild b/games-action/swordandsworcery/swordandsworcery-1.02-r2.ebuild
new file mode 100644
index 000000000000..88b2d353ae31
--- /dev/null
+++ b/games-action/swordandsworcery/swordandsworcery-1.02-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop
+
+DESCRIPTION="An exploratory action adventure game with an emphasis on audiovisual style"
+HOMEPAGE="http://www.swordandsworcery.com/"
+SRC_URI="${PN}_${PV}.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="CAPYBARA-EULA LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="bundled-libs"
+RESTRICT="bindist fetch splitdebug"
+
+MYGAMEDIR=/opt/${PN}
+QA_PREBUILT="
+	${MYGAMEDIR#/}/bin/*
+	${MYGAMEDIR#/}/lib/*
+"
+
+# TODO: unbundle liblua-5.1 when available for multilib
+# linked to pulseaudio
+RDEPEND="
+	virtual/opengl
+	amd64? (
+		>=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)]
+		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+		>=virtual/glu-9.0-r1[abi_x86_32(-)]
+		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+		>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+		>=media-libs/flac-1.2.1-r5[abi_x86_32(-)]
+		>=media-libs/libogg-1.3.0[abi_x86_32(-)]
+		>=media-libs/libsndfile-1.0.25[abi_x86_32(-)]
+		>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
+		>=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)]
+		>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
+		>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
+		>=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
+		>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+		>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+		>=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)]
+		!bundled-libs? (
+			>=net-misc/curl-7.36.0[abi_x86_32(-)]
+			>=media-libs/libsdl-1.2.15-r4[X,sound,video,opengl,joystick,abi_x86_32(-)]
+		)
+	)
+	x86? (
+		dev-libs/openssl:0=
+		media-libs/alsa-lib
+		media-libs/flac
+		media-libs/libogg
+		media-libs/libsndfile
+		media-libs/libvorbis
+		media-sound/pulseaudio
+		sys-libs/zlib
+		virtual/glu
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libxcb
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXtst
+		!bundled-libs? (
+			net-misc/curl
+			media-libs/libsdl[X,sound,video,opengl,joystick]
+		)
+	)"
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to your DISTDIR directory."
+}
+
+src_prepare() {
+	default
+
+	if ! use bundled-libs ; then
+		einfo "removing bundled libs..."
+		rm -v lib/libcurl.so* lib/libSDL-1.2.so* \
+			lib/libstdc++.so* || die
+	fi
+
+	sed \
+		-e "s#@GAMEDIR@#${MYGAMEDIR}#" \
+		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
+}
+
+src_install() {
+	insinto "${MYGAMEDIR}"
+	doins -r bin lib res
+
+	dobin "${T}"/${PN}
+	make_desktop_entry ${PN}
+
+	docinto html
+	dodoc README.html
+
+	fperms +x "${MYGAMEDIR}"/bin/${PN}
+}
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index ea30399fc7d4..772b23a88202 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/aquaria/Manifest b/games-arcade/aquaria/Manifest
index af6052ab7666..3d4609e0f0e8 100644
--- a/games-arcade/aquaria/Manifest
+++ b/games-arcade/aquaria/Manifest
@@ -1,3 +1,3 @@
 DIST aquaria-lnx-humble-bundle.mojo.run 209499691 BLAKE2B e592e451f192136b419281b2e55244d9baaae39bf462cd30a1bc4ad26a5ca825634309423ef3e51ae18f35023169417b1d7d78a19a3f4abf9415072d947586dd SHA512 4ae491ade644df73f676c7bd7c36aa79140aa7c4a312ecd613ba1c900506123ae37c644200433c0045713bb8f3f88e90e58be64d2fea6eee4e7015cd3e157738
-EBUILD aquaria-1.1.3-r2.ebuild 1068 BLAKE2B ce66606a8e5428d530430ba15e7b2ab60d0a19b818a2ac7f8ebe5d66836bb5e11458191c8b74812744fba35164887a454b3f9e296d38e9a9cf05498fa7371de2 SHA512 6092195177c6577c8d0492e9b532590cde927b8c06d9d61487993d28a5e9cc0a68bbf68b7ba065ac0c291ff25f11d8cb9d5909bc0343b0b61433af1a3ce30b1e
+EBUILD aquaria-1.1.3-r3.ebuild 1070 BLAKE2B 09e116e2473c5a9c1cb7b65315c9871f3253f048213ce5caa486ffc2430f48b8358195eab4ca079ad7d35b9e3f6b0932ef9f418d70eb9205f74f990981c94416 SHA512 0cedb9f0f4a913ca86a79c94ac46ecca24c86a588ed2ed242a147e787e27297ac82ebc338859969f45398a6338099933af20a40210f0f2b53cff3f839c67c791
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/aquaria/aquaria-1.1.3-r2.ebuild b/games-arcade/aquaria/aquaria-1.1.3-r2.ebuild
deleted file mode 100644
index e1fb8b150c63..000000000000
--- a/games-arcade/aquaria/aquaria-1.1.3-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop unpacker wrapper
-
-DESCRIPTION="A 2D scroller set in a massive ocean world"
-HOMEPAGE="http://www.bit-blot.com/aquaria/"
-SRC_URI="aquaria-lnx-humble-bundle.mojo.run"
-S="${WORKDIR}"/data
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="strip fetch bindist"
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
-	>=media-libs/openal-1.15.1[abi_x86_32(-)]"
-BDEPEND="app-arch/unzip"
-
-dir=opt/${PN}
-QA_PREBUILT="${dir#/}/aquaria"
-
-pkg_nofetch() {
-	echo
-	elog "Download ${SRC_URI} from ${HOMEPAGE} and place it into"
-	elog "your DISTDIR directory."
-	echo
-}
-
-src_unpack() {
-	unpack_zip ${A}
-}
-
-src_install() {
-	insinto ${dir}
-	exeinto ${dir}
-
-	doins -r *.xml */
-	doexe ${PN}
-	doicon ${PN}.png
-
-	dodoc README-linux.txt
-	mv "${ED}/${dir}"/docs "${ED}/usr/share/doc/${PF}/html" || die
-	dosym  ../../../usr/share/doc/${PF}/html ${dir}/docs
-
-	make_wrapper "${PN}" "./${PN}" "${dir}"
-	make_desktop_entry "${PN}" "Aquaria"
-}
diff --git a/games-arcade/aquaria/aquaria-1.1.3-r3.ebuild b/games-arcade/aquaria/aquaria-1.1.3-r3.ebuild
new file mode 100644
index 000000000000..c052fc1b10ad
--- /dev/null
+++ b/games-arcade/aquaria/aquaria-1.1.3-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop unpacker wrapper
+
+DESCRIPTION="A 2D scroller set in a massive ocean world"
+HOMEPAGE="http://www.bit-blot.com/aquaria/"
+SRC_URI="aquaria-lnx-humble-bundle.mojo.run"
+S="${WORKDIR}"/data
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="strip fetch bindist"
+
+RDEPEND="
+	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
+	>=media-libs/openal-1.15.1[abi_x86_32(-)]"
+BDEPEND="app-arch/unzip"
+
+dir=/opt/${PN}
+QA_PREBUILT="${dir#/}/aquaria"
+
+pkg_nofetch() {
+	echo
+	elog "Download ${SRC_URI} from ${HOMEPAGE} and place it into"
+	elog "your DISTDIR directory."
+	echo
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_install() {
+	insinto ${dir}
+	doins -r *.xml */
+
+	exeinto ${dir}
+	doexe ${PN}
+
+	doicon ${PN}.png
+
+	dodoc README-linux.txt
+	mv "${ED}/${dir}"/docs "${ED}/usr/share/doc/${PF}/html" || die
+	dosym  ../../../usr/share/doc/${PF}/html ${dir}/docs
+
+	make_wrapper "${PN}" "./${PN}" "${dir}"
+	make_desktop_entry "${PN}" "Aquaria"
+}
diff --git a/games-arcade/barbarian-bin/Manifest b/games-arcade/barbarian-bin/Manifest
index e3ea2902ca8e..c496c31f5454 100644
--- a/games-arcade/barbarian-bin/Manifest
+++ b/games-arcade/barbarian-bin/Manifest
@@ -1,3 +1,3 @@
 DIST barbarian101_linux.zip 925199 BLAKE2B d8552b7fb03836ec75943b5b754489c345c70c9534301f16a64cdd21ea262fcff19ae6916bcd469b26dd088676079df2190bda369ca085d6c4285d84ebc12616 SHA512 9b46c75666359ed5102a89d29e8b6afacf07ccfa6175f6df27b5acc48b0e0119106f1c1376b124ff761d373bf04145e804659b81503b2834ba09ac05fad5c4f4
-EBUILD barbarian-bin-1.01-r2.ebuild 1315 BLAKE2B 335419fd3f6b4eded4d986a4e55a7e110741ff6988d3838e213543dc29c5cf3addcc4fa6a3924728c12af8310da2efb75c0c46969db4ee94c6887163cf40689d SHA512 571996903576cd1edab8cb5adf22a96dbaeec739344d3a45166d8fea0d2d5f623a4bc6a9d6e9ae563a81e1412826e0734f399fe43adff7d6e4cae3b7755c2b7f
+EBUILD barbarian-bin-1.01-r3.ebuild 1343 BLAKE2B 013fcb0c7aacdcdea4b0cf46de217c37fcbaa84a0d91cb037c56499fb50f3d07e10bd1190af46abe89d0e672588b619b9c9f453a22fc6ea2da6e435dff101a8a SHA512 20070dff9186c47b5ce05512fdd70f9bd712b1a297cdccff6fca8217f055dd84412c43d5e9f4e5fa00dab13d5420b302b90a0061ca08c3b7222176de203c5164
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/barbarian-bin/barbarian-bin-1.01-r2.ebuild b/games-arcade/barbarian-bin/barbarian-bin-1.01-r2.ebuild
deleted file mode 100644
index c7f7f26b27fe..000000000000
--- a/games-arcade/barbarian-bin/barbarian-bin-1.01-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop wrapper
-
-MY_PN=${PN/-bin/}
-DESCRIPTION="Save Princess Mariana through one-on-one battles with demonic barbarians"
-HOMEPAGE="http://www.tdbsoft.com/"
-SRC_URI="http://www.pcpages.com/tomberrr/downloads/${MY_PN}${PV/./}_linux.zip"
-S="${WORKDIR}"
-
-LICENSE="CC-BY-NC-ND-2.0"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="strip"
-
-RDEPEND="
-	acct-group/gamestat
-	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
-	sys-libs/libstdc++-v3:5
-	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
-"
-BDEPEND="app-arch/unzip"
-
-game_dest="opt/${MY_PN}"
-QA_PREBUILT="${game_dest}/Barbarian"
-
-src_install() {
-	dodir ${game_dest}
-	cp -r gfx sounds "${ED}"/${game_dest}/ || die
-
-	exeinto ${game_dest}
-	doexe Barbarian
-
-	docinto html
-	dodoc Barbarian.html
-
-	make_wrapper barbarian ./Barbarian "${game_dest}"
-
-	# High-score file
-	dodir /var/games/${PN}
-	touch "${ED}"/var/games/${PN}/heroes.hoh || die
-	dosym ../../var/games/${PN}/heroes.hoh ${game_dest}/heroes.hoh
-
-	fperms 660 /var/games/${PN}/heroes.hoh
-	fowners -R root:gamestat /var/games/${PN}
-	fperms g+s /opt/${MY_PN}/Barbarian
-
-	newicon gfx/sprites/player_attack_2_1.bmp barbarian.bmp
-	make_desktop_entry barbarian "Barbarian" /usr/share/pixmaps/barbarian.bmp
-}
diff --git a/games-arcade/barbarian-bin/barbarian-bin-1.01-r3.ebuild b/games-arcade/barbarian-bin/barbarian-bin-1.01-r3.ebuild
new file mode 100644
index 000000000000..6f60c21567e9
--- /dev/null
+++ b/games-arcade/barbarian-bin/barbarian-bin-1.01-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+MY_PN=${PN/-bin/}
+DESCRIPTION="Save Princess Mariana through one-on-one battles with demonic barbarians"
+HOMEPAGE="http://www.tdbsoft.com/"
+SRC_URI="http://www.pcpages.com/tomberrr/downloads/${MY_PN}${PV/./}_linux.zip"
+S="${WORKDIR}"
+
+LICENSE="CC-BY-NC-ND-2.0"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="strip"
+
+RDEPEND="
+	acct-group/gamestat
+	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
+	sys-libs/libstdc++-v3:5
+	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
+"
+BDEPEND="app-arch/unzip"
+
+game_dest="/opt/${MY_PN}"
+QA_PREBUILT="${game_dest#/}/Barbarian"
+
+src_install() {
+	dodir ${game_dest}
+	cp -r gfx sounds "${ED}"/${game_dest}/ || die
+
+	exeinto ${game_dest}
+	doexe Barbarian
+
+	docinto html
+	dodoc Barbarian.html
+
+	make_wrapper barbarian ./Barbarian "${game_dest}"
+
+	# High-score file
+	dodir /var/games/${PN}
+	touch "${ED}"/var/games/${PN}/heroes.hoh || die
+	dosym ../../var/games/${PN}/heroes.hoh /opt/${MY_PN}/heroes.hoh
+
+	fperms 660 /var/games/${PN}/heroes.hoh
+	fowners -R root:gamestat /var/games/${PN} /opt/${MY_PN}/Barbarian
+	fperms g+s /opt/${MY_PN}/Barbarian
+
+	newicon gfx/sprites/player_attack_2_1.bmp barbarian.bmp
+	make_desktop_entry barbarian "Barbarian" /usr/share/pixmaps/barbarian.bmp
+}
diff --git a/games-arcade/emilia-pinball/Manifest b/games-arcade/emilia-pinball/Manifest
index b9488306c57c..063776743d2b 100644
--- a/games-arcade/emilia-pinball/Manifest
+++ b/games-arcade/emilia-pinball/Manifest
@@ -3,5 +3,5 @@ AUX emilia-pinball-0.3.1-glibc210.patch 383 BLAKE2B 3d4eaf146dcef5dacbc1e61d667a
 AUX emilia-pinball-0.3.1-libtool.patch 1683 BLAKE2B 8ee0b3bf1a913310993e45a37b3cd0b59adcc32e004994a093d63d5cfcaa5c22cd3fa80f0407b6b77f8381d9bf6b2dc36dc4396406f703d7925ee93bef3bd0c7 SHA512 43f09fd61f158c62abec979f45d019821099789318b22394618f94f5b49a15cda3759cbe4f4fc74f7dbe5f89856138a0d1dcd5fd335817bd71326d90ab50c719
 AUX emilia-pinball-0.3.1-parallel.patch 356 BLAKE2B 5944a0dcec80a6c593be6c451912a6eed1d6afe7998ff48e83dd3d8b8d635c117a253c9a2dee288e3d38d6e77ad05eac83a4c46789389ea329f8be0a3d8177bf SHA512 54d467c4e7aae9902c3c4cfde999c2c8245bb92c6ede5464c229852ba0a29858e86a0781408eb7de40022b13635ef7826323ef510e80ef2b9758c1bdbdb9aff0
 DIST pinball-0.3.1.tar.gz 6082982 BLAKE2B 307fd8fa6a6a64a15423f2cdacf6711affec4d0a94beca4c660316fa2db268b857fe80d3a672a078fd4454e858fdbf235ab3c62ba9695ee6df422b56536ba2d2 SHA512 d54f2635f583be8a7e4bf3463c69c1ab368e1c069dd7c4edffb95df0448faf7e82ddb8f8607d22a7336e2db176134555ca65b613e9d008b38fecb8ad5a818498
-EBUILD emilia-pinball-0.3.1-r2.ebuild 1401 BLAKE2B e49ed85390c012c546176f670a73ba0fdab545abbf222f92f64fb0d658a07998fb16e0eb13b360afff3611c332690f565189bb20a8144b8621ea9cc28cbe43fc SHA512 ecc2a81fef12517337e8162aa8993f145625c807267fb7bd623bc8a89b612db82ccae7c55296ce92bc56c299e93f712919544115eb4251ea03a6f666ef237155
+EBUILD emilia-pinball-0.3.1-r3.ebuild 1418 BLAKE2B ffc54459ea68ed950c416dcdedbcb9ddb656d35ec08af8c0cdc0836410e02afb0462c7d4bf10d71ba6d20d7548ba276a44cef448080484cf135b3e655de1c8e2 SHA512 6ddcdd743475849876969feca4d16d2f7bfb3ac9aaf60a04229b63d1edc93e8cc92a2485b808af006f4c6bdeba6104aca040d98b947fdb64468bb30cea142620
 MISC metadata.xml 330 BLAKE2B 7deaad70c752f4c41009dfd6ec073f972e9ee484d4497c0b23d184cd48bdb5aaa45f2644c412ab2a885aea6655e1a737a612bb65b3d8147272f63a2de932825c SHA512 8432311fd9fb74150e0571245c2afda26de63a3a3671905cb7f221984933e5971c1f5f355517c54b7c31de3a3d3349d06116a4e67c57c44489147af5ae80e8cf
diff --git a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r2.ebuild b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r2.ebuild
deleted file mode 100644
index 523439876ec8..000000000000
--- a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop
-
-MY_PN=${PN/emilia-/}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="SDL OpenGL pinball game"
-HOMEPAGE="http://pinball.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pinball/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	media-libs/libsdl[joystick,opengl,video,X]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]
-	x11-libs/libICE
-	x11-libs/libSM
-	virtual/opengl
-	virtual/glu
-"
-DEPEND="
-	${DEPEND}
-	x11-libs/libXt
-"
-
-RDEPEND+=" acct-group/gamestat"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glibc210.patch
-	"${FILESDIR}"/${P}-libtool.patch
-	"${FILESDIR}"/${P}-gcc46.patch
-	"${FILESDIR}"/${P}-parallel.patch
-)
-
-src_prepare() {
-	# bug #334899
-	sed -i -e '/dnl/d' {src,test}/Makefile.am || die
-
-	default
-
-	rm -rf libltdl || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-x
-}
-
-src_compile() {
-	emake CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	default
-
-	dosym pinball /usr/bin/emilia-pinball
-
-	sed -i \
-		-e 's:-I${prefix}/include/pinball:-I/usr/include/pinball:' \
-		"${ED}"/usr/bin/pinball-config || die
-
-	newicon data/pinball.xpm ${PN}.xpm
-	make_desktop_entry emilia-pinball "Emilia pinball"
-
-	fperms -R 660 /var/games/pinball
-	fowners -R root:gamestat /var/games/pinball
-	fperms g+s /usr/bin/pinball
-}
diff --git a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r3.ebuild b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r3.ebuild
new file mode 100644
index 000000000000..2e0de0e6e743
--- /dev/null
+++ b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop
+
+MY_PN=${PN/emilia-/}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="SDL OpenGL pinball game"
+HOMEPAGE="http://pinball.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pinball/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	media-libs/libsdl[joystick,opengl,video,X]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
+	x11-libs/libICE
+	x11-libs/libSM
+	virtual/opengl
+	virtual/glu
+"
+DEPEND="
+	${DEPEND}
+	x11-libs/libXt
+"
+
+RDEPEND+=" acct-group/gamestat"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc210.patch
+	"${FILESDIR}"/${P}-libtool.patch
+	"${FILESDIR}"/${P}-gcc46.patch
+	"${FILESDIR}"/${P}-parallel.patch
+)
+
+src_prepare() {
+	# bug #334899
+	sed -i -e '/dnl/d' {src,test}/Makefile.am || die
+
+	default
+
+	rm -rf libltdl || die
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-x
+}
+
+src_compile() {
+	emake CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	default
+
+	dosym pinball /usr/bin/emilia-pinball
+
+	sed -i \
+		-e 's:-I${prefix}/include/pinball:-I/usr/include/pinball:' \
+		"${ED}"/usr/bin/pinball-config || die
+
+	newicon data/pinball.xpm ${PN}.xpm
+	make_desktop_entry emilia-pinball "Emilia pinball"
+
+	fperms -R 660 /var/games/pinball
+	fowners -R root:gamestat /usr/bin/pinball /var/games/pinball
+	fperms g+s /usr/bin/pinball
+}
diff --git a/games-arcade/gunocide2ex/Manifest b/games-arcade/gunocide2ex/Manifest
index 82405816c24e..dd88e7fe81de 100644
--- a/games-arcade/gunocide2ex/Manifest
+++ b/games-arcade/gunocide2ex/Manifest
@@ -1,5 +1,5 @@
 AUX gunocide2ex-1.0-build.patch 3630 BLAKE2B 52a1d29ce7571a8a8f62548e2fdc7d4d55861d13d66f3bea51dd63f067433791ec7512a169d2a6112eed5fee6a6655be5384719085ead240353958de79ede646 SHA512 bd3ac13840b039f6766c68e77f331f61c94f170657f5959f0c8cd85fbe61468ef6a6cb513b70e3b1f2bfe809111e48ff13f5b7e79e066883b2066f6be9269fbc
 AUX gunocide2ex-1.0-glibc2.10.patch 381 BLAKE2B effecdcc17776e9f92db5054158e8becd895b17e283cc2f3926d1cf10f0465f65596e8a5391e4fa188d9cfaaf7ac06ba3feb31a18710f6709502306191260486 SHA512 187520144d3702c0a9e29849601b82cbe4d5d06443c6bff26a9f6f9011438a712c01194327fe0ad43bed5cf376c061f96ed6b9b114fd54b58c64bf1804e5eda8
 DIST g2ex-setup.run 30844481 BLAKE2B 3d59d14e594c1f742d8f39098baeb68c4898f6d04aceefa1b6eeaf6c31378eda492b5984394c1b833e7b47b1360889e74f4e944fbf9721ac8f3456116bd469ca SHA512 e3c861843d88c3b09fa2e579d1be4b0590c04b7b401c7d592cf6b7150fc395445056ba599c0bc6f72ba7044cfc097070751d32bb66aa790e72e2b1c45407f2b2
-EBUILD gunocide2ex-1.0-r2.ebuild 1755 BLAKE2B 4e79dadaf8ac3529255e46fe40ede39d18b159ba47067978f2a42914711fba1cefa6a602b53218bc775bd4ea175862aaa1d07a51d039e86354bca6616dd60d25 SHA512 474509fc044634c28e5cf243489a116dd077de67042fe7eb0b08cb8508ee5e53aee06704354bb3d1f118c7893c6e52945f5e7dbdcdae27b97e58bb9609435b56
+EBUILD gunocide2ex-1.0-r3.ebuild 1769 BLAKE2B 129567cae83f7125f80955ac75f2c994e55ac58c0f2af5516c21345b61bc466ca4b3173daac80c745f716fddf2390095d6896fa3a470e54b4316439516c70b24 SHA512 21976e04da8b6dfcc8b543d403e405a75dc8cfd657cdfba4c2a5f46433cb9e71cbb6bd298d4c53d937736099c5f844d413deed514ce9ac0b8830cf23acad9b27
 MISC metadata.xml 327 BLAKE2B 78befc8fb90a335e458fc40d096a8dd59c04da0c72b039f7ad816d37693558514d77a40f9bbec5966aa611d2f323a1e12ac44b2dcefda015260e669f3e622887 SHA512 0ad645742ce134798ac8178d859ccdeedc9b060f7d5065b825ac9c9158130e7221c068264ce82e95f066294c045a9440a9aca241484115057ad3a709afad905f
diff --git a/games-arcade/gunocide2ex/gunocide2ex-1.0-r2.ebuild b/games-arcade/gunocide2ex/gunocide2ex-1.0-r2.ebuild
deleted file mode 100644
index 920de2e8b41e..000000000000
--- a/games-arcade/gunocide2ex/gunocide2ex-1.0-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop edos2unix toolchain-funcs unpacker
-
-DESCRIPTION="Fast-paced 2D shoot'em'up"
-HOMEPAGE="http://g2ex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g2ex/g2ex-setup.run"
-S="${WORKDIR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND="
-	media-libs/libsdl[video]
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer[vorbis]
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/gamestat
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-glibc2.10.patch
-)
-
-src_unpack() {
-	unpack_makeself
-	mkdir binary || die
-}
-
-src_prepare() {
-	default
-
-	edos2unix config.cfg
-
-	sed -i \
-		-e "s:/usr/local/games/gunocide2ex/config\.cfg:/etc/${PN}.cfg:" \
-		-e "s:/usr/local/games/gunocide2ex/hscore\.dat:/var/games/gunocide2ex/${PN}-hscore.dat:" \
-		-e "s:memleaks.log:/dev/null:" \
-		src/*.{h,cpp} || die
-
-	sed -i \
-		-e "s:/usr/local/games:/usr/share:" \
-		src/*.{h,cpp} $(find gfx -name '*.txt') || die
-}
-
-src_compile() {
-	cd src || die
-
-	tc-export CXX
-
-	emake \
-		CXXFLAGS="${CXXFLAGS} $(sdl-config --cflags)" \
-		$(echo *.cpp | sed 's/\.cpp/.o/g')
-
-	$(tc-getCXX) ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o ${PN} *.o -lpthread -lSDL -lSDL_ttf -lSDL_mixer || die
-}
-
-src_install() {
-	dobin src/${PN}
-	dosym ${PN} /usr/bin/g2ex
-
-	insinto /usr/share/${PN}
-	doins -r gfx sfx lvl credits arial.ttf
-
-	insinto /etc
-	newins config.cfg ${PN}.cfg
-
-	insinto /var/games/${PN}
-	newins hscore.dat ${PN}-hscore.dat
-
-	fperms 660 /var/games/${PN}/${PN}-hscore.dat
-	fowners -R root:gamestat /var/games/${PN}
-	fperms g+s /usr/bin/g2ex
-
-	dodoc history doc/MANUAL_DE
-	docinto html
-	dodoc doc/manual_de.html
-
-	newicon g2icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Gunocide II EX"
-}
diff --git a/games-arcade/gunocide2ex/gunocide2ex-1.0-r3.ebuild b/games-arcade/gunocide2ex/gunocide2ex-1.0-r3.ebuild
new file mode 100644
index 000000000000..b13817223bfb
--- /dev/null
+++ b/games-arcade/gunocide2ex/gunocide2ex-1.0-r3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop edos2unix toolchain-funcs unpacker
+
+DESCRIPTION="Fast-paced 2D shoot'em'up"
+HOMEPAGE="http://g2ex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/g2ex/g2ex-setup.run"
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND="
+	media-libs/libsdl[video]
+	media-libs/sdl-ttf
+	media-libs/sdl-mixer[vorbis]
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-glibc2.10.patch
+)
+
+src_unpack() {
+	unpack_makeself
+	mkdir binary || die
+}
+
+src_prepare() {
+	default
+
+	edos2unix config.cfg
+
+	sed -i \
+		-e "s:/usr/local/games/gunocide2ex/config\.cfg:/etc/${PN}.cfg:" \
+		-e "s:/usr/local/games/gunocide2ex/hscore\.dat:/var/games/gunocide2ex/${PN}-hscore.dat:" \
+		-e "s:memleaks.log:/dev/null:" \
+		src/*.{h,cpp} || die
+
+	sed -i \
+		-e "s:/usr/local/games:/usr/share:" \
+		src/*.{h,cpp} $(find gfx -name '*.txt') || die
+}
+
+src_compile() {
+	cd src || die
+
+	tc-export CXX
+
+	emake \
+		CXXFLAGS="${CXXFLAGS} $(sdl-config --cflags)" \
+		$(echo *.cpp | sed 's/\.cpp/.o/g')
+
+	$(tc-getCXX) ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o ${PN} *.o -lpthread -lSDL -lSDL_ttf -lSDL_mixer || die
+}
+
+src_install() {
+	dobin src/${PN}
+	dosym ${PN} /usr/bin/g2ex
+
+	insinto /usr/share/${PN}
+	doins -r gfx sfx lvl credits arial.ttf
+
+	insinto /etc
+	newins config.cfg ${PN}.cfg
+
+	insinto /var/games/${PN}
+	newins hscore.dat ${PN}-hscore.dat
+
+	fperms 660 /var/games/${PN}/${PN}-hscore.dat
+	fowners -R root:gamestat /var/games/${PN} /usr/bin/g2ex
+	fperms g+s /usr/bin/g2ex
+
+	dodoc history doc/MANUAL_DE
+	docinto html
+	dodoc doc/manual_de.html
+
+	newicon g2icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Gunocide II EX"
+}
diff --git a/games-arcade/jardinains/Manifest b/games-arcade/jardinains/Manifest
index 8951d2015ad0..48b937c6884a 100644
--- a/games-arcade/jardinains/Manifest
+++ b/games-arcade/jardinains/Manifest
@@ -1,4 +1,4 @@
 AUX strings-pt.patch 8310 BLAKE2B 575c2faff1daeea851bd5f359b974c40909ece97221787145ee44337046d9f8478f0bfda8eee7956f855b82de432b0df41aeb6fb9babc750b6dcf9697ea1783f SHA512 b57d6f422757fb6edb86f21152d558d2b11bc315d60f7f5b787410f2cc626807216dfc30fd2ee7d8ccb93af68118bce04040e9a9ee5130e350a6fef5d53d0c5a
 DIST JN2_1_FREE_LIN.tar.gz 17433159 BLAKE2B de257584d5e0babc4c0304aec2451e92ec288c77e8aff68eaad63b43238126b4059dc56a1632b66b2bfd4a9f0408cf492a77c56de2521e12f630d498a751919b SHA512 ddb6e48e071b42b7871cb6396c61fdf9bfb85e9bb9f88720e8ac1b7bff499c43784de6bf3f67d3fe61bc05ed0e3f6a24f646aa6c54e387b95e744c16525978e8
-EBUILD jardinains-2.0-r2.ebuild 1598 BLAKE2B 64d1e8e705751c468b3cba514fb241ed8d24cb2fd78b0b2981d4062a37970c3942e17b32e8d3c0db2ac4750f76300640f6b78e83306eecc2be586504c2c855e7 SHA512 ee2851e0aca250af4c69fd2963e79e464f3693c4eb5de821602a7669fe5004c166849fc0cb51a91c4a9d701d3b09ccf26c0e4786dd158b917749b42cd192a4dc
+EBUILD jardinains-2.0-r4.ebuild 1622 BLAKE2B 561c28e709cac74bb71adc66b77a130dae64477c4dd7084295788555026831d33a0bc470079f0118ddb360f383a4df36e51209eedccc73b14a36bf99b01147a8 SHA512 9f765c7611a26bf944eaa352e1f5727c2243f46a32425265d782de0e6bc8681fc9cf9329ad0bd8fc70b80ff5bbd542434bf3bf8b2f3f6ad23894e7b503735db3
 MISC metadata.xml 620 BLAKE2B d7544b15c6c62f4c3d1694e30afb4bf4a7a23402d83a594f35ab1f16a7eef3046121656ded24364b6e09dc93e98c17558e1ecc2e60e19edb6b8db6e95b2f00fd SHA512 4400b85a7b410885b2528a18cde41b35cd4a4034e5aecf2f1ad26c0300ed5d8e4bb01646d5be30f9c198d4d70b0bb9cc45bf52f7664cb9a51c3d704a56fa25b5
diff --git a/games-arcade/jardinains/jardinains-2.0-r2.ebuild b/games-arcade/jardinains/jardinains-2.0-r2.ebuild
deleted file mode 100644
index 177944be5b6e..000000000000
--- a/games-arcade/jardinains/jardinains-2.0-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop wrapper
-
-DESCRIPTION="Arkanoid with Gnomes"
-HOMEPAGE="http://www.jardinains2.com"
-SRC_URI="mirror://gentoo/JN2_1_FREE_LIN.tar.gz"
-
-LICENSE="jardinains"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="strip"
-QA_EXECSTACK="opt/jardinains/jardinains"
-
-RDEPEND="
-	acct-group/gamestat
-	sys-libs/libstdc++-v3:5
-	>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-	>=virtual/glu-9.0-r1[abi_x86_32(-)]
-	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
-"
-
-dir=opt/${PN}
-QA_PREBUILT="${dir}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}"/strings-pt.patch
-)
-
-src_unpack() {
-	unpack JN2_1_FREE_LIN.tar.gz
-	cd "${WORKDIR}" || die
-	mv "Jardinains 2!" ${P} || die
-}
-
-src_prepare() {
-	default
-
-	# clean Mac fork files (bug #295782)
-	find . -type f -name "._*" -exec rm -f '{}' + || die
-}
-
-src_install() {
-	exeinto ${dir}
-	doexe jardinains
-
-	insinto ${dir}
-	doins -r LICENSE.txt data help
-
-	make_wrapper jardinains ./jardinains "${dir}" "${dir}"
-	make_desktop_entry jardinains "Jardinains 2"
-	touch "${ED}"/${dir}/data/prefs.xml || die
-
-	chmod g+rw "${ED}"/${dir}/data/prefs.xml || die
-	chmod -R g+rw "${ED}"/${dir}/data/players || die
-
-	fperms -R 660 /opt/${PN}/data
-	fowners -R root:gamestat /opt/${PN}/data
-	fperms g+s /opt/${PN}/${PN}
-}
-
-pkg_postinst() {
-	elog "Due to the way this software is designed all user preferences for"
-	elog "graphics, audio and other in game data are shared among all users"
-	elog "of the computer."
-}
diff --git a/games-arcade/jardinains/jardinains-2.0-r4.ebuild b/games-arcade/jardinains/jardinains-2.0-r4.ebuild
new file mode 100644
index 000000000000..e4943e1e457b
--- /dev/null
+++ b/games-arcade/jardinains/jardinains-2.0-r4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+DESCRIPTION="Arkanoid with Gnomes"
+HOMEPAGE="http://www.jardinains2.com"
+SRC_URI="mirror://gentoo/JN2_1_FREE_LIN.tar.gz"
+
+LICENSE="jardinains"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="strip"
+
+RDEPEND="
+	acct-group/gamestat
+	sys-libs/libstdc++-v3:5
+	>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+	>=virtual/glu-9.0-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
+"
+
+dir=/opt/${PN}
+QA_PREBUILT="${dir#/}/${PN}"
+QA_EXECSTACK="${dir#/}${PN}/jardinains"
+
+PATCHES=(
+	"${FILESDIR}"/strings-pt.patch
+)
+
+src_unpack() {
+	unpack JN2_1_FREE_LIN.tar.gz
+	cd "${WORKDIR}" || die
+	mv "Jardinains 2!" ${P} || die
+}
+
+src_prepare() {
+	default
+
+	# clean Mac fork files (bug #295782)
+	find . -type f -name "._*" -exec rm -f '{}' + || die
+}
+
+src_install() {
+	exeinto ${dir}
+	doexe jardinains
+
+	insinto ${dir}
+	doins -r LICENSE.txt data help
+
+	make_wrapper jardinains ./jardinains "${dir}" "${dir}"
+	make_desktop_entry jardinains "Jardinains 2"
+	touch "${ED}"/${dir}/data/prefs.xml || die
+
+	chmod g+rw "${ED}"/${dir}/data/prefs.xml || die
+	chmod -R g+rw "${ED}"/${dir}/data/players || die
+
+	fperms -R 660 /opt/${PN}/data
+	fowners -R root:gamestat /opt/${PN}/data /opt/${PN}/jardinains
+	fperms g+s /opt/${PN}/${PN}
+}
+
+pkg_postinst() {
+	elog "Due to the way this software is designed all user preferences for"
+	elog "graphics, audio and other in game data are shared among all users"
+	elog "of the computer."
+}
diff --git a/games-arcade/pachi/Manifest b/games-arcade/pachi/Manifest
index 8641ab0f5290..f164e5aadc4d 100644
--- a/games-arcade/pachi/Manifest
+++ b/games-arcade/pachi/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0-autotools.patch 1173 BLAKE2B 3bc58ba6dc677f2fbff28f944ecd01e41fe41df5dea2b7e8cbbb596e5ee4f797bf4720e7b4ccb7f182c0f15748b128db33127c23e54b744a6b980d79f13eb601 SHA512 478e4daf8c396d0938ce33414d37b6502cebfa16b57b099365ca9cdbda1b042871fe95392f005767c49759400c0823edc1b5bbe8b2bf96d9997cdb5df190a5a7
 DIST pachi-1.0.tar.bz2 3101484 BLAKE2B 31c15f1c0fac503abbba67c0483e60d1b12d84d7d0cb5eaebda01e0942ead1d202841942711306c800cfe8346a3e31ed10671555184d52d345464640a90d5c1c SHA512 9b09baa47ceb051d80ea621d2449afd2d9de959e707d2a1b3119ce8f0c623ebc1afb1678389c647b066fb2211f3f7eb27d713ee33514e2739ba48f9bf14c7952
-EBUILD pachi-1.0-r1.ebuild 1088 BLAKE2B 23c93592b2c603473f5a5588f93fa8da6765c515a9e95bb24fde5b51d70b418e28812471981083ef51d3a399da331e63bffbec640cff2115cd52382cdca1119e SHA512 fe799267b62024ce3800163a09de45dcb5a90c124e5eec445ff63a2909e080d1acf20d7d5be19579dfe46c5a3e896c9d1ffc0594d14211e3807f6cd15bda52dd
+EBUILD pachi-1.0-r2.ebuild 1103 BLAKE2B 2c239902702dc09f01efdef339c06c74753db5ef0fe9d5b29fca18ab46a70fb65dd5e059fa7f4a92ebc4eca2ea2f26897844166a5f8a77ef2515f0c07a02407d SHA512 c74daa86012725b439e7af51368a87387a240e6558cc06391bf0142da771fa3bf9b143df219d3beae4eb1f7db95791a14457fe4bbcb78c5b771ce2476862603d
 MISC metadata.xml 333 BLAKE2B e14155543715b12b61b84d111606a7630315a349d0ad1ed68a4323ec50ff225f6cd9ed3a3bbc980e1246982bb25444884a1e63386c9526d31fb7b31b28f95892 SHA512 9f7e4e3994f529f9905dcf550cfb3ab0a4f0998a689a52e34d1bb2b5916273e7827937900606316cdd465e90752ab5a1bd0cf248f6288fc3d1be3f3d35982567
diff --git a/games-arcade/pachi/pachi-1.0-r1.ebuild b/games-arcade/pachi/pachi-1.0-r1.ebuild
deleted file mode 100644
index d8cfae4ed69f..000000000000
--- a/games-arcade/pachi/pachi-1.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop
-
-DESCRIPTION="platform game inspired by games like Manic Miner and Jet Set Willy"
-HOMEPAGE="http://dragontech.sourceforge.net/index.php?main=pachi&lang=en"
-# Upstream doesn't version their releases.
-# (should be downloaded and re-compressed with tar -jcvf)
-#SRC_URI="mirror://sourceforge/dragontech/pachi_source.tgz"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-S="${WORKDIR}"/Pachi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	media-libs/libsdl[joystick,sound,video]
-	media-libs/sdl-mixer[mod]
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/gamestat
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-autotools.patch
-)
-
-src_prepare() {
-	default
-
-	rm -f missing || die
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	newicon Tgfx/icon.bmp ${PN}.bmp
-	make_desktop_entry ${PN} Pachi /usr/share/pixmaps/${PN}.bmp
-
-	fowners root:gamestat /var/lib/${PN}/data/scores.dat
-	fperms 660 /var/lib/${PN}/data/scores.dat
-	fperms g+s /usr/bin/${PN}
-}
diff --git a/games-arcade/pachi/pachi-1.0-r2.ebuild b/games-arcade/pachi/pachi-1.0-r2.ebuild
new file mode 100644
index 000000000000..00da8955ee37
--- /dev/null
+++ b/games-arcade/pachi/pachi-1.0-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop
+
+DESCRIPTION="platform game inspired by games like Manic Miner and Jet Set Willy"
+HOMEPAGE="http://dragontech.sourceforge.net/index.php?main=pachi&lang=en"
+# Upstream doesn't version their releases.
+# (should be downloaded and re-compressed with tar -jcvf)
+#SRC_URI="mirror://sourceforge/dragontech/pachi_source.tgz"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+S="${WORKDIR}"/Pachi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	media-libs/libsdl[joystick,sound,video]
+	media-libs/sdl-mixer[mod]
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-autotools.patch
+)
+
+src_prepare() {
+	default
+
+	rm -f missing || die
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	newicon Tgfx/icon.bmp ${PN}.bmp
+	make_desktop_entry ${PN} Pachi /usr/share/pixmaps/${PN}.bmp
+
+	fowners root:gamestat /var/lib/${PN}/data/scores.dat /usr/bin/${PN}
+	fperms 660 /var/lib/${PN}/data/scores.dat
+	fperms g+s /usr/bin/${PN}
+}
diff --git a/games-arcade/shovel-knight/Manifest b/games-arcade/shovel-knight/Manifest
index ab98a23d91e0..af20c8e81b53 100644
--- a/games-arcade/shovel-knight/Manifest
+++ b/games-arcade/shovel-knight/Manifest
@@ -1,3 +1,3 @@
 DIST shovel_knight_treasure_trove_en_3_3_15418.sh 226753557 BLAKE2B 3103871333f5dec931b109ccc8a8820054f8bd934d01daf97bb5ad84e9dfaebd2c79d1943fb7049468f49c9db87c51dec0e08d38469e364bafb8bc50fbd9d40d SHA512 6832593440cc5059f0df37be991bb2e87c071c7ed566b2c6d0f6cc418190be92c4f793f2c694f620b9378914cde13abf9049eba8cdd90b9dfe961ae9a65dc42a
-EBUILD shovel-knight-3.3.ebuild 1614 BLAKE2B 1c1c339842ce7da65c7d03c2b6802cb6a6de443bee5cedcd2f874c38866cf299f1da0e42445cc82ef4a2975a9a36d4eb6d709f25b2f5a5530e19d687373d6038 SHA512 d7b67fa256d6866219d8ea95272b253c2dcbff1cf33c6798a9762c259bc2124986f6c4d75eaf73466b656825a45002c88bc19a06b1eb1ae0f909867caffaf3b3
+EBUILD shovel-knight-3.3.ebuild 1524 BLAKE2B 59dc13484695351d998739df4943d3b73d60e5833277aba3c3063a91c564012929034d6cf8bcd65f0ed6bf34148317f9c09d77aaa934d0a4d6ab245346e41b04 SHA512 6b20b241cf0735567844bd1965333aa907589b1b9ecc33416ee97f332a4c3491098976086e1185fa1371ef71baf79138f6a20022c0339db9c790567d261b3197
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-arcade/shovel-knight/shovel-knight-3.3.ebuild b/games-arcade/shovel-knight/shovel-knight-3.3.ebuild
index 711593617539..c7f98580ae68 100644
--- a/games-arcade/shovel-knight/shovel-knight-3.3.ebuild
+++ b/games-arcade/shovel-knight/shovel-knight-3.3.ebuild
@@ -3,12 +3,13 @@
 
 EAPI=7
 
-inherit desktop unpacker wrapper xdg-utils
+inherit desktop unpacker wrapper xdg
 
 MY_PN="ShovelKnight"
 DESCRIPTION="Sweeping classic action adventure with an 8-bit retro aesthetic"
 HOMEPAGE="https://yachtclubgames.com/shovel-knight/"
 SRC_URI="${PN//-/_}_treasure_trove_en_3_3_15418.sh"
+S="${WORKDIR}/data/noarch/game"
 
 LICENSE="Yacht-Club-Games-EULA"
 SLOT="0"
@@ -24,8 +25,6 @@ RDEPEND="
 	virtual/opengl
 "
 
-S="${WORKDIR}/data/noarch/game"
-
 DIR="/opt/${PN}"
 QA_PREBUILT="${DIR#/}/*"
 
@@ -62,6 +61,3 @@ src_install() {
 	newicon -s 256 ../support/icon.png ${PN}.png
 	make_desktop_entry ${MY_PN} "Shovel Knight"
 }
-
-pkg_postinst() { xdg_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/games-arcade/tomatoes/Manifest b/games-arcade/tomatoes/Manifest
index 5c7d819331c8..96904a3d5a35 100644
--- a/games-arcade/tomatoes/Manifest
+++ b/games-arcade/tomatoes/Manifest
@@ -3,5 +3,5 @@ AUX tomatoes-1.55-gcc43.patch 282 BLAKE2B 96ff4d81ca15fe6813dc3df77fdb126b4907d9
 AUX tomatoes-1.55-underlink.patch 905 BLAKE2B 2deffc2f21569ed78e032400bac9dc3d77ea6bd2916e986d586eff6796018df632b8d31fc396830db683a7fcf1641b53b1d38c8596683f9dcd283445998d3b66 SHA512 6917df7c096827749e4dbe641822c68a65887215c79a3c7392116d72bd3e76ff60192ce168668ad7b5cb01f0750eeb47ccbe54d58c3a0f560b8340ca265b1595
 DIST tomatoes-linux-1.5.tar.bz2 8807421 BLAKE2B ee2128018d13d274b0ed5b27f9339b4e9d47a15753411c30d4174607c252d10d64a40e40b25454adb6f14ec96845b92cf9b0fe57b3bdcbbb70fe905ec0bf1c0e SHA512 517f592bb3c3fb43cb740c58011f06b7a71c96eaff74ce1088db8dbd4aafa3463bba516547cd010e9ef2ca947fd36962c3d13ece6e979cab8adf01ffa991c308
 DIST tomatoes-linux-src-1.55.tar.bz2 62947 BLAKE2B 22561900842dfe4cb56128ddaf471fac56a2c93b4c24ce3cca7045d10235ab60b81184c9617f9f4d10877df23e6db0d5abc0dc032d38788993daab1a2c49ab1e SHA512 b5a6287659746179f0418630c55d34dc34897b532687007386b0b540ec728cc2492813f0d454314994a26a3629a24c802630085f64b969d1e6ea9ec936f5fe35
-EBUILD tomatoes-1.55-r3.ebuild 1627 BLAKE2B 2be42abe1e64c49c0c27415fac17291de29c213328b0a71224c3fbf81a5077729c86e017a249aef16f0651a205d1759f2dbc0f318ef9a49bb386a7283ead31a5 SHA512 d0399e6fd944d6908f8137625c51d8192c66a95900b490368ce491f965c8f0472894a655e20a86a401c65260f7fec430c571bc337fb9bc2a1d6c4b65c34e3671
+EBUILD tomatoes-1.55-r4.ebuild 1642 BLAKE2B 1b4b45b6e21743243e1a35b5a3598ec75e0306ec12a0e8a8a80771a7a4a4d517c34ccc9f0d1462b48b310946e717f689afd8ce756eb22416c62e84a3cc99728c SHA512 9f0b29f0c4305c23829b737654880757bd7f2517ff8f8492f5d25a8975225a0c3a585794128d44dde39c1493dce994587efeb0be276a95ee1f9821e2faa54a13
 MISC metadata.xml 331 BLAKE2B 312d2ef06020a89fa08e79d82b22727eff32e689182f3f142bbc788555d2b05ddf93414a616deff188bc6d2ae35561da8fd832c2541c404d6136da144950c5b9 SHA512 adee588bcc930244c19ea9a3ac34b70c3afbbbed2b68d61289742fd7ca3d97eae5724cef90d350a4e5b8ff8b594f8d25fc1a5fbc672459034d0a492bb155223d
diff --git a/games-arcade/tomatoes/tomatoes-1.55-r3.ebuild b/games-arcade/tomatoes/tomatoes-1.55-r3.ebuild
deleted file mode 100644
index 088f0a4563b1..000000000000
--- a/games-arcade/tomatoes/tomatoes-1.55-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs
-
-DATA_PV=1.5
-DESCRIPTION="How many tomatoes can you smash in ten short minutes?"
-HOMEPAGE="http://tomatoes.sourceforge.net/about.html"
-SRC_URI="mirror://sourceforge/tomatoes/tomatoes-linux-src-${PV}.tar.bz2
-	mirror://sourceforge/tomatoes/tomatoes-linux-${DATA_PV}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[mod]
-	virtual/opengl
-	virtual/glu
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/gamestat
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-c_str.patch
-	"${FILESDIR}"/${P}-underlink.patch
-	"${FILESDIR}"/${P}-gcc43.patch
-)
-
-src_prepare() {
-	default
-
-	mv ../tomatoes-1.5/* . || die "mv failed"
-	mv icon.png ${PN}.png || die
-
-	sed -i \
-		-e "/^MPKDIR = /s:./:/usr/share/${PN}/:" \
-		-e "/^MUSICDIR = /s:./music/:/usr/share/${PN}/music/:" \
-		-e "/^HISCOREDIR = /s:./:/var/games/${PN}/:" \
-		-e "/^CONFIGDIR = /s:./:/etc/${PN}/:" \
-		-e "/^OVERRIDEDIR = /s:./data/:/usr/share/${PN}/data/:" \
-		makefile \
-		|| die "sed failed"
-}
-
-src_configure() {
-	tc-export CXX
-}
-
-src_install() {
-	dobin tomatoes
-	dodoc README README-src
-
-	insinto /usr/share/${PN}
-	doins -r tomatoes.mpk music
-
-	doicon ${PN}.png
-	make_desktop_entry tomatoes "I Have No Tomatoes"
-
-	dodir /var/games/${PN}
-	touch "${ED}"/var/games/${PN}/hiscore.lst || die "touch failed"
-
-	fperms 660 /var/games/${PN}/hiscore.lst
-	fowners -R root:gamestat /var/games/${PN}
-	fperms g+s /usr/bin/${PN}
-
-	insinto /etc/${PN}
-	doins config.cfg
-}
diff --git a/games-arcade/tomatoes/tomatoes-1.55-r4.ebuild b/games-arcade/tomatoes/tomatoes-1.55-r4.ebuild
new file mode 100644
index 000000000000..7bf17cee3fca
--- /dev/null
+++ b/games-arcade/tomatoes/tomatoes-1.55-r4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DATA_PV=1.5
+DESCRIPTION="How many tomatoes can you smash in ten short minutes?"
+HOMEPAGE="http://tomatoes.sourceforge.net/about.html"
+SRC_URI="mirror://sourceforge/tomatoes/tomatoes-linux-src-${PV}.tar.bz2
+	mirror://sourceforge/tomatoes/tomatoes-linux-${DATA_PV}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer[mod]
+	virtual/opengl
+	virtual/glu
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-c_str.patch
+	"${FILESDIR}"/${P}-underlink.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+)
+
+src_prepare() {
+	default
+
+	mv ../tomatoes-1.5/* . || die "mv failed"
+	mv icon.png ${PN}.png || die
+
+	sed -i \
+		-e "/^MPKDIR = /s:./:/usr/share/${PN}/:" \
+		-e "/^MUSICDIR = /s:./music/:/usr/share/${PN}/music/:" \
+		-e "/^HISCOREDIR = /s:./:/var/games/${PN}/:" \
+		-e "/^CONFIGDIR = /s:./:/etc/${PN}/:" \
+		-e "/^OVERRIDEDIR = /s:./data/:/usr/share/${PN}/data/:" \
+		makefile \
+		|| die "sed failed"
+}
+
+src_configure() {
+	tc-export CXX
+}
+
+src_install() {
+	dobin tomatoes
+	dodoc README README-src
+
+	insinto /usr/share/${PN}
+	doins -r tomatoes.mpk music
+
+	doicon ${PN}.png
+	make_desktop_entry tomatoes "I Have No Tomatoes"
+
+	dodir /var/games/${PN}
+	touch "${ED}"/var/games/${PN}/hiscore.lst || die "touch failed"
+
+	fperms 660 /var/games/${PN}/hiscore.lst
+	fowners -R root:gamestat /var/games/${PN} /usr/bin/${PN}
+	fperms g+s /usr/bin/${PN}
+
+	insinto /etc/${PN}
+	doins config.cfg
+}
diff --git a/games-arcade/xbill/Manifest b/games-arcade/xbill/Manifest
index 7010d3e68e53..a6f7f2d4826f 100644
--- a/games-arcade/xbill/Manifest
+++ b/games-arcade/xbill/Manifest
@@ -1,5 +1,5 @@
 AUX xbill-2.1-gentoo.patch 9281 BLAKE2B 852ac415c5525daeb47f321c2e91d76a2af842b5e934a0082e481a940919cffff3c600cd373c76564741346d580db01eba8ce502ba7f47c627a3c66bf042aa5a SHA512 81bdcb950260b6d8b52b9857d1d09b351b422df5789319873ea6e6f2431559c6a0a5a963a87313ed23b2a496d570c6c02e50df2c22f4195c48506f7711a740b8
 AUX xbill-2.1-gtk2.patch 582 BLAKE2B d577b0ba7e6247594c616d0d439136d9e0a6378518085e5d29303dbdce065d21ab623d12a18716ce03c35bd00e2a73aa865553c3f541cfe48eacebf60116d467 SHA512 f25980493ccc86f42c0ac4d996b6ec1580011b7764e7b1ad80dd04698a094c0c1842512e544d62ffd527b9a08109f7389c1741f4837e5320accc128786dbc546
 DIST xbill-2.1.tar.gz 77610 BLAKE2B aeadc62fa01a3d37b1ae6388987e5d5e3a2d73b9c5afa99b9a2c61155eeb5fb2efc4a36dd2cbeb3fd2f677b385550146d75964afa5f7e83a27f6dc7a16db83c9 SHA512 127604d88258db0ec47084209c656f8817146d70b0fe16f5a1d79883415cf38200594834b39080d78c627104ae6d204f3c12caf127fa094108c4edfbfa98d966
-EBUILD xbill-2.1-r3.ebuild 939 BLAKE2B e4b6236c6232c20f640f9328b9dd68b66da60a3d37256e1de9d78998db9fd22ef5ef738ecd48952a46887dcbbcb5e66873dc05bd4ccd00ef4ace7373934ef035 SHA512 a6c977e4b9b309b01eb01744aa0d5053c3d5fd068dfb7bff7e8c14481e6fd55e093a82091305ab189ad5d5651eeeab919098ddee14961ed87fb003908d9bcd39
+EBUILD xbill-2.1-r4.ebuild 955 BLAKE2B fb6a9a5586a91ed6654c81aab7d238757c31f592bda2941648be296d491c6214548371ec856714b5168a475957ddd3f373755f98cc776972b70796ca514699bb SHA512 16130a35969ab2182728cc934399d2f02c8966db63df33e78ac1d1842d8adfa011118d361288ff458c898920f67dec9bf36780eff20c7a1957ce4c049aecea3f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xbill/xbill-2.1-r3.ebuild b/games-arcade/xbill/xbill-2.1-r3.ebuild
deleted file mode 100644
index 70378b00ceb9..000000000000
--- a/games-arcade/xbill/xbill-2.1-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop
-
-DESCRIPTION="A game about an evil hacker called Bill!"
-HOMEPAGE="http://www.xbill.org/"
-SRC_URI="http://www.xbill.org/download/${P}.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="acct-group/gamestat
-	media-fonts/font-misc-misc
-	gtk? ( x11-libs/gtk+:2 )
-	!gtk? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gtk2.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	default
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-motif \
-		$(use_enable gtk) \
-		$(use_enable !gtk athena)
-}
-
-src_install() {
-	default
-	newicon pixmaps/icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} XBill ${PN}
-	fowners :gamestat /var/lib/xbill/scores
-	fperms 664 /var/lib/xbill/scores
-}
diff --git a/games-arcade/xbill/xbill-2.1-r4.ebuild b/games-arcade/xbill/xbill-2.1-r4.ebuild
new file mode 100644
index 000000000000..cbd5ae78dd07
--- /dev/null
+++ b/games-arcade/xbill/xbill-2.1-r4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop
+
+DESCRIPTION="A game about an evil hacker called Bill!"
+HOMEPAGE="http://www.xbill.org/"
+SRC_URI="http://www.xbill.org/download/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="acct-group/gamestat
+	media-fonts/font-misc-misc
+	gtk? ( x11-libs/gtk+:2 )
+	!gtk? ( x11-libs/libXaw )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gtk2.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-motif \
+		$(use_enable gtk) \
+		$(use_enable !gtk athena)
+}
+
+src_install() {
+	default
+	newicon pixmaps/icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} XBill ${PN}
+
+	fowners :gamestat /var/lib/xbill/scores /usr/bin/${PN}
+	fperms 664 /var/lib/xbill/scores
+}
diff --git a/games-arcade/xgalaga/Manifest b/games-arcade/xgalaga/Manifest
index 613edeb15865..c41575796c41 100644
--- a/games-arcade/xgalaga/Manifest
+++ b/games-arcade/xgalaga/Manifest
@@ -1,4 +1,4 @@
 AUX xgalaga-2.1.1.0-respect-AR.patch 633 BLAKE2B 9bfcf18f6bfc8deaa39427269539c0f07ffff02dcec7cbdebdfd432bb07138ca85464d4bc4db96bf49ce8cbecaeb544074a22ba3a424526c4b2b6af4bd5f9668 SHA512 e094a8158bae4ac25573ce99f12e070eb444bb14e15f80c7d5380b0b9697ccc696797fb575e82ac9f5b214ef1a6561f71f8a84d42576bacae6d9c14718cb0367
 DIST xgalaga-2.1.1.0.tar.gz 331621 BLAKE2B 290881eb89cacc7a2be469af8da2c11d710dea45f165daa43d4a10a310e681c9f6ffb012e057e266f1e50c5629122ca38cfd97e31a788104e7710f02d756f59d SHA512 087db9e0501cedb042bb673a217f9de32640d3e4f4f529a29fd25ed682a1aece9ae1beacdc2ee77fc93ac931411a1051e2cd19873578ccffe5f03a083bffe513
-EBUILD xgalaga-2.1.1.0-r1.ebuild 1427 BLAKE2B c37ccc685beea069675296c7d3ae9122e201bf1769f4e7ffbe20c5c922e6d0bb36a3ef65d03eb839cf23d9c3c6d359aea3d8c40171d302933944ca9503dd6126 SHA512 e2d02a5e628a29e13c6ce091884dbb9063323bad0dab3c46701a25884611691dd1178eaca7c92d538cbd53f3a2fc50cd63e61763ce3001e0afeba62b98812325
+EBUILD xgalaga-2.1.1.0-r1.ebuild 1481 BLAKE2B 9273b52aeb3c9b746a1cbb9e550cd6051d692789354c13d4cb4d8ab9a9bf3fde78ffe90209e3139373832db0764f2740a948e5b4952bf56d27d1faf45d250c02 SHA512 12ab6b11e2f92f18d0840437ca3d3d91370e1daecac6ae1db6dd8c30371f180a0acba0669caa4e2c6b3efbfc2c26fd0de3fcab5bbb8574d95b0e4e2738cd3d45
 MISC metadata.xml 330 BLAKE2B b3e61a8f4911203a72c70798959045a62572b4a814bbf8f03ccf17f8da74eaa4c542883da6f2ff780c7e83ab26398ff95a46b36a41c22785903b0299707e6e9c SHA512 2c0045dadc3b72dda9b7f3389aebb5a2d38b91f2cd63891a9bd97e2f23971c916ce515cbbda6b0c6f2b8a600fc56bd77d9db749d223eee5cd6edc99525217545
diff --git a/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild b/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
index 45c550a058be..1b87b13d58d9 100644
--- a/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
+++ b/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
@@ -60,6 +60,6 @@ src_install() {
 	touch "${ED}"/var/games/${PN}/scores || die
 
 	fperms -R 660 /var/games/${PN}
-	fowners -R root:gamestat /var/games/${PN}
+	fowners -R root:gamestat /var/games/${PN} /usr/bin/{xgalaga,xgal.sndsrv.oss,xgalaga-hyperspace}
 	fperms g+s /usr/bin/{xgalaga,xgal.sndsrv.oss,xgalaga-hyperspace}
 }
diff --git a/games-arcade/xjump/Manifest b/games-arcade/xjump/Manifest
index 9c08b5b08fdd..3929e883d189 100644
--- a/games-arcade/xjump/Manifest
+++ b/games-arcade/xjump/Manifest
@@ -1,5 +1,5 @@
 AUX xjump-2.7.5-ldflags.patch 335 BLAKE2B 53685cae49b253939a1f3e1172295294e1552918b86a6559f2a955d0fedcafd316de94b614a0298ee1313d2b1583437985285f026ec8d228afb0652ccc08e47a SHA512 e5fa4970475a5e00c42b11da05dfb18579080dd1d0c9e18e7077c709dbcab5e45322a636a6f12885248dcc771cbf615b4bcbe1fe99d3119f2da6b422cfef27c4
 DIST xjump_2.7.5-6.1.debian.tar.gz 9803 BLAKE2B 0a51a579aec18c71561f32d1f6321c383c8137dbe3923f3afdf00100f1c47ec062e2200a04a3281f32124f5fe72094abb6a1fc6a86de00c4886d872a21fe9a79 SHA512 c4962acd25c4cabef37acd3b5d39867a955f2fa769cc203fb00edfe37f37ce25369099b589a282189847e7bffeb874b4eaf8deea9320a9083da7e95425625cf8
 DIST xjump_2.7.5.orig.tar.gz 15940 BLAKE2B 9a022f9c6f522d8977268cd00709cc7a8aed9cf6ead042d1c75c0c0e7c011a1898690fa74e957198c5916806da4cc3d80d7d235342e7e41a33c2086553b91075 SHA512 6ce846d6681bf8b084edc06f8415a57f66d1778ec9af8b9b170f4f37292a8172b3507a08c85032a5b8588b50a7f2eefe205add4c779edd7c7ef8fb6d818d9300
-EBUILD xjump-2.7.5-r1.ebuild 1445 BLAKE2B 581d4cb8d6b0f516c4dd94dfbc7bbf6303e6fe8120915075af34699fe4eddc60c03fb092fc5d0d37ca5936b740aa837ef3ff4c4490cd093ec4a8116ab96eb35d SHA512 661f55276b3bd10fa119205009dff1b44eb0618dc900904e48a9c9dfbd6ca208611dc4ab18b5faf352cdf2c15b965c07bceeeeceb803c8ee149f62a2e1448542
+EBUILD xjump-2.7.5-r2.ebuild 1460 BLAKE2B 072a22d6e147107cedc969c1ec8954a751040a89864f678c9315f10a84515f4ba6204967b18fecd5bbface570fec21b47ba76dd2cb6a7a9d1240662c532ce0fa SHA512 d3934f5a3d9cb6f25a9d6113da4980076331173d86d89a539d2b45fbfe66a186eaf8af2de59db507d89188a3615f2af058a96539e517338bb944148aa5970f12
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xjump/xjump-2.7.5-r1.ebuild b/games-arcade/xjump/xjump-2.7.5-r1.ebuild
deleted file mode 100644
index 5e3328386b46..000000000000
--- a/games-arcade/xjump/xjump-2.7.5-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DEBIAN_PATCH="6.1"
-DESCRIPTION="An X game where one tries to jump up as many levels as possible"
-HOMEPAGE="http://packages.debian.org/stable/games/xjump"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.gz"
-S="${WORKDIR}"/${P}.orig
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-RDEPEND+=" acct-group/gamestat"
-
-PATCHES=(
-	"${WORKDIR}"/debian/patches/01_overflow.patch
-	"${WORKDIR}"/debian/patches/02_fix_repeat.patch
-	"${WORKDIR}"/debian/patches/03_source_warnings.patch
-	"${WORKDIR}"/debian/patches/04_makefile_respect_cflags.patch
-	"${WORKDIR}"/debian/patches/05_unneded_deps.patch
-	"${FILESDIR}"/${P}-ldflags.patch
-)
-
-src_prepare() {
-	default
-
-	# set up where we will keep the highscores file:
-	sed -i \
-		-e "/^CC/d" \
-		-e "/^CFLAGS/d" \
-		-e "s,/record,/xjump.hiscores," \
-		Makefile || die
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dobin xjump
-	dodoc README.euc
-
-	# Set up the hiscores file
-	dodir /var/games/${PN}
-	touch "${ED}"/var/games/${PN}/xjump.hiscores || die
-
-	fperms -R 660 /var/games/${PN}
-	fowners -R root:gamestat /var/games/${PN}
-	fperms g+s /usr/bin/xjump
-}
diff --git a/games-arcade/xjump/xjump-2.7.5-r2.ebuild b/games-arcade/xjump/xjump-2.7.5-r2.ebuild
new file mode 100644
index 000000000000..7dacc1d1aa39
--- /dev/null
+++ b/games-arcade/xjump/xjump-2.7.5-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DEBIAN_PATCH="6.1"
+DESCRIPTION="An X game where one tries to jump up as many levels as possible"
+HOMEPAGE="http://packages.debian.org/stable/games/xjump"
+SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/x/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.gz"
+S="${WORKDIR}"/${P}.orig
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXpm
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+RDEPEND+=" acct-group/gamestat"
+
+PATCHES=(
+	"${WORKDIR}"/debian/patches/01_overflow.patch
+	"${WORKDIR}"/debian/patches/02_fix_repeat.patch
+	"${WORKDIR}"/debian/patches/03_source_warnings.patch
+	"${WORKDIR}"/debian/patches/04_makefile_respect_cflags.patch
+	"${WORKDIR}"/debian/patches/05_unneded_deps.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_prepare() {
+	default
+
+	# set up where we will keep the highscores file:
+	sed -i \
+		-e "/^CC/d" \
+		-e "/^CFLAGS/d" \
+		-e "s,/record,/xjump.hiscores," \
+		Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin xjump
+	dodoc README.euc
+
+	# Set up the hiscores file
+	dodir /var/games/${PN}
+	touch "${ED}"/var/games/${PN}/xjump.hiscores || die
+
+	fperms -R 660 /var/games/${PN}
+	fowners -R root:gamestat /var/games/${PN} /usr/bin/${PN}
+	fperms g+s /usr/bin/${PN}
+}
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index b529584bf5c0..4564569bb2ba 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index bdb1648ac7fe..645c0c4cc601 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -1,8 +1,13 @@
 AUX pysolfc-2.6.4-python38.patch 343 BLAKE2B f0530a19cc53baa0f2f5a0a32f4c095c073bec967ffca6aff3185fe147ac8d1b80d5039664eeb111b9a138e144bef7cd8135377fbfb76a8f78bd00ea773244e0 SHA512 1a1362bfc3faa9a4b51ade80004a2931975def8aa6ea63db3a33116c9e3965a2bed110428d29175f1d9245a5438746ce33d04c8d8b13fa0d376a7c204fe12df5
 AUX pysolfc-gentoo.patch 322 BLAKE2B c2fccd5b11942d4cdce148199c6e8b8544502ba7bd95c2bdf230ebf96abc0b9d4e6225e7b1dde92f5eea8820149c10eb4c53e8f95fe82fcec15a480c0efa061a SHA512 963daef445d492a693380466fcfdc7f464947269d8a2b687039f31179c1f4fe5119efd71f83708073373c3ac5174a754075367937f99253d6b443e74e60e93d3
 AUX pysolfc-locales.patch 655 BLAKE2B ce8068858b91eead34f3ff374959d362aef3c1b2e6448016f54a4f69a04ff3c629660460a04af51d09e7451870db0727aa46bb190cd4671f0b81cb57c783c689 SHA512 53f95675c032f6d47957e883c9c5da4807b185fe4daaab663f36fb7044f12eb191cd934b6375534f5fcbc3f45dcd1b003639cf1d5f9d65b90fa5cc0afaae718e
+DIST PySolFC-2.12.0.tar.xz 3816376 BLAKE2B c37388873fcfc665f237ce7cae21d7d263b95f96efea118c6660f2d2fd18b4b5b2e935519b1318ec3f444085ec12dcfb65dc70a43937a9ec3dd7199f59c8edac SHA512 893012e93ca1cba72fac5f9f428c548af3aa59fa094aa9d027ed6740c91b34c5be62972e6522fb89264d1eb0f887234ddb07fa67a765573e105dbc25d885d1c5
 DIST PySolFC-Cardsets--Minimal-2.0.1.tar.xz 1450064 BLAKE2B 629318963ee9bf82f6ab0de03f1b59047b896f7528d0f9f5be973fb550b496b523238b9ef8fcdc034f53b5a7adc4c3b56326e912bb83fcfa7e7ad2f9dec8be6b SHA512 56c9ad3c1f9231c6f3866366d694eb6be6036b1b46c8a1ffbd6f7a243a19ab377d30ee4ccaae34f13e35727357d4168db7d9bc044562ec2d86445fb8aec84e4a
+DIST PySolFC-Cardsets--Minimal-2.0.2.tar.xz 6969096 BLAKE2B 50e87073cf4ab69031e1e4116115ddb1771197da176ac609c09e2f5fab1cc48ccb6f3ba40d7b581f67013835893106f7ab579a2cbc744aad98095944fbd2d5d9 SHA512 5317866d6259b154219ec6efea349af3f9cb0fe9309a895ee55f7be87ebc8c34df12b81a08e1dee907a3f475f4e623c3609fdbd7e357890c2ade418ec5d68cb2
 DIST PySolFC-Cardsets-2.0.tar.bz2 30687905 BLAKE2B f17f5095a05cf42ea9eb3e7a3a7fefe055cc3452882bf96db82bb4d1bebb2307ffc2d0fd8836f7414bfcd93b1d8de52adb43ef22701a0806f2c6c036d9306501 SHA512 24275cd3656024e268a49487ac75e1e67e61ec20e0a9f88e2d1c287f91314a1a9343856d1202ce468f8863f4e9a9bf27526fbb1979a7d765718b38e64ca0cfc8
+DIST PySolFC-Cardsets-2.1PRE.tar.bz2 34399177 BLAKE2B 12f577e67e858b96e9d76bb3aceafaaf1cb267b1805c91f36a51ae0b92652cc265d675543bc16923b216b125142b36aee858b54c2dc8f2eeccdd0d6c3e435fe7 SHA512 7fb83450fb3579d9a4e3e0ec1404d5da779c3e99d0ceaaad9d35adf599e2d9ef173f9d2bbf272ff08dc3c3e043a5dda78ae054c95c6fad828e80dff4c9011314
+DIST pysol-music-4.50.tar.xz 2144764 BLAKE2B ce6203441efa4525633b22b289be1d20aaa3107baf2127f96a46df19ba43d4ddbe62ccb6e68488d9845de91678aed0b87d93524b97615def63940b738a32d005 SHA512 ef281db180d28ccdeada3124d8a2451011fceedacd7cde8bb29305953438081839cb9ec48f51cb44f2bebf7828e940d79993fd026844983cf270ba1d7c839a85
 DIST pysolfc-2.6.4.tar.gz 7380668 BLAKE2B d172a5d69ab2d9ca2c2c56327111b564bcdaf4800f0903051bd5a4f06e22be7ca5630f7f8b9b70b7ebfcb7ad88cc5fea2357e13a9f0bb791edb6edd42f210127 SHA512 da127a2859315eba72b6affe8210068b3b8bf16837ba106a268e0de84b908528aef1a97d5fc63cecfa89317e3bef815758e44007c50d772fb96a1f62045e5906
+EBUILD pysolfc-2.12.0.ebuild 1760 BLAKE2B 357c85e480c723ebf10f905306a510c328b66c52d42fd77a87f074c3e26a0fa132fb355775d2ddda93fe658ee7ebb26df67fbcdde4b31030355e270c354a9559 SHA512 a52ea2864b51751f82c2984b252269160c86c926ceb69628866d6f1ee9db52c0af14d484fe1a8a039bfcdeb9f913c851868369c9d56913637f345df4d9fcbb2f
 EBUILD pysolfc-2.6.4-r1.ebuild 2169 BLAKE2B 581be072c6f3d141478a972dd15d4a81321abad8eb7d817dfbc8975f8e57c6570efcddeff45e56f4bbf13076be7ad360a92f0c567a905fbc39441af9d275c01d SHA512 afcbaa4a60df2d7b3cbb3bb32564383d05d1bd8a4064ca1ed3151cd5db822c3eedc42aad37dec8aaab825ccd94c1342033b5454830412f918f4863e8eebd5992
 MISC metadata.xml 562 BLAKE2B 1c818819cff77a23b88ca9ba0e67dab5a1ec9e388f68bd125acc0514306df05d76f2e9137aad414aebe2ed91b2632d04ca9f71435545846099c90a5c42e14ad5 SHA512 e3c7ecd4c54a21b46ee4ce4abc994fd5b8b486e4d5924755c0817fb0a29784a2fb36a10ed7aa36d4d5fa2c6518187702d879efc305a17c7699e8fe99bb09d107
diff --git a/games-board/pysolfc/pysolfc-2.12.0.ebuild b/games-board/pysolfc/pysolfc-2.12.0.ebuild
new file mode 100644
index 000000000000..c234eda859ad
--- /dev/null
+++ b/games-board/pysolfc/pysolfc-2.12.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1 xdg
+
+MY_PN="PySolFC"
+MY_P="${MY_PN}-${PV}"
+PS_CARD_P="${MY_PN}-Cardsets-2.1PRE"
+PS_CARD_MIN_P="${MY_PN}-Cardsets--Minimal-2.0.2"
+PS_MUSIC_P="pysol-music-4.50"
+
+DESCRIPTION="Exciting collection of more than 1000 solitaire card games"
+HOMEPAGE="https://pysolfc.sourceforge.io/"
+SRC_URI="mirror://sourceforge/pysolfc/${MY_P}.tar.xz
+	extra-cardsets? ( mirror://sourceforge/pysolfc/${PS_CARD_P}.tar.bz2 )
+	!extra-cardsets? ( mirror://sourceforge/pysolfc/${PS_CARD_MIN_P}.tar.xz )
+	sound? ( mirror://sourceforge/pysolfc/${PS_MUSIC_P}.tar.xz )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+ GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="extra-cardsets minimal +sound"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/attrs[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+		dev-python/pysol_cards[${PYTHON_USEDEP}]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		!minimal? (
+			dev-python/pillow[jpeg,tk,${PYTHON_USEDEP}]
+			dev-tcltk/tktable
+		)
+		sound? (
+			dev-python/pygame[${PYTHON_USEDEP}]
+			media-libs/sdl2-mixer[mod]
+		)
+	')"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	local DOCS=( AUTHORS.md NEWS.asciidoc README.md )
+	distutils-r1_python_install_all
+
+	doman docs/pysol{,fc}.6
+
+	insinto /usr/share/${MY_PN}
+	doins -r ../$(usex extra-cardsets ${PS_CARD_P} ${PS_CARD_MIN_P})/.
+
+	if use sound; then
+		insinto /usr/share/${MY_PN}/music
+		doins ../${PS_MUSIC_P}/data/music/*.{it,mod,s3m}
+	fi
+
+	# html files are used at runtime, keep at default location
+	dosym -r /usr/share/{${MY_PN},doc/${PF}}/html
+}
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index a0e9b6017d98..44698394773e 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/etqw-bin/Manifest b/games-fps/etqw-bin/Manifest
index ede2430718d1..9bae7f5fc8c6 100644
--- a/games-fps/etqw-bin/Manifest
+++ b/games-fps/etqw-bin/Manifest
@@ -1,3 +1,3 @@
 DIST ETQW-client-1.5-full.x86.run 556383725 BLAKE2B 8fcaa8518c7c452a4fe593a00beea0f5a6d5849c72b03d4a443fffde8540ea53b7bf0376d90b2f2ed4e3a736628f8871e009a49b938344516b2db0495cf1e826 SHA512 32bb3d7ef47790ac6b790a5a5d61592c3504d034372254102985e58dee25b5d200e507330226bf8458c628154c246b2abcb08bf550fa044189c4c8de813af0c2
-EBUILD etqw-bin-1.5-r3.ebuild 1983 BLAKE2B 5e4ae4f5e5d2b5b3013cc53b4f5d781d486f2a526807ab5c8238079ee5e4f08ad9ad1c020a2c16127a7bf590b8381c20402e1add1b855f1a75bbcb85b74c8dca SHA512 968c1c51b1b0be762f792030839503f4cd4eadb4d1a728434d3e1227ec715f4d342307d851b5b201dd8bb3227b2b3b1c5d3cea086fb9c5a52726e6ab4bfa5be0
+EBUILD etqw-bin-1.5-r4.ebuild 1988 BLAKE2B 0e41c0654cac48336ce510b3cf5c112ee44aaf0d4ac950e3f2f2d1b45ca05bf0f9260c65e4bd461b9511c8d14ca347dd4e4af24cb1eeacb5faebac810e427ba4 SHA512 9e60d32146e57db384650fc0ddc91fcb5cea412f9d806042b36f977ca908980d58909cd9cebce851789c6f09ad339f24807730ea18a78e53557a18a9c580321e
 MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-fps/etqw-bin/etqw-bin-1.5-r3.ebuild b/games-fps/etqw-bin/etqw-bin-1.5-r3.ebuild
deleted file mode 100644
index f13784da99a7..000000000000
--- a/games-fps/etqw-bin/etqw-bin-1.5-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop wrapper
-
-DESCRIPTION="Enemy Territory: Quake Wars"
-HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/ETQWFrontPage/"
-SRC_URI="http://ftp.jeuxlinux.fr/files/ETQW-client-${PV}-full.x86.run"
-S="${WORKDIR}"/data
-
-LICENSE="ETQW"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="cdinstall"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
-	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-	sys-libs/glibc
-	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-	virtual/jpeg-compat:62[abi_x86_32(-)]
-	amd64? ( sys-libs/glibc[multilib] )
-	cdinstall? ( games-fps/etqw-data )
-"
-BDEPEND="app-arch/unzip"
-
-MY_DIR=opt/etqw
-
-QA_PREBUILT="
-	${MY_DIR}/*.x86
-	${MY_DIR}/*.so*
-"
-
-src_unpack() {
-	tail -c +194885 "${DISTDIR}"/${A} > ${A}.zip
-	unpack ./${A}.zip
-	rm -f ${A}.zip || die
-}
-
-src_install() {
-	insinto ${MY_DIR}
-	doins -r base pb *.png
-	dodoc *.txt
-
-	exeinto ${MY_DIR}
-	doexe etqw{,ded,-rthread}.x86 openurl.sh libCgx86.so libSDL*.id.so*
-
-	newicon etqw_icon.png etqw.png
-	make_wrapper etqw ./etqw.x86 "${MY_DIR}" "${MY_DIR}"
-	make_desktop_entry etqw "Enemy Territory: Quake Wars" etqw
-
-	make_wrapper etqw-dedicated ./etqwded.x86 "${MY_DIR}" "${MY_DIR}"
-	make_desktop_entry etqw-dedicated "Enemy Territory: Quake Wars (dedicated server)" etqw
-
-	make_wrapper etqw-rthread ./etqw-rthread.x86 "${MY_DIR}" "${MY_DIR}"
-	make_desktop_entry etqw-rthread "Enemy Territory: Quake Wars (SMP)" etqw
-}
-
-pkg_postinst() {
-	if ! use cdinstall ; then
-		elog "You need to copy pak00*.pk4, zpak_*.pk4 and the megatextures"
-		elog "directory to ${MY_DIR}/base before running the game."
-	fi
-
-	elog "To change the game language from English, add"
-	elog "seta sys_lang \"your_language\" to your autoexec.cfg file."
-	elog "Menu fonts may not show up until you do so."
-}
diff --git a/games-fps/etqw-bin/etqw-bin-1.5-r4.ebuild b/games-fps/etqw-bin/etqw-bin-1.5-r4.ebuild
new file mode 100644
index 000000000000..6b10bfba6e38
--- /dev/null
+++ b/games-fps/etqw-bin/etqw-bin-1.5-r4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+DESCRIPTION="Enemy Territory: Quake Wars"
+HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/ETQWFrontPage/"
+SRC_URI="http://ftp.jeuxlinux.fr/files/ETQW-client-${PV}-full.x86.run"
+S="${WORKDIR}"/data
+
+LICENSE="ETQW"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="cdinstall"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
+	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+	sys-libs/glibc
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	virtual/jpeg-compat:62[abi_x86_32(-)]
+	amd64? ( sys-libs/glibc[multilib] )
+	cdinstall? ( games-fps/etqw-data )
+"
+BDEPEND="app-arch/unzip"
+
+MY_DIR=/opt/etqw
+
+QA_PREBUILT="
+	${MY_DIR#/}/*.x86
+	${MY_DIR#/}/*.so*
+"
+
+src_unpack() {
+	tail -c +194885 "${DISTDIR}"/${A} > ${A}.zip
+	unpack ./${A}.zip
+	rm -f ${A}.zip || die
+}
+
+src_install() {
+	insinto ${MY_DIR}
+	doins -r base pb *.png
+	dodoc *.txt
+
+	exeinto ${MY_DIR}
+	doexe etqw{,ded,-rthread}.x86 openurl.sh libCgx86.so libSDL*.id.so*
+
+	newicon etqw_icon.png etqw.png
+	make_wrapper etqw ./etqw.x86 "${MY_DIR}" "${MY_DIR}"
+	make_desktop_entry etqw "Enemy Territory: Quake Wars" etqw
+
+	make_wrapper etqw-dedicated ./etqwded.x86 "${MY_DIR}" "${MY_DIR}"
+	make_desktop_entry etqw-dedicated "Enemy Territory: Quake Wars (dedicated server)" etqw
+
+	make_wrapper etqw-rthread ./etqw-rthread.x86 "${MY_DIR}" "${MY_DIR}"
+	make_desktop_entry etqw-rthread "Enemy Territory: Quake Wars (SMP)" etqw
+}
+
+pkg_postinst() {
+	if ! use cdinstall ; then
+		elog "You need to copy pak00*.pk4, zpak_*.pk4 and the megatextures"
+		elog "directory to ${MY_DIR}/base before running the game."
+	fi
+
+	elog "To change the game language from English, add"
+	elog "seta sys_lang \"your_language\" to your autoexec.cfg file."
+	elog "Menu fonts may not show up until you do so."
+}
diff --git a/games-fps/etqw-demo/Manifest b/games-fps/etqw-demo/Manifest
index 736070d5c7bb..cbefb239099d 100644
--- a/games-fps/etqw-demo/Manifest
+++ b/games-fps/etqw-demo/Manifest
@@ -1,3 +1,3 @@
 DIST ETQW-demo2-client-full.r1.x86.run 691248874 BLAKE2B 42692da7b2f7f35730dea9557c26bb189ac555eccdaf2873d3b5e91bff640b1cd121022aa671c990f92164a97874e9f46f47c76ad01f2ff2973ad3edea6898db SHA512 41332208626449da74bea71a9926258f50986f0af85045d470d4405d27e497085ba318337181802be58eb50c724ab91df6b9c810e5fcc5f8dc131486d6529f38
-EBUILD etqw-demo-2.0_p1-r3.ebuild 1548 BLAKE2B 4f04f7f452d00d6a26838adf7064c088d930225bd34d61223ab226adf3f695707bc7797f30790a9935b502c3a497cf53b645d9f5582c48a418f3d2581e0eae57 SHA512 8474b43175dfbda40773ffab928abafd49eebabbf16a0810cfe95159e23330f125bce44b30ea668444d59945e3e57e558f22224b50fa4093db8bd8a290b63027
+EBUILD etqw-demo-2.0_p1-r4.ebuild 1549 BLAKE2B 2bdb599a354e72670b14a263e0692aba18aeb4383e3d8e3dc38b79f5cc71a2b7c5ee53b678304fd6f721646d74c138e1411355a7b6278a5dabd7e30b506a429d SHA512 bb26a676df2736bb1a22f24ef299f38ffb4987ca054e107324f71df98b7875a9129304045cda2baf9480b35487e47ad9e1e1a03af44755693a0ff4257b23f94d
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/etqw-demo/etqw-demo-2.0_p1-r3.ebuild b/games-fps/etqw-demo/etqw-demo-2.0_p1-r3.ebuild
deleted file mode 100644
index 244db5ad24ee..000000000000
--- a/games-fps/etqw-demo/etqw-demo-2.0_p1-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop unpacker wrapper
-
-MY_MAJOR=$(ver_cut 1)
-MY_REV=$(ver_cut 3-)
-MY_BODY="ETQW-demo${MY_MAJOR}-client-full.r${MY_REV/p/}.x86"
-
-DESCRIPTION="Enemy Territory: Quake Wars demo"
-HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/"
-SRC_URI="mirror://idsoftware/etqw/${MY_BODY}.run"
-S="${WORKDIR}"
-
-# See copyrights.txt
-LICENSE="ETQW"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="bindist strip mirror"
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
-	sys-libs/ncurses-compat[abi_x86_32(-)]
-	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-	virtual/jpeg-compat:62[abi_x86_32(-)]
-	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-"
-
-BDEPEND="app-arch/unzip"
-
-dir=opt/${PN}
-
-QA_PREBUILT="
-	${dir:1}/guis/libmojosetupgui_ncurses.so
-	${dir:1}/data/*
-	${dir:1}/data/pb/*.so
-"
-
-src_unpack() {
-	# exit status of 1 should just be warnings, not corrupt archive
-	unpack_zip ${A}
-}
-
-src_install() {
-	insinto "${dir}"
-	doins -r guis scripts
-
-	cd data || die
-	insinto "${dir}"/data
-	doins -r base pb etqw_icon.png
-	dodoc README.txt EULA.txt copyrights.txt etqwtv.txt
-
-	exeinto "${dir}"/data
-	doexe etqw *\.x86 etqw-* libCgx86* libSDL* *.sh
-
-	make_wrapper ${PN} ./etqw.x86 "${dir}"/data "${dir}"/data
-	# Matches with desktop entry for enemy-territory-truecombat
-	make_desktop_entry ${PN} "Enemy Territory - Quake Wars (Demo)"
-
-	make_wrapper ${PN}-ded ./etqwded.x86 "${dir}"/data "${dir}"/data
-}
diff --git a/games-fps/etqw-demo/etqw-demo-2.0_p1-r4.ebuild b/games-fps/etqw-demo/etqw-demo-2.0_p1-r4.ebuild
new file mode 100644
index 000000000000..9b412a633907
--- /dev/null
+++ b/games-fps/etqw-demo/etqw-demo-2.0_p1-r4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop unpacker wrapper
+
+MY_MAJOR=$(ver_cut 1)
+MY_REV=$(ver_cut 3-)
+MY_BODY="ETQW-demo${MY_MAJOR}-client-full.r${MY_REV/p/}.x86"
+
+DESCRIPTION="Enemy Territory: Quake Wars demo"
+HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/"
+SRC_URI="mirror://idsoftware/etqw/${MY_BODY}.run"
+S="${WORKDIR}"
+
+# See copyrights.txt
+LICENSE="ETQW"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="bindist strip mirror"
+
+RDEPEND="
+	>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
+	sys-libs/ncurses-compat[abi_x86_32(-)]
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	virtual/jpeg-compat:62[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+"
+
+BDEPEND="app-arch/unzip"
+
+dir=/opt/${PN}
+
+QA_PREBUILT="
+	${dir#/}/guis/libmojosetupgui_ncurses.so
+	${dir#/}/data/*
+	${dir#/}/data/pb/*.so
+"
+
+src_unpack() {
+	# exit status of 1 should just be warnings, not corrupt archive
+	unpack_zip ${A}
+}
+
+src_install() {
+	insinto "${dir}"
+	doins -r guis scripts
+
+	cd data || die
+	insinto "${dir}"/data
+	doins -r base pb etqw_icon.png
+	dodoc README.txt EULA.txt copyrights.txt etqwtv.txt
+
+	exeinto "${dir}"/data
+	doexe etqw *\.x86 etqw-* libCgx86* libSDL* *.sh
+
+	make_wrapper ${PN} ./etqw.x86 "${dir}"/data "${dir}"/data
+	# Matches with desktop entry for enemy-territory-truecombat
+	make_desktop_entry ${PN} "Enemy Territory - Quake Wars (Demo)"
+
+	make_wrapper ${PN}-ded ./etqwded.x86 "${dir}"/data "${dir}"/data
+}
diff --git a/games-fps/ezquake-bin/Manifest b/games-fps/ezquake-bin/Manifest
index fd917764c8c6..807a90bb4e45 100644
--- a/games-fps/ezquake-bin/Manifest
+++ b/games-fps/ezquake-bin/Manifest
@@ -2,5 +2,5 @@ DIST ezquake_linux-x86_1.9.3.tar.gz 19230315 BLAKE2B df2128f8aa05a1e4d970b52d193
 DIST ezquake_linux-x86_64.1.9.3.tar.gz 18624824 BLAKE2B 619d2ef3c03a9d105000c75c0c2d21398d4080810b7cab6d6a143ac0a4513420f0756c01d932f7332cbd87dfba335d6b82b1ee122fb94c2fcf4331e7beab7689 SHA512 4c2f5060bbf08ca3b9583d4c3502e69bf6d503efd0e14df9d5fe54e1e8ac1c5ca0b920c3748e4a8e1f86c60d6e5809977352636d4758fd9cb3934cea03b1138f
 DIST ezquake_linux32_2.2.tar.gz 1685934 BLAKE2B f4e1374992ac548c45ca59161c0e86214f50db17502f6bc89d56ec4e9c596478399ff02c86a539e3590f0ad82d90dd7b2f02df25089573068b4e24e1085d0898 SHA512 2a42b43a0b4ad75c22c58bb53f8161eec1460cac3b841ccf2593e0cb803c4ef5cee23f939f859eb6d95409a01c4ccc3eabae108eac6c1cb850f9c5c3445bf5ab
 DIST ezquake_linux64_2.2.tar.gz 1804397 BLAKE2B 9ad294fda829a9dd68201a7c5deb9e3a708f4ac81caa97745e965bcececfc0c1aa787b53ad5465238452bee4ded256214eb234658e8bc17795ef519faaa67057 SHA512 c1f1772971980a7b349da6c6eea5643591d5bc81a939b28e50651c5773d8372277fb6bc9a5681c59e8273ca6250fa712c3b76db488bf521dd3675aabd5e1af8e
-EBUILD ezquake-bin-2.2-r2.ebuild 1952 BLAKE2B 8eb36d74f9b313705253a2b18f60e34c798ebf5cb94b0fac6a5f2dbd5e0be247e610361ebda7297dcf10907c011b823be74c202e7460ba4b5c00e1fcf2401b62 SHA512 40b56dffc6f236366198d25825a6d68e312f295db6c84e9f1bb648a7ff302d73093eaa906f37580f536a7201a899d40ef0775955fb148ac88428fad3a94d45ee
+EBUILD ezquake-bin-2.2-r3.ebuild 1955 BLAKE2B 3c6f608e1b0edf49185f24d06ba668ba630093d6dd780010811f541b6d12eee36b37411646684d1c85218275bc003d7bc285b2d4667b3810945c6ea44363a127 SHA512 4ff2f0bbb8d6e245223eaa116b739441d513a2247aa894e862804ab64d49cdcfc91551452ed11be68b64a3c3b4e2ebc48efa0895ffbfdd7acdca4f0d75e18ead
 MISC metadata.xml 340 BLAKE2B 0e535869685c648fd759901404ee04e736d85783bd09f34756917ce5bfb1239048accdf32fd59ae3a11828da8dbc6ca1b337f28259013b864b9e02e687758cac SHA512 4922600550155470211bb2fe2eab50f02e120d82261d2956f7f73604ec5e76c71e37be5d9a542d9f963eaa0927da7bcb9b464428a7b778d17a383135e423063e
diff --git a/games-fps/ezquake-bin/ezquake-bin-2.2-r2.ebuild b/games-fps/ezquake-bin/ezquake-bin-2.2-r2.ebuild
deleted file mode 100644
index 2a31a079e3b6..000000000000
--- a/games-fps/ezquake-bin/ezquake-bin-2.2-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit wrapper
-
-MY_FULL_PV=1.9.3
-MY_PN="${PN/-bin/}"
-DESCRIPTION="Quakeworld client with mqwcl functionality and many more features"
-HOMEPAGE="http://ezquake.sf.net/"
-SRC_URI="
-	amd64? ( mirror://sourceforge/${MY_PN}/${MY_PN}_linux-x86_64.${MY_FULL_PV}.tar.gz
-		mirror://sourceforge/${MY_PN}/${MY_PN}_linux64_${PV}.tar.gz )
-	x86? ( mirror://sourceforge/${MY_PN}/${MY_PN}_linux-x86_${MY_FULL_PV}.tar.gz
-		mirror://sourceforge/${MY_PN}/${MY_PN}_linux32_${PV}.tar.gz )
-"
-S="${WORKDIR}"/${MY_PN}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="cdinstall"
-
-RESTRICT="strip mirror"
-
-DEPEND="cdinstall? ( games-fps/quake1-data )"
-RDEPEND="
-	${DEPEND}
-	virtual/opengl
-	x11-libs/libXpm
-	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm
-"
-
-MY_DIR=opt/${PN}
-QA_PREBUILT="${MY_DIR}/ezquake*"
-
-src_unpack() {
-	unpack ${A}
-
-	if use amd64; then
-		mv ${MY_PN}_linux-x86_64.${MY_FULL_PV} "${MY_PN}" || die
-		mv ezquake-gl_linux-x64.glx "${MY_PN}"/ezquake-gl.glx || die
-	else
-		mv ${MY_PN}_linux-x86.${MY_FULL_PV} "${MY_PN}" || die
-		mv ezquake-gl_linux-x86.glx "${MY_PN}"/ezquake-gl.glx || die
-	fi
-}
-
-src_install() {
-	exeinto ${MY_DIR}
-	insinto ${MY_DIR}
-
-	doexe ezquake-gl.glx
-	doins -r ezquake qw
-	dosym ../../usr/share/quake1/id1 ${MY_DIR}/id1
-	make_wrapper ezquake-gl.glx ./ezquake-gl.glx "${MY_DIR}" "${MY_DIR}"
-}
-
-pkg_postinst() {
-	if ! use cdinstall; then
-		elog "NOTE that this client doesn't include .pak files. You *should*"
-		elog "enable \"cdinstall\" flag or install quake1-demodata with the symlink use flag."
-		elog "You can also copy the files from your Quake1 CD to"
-		elog "  ${MY_DIR}/quake1/id1 (all names lowercase)"
-		elog ""
-		elog "You may also want to check:"
-		elog " http://fuhquake.quakeworld.nu - complete howto on commands and variables"
-		elog " http://equake.quakeworld.nu - free package containing various files"
-	fi
-}
diff --git a/games-fps/ezquake-bin/ezquake-bin-2.2-r3.ebuild b/games-fps/ezquake-bin/ezquake-bin-2.2-r3.ebuild
new file mode 100644
index 000000000000..d4d62ccdf6fe
--- /dev/null
+++ b/games-fps/ezquake-bin/ezquake-bin-2.2-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit wrapper
+
+MY_FULL_PV=1.9.3
+MY_PN="${PN/-bin/}"
+DESCRIPTION="Quakeworld client with mqwcl functionality and many more features"
+HOMEPAGE="http://ezquake.sf.net/"
+SRC_URI="
+	amd64? ( mirror://sourceforge/${MY_PN}/${MY_PN}_linux-x86_64.${MY_FULL_PV}.tar.gz
+		mirror://sourceforge/${MY_PN}/${MY_PN}_linux64_${PV}.tar.gz )
+	x86? ( mirror://sourceforge/${MY_PN}/${MY_PN}_linux-x86_${MY_FULL_PV}.tar.gz
+		mirror://sourceforge/${MY_PN}/${MY_PN}_linux32_${PV}.tar.gz )
+"
+S="${WORKDIR}"/${MY_PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="cdinstall"
+
+RESTRICT="strip mirror"
+
+DEPEND="cdinstall? ( games-fps/quake1-data )"
+RDEPEND="
+	${DEPEND}
+	virtual/opengl
+	x11-libs/libXpm
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm
+"
+
+MY_DIR=/opt/${PN}
+QA_PREBUILT="${MY_DIR#/}/ezquake*"
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64; then
+		mv ${MY_PN}_linux-x86_64.${MY_FULL_PV} "${MY_PN}" || die
+		mv ezquake-gl_linux-x64.glx "${MY_PN}"/ezquake-gl.glx || die
+	else
+		mv ${MY_PN}_linux-x86.${MY_FULL_PV} "${MY_PN}" || die
+		mv ezquake-gl_linux-x86.glx "${MY_PN}"/ezquake-gl.glx || die
+	fi
+}
+
+src_install() {
+	exeinto ${MY_DIR}
+	doexe ezquake-gl.glx
+
+	insinto ${MY_DIR}
+	doins -r ezquake qw
+	dosym ../../usr/share/quake1/id1 ${MY_DIR}/id1
+	make_wrapper ezquake-gl.glx ./ezquake-gl.glx "${MY_DIR}" "${MY_DIR}"
+}
+
+pkg_postinst() {
+	if ! use cdinstall; then
+		elog "NOTE that this client doesn't include .pak files. You *should*"
+		elog "enable \"cdinstall\" flag or install quake1-demodata with the symlink use flag."
+		elog "You can also copy the files from your Quake1 CD to"
+		elog "  ${MY_DIR}/quake1/id1 (all names lowercase)"
+		elog ""
+		elog "You may also want to check:"
+		elog " http://fuhquake.quakeworld.nu - complete howto on commands and variables"
+		elog " http://equake.quakeworld.nu - free package containing various files"
+	fi
+}
diff --git a/games-fps/ut2004-demo/Manifest b/games-fps/ut2004-demo/Manifest
index 9e0859ed9657..3f38a383b5c2 100644
--- a/games-fps/ut2004-demo/Manifest
+++ b/games-fps/ut2004-demo/Manifest
@@ -1,3 +1,3 @@
 DIST ut2004-lnx-demo3334.run 288950743 BLAKE2B 82a45af7de4735cbcb1b8b4b5303d28d96e3e4888e12b60b920db096ed07b4c5d902eda258276c95865316206ddfd5828174397a8e921118e33f63be01e71861 SHA512 4cdd61901f4c082d1e02caf301a24f1e18e89f4efc9fbce0e4496178916b6c14245131b62f27deb17f1763cd4b8bf68ee60cc7af5ece5fa2b39d1bf349361da0
-EBUILD ut2004-demo-3334-r2.ebuild 1801 BLAKE2B c6c3787ecea657191de65cf78b0bbef456c174a7800043ef79b58db612e11e84320f18fe23f4d71bb57fd860dc3b34451a596bb1eaf4f491e4f5e20d68dffda6 SHA512 0283e14511d3a1dd7694a05a3e42fe19c04fd6e5dbfdf1ad09f9ab67c5d9e0bfe06ca9965158cbce7c23a0f35a519e5db9eb16145c1a2ead012187c7b2c52fa0
+EBUILD ut2004-demo-3334-r3.ebuild 1806 BLAKE2B ae3e1142e870dc7ef7d3a5fa4d74634db633504a8e0885cdf9970732b7d125a389af58dfc692664c52860c192820f93c9c6eabde9a1c2f7f86de19b749686f8b SHA512 301f58d89dad8bcea73b1b36db83dea92a7a8efa14cb0030124c033ba15cd7437f77a0fd3a98c84ffa7916a2d71640ccea655edd4c64f4f054db6fc717e91aae
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-demo/ut2004-demo-3334-r2.ebuild b/games-fps/ut2004-demo/ut2004-demo-3334-r2.ebuild
deleted file mode 100644
index 51362724f160..000000000000
--- a/games-fps/ut2004-demo/ut2004-demo-3334-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop unpacker wrapper
-
-MY_P="ut2004-lnx-demo${PV}.run"
-DESCRIPTION="Demo for the critically-acclaimed first-person shooter"
-HOMEPAGE="http://www.unrealtournament.com/"
-SRC_URI="mirror://gentoo/${MY_P}"
-S="${WORKDIR}"
-
-LICENSE="ut2003-demo"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	sys-libs/libstdc++-v3:5
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-"
-
-dir=opt/${PN}
-Ddir="${ED}"/${dir}
-QA_PREBUILT="${dir}/System/*"
-
-src_unpack() {
-	unpack_makeself
-	unpack ./setupstuff.tar.gz
-}
-
-src_install() {
-	dodir ${dir}
-
-	tar xjf ut2004demo.tar.bz2 -C "${Ddir}" || die
-
-	if use x86 ; then
-		tar xjf linux-x86.tar.bz2 || die
-	elif use amd64 ; then
-		tar xjf linux-amd64.tar.bz2 || die
-	fi
-
-	insinto ${dir}
-	doins README.linux ut2004.xpm
-	newicon ut2004.xpm ut2004-demo.xpm
-
-	exeinto ${dir}
-	doexe bin/ut2004-demo
-
-	exeinto ${dir}/System
-	doexe System/{libSDL-1.2.so.0,openal.so,ucc-bin,ut2004-bin}
-
-	make_wrapper ut2004-demo ./ut2004-demo "${dir}" "${dir}"
-	make_desktop_entry ut2004-demo "Unreal Tournament 2004 (Demo)" ut2004-demo
-}
-
-pkg_postinst() {
-	echo
-	elog "For Text To Speech:"
-	elog "   1) emerge festival speechd"
-	elog "   2) Edit your ~/.ut2004demo/System/UT2004.ini file."
-	elog "      In the [SDLDrv.SDLClient] section, add:"
-	elog "         TextToSpeechFile=/dev/speech"
-	elog "   3) Start speechd."
-	elog "   4) Start the game.  Be sure to go into the Audio"
-	elog "      options and enable Text To Speech."
-	echo
-	elog "To test, pull down the console (~) and type:"
-	elog "   TTS this is a test."
-	echo
-	elog "You should hear something that sounds like 'This is a test.'"
-	echo
-}
diff --git a/games-fps/ut2004-demo/ut2004-demo-3334-r3.ebuild b/games-fps/ut2004-demo/ut2004-demo-3334-r3.ebuild
new file mode 100644
index 000000000000..f3e7fe14b61e
--- /dev/null
+++ b/games-fps/ut2004-demo/ut2004-demo-3334-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop unpacker wrapper
+
+MY_P="ut2004-lnx-demo${PV}.run"
+DESCRIPTION="Demo for the critically-acclaimed first-person shooter"
+HOMEPAGE="http://www.unrealtournament.com/"
+SRC_URI="mirror://gentoo/${MY_P}"
+S="${WORKDIR}"
+
+LICENSE="ut2003-demo"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	sys-libs/libstdc++-v3:5
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
+"
+
+dir=/opt/${PN}
+Ddir="${ED}"/${dir#/}
+QA_PREBUILT="${dir#/}/System/*"
+
+src_unpack() {
+	unpack_makeself
+	unpack ./setupstuff.tar.gz
+}
+
+src_install() {
+	dodir ${dir}
+
+	tar xjf ut2004demo.tar.bz2 -C "${Ddir}" || die
+
+	if use x86 ; then
+		tar xjf linux-x86.tar.bz2 || die
+	elif use amd64 ; then
+		tar xjf linux-amd64.tar.bz2 || die
+	fi
+
+	insinto ${dir}
+	doins README.linux ut2004.xpm
+	newicon ut2004.xpm ut2004-demo.xpm
+
+	exeinto ${dir}
+	doexe bin/ut2004-demo
+
+	exeinto ${dir}/System
+	doexe System/{libSDL-1.2.so.0,openal.so,ucc-bin,ut2004-bin}
+
+	make_wrapper ut2004-demo ./ut2004-demo "${dir}" "${dir}"
+	make_desktop_entry ut2004-demo "Unreal Tournament 2004 (Demo)" ut2004-demo
+}
+
+pkg_postinst() {
+	echo
+	elog "For Text To Speech:"
+	elog "   1) emerge festival speechd"
+	elog "   2) Edit your ~/.ut2004demo/System/UT2004.ini file."
+	elog "      In the [SDLDrv.SDLClient] section, add:"
+	elog "         TextToSpeechFile=/dev/speech"
+	elog "   3) Start speechd."
+	elog "   4) Start the game.  Be sure to go into the Audio"
+	elog "      options and enable Text To Speech."
+	echo
+	elog "To test, pull down the console (~) and type:"
+	elog "   TTS this is a test."
+	echo
+	elog "You should hear something that sounds like 'This is a test.'"
+	echo
+}
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 45f0e96f64c3..ef9eaa6748dc 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/seatris/Manifest b/games-puzzle/seatris/Manifest
index 5d5cc5a6186f..938b07f417ca 100644
--- a/games-puzzle/seatris/Manifest
+++ b/games-puzzle/seatris/Manifest
@@ -1,4 +1,4 @@
 AUX seatris-0.0.14-as-needed.patch 215 BLAKE2B 3d2ea91214f6f00ec767aa00bfce6c77c7a42132a94f0e394d0a7f89c1eeaa3ff9d8638cce1321f6fb97bec614fbdb0f07fcbc68a2cd65fbd48373887aaa5846 SHA512 587f8f4f555b6a97d38a0c7bb8069674e6612ff5e3027b7c7327a02178aabdc20a6d32f63b7a667eac31480e435f575844afdd79523707d0fcf586417d8fd38b
 DIST seatris-0.0.14.tar.gz 53056 BLAKE2B 8efbc4531f98f06857815c86e2833ede03de3206bfc89efe387e2b388252c05d11b404e4a72fe6b33f215908cf03bc5687c627fa61943cb549c59bfb82455939 SHA512 105722ddbeaa8ae3863331126cf816e7d590ebe4ca244b32d3275071c2537c2865183a90f60f8dbf46cfacbcee4e811b653ff9cc6d2eae51c9ed6efa9263fac2
-EBUILD seatris-0.0.14-r1.ebuild 1035 BLAKE2B 46798ab77c0e9e2e95dea9e0230676d6fbd8374986884741d5af0eb2bd9cd6c2f1ec7b2d2d493777dcd3b0471b175a2588858620d0dd368eb56765211c4b634b SHA512 5e23a56a154a3202fab51cb8a8a1c4c9c9306d854fb8677c13385efe1cb7c2393a2101a11ab98d9eb52b20d62979dcdaf662d22c20fd563ad0e24fc3a0b9aff5
+EBUILD seatris-0.0.14-r2.ebuild 1050 BLAKE2B aea45d29574fe5b25c6f675f91522da4d4cb65895f00fbcdd1e6584f129f206a46a265c4b11796da8892708bcbc39f87ba2199ea45186b962d53d03e934965e5 SHA512 44b854d5ce07ce3c42f9619ac659b77231ffdd68bfd1dcc99478a2d9c2db67d9e10910eb4a6e0dffa7ae1448e5db782c91b585ca8569aee163bfacdb0151044f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/seatris/seatris-0.0.14-r1.ebuild b/games-puzzle/seatris/seatris-0.0.14-r1.ebuild
deleted file mode 100644
index 6669683f0a9d..000000000000
--- a/games-puzzle/seatris/seatris-0.0.14-r1.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 toolchain-funcs
-
-DESCRIPTION="A color ncurses tetris clone"
-HOMEPAGE="http://www.earth.li/projectpurple/progs/seatris.html"
-SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="sys-libs/ncurses:="
-RDEPEND="
-	${DEPEND}
-	acct-group/gamestat
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-as-needed.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:/var/lib/games:/var/lib/${PN}:" \
-		scoring.h seatris.6 || die
-}
-
-src_configure() {
-	tc-export CC
-	econf
-}
-
-src_compile() {
-	emake LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
-}
-
-src_install() {
-	dobin seatris
-
-	doman seatris.6
-	dodoc ACKNOWLEDGEMENTS HISTORY README TODO example.seatrisrc
-
-	dodir /var/lib/${PN}
-	touch "${ED}"/var/lib/${PN}/seatris.score || die
-	fperms 660 /var/lib/${PN}/seatris.score
-
-	fowners -R root:gamestat /var/lib/${PN}
-	fperms g+s /usr/bin/${PN}
-}
diff --git a/games-puzzle/seatris/seatris-0.0.14-r2.ebuild b/games-puzzle/seatris/seatris-0.0.14-r2.ebuild
new file mode 100644
index 000000000000..2b208413feb3
--- /dev/null
+++ b/games-puzzle/seatris/seatris-0.0.14-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A color ncurses tetris clone"
+HOMEPAGE="http://www.earth.li/projectpurple/progs/seatris.html"
+SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="sys-libs/ncurses:="
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:/var/lib/games:/var/lib/${PN}:" \
+		scoring.h seatris.6 || die
+}
+
+src_configure() {
+	tc-export CC
+	econf
+}
+
+src_compile() {
+	emake LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
+}
+
+src_install() {
+	dobin seatris
+
+	doman seatris.6
+	dodoc ACKNOWLEDGEMENTS HISTORY README TODO example.seatrisrc
+
+	dodir /var/lib/${PN}
+	touch "${ED}"/var/lib/${PN}/seatris.score || die
+	fperms 660 /var/lib/${PN}/seatris.score
+
+	fowners -R root:gamestat /var/lib/${PN} /usr/bin/${PN}
+	fperms g+s /usr/bin/${PN}
+}
diff --git a/games-puzzle/splice/Manifest b/games-puzzle/splice/Manifest
index 32a360002edf..97b8e11aae26 100644
--- a/games-puzzle/splice/Manifest
+++ b/games-puzzle/splice/Manifest
@@ -1,3 +1,3 @@
 DIST splice-linux-1353389454.tar.gz 305838859 BLAKE2B ef8c6ae70b48f6c1860e3d6591876063abea77fe0f9a7597f91e32295bee8e517fed1bf6fa3fa5e491ea11e8da7faffa26ad9d9329d960269e29dda7adf8a14d SHA512 67a83a30bdb8ff0eecf9097bb4615053fcdb073daada4a24b61ae239ed56b7d2192247e80989c67554dcfcc1069c2105a6083f9fafffa4bbd66bbf29edad6a44
-EBUILD splice-20121120-r1.ebuild 1273 BLAKE2B 033e4fbfe1e329c9e63fd596a7e7f8a501c046ee9bb7b62ecaf4916d6bd90223c0a14c8fedb1b6a6093bf2991c9542bbef59418f9f30f08d83234ab081b4d762 SHA512 e481a2c2469a1d40259f1b65f7a8ab5af7dd883b6d4abb0cc956c52e946d83ec66c85ba2c18fde3632d7c5b125a37173b4d00039a9adf2b2d2fddcbab8e4ea35
+EBUILD splice-20121120-r2.ebuild 1274 BLAKE2B 1309de7d2ff431cd2be1dc0fce84acca9d119765fd80c0d8c7358bb538b4da646ada94310855aff7d92394538a693fe624a16a08ab92c7c4a3230baae1aee796 SHA512 b4f2f099ae0c755f4dc8db72d2a94af21867a4ecb17238b7c2e141fb26d98a1f2d0ff24111086e2ba14b1ae32028d9b99d7c4921a2c4b5e42a1c47b397bbec4b
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-puzzle/splice/splice-20121120-r1.ebuild b/games-puzzle/splice/splice-20121120-r1.ebuild
deleted file mode 100644
index 2a420c4413f1..000000000000
--- a/games-puzzle/splice/splice-20121120-r1.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
-
-inherit desktop wrapper
-
-DESCRIPTION="An experimental and artistic puzzler set in a microbial world"
-HOMEPAGE="http://www.cipherprime.com/games/splice/"
-SRC_URI="splice-linux-1353389454.tar.gz"
-S="${WORKDIR}"/Linux
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=opt/${PN}
-QA_PREBUILT="
-	${MYGAMEDIR#/}/Splice*
-	${MYGAMEDIR#/}/Splice_Data/Mono/*
-"
-
-# TODO: unbundle mono? (seems hardcoded)
-#       icon
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext"
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to your DISTDIR directory."
-}
-
-src_prepare() {
-	default
-
-	einfo "Removing ${ARCH} unrelated files..."
-	rm -v Splice.x86$(usex amd64 "" "_64") || die
-	rm -rv Splice_Data/Mono/x86$(usex amd64 "" "_64") || die
-
-	rm README~ || die
-	mv README "${T}"/ || die
-}
-
-src_install() {
-	dodoc "${T}"/README
-
-	insinto ${MYGAMEDIR}
-	doins -r *
-
-	make_desktop_entry ${PN}
-	make_wrapper ${PN} "./Splice.x86$(usex amd64 "_64" "")" "${MYGAMEDIR}"
-
-	fperms +x ${MYGAMEDIR}/Splice.x86$(usex amd64 "_64" "")
-}
diff --git a/games-puzzle/splice/splice-20121120-r2.ebuild b/games-puzzle/splice/splice-20121120-r2.ebuild
new file mode 100644
index 000000000000..4a89f862c355
--- /dev/null
+++ b/games-puzzle/splice/splice-20121120-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+DESCRIPTION="An experimental and artistic puzzler set in a microbial world"
+HOMEPAGE="http://www.cipherprime.com/games/splice/"
+SRC_URI="splice-linux-1353389454.tar.gz"
+S="${WORKDIR}"/Linux
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="bindist fetch splitdebug"
+
+MYGAMEDIR=/opt/${PN}
+QA_PREBUILT="
+	${MYGAMEDIR#/}/Splice*
+	${MYGAMEDIR#/}/Splice_Data/Mono/*
+"
+
+# TODO: unbundle mono? (seems hardcoded)
+#       icon
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext"
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to your DISTDIR directory."
+}
+
+src_prepare() {
+	default
+
+	einfo "Removing ${ARCH} unrelated files..."
+	rm -v Splice.x86$(usex amd64 "" "_64") || die
+	rm -rv Splice_Data/Mono/x86$(usex amd64 "" "_64") || die
+
+	rm README~ || die
+	mv README "${T}"/ || die
+}
+
+src_install() {
+	dodoc "${T}"/README
+
+	insinto ${MYGAMEDIR}
+	doins -r *
+
+	make_desktop_entry ${PN}
+	make_wrapper ${PN} "./Splice.x86$(usex amd64 "_64" "")" "${MYGAMEDIR}"
+
+	fperms +x ${MYGAMEDIR}/Splice.x86$(usex amd64 "_64" "")
+}
diff --git a/games-puzzle/tiny-and-big/Manifest b/games-puzzle/tiny-and-big/Manifest
index 6e3782cbc0ce..5bb601c5ba54 100644
--- a/games-puzzle/tiny-and-big/Manifest
+++ b/games-puzzle/tiny-and-big/Manifest
@@ -1,3 +1,3 @@
 DIST tinyandbig_grandpasleftovers-retail-linux-1.4.1_1370968537.tar.bz2 1170058011 BLAKE2B 2c1845165408cca68fd791b2d6f91c49e1131c25c29a49ab8512e82cf0664d52fcb8526741693e045e3ea1560ace47ed3d8a8e51a4851d6ce57adce6f2bcd445 SHA512 3dbf6ebbe6047f5258f482e776809c6817df8d14cfc20014fb6e4a6accc3db3e93051270ce29371bc0ef56d380bd382dbf8eb75b592c3f0097ca3546d889193e
-EBUILD tiny-and-big-1.4.1-r1.ebuild 1375 BLAKE2B 618b2908e89079db3751a3616045b3a1b9cb0fab6dbe032850b765bcbac76a4d89165d450fa5f9bcff640ae841511c7ea8b992b52243924fec36d716bd058b2f SHA512 9a37ef2ba2747ba922cfc3e5bd78a5240ec72adac6b6b1a2bd8c4ecefd3d67096b039d4839fc8b370d286a27eabce9974736a9867e26bc680507f3a984d934be
+EBUILD tiny-and-big-1.4.1-r2.ebuild 1376 BLAKE2B f9b3c48ca408bc2a1afa258f8eb10a6e8bbd26efbf7b5e7d9e8ed0729b4ccdf71ea31b093ce5a03cb72148537611846589a320ac3daad71c5522e37dda44acca SHA512 c9e953b7a173d8103206302d36bc2dee615359bd5d5d723bac4c838fd45072b30dcd5826760b4d8fa55f1e2aaa4c664f1b405537c7774b3ba9b0240122f23957
 MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-puzzle/tiny-and-big/tiny-and-big-1.4.1-r1.ebuild b/games-puzzle/tiny-and-big/tiny-and-big-1.4.1-r1.ebuild
deleted file mode 100644
index e0c90bcce700..000000000000
--- a/games-puzzle/tiny-and-big/tiny-and-big-1.4.1-r1.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
-
-inherit desktop wrapper
-
-DESCRIPTION="Combines elements of adventure, jump&run and physical puzzles"
-HOMEPAGE="http://www.tinyandbig.com/"
-SRC_URI="tinyandbig_grandpasleftovers-retail-linux-${PV}_1370968537.tar.bz2"
-S="${WORKDIR}"/tinyandbig
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libs"
-
-RESTRICT="bindist fetch bundled-libs? ( splitdebug )"
-
-MYGAMEDIR=opt/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/bin32/*
-	${MYGAMEDIR#/}/bin64/*"
-
-# TODO: unbundle media-libs/cal3d, lib hacked or old version
-RDEPEND="
-	media-libs/openal
-	virtual/opengl
-	x11-libs/libX11
-	!bundled-libs? (
-		media-gfx/nvidia-cg-toolkit
-	)
-"
-BDEPEND="app-arch/bzip2"
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to your DISTDIR directory."
-	einfo
-}
-
-src_prepare() {
-	default
-
-	if ! use bundled-libs ; then
-		rm -v $(usex amd64 "bin64" "bin32")/libCg{,GL}.so || die "unbundling libs failed!"
-	fi
-}
-
-src_install() {
-	local bindir=$(usex amd64 "bin64" "bin32")
-
-	insinto ${MYGAMEDIR}
-	doins -r assets ${bindir}
-
-	make_wrapper ${PN} "./${bindir}/tinyandbig" "${MYGAMEDIR}" "${MYGAMEDIR}/${bindir}"
-	make_desktop_entry ${PN} "Tiny & Big"
-	dodoc readme.txt
-
-	fperms +x ${MYGAMEDIR}/${bindir}/tinyandbig
-}
diff --git a/games-puzzle/tiny-and-big/tiny-and-big-1.4.1-r2.ebuild b/games-puzzle/tiny-and-big/tiny-and-big-1.4.1-r2.ebuild
new file mode 100644
index 000000000000..983779968c63
--- /dev/null
+++ b/games-puzzle/tiny-and-big/tiny-and-big-1.4.1-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+DESCRIPTION="Combines elements of adventure, jump&run and physical puzzles"
+HOMEPAGE="http://www.tinyandbig.com/"
+SRC_URI="tinyandbig_grandpasleftovers-retail-linux-${PV}_1370968537.tar.bz2"
+S="${WORKDIR}"/tinyandbig
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="bundled-libs"
+
+RESTRICT="bindist fetch bundled-libs? ( splitdebug )"
+
+MYGAMEDIR=/opt/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}/bin32/*
+	${MYGAMEDIR#/}/bin64/*"
+
+# TODO: unbundle media-libs/cal3d, lib hacked or old version
+RDEPEND="
+	media-libs/openal
+	virtual/opengl
+	x11-libs/libX11
+	!bundled-libs? (
+		media-gfx/nvidia-cg-toolkit
+	)
+"
+BDEPEND="app-arch/bzip2"
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to your DISTDIR directory."
+	einfo
+}
+
+src_prepare() {
+	default
+
+	if ! use bundled-libs ; then
+		rm -v $(usex amd64 "bin64" "bin32")/libCg{,GL}.so || die "unbundling libs failed!"
+	fi
+}
+
+src_install() {
+	local bindir=$(usex amd64 "bin64" "bin32")
+
+	insinto ${MYGAMEDIR}
+	doins -r assets ${bindir}
+
+	make_wrapper ${PN} "./${bindir}/tinyandbig" "${MYGAMEDIR}" "${MYGAMEDIR}/${bindir}"
+	make_desktop_entry ${PN} "Tiny & Big"
+	dodoc readme.txt
+
+	fperms +x ${MYGAMEDIR}/${bindir}/tinyandbig
+}
diff --git a/games-puzzle/xbomb/Manifest b/games-puzzle/xbomb/Manifest
index 6c0fb2120767..b15051b58678 100644
--- a/games-puzzle/xbomb/Manifest
+++ b/games-puzzle/xbomb/Manifest
@@ -1,5 +1,5 @@
 AUX xbomb-2.2b-DESTDIR.patch 706 BLAKE2B 257023ee9127df592b81c7e4cb24b2004cd1522f89766ac8a6ee094889567278f59b2c17faca7f00954fb5021762ebdd593fb0e253f54c2b83546e4b5f83c0e8 SHA512 be770c9dd42e7c802af60ebe019b359d12b74397956d32881504b20f8ad44994a3cf1dcd3e23fcf65642cbee1aa622ba2fff63ec223fce9faaef0c03ed4b1914
 AUX xbomb-2.2b-ldflags.patch 177 BLAKE2B b43eab3cf0fdbabce44b2ec6c2f47db947cb857e46620a4d4b5d2d30da07a0ee169e54403854f54a755e7569d37d9a43948ebf6bdb35611a0cbc8f415d2507dc SHA512 047f410f34505d4582969f071eb1982fd3bb38357ad228e61608ca9307118263f34d6a1b43832877ca2862e107018132bad3bf6e3df79b641d5466efb94a6d8c
 DIST xbomb-2.2b.tgz 24774 BLAKE2B 77a447af42ecd47654b826d884e7c31e98e0bdfb06d1574401064fe79dc42c961fc95a96dd6509871d78589e06eb54f975a292a5371c16520e125b75aae8b637 SHA512 7315cc08bff1ef14cc376ea3ad4913c4286e2e33e92ca1d924e4703fba2f58e5aa9df0db760cd0d9a83f2f1730cc65281403f5b198f32a30d0c5e736add8c2e1
-EBUILD xbomb-2.2b-r1.ebuild 1052 BLAKE2B 27f4468551b7bba3af241bfcef1197a10bc9df2690c299403c0e135b6b08ecb59219f2249e23d47e4ca2ceb75430461cc78d4a2ce1cd3aa55d8d7b4b5659068f SHA512 5a2386b5107289a488972561ab5908b33a39e851e21b1b7db927528d6c79f26d7b0fdbae7da35e681ef8ded2e846ac8cfbd19d2456c6d5cae56981a8a3e1b5a7
+EBUILD xbomb-2.2b-r2.ebuild 1067 BLAKE2B 5c8da07f6598eb0e77798482a4fabe65260dcd284e70b032af0cb6cbfb59a68db1b686e2d2effa30fea8906ff2bd02504db26b0f3f1bf971655e56f53c5280e6 SHA512 64ac7055c889ab7de07425c30ad2567c2e90568165a0b854328c13b523f97a395ed9eb09dd9cb21e5ad25e8128f70478d57621de38136af3c4005c2a7eb7aa5b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/xbomb/xbomb-2.2b-r1.ebuild b/games-puzzle/xbomb/xbomb-2.2b-r1.ebuild
deleted file mode 100644
index d717dc1dcef8..000000000000
--- a/games-puzzle/xbomb/xbomb-2.2b-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Minesweeper clone with hexagonal, rectangular and triangular grid"
-HOMEPAGE="http://www.gedanken.org.uk/software/xbomb/"
-SRC_URI="http://www.gedanken.org.uk/software/xbomb/download/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="x11-libs/libXaw"
-RDEPEND="
-	${DEPEND}
-	acct-group/gamestat
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-DESTDIR.patch
-	"${FILESDIR}"/${P}-ldflags.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/strip/d' \
-		-e '/^CC=/d' \
-		-e "/^CFLAGS/ { s:=.*:=${CFLAGS}: }" \
-		Makefile || die
-	sed -i \
-		-e "s:/var/tmp:/var/lib/${PN}:g" \
-		hiscore.c || die
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	default
-
-	dodir /var/lib/${PN}
-	touch "${ED}"/var/lib/${PN}/${PN}{3,4,6}.hi || die "touch failed"
-	fperms 660 /var/lib/${PN}/${PN}{3,4,6}.hi
-
-	fowners root:gamestat /var/lib/${PN}
-	fperms g+s /usr/bin/${PN}
-
-	make_desktop_entry xbomb XBomb
-}
diff --git a/games-puzzle/xbomb/xbomb-2.2b-r2.ebuild b/games-puzzle/xbomb/xbomb-2.2b-r2.ebuild
new file mode 100644
index 000000000000..d43f0aec54a7
--- /dev/null
+++ b/games-puzzle/xbomb/xbomb-2.2b-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Minesweeper clone with hexagonal, rectangular and triangular grid"
+HOMEPAGE="http://www.gedanken.org.uk/software/xbomb/"
+SRC_URI="http://www.gedanken.org.uk/software/xbomb/download/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="x11-libs/libXaw"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-DESTDIR.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/strip/d' \
+		-e '/^CC=/d' \
+		-e "/^CFLAGS/ { s:=.*:=${CFLAGS}: }" \
+		Makefile || die
+	sed -i \
+		-e "s:/var/tmp:/var/lib/${PN}:g" \
+		hiscore.c || die
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	dodir /var/lib/${PN}
+	touch "${ED}"/var/lib/${PN}/${PN}{3,4,6}.hi || die "touch failed"
+	fperms 660 /var/lib/${PN}/${PN}{3,4,6}.hi
+
+	fowners root:gamestat /var/lib/${PN} /usr/bin/${PN}
+	fperms g+s /usr/bin/${PN}
+
+	make_desktop_entry xbomb XBomb
+}
diff --git a/games-puzzle/xwelltris/Manifest b/games-puzzle/xwelltris/Manifest
index 330fbd11b57b..45992bb3bbd8 100644
--- a/games-puzzle/xwelltris/Manifest
+++ b/games-puzzle/xwelltris/Manifest
@@ -1,5 +1,5 @@
 AUX xwelltris-1.0.1-gcc-11.patch 317 BLAKE2B d8de25ff359ab2dbf15f953b1689df4f056e4ef4991da1e98935ca1c51d7c46ea3321827702eb0b92c595cfed85c52c156d23c9d700e51f03c681b50f6c25b1e SHA512 3afd9b2f5c6bd684a4392d72a9a482b0bde6ff86a4027cc749aaf452add5d2ff59a242c39d198c0e0625f90d0d14c4b6d319f397b7f7b65742b3320cc8712250
 AUX xwelltris-1.0.1-scorefile-dir.patch 615 BLAKE2B 77dd21fa7650bb2d940422aebf80bd9c82188c577bf7a498e7537b88218dbbfae3be8309588798b03e7590a002a317a8171202b9b0aa411421160d776109a7c1 SHA512 3bc2e6ef0b44ead08103441e9e4e13263b108986461d263a30fc0125b25d687e74e7e49d3610fc2207a370125aaf79c839e41584e97e989b2e6dceb1478a4919
 DIST xwelltris-1.0.1.src.tar.gz 422822 BLAKE2B c6eda0d294e79c5715bcaa593776ecfb0cdc734386fc4e9a6825dd090340c2744a251ad1e753421865151928608e4aebdd5050b0091a0799b7d1da5a0b3bdd60 SHA512 6b1080c6e6d1b579c441d1f42bb6454dafed62a63790d5798e83cf137db7ff2ddc07db7e89b34402a5249770697cc3f8ad5e6222266142c7b43f6936828f2536
-EBUILD xwelltris-1.0.1.ebuild 1498 BLAKE2B 101ebb78875362288d23443e810ddcb2e0228bea486c911737714b8dc56b9bc758a2ab19a30b3e019e0c4ba8ce2c24f351a552655aaf9be1adc1aa4fbd6ae502 SHA512 c10754ec0adbc2e7c725dd954d83afe9ac79f6a858340eb2a49bb2b9d410aec797dc7eaaddf799819bed2ac8e4c1e18f1a7eefd4234146a66c0584b16cd99e1a
+EBUILD xwelltris-1.0.1-r1.ebuild 1513 BLAKE2B d03090d50bb7244ac69e16130ba6969c2effc15c41f58c59e3ffcff1641215b14a98496a733e721ae507b5f14ab4588beed33e079cce0463149253cf01a3a707 SHA512 5174af72f10786b2e072e90c936bd4bcd7838fba0b9e190e10ec95023100f998492b904622055e2313311eb46182c0b0ae7bdc76add0a5a2ca9bf8acd66d4858
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/xwelltris/xwelltris-1.0.1-r1.ebuild b/games-puzzle/xwelltris/xwelltris-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..6d69ef032900
--- /dev/null
+++ b/games-puzzle/xwelltris/xwelltris-1.0.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs prefix
+
+DESCRIPTION="2.5D tetris like game"
+HOMEPAGE="http://xnc.jinr.ru/xwelltris/"
+SRC_URI="http://xnc.jinr.ru/xwelltris/src/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	media-libs/libsdl[video]
+	media-libs/sdl-image[gif]
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+
+PATCHES=(
+	# Look in ${EPREFIX}/var/lib/xwelltris for score file
+	"${FILESDIR}"/${PN}-1.0.1-scorefile-dir.patch
+	"${FILESDIR}"/${PN}-1.0.1-gcc-11.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/INSTALL_PROGRAM/s/-s //' \
+		src/Make.common.in || die
+
+	sed -i \
+		-e "/GLOBAL_SEARCH/s:\".*\":\"/usr/share/${PN}\":" \
+		src/include/globals.h.in || die
+
+	# Ensure we look in ${EPREFIX}/var/lib/${PN} for score file
+	eprefixify src/commonfuncs.cxx
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	# configure/build process is pretty messed up
+	econf --with-sdl
+}
+
+src_compile() {
+	emake -C src
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/${PN} /var/lib/${PN} /usr/share/man
+
+	emake install \
+		INSTDIR="${D}/usr/bin" \
+		INSTLIB="${D}/usr/share/${PN}" \
+		INSTMAN=/usr/share/man
+
+	dodoc AUTHORS Changelog README*
+
+	# Move score file to our location
+	mv "${ED}"/usr/share/${PN}/welltris.scores "${ED}"/var/lib/${PN}/welltris.scores || die
+
+	fowners root:gamestat /var/lib/${PN}/welltris.scores /usr/bin/${PN}
+	fperms 660 /var/lib/${PN}/welltris.scores
+	fperms g+s /usr/bin/${PN}
+}
diff --git a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild b/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
deleted file mode 100644
index 11369637b0b0..000000000000
--- a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs prefix
-
-DESCRIPTION="2.5D tetris like game"
-HOMEPAGE="http://xnc.jinr.ru/xwelltris/"
-SRC_URI="http://xnc.jinr.ru/xwelltris/src/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	media-libs/libsdl[video]
-	media-libs/sdl-image[gif]
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/gamestat
-"
-
-PATCHES=(
-	# Look in ${EPREFIX}/var/lib/xwelltris for score file
-	"${FILESDIR}"/${PN}-1.0.1-scorefile-dir.patch
-	"${FILESDIR}"/${PN}-1.0.1-gcc-11.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/INSTALL_PROGRAM/s/-s //' \
-		src/Make.common.in || die
-
-	sed -i \
-		-e "/GLOBAL_SEARCH/s:\".*\":\"/usr/share/${PN}\":" \
-		src/include/globals.h.in || die
-
-	# Ensure we look in ${EPREFIX}/var/lib/${PN} for score file
-	eprefixify src/commonfuncs.cxx
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	# configure/build process is pretty messed up
-	econf --with-sdl
-}
-
-src_compile() {
-	emake -C src
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/${PN} /var/lib/${PN} /usr/share/man
-
-	emake install \
-		INSTDIR="${D}/usr/bin" \
-		INSTLIB="${D}/usr/share/${PN}" \
-		INSTMAN=/usr/share/man
-
-	dodoc AUTHORS Changelog README*
-
-	# Move score file to our location
-	mv "${ED}"/usr/share/${PN}/welltris.scores "${ED}"/var/lib/${PN}/welltris.scores || die
-
-	fowners root:gamestat /var/lib/${PN}/welltris.scores
-	fperms 660 /var/lib/${PN}/welltris.scores
-	fperms g+s /usr/bin/${PN}
-}
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 2cf560ab7d1e..1409ca39f238 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/dwarf-fortress/Manifest b/games-roguelike/dwarf-fortress/Manifest
index 88bd0e04287a..5c7760cf6c5e 100644
--- a/games-roguelike/dwarf-fortress/Manifest
+++ b/games-roguelike/dwarf-fortress/Manifest
@@ -2,5 +2,5 @@ AUX Makefile.native 1016 BLAKE2B ea40a1f90bf52e52c7cf88e99c73c981c00506eddb4ad9c
 AUX dwarf-fortress 516 BLAKE2B 9d2faffac265e99698fa1c481eec8598fbe66b4ab205b18c76d285cd16fe1b32d3bfa9bc415bceae6e1e350e955ac3b3cebd7d46943a06ff71715fd1cb5402df SHA512 1f1fada35e33cb99c28835d600f6567ecaaf7b2c6111a2e96b1a88c54e5d727f94ae1c0213327bc70a623dbdf19a8433e3c59edcab5a40e898b0124eb2eb9006
 DIST df_44_12_linux.tar.bz2 12081683 BLAKE2B 2410e8da6af6a8ced45d3e95dc06e2d0f4e31dbdcd6b8d9945a761d2278532bb24c1095418aa22639eedded256b3d485fa128984e6282a491d4dc7bd9af8671b SHA512 03cd7f6800d44873b573cc5bffb12c7a246c3aba0ee8535001372df689a5179dc02592670fd87f2fd5de82421605f34152f6241307c8f7b9fb4d7b8704aed70c
 DIST df_44_12_linux32.tar.bz2 12686340 BLAKE2B bf1e1370930d91d2c9e72d3366bc79706092d1505853eb63c6160fea39822551d3276958ac6d2916b8f7825be0c054a037219210f0c2c18a731065a2dd1bb842 SHA512 5cd352acf310592c7e30442205b7fe590f421c5e3562959dcfd32a17d3d562347c2b32e3bc5835637c5550ce2c696c17b6dc910ee4cf766be07af306e83537db
-EBUILD dwarf-fortress-0.44.12.ebuild 2343 BLAKE2B 0eb61350aad85953aacb00e1ee9503a765d1bd45e276229dcb6174549efc6070b9cf13884bf9dae51da2724a968bd5c4509231c81d1523457a0dc155e61312c9 SHA512 8fee92a9c804fb04ed8adccb4691ffc9185a6739ced24ff171f6b78a9da666fde980fcd5adda1184e3d0b8156d525968f503542a89fff38e4fe63f323564f4f9
+EBUILD dwarf-fortress-0.44.12.ebuild 2344 BLAKE2B b6657167f0c9191e9cdc76b7ca4d149238b50b5526eb9f236c2f12166dce93e2ebc0c7ae692f70ac456b9b8cd50d2606a76859835b1db9d289cb67de90aef5af SHA512 b82d7d1782d70635cdcba237d5a847becef9eabe4f814cffc0c397a3a662a511848f49a783303707e6820e6bbf0b2cfb843edb5fc91c32eb87cd16ab7ad025f0
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild
index dfcfe78cf3cf..7a4dab115c0c 100644
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.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
@@ -13,11 +13,13 @@ DESCRIPTION="A single-player fantasy game"
 HOMEPAGE="https://www.bay12games.com/dwarves"
 SRC_URI="amd64? ( https://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 )
 	x86? ( https://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )"
+S="${WORKDIR}"/${MY_PN}_linux
 
 LICENSE="free-noncomm BSD BitstreamVera"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="debug"
+RESTRICT="strip"
 
 RDEPEND="media-libs/glew:0
 	media-libs/libsdl[joystick,video]
@@ -34,11 +36,8 @@ DEPEND="${RDEPEND}
 	sys-libs/ncurses-compat:5[unicode]
 	virtual/pkgconfig"
 
-S=${WORKDIR}/${MY_PN}_linux
-
 gamesdir="/opt/${PN}"
 QA_PREBUILT="${gamesdir#/}/libs/Dwarf_Fortress"
-RESTRICT="strip"
 
 src_prepare() {
 	rm -f libs/*.so* || die
diff --git a/games-roguelike/moria/Manifest b/games-roguelike/moria/Manifest
index a4f7c9091189..4eeefb59418d 100644
--- a/games-roguelike/moria/Manifest
+++ b/games-roguelike/moria/Manifest
@@ -1,5 +1,5 @@
 AUX moria-5.7.12-gentoo-paths.patch 1842 BLAKE2B bb5460110dd86feff51ab50a66cf54c6ae2b98c81af590205da9c361278396da109dc9443ee14f6697944b59b9b17f404bf904d91e84dc46ac1b9a8e7196f041 SHA512 cdd4e7161799204c9d99e7c52f69430aae0e8b96aa9622f89bdfe6288899133cd836af04ed0a5593a01539c4762e527630f2d8ffa9081deb7df991a5c3d82c7d
 AUX moria.6 2996 BLAKE2B ee20dc08b849eccf3860736b401a500f50598c340c0098d6cd820eb65ecbe13467b09ef23ab4982204b394ca8e0ef644bfbff4c8dd9df07ff15cb2b635d6af5e SHA512 54d4914f4c9bf364ef8539079d0a3cf91257309a479818e106c5ee41bbf2dab608074988d12529fd726e4cafd5c48baed4793f32a2a254593a928c5b6d1b9bd5
 DIST moria-5.7.14.tar.gz 395191 BLAKE2B dfa8481c51009fba3d692d8f5a667a85904149a7756822b435ae8fe30a8ad9c5bb901f6efb21dfe17e1155e49c080ca7b3de154bcd2a5df055a17b3a81b5b6b0 SHA512 5c99ed314a29684d2fc18a1429fb7609553a78fd053eac8d61189e0af8c72777d481910153514dfe544a8939be24ed9725fc2b31e89e5d6e26f0b1df5ad4c3e0
-EBUILD moria-5.7.14.ebuild 1174 BLAKE2B 5f103faa7fc5da06430b0c625b9e8f7892fd9060b2608aaa02ef6a6e28ebe3cd260fdf73114642ed6fa9a759ead0394eb22803653d543f874aa7c0518369a3d9 SHA512 be46802006d00744a9032f3f96d79415b58a3c33110e0ebce460a751e2f72605464b16810cf0dc66b5a239a3a901697b1927aad78998b8a94a5a8753f0f62902
+EBUILD moria-5.7.14-r1.ebuild 1189 BLAKE2B eb18b46531de97572737f930aeb4c0afbc4fbadc0e21d7962b39f4fb049bba41d6be79fc29128e6064d455b64148717bc3159703a1cb4001091822267196705e SHA512 fd92f13e24e0b7ea4ec24f6798436a5eb2674fc2a2117969e76801c301b22c612332634f191f765f02007c20ffb90f00f830fbbec303363d6f0e4964d0c9b1ea
 MISC metadata.xml 342 BLAKE2B f53651879ccf3a26ac770d9746a76f5d59eb4403db9bdd4ae5f222f1a8e26c8a0c1ff86c47f087381d49229c1bc9473c7415072fd716ba0ba57f88c21198e5f2 SHA512 f6c4db0374588d0ba1070fdba2e38d647de66378fccc6a59e96c27cd50b4e2f9071259202cb1b33fe99d57332230dc68d450df2017ee1124f6b505d40f9f9843
diff --git a/games-roguelike/moria/moria-5.7.14-r1.ebuild b/games-roguelike/moria/moria-5.7.14-r1.ebuild
new file mode 100644
index 000000000000..590754b6a2c7
--- /dev/null
+++ b/games-roguelike/moria/moria-5.7.14-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_IN_SOURCE_BUILD="yes"
+inherit cmake prefix
+
+DESCRIPTION="The Dungeons of Moria, a single player roguelike game, also known as Umoria"
+HOMEPAGE="https://umoria.org/"
+SRC_URI="https://github.com/dungeons-of-moria/umoria/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~m68k ~x86"
+IUSE=""
+
+RDEPEND="acct-group/gamestat
+	>=sys-libs/ncurses-6.0:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/umoria-${PV}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.7.12-gentoo-paths.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+	hprefixify src/config.cpp
+}
+
+src_install() {
+	newbin umoria/umoria moria
+
+	insinto /usr/share/moria
+	doins umoria/data/*.txt
+
+	insinto /var/lib/moria
+	doins umoria/scores.dat
+	fowners root:gamestat /var/lib/moria/scores.dat /usr/bin/${PN}
+	fperms g+w /var/lib/moria/scores.dat
+
+	doman "${FILESDIR}"/${PN}.6
+	dodoc -r AUTHORS CHANGELOG.md CONTRIBUTING.md README.md historical
+}
+
+pkg_postinst() {
+	elog
+	elog "Please add users to the 'gamestat' group, so they can run Moria:"
+	elog "  usermod -aG gamestat <user>"
+	elog
+}
diff --git a/games-roguelike/moria/moria-5.7.14.ebuild b/games-roguelike/moria/moria-5.7.14.ebuild
deleted file mode 100644
index 7198955b23e6..000000000000
--- a/games-roguelike/moria/moria-5.7.14.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_IN_SOURCE_BUILD="yes"
-inherit cmake prefix
-
-DESCRIPTION="The Dungeons of Moria, a single player roguelike game, also known as Umoria"
-HOMEPAGE="https://umoria.org/"
-SRC_URI="https://github.com/dungeons-of-moria/umoria/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~m68k ~x86"
-IUSE=""
-
-RDEPEND="acct-group/gamestat
-	>=sys-libs/ncurses-6.0:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/umoria-${PV}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.7.12-gentoo-paths.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-	hprefixify src/config.cpp
-}
-
-src_install() {
-	newbin umoria/umoria moria
-
-	insinto /usr/share/moria
-	doins umoria/data/*.txt
-
-	insinto /var/lib/moria
-	doins umoria/scores.dat
-	fowners root:gamestat /var/lib/moria/scores.dat
-	fperms g+w /var/lib/moria/scores.dat
-
-	doman "${FILESDIR}"/${PN}.6
-	dodoc -r AUTHORS CHANGELOG.md CONTRIBUTING.md README.md historical
-}
-
-pkg_postinst() {
-	elog
-	elog "Please add users to the 'gamestat' group, so they can run Moria:"
-	elog "  usermod -aG gamestat <user>"
-	elog
-}
diff --git a/games-roguelike/neon-chrome/Manifest b/games-roguelike/neon-chrome/Manifest
index f00a553a0be4..1949f7de8417 100644
--- a/games-roguelike/neon-chrome/Manifest
+++ b/games-roguelike/neon-chrome/Manifest
@@ -1,3 +1,3 @@
 DIST NeonChrome-Linux-1.1.12.tar 64140772 BLAKE2B cadda4c659b96b96c4b9b2a1dfc78152a89e53a2662f5e2dc70a0d4c98a813822d8c977deb0d6d6aeca0a2d2608cb04274c0ad33554ce27ab2ddf318499c9750 SHA512 f659bbe87f3b2933346bc17a4ccdcdc37ff8bb2db7a94dc5334db7109d64cd9f5a28b14845f767aaf1e103be826d3cd0fefc528a02df2079123094436e94f2cd
-EBUILD neon-chrome-1.1.12.ebuild 1093 BLAKE2B fbee6c33aa521bdfd87548f03f32a8fb47e943cea4daa5a585069c77295e1531c11e3151c8fcf8433e9c617c04bd2ce567856a909301579a9c9885a494cc76cc SHA512 d51141a9c1fc7ba4861a50ad507803c203ac4db5cd37886899e954701c8fd86565f75a9ee0aeec78f5ddf41fdec1c1352f5b45e8a3af000595ce888f7be7e675
+EBUILD neon-chrome-1.1.12.ebuild 1094 BLAKE2B 3794fef7e8b6bccbaf682f2dae80ccad0c315b3adad5271070325ee94224e9631144f5f4f269a117f7260e95e467a5a5bb8e50be51292ab601cc4ebf7619c4f5 SHA512 fdcc2de8ea93ac306d0c03c2ee27ac9be6623028ea2658f745eaaae90fa62fce2681cabeafdfda14dd1d40f72594b6e96feda8b411dcb180b1d4021eaae13fec
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-roguelike/neon-chrome/neon-chrome-1.1.12.ebuild b/games-roguelike/neon-chrome/neon-chrome-1.1.12.ebuild
index e23b2be6e5ca..c0053f081358 100644
--- a/games-roguelike/neon-chrome/neon-chrome-1.1.12.ebuild
+++ b/games-roguelike/neon-chrome/neon-chrome-1.1.12.ebuild
@@ -10,6 +10,7 @@ DESCRIPTION="A ruthless top-down cyberpunk shooter with rogue-like elements"
 HOMEPAGE="https://neonchromegame.com/"
 SRC_URI="${MY_PN}-Linux-${PV}.tar"
 #	https://dev.gentoo.org/~chewi/distfiles/${PN}.png"
+S="${WORKDIR}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
@@ -21,10 +22,8 @@ RDEPEND="
 	media-libs/openal
 "
 
-S="${WORKDIR}"
-
 DIR="/opt/${PN}"
-QA_PREBUILT="${DIR}/*"
+QA_PREBUILT="${DIR#/}/*"
 
 pkg_nofetch() {
 	einfo "Please buy and download ${SRC_URI} from:"
diff --git a/games-roguelike/tome/Manifest b/games-roguelike/tome/Manifest
index 7bcb8e5615a6..dfc72b568652 100644
--- a/games-roguelike/tome/Manifest
+++ b/games-roguelike/tome/Manifest
@@ -2,5 +2,5 @@ AUX tome-2.3.5-format.patch 2925 BLAKE2B 8490e618151a05976cd93592a5218c234c93e2e
 AUX tome-2.3.5-gentoo-paths.patch 1032 BLAKE2B 35f96b35c05a12e355040c12307ce83c4e1e6e6bf2beb55c69ac28b17841735d89f8d27210ced170d6fcbb88409de80a9c05ae93e27c342e80b0c4fbea33cee3 SHA512 f1eb53c8afdd62dbfde78576d4307ecd2dbbd3b19023bbba2dbcc7a81a3aec60e11194ad961bc75107ca9999578afb5626fc5e100149525b1517ee72e3b12728
 AUX tome-2.3.5-noX.patch 453 BLAKE2B c16d66c9e3796421f045eebe9b184a3ade5556b0dc5061a71f449320b48e14530e294421c259a2f1ab7a1b7e1c1985af718d6b4ec341bbe4f8a7f41cfd257d23 SHA512 8e887690673021ca0daace4f2e43dcd8ce2d905cf3db5e97c35e90c227037b4e453e11bac6da97808320e6b6b101fc04ff7d5f65ae55e9d3d2c2318645506a58
 DIST tome-235-src.tar.bz2 2951227 BLAKE2B 7a9a6c608873062f9d6deae38c7e39244ca25d2bbb553d338014078c86b9decc36869c2f39f875425f9c3bb26784d3e460a225c5dabd197437781488f3e15d74 SHA512 f456aa91d18397297c213fa67dd14a4d29e024525be99f83b22cbe42f4d426b57fe6115a7124e3ec34de8f351117de525eab996ba7a2a230119e43639c4c9205
-EBUILD tome-2.3.5.ebuild 3750 BLAKE2B 53b046c729bc8b3fbc2b3935a6712647e21e7c37a41345560d2ad316adc0089f0310fb4ed94676224fde689b2541159059d3e6a2fc0c119df311caf6d7f38f87 SHA512 4cc75d61b1cf921ed6c09ed0e4f7c37549f5f96c0341e6196e94a840e9cf00bce949fe39f36deb8a201dd40886a39a98d585ad19fc7971a149a7c32d94eb432a
+EBUILD tome-2.3.5-r1.ebuild 3765 BLAKE2B ea56d2d6d054d8b66352ba8e4afb2b42db2286bf13378ecd848279a53f7df47b319f5cca4dd0f05e3e5b5b3882ba77d1a2d8fc57896412044dcd545d61f527b3 SHA512 08b8f04f224db47e41c9475ffe3ea52ee5ed16b84a63912f28224b9d0f812f0d6ee4f30ad1201cb2bc52749116a555147713daaa49f9a8989b0be2ce5e8937ad
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-roguelike/tome/tome-2.3.5-r1.ebuild b/games-roguelike/tome/tome-2.3.5-r1.ebuild
new file mode 100644
index 000000000000..946930b9a686
--- /dev/null
+++ b/games-roguelike/tome/tome-2.3.5-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV=${PV//./}
+DESCRIPTION="save the world from Morgoth and battle evil (or become evil ;])"
+HOMEPAGE="http://t-o-m-e.net/"
+SRC_URI="http://t-o-m-e.net/dl/src/tome-${MY_PV}-src.tar.bz2"
+S="${WORKDIR}"/tome-${MY_PV}-src/src
+
+LICENSE="Moria"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk sdl X Xaw3d"
+
+RDEPEND="
+	>=sys-libs/ncurses-5:0=
+	sdl? (
+		media-libs/sdl-ttf
+		media-libs/sdl-image
+		media-libs/libsdl )
+	gtk? ( >=x11-libs/gtk+-2.12.8:2 )
+	X? ( x11-libs/libX11 )
+	Xaw3d? ( x11-libs/libXaw )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	x11-misc/makedepend
+"
+
+RDEPEND+=" acct-group/gamestat"
+
+PATCHES=(
+	"${FILESDIR}/"${PN}-2.3.5-gentoo-paths.patch
+	"${FILESDIR}"/${PN}-2.3.5-format.patch
+	"${FILESDIR}"/${PN}-2.3.5-noX.patch
+)
+
+src_prepare() {
+	mv makefile.std makefile || die
+
+	default
+
+	sed -i -e '/^CC =/d' makefile || die
+	sed -i -e "s:xx:x:" ../lib/edit/p_info.txt || die
+	# sed -i -e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c || die
+
+	find .. -name .cvsignore -exec rm -f \{\} + || die
+	find ../lib/edit -type f -exec chmod a-x \{\} + || die
+}
+
+src_compile() {
+	tc-export CC
+
+	local GENTOO_INCLUDES="" GENTOO_DEFINES="-DUSE_GCU " GENTOO_LIBS="$($(tc-getPKG_CONFIG) ncurses --libs)"
+
+	if use sdl || use X || use gtk || use Xaw3d; then
+		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY \
+			-DSUPPORT_GAMMA"
+	fi
+
+	if use sdl || use X || use Xaw3d; then
+		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK "
+	fi
+
+	if use sdl; then
+		GENTOO_INCLUDES="${GENTOO_INCLUDES} $(sdl-config --cflags)"
+		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_SDL "
+		GENTOO_LIBS="${GENTOO_LIBS} $(sdl-config --libs) -lSDL_image -lSDL_ttf"
+	fi
+
+	if use X; then
+		GENTOO_INCLUDES="${GENTOO_INCLUDES} -I/usr/X11R6/include "
+		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_X11 "
+		GENTOO_LIBS="${GENTOO_LIBS} -L/usr/X11R6/lib -lX11 "
+	fi
+
+	if use Xaw3d; then
+		GENTOO_INCLUDES="${GENTOO_INCLUDES} -I/usr/X11R6/include "
+		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_XAW "
+		GENTOO_LIBS="${GENTOO_LIBS} -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 "
+	fi
+
+	if use gtk; then
+		GENTOO_INCLUDES="${GENTOO_INCLUDES} $($(tc-getPKG_CONFIG) gtk+-2.0 --cflags)"
+		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_GTK2 "
+		GENTOO_LIBS="${GENTOO_LIBS} $($(tc-getPKG_CONFIG) gtk+-2.0 --libs) "
+		GTK_SRC_FILE="main-gtk2.c"
+		GTK_OBJ_FILE="main-gtk2.o"
+	else
+		GTK_SRC_FILE=""
+		GTK_OBJ_FILE=""
+	fi
+
+	if use amd64; then
+		GENTOO_DEFINES="${GENTOO_DEFINES} -DLUA_NUM_TYPE=int "
+	fi
+
+	GENTOO_INCLUDES="${GENTOO_INCLUDES} -Ilua -I."
+	GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_LUA"
+
+	emake -j1 \
+		INCLUDES="${GENTOO_INCLUDES}" \
+		DEFINES="${GENTOO_DEFINES}" \
+		depend
+
+	emake tolua
+
+	emake \
+		COPTS="${CFLAGS}" \
+		INCLUDES="${GENTOO_INCLUDES}" \
+		DEFINES="${GENTOO_DEFINES}" \
+		LIBS="${GENTOO_LIBS} -lm" \
+		BINDIR="${EPREFIX}/usr/bin" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" \
+		GTK_SRC_FILE="${GTK_SRC_FILE}" \
+		GTK_OBJ_FILE="${GTK_OBJ_FILE}"
+}
+
+src_install() {
+	emake -j1 \
+		DESTDIR="${D}" \
+		OWNER="nobody" \
+		BINDIR="${EPREFIX}/usr/bin" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" install
+
+	cd .. || die
+	dodoc *.txt
+
+	dodir /var/games
+	touch "${ED}/var/games/${PN}-scores.raw" || die
+
+	fperms 660 /var/games/${PN}-scores.raw
+	fowners root:gamestat /var/games/${PN}-scores.raw /usr/bin/${PN}
+	fperms g+s /usr/bin/${PN}
+}
+
+pkg_postinst() {
+	ewarn "ToME ${PV} is not save-game compatible with 2.3.0 and previous versions."
+	echo
+	ewarn "If you have older save files and you wish to continue those games,"
+	ewarn "you'll need to remerge the version of ToME with which you started"
+	ewarn "those save-games."
+}
diff --git a/games-roguelike/tome/tome-2.3.5.ebuild b/games-roguelike/tome/tome-2.3.5.ebuild
deleted file mode 100644
index 3e3884187946..000000000000
--- a/games-roguelike/tome/tome-2.3.5.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV=${PV//./}
-DESCRIPTION="save the world from Morgoth and battle evil (or become evil ;])"
-HOMEPAGE="http://t-o-m-e.net/"
-SRC_URI="http://t-o-m-e.net/dl/src/tome-${MY_PV}-src.tar.bz2"
-S="${WORKDIR}"/tome-${MY_PV}-src/src
-
-LICENSE="Moria"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk sdl X Xaw3d"
-
-RDEPEND="
-	>=sys-libs/ncurses-5:0=
-	sdl? (
-		media-libs/sdl-ttf
-		media-libs/sdl-image
-		media-libs/libsdl )
-	gtk? ( >=x11-libs/gtk+-2.12.8:2 )
-	X? ( x11-libs/libX11 )
-	Xaw3d? ( x11-libs/libXaw )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	x11-misc/makedepend
-"
-
-RDEPEND+=" acct-group/gamestat"
-
-PATCHES=(
-	"${FILESDIR}/"${PN}-2.3.5-gentoo-paths.patch
-	"${FILESDIR}"/${PN}-2.3.5-format.patch
-	"${FILESDIR}"/${PN}-2.3.5-noX.patch
-)
-
-src_prepare() {
-	mv makefile.std makefile || die
-
-	default
-
-	sed -i -e '/^CC =/d' makefile || die
-	sed -i -e "s:xx:x:" ../lib/edit/p_info.txt || die
-	# sed -i -e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c || die
-
-	find .. -name .cvsignore -exec rm -f \{\} + || die
-	find ../lib/edit -type f -exec chmod a-x \{\} + || die
-}
-
-src_compile() {
-	tc-export CC
-
-	local GENTOO_INCLUDES="" GENTOO_DEFINES="-DUSE_GCU " GENTOO_LIBS="$($(tc-getPKG_CONFIG) ncurses --libs)"
-
-	if use sdl || use X || use gtk || use Xaw3d; then
-		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY \
-			-DSUPPORT_GAMMA"
-	fi
-
-	if use sdl || use X || use Xaw3d; then
-		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK "
-	fi
-
-	if use sdl; then
-		GENTOO_INCLUDES="${GENTOO_INCLUDES} $(sdl-config --cflags)"
-		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_SDL "
-		GENTOO_LIBS="${GENTOO_LIBS} $(sdl-config --libs) -lSDL_image -lSDL_ttf"
-	fi
-
-	if use X; then
-		GENTOO_INCLUDES="${GENTOO_INCLUDES} -I/usr/X11R6/include "
-		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_X11 "
-		GENTOO_LIBS="${GENTOO_LIBS} -L/usr/X11R6/lib -lX11 "
-	fi
-
-	if use Xaw3d; then
-		GENTOO_INCLUDES="${GENTOO_INCLUDES} -I/usr/X11R6/include "
-		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_XAW "
-		GENTOO_LIBS="${GENTOO_LIBS} -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 "
-	fi
-
-	if use gtk; then
-		GENTOO_INCLUDES="${GENTOO_INCLUDES} $($(tc-getPKG_CONFIG) gtk+-2.0 --cflags)"
-		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_GTK2 "
-		GENTOO_LIBS="${GENTOO_LIBS} $($(tc-getPKG_CONFIG) gtk+-2.0 --libs) "
-		GTK_SRC_FILE="main-gtk2.c"
-		GTK_OBJ_FILE="main-gtk2.o"
-	else
-		GTK_SRC_FILE=""
-		GTK_OBJ_FILE=""
-	fi
-
-	if use amd64; then
-		GENTOO_DEFINES="${GENTOO_DEFINES} -DLUA_NUM_TYPE=int "
-	fi
-
-	GENTOO_INCLUDES="${GENTOO_INCLUDES} -Ilua -I."
-	GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_LUA"
-
-	emake -j1 \
-		INCLUDES="${GENTOO_INCLUDES}" \
-		DEFINES="${GENTOO_DEFINES}" \
-		depend
-
-	emake tolua
-
-	emake \
-		COPTS="${CFLAGS}" \
-		INCLUDES="${GENTOO_INCLUDES}" \
-		DEFINES="${GENTOO_DEFINES}" \
-		LIBS="${GENTOO_LIBS} -lm" \
-		BINDIR="${EPREFIX}/usr/bin" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" \
-		GTK_SRC_FILE="${GTK_SRC_FILE}" \
-		GTK_OBJ_FILE="${GTK_OBJ_FILE}"
-}
-
-src_install() {
-	emake -j1 \
-		DESTDIR="${D}" \
-		OWNER="nobody" \
-		BINDIR="${EPREFIX}/usr/bin" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" install
-
-	cd .. || die
-	dodoc *.txt
-
-	dodir /var/games
-	touch "${ED}/var/games/${PN}-scores.raw" || die
-
-	fperms 660 /var/games/${PN}-scores.raw
-	fowners root:gamestat /var/games/${PN}-scores.raw
-	fperms g+s /usr/bin/${PN}
-}
-
-pkg_postinst() {
-	ewarn "ToME ${PV} is not save-game compatible with 2.3.0 and previous versions."
-	echo
-	ewarn "If you have older save files and you wish to continue those games,"
-	ewarn "you'll need to remerge the version of ToME with which you started"
-	ewarn "those save-games."
-}
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 4e385cfa59ee..e589f9b6a8b3 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/baldurs-gate-ee/Manifest b/games-rpg/baldurs-gate-ee/Manifest
index 8b4e57811f5f..6340130f2950 100644
--- a/games-rpg/baldurs-gate-ee/Manifest
+++ b/games-rpg/baldurs-gate-ee/Manifest
@@ -1,5 +1,5 @@
 DIST baldur_s_gate_enhanced_edition_en_2_5_23121.sh 2892168067 BLAKE2B 7e20922f539be65cf7371f7f1706873e5a147313e3aa0335bfa5d6c4456a40665260a36abab6e73361c5f9c0a0bc2faff6e719dd72fb0ddd8b0e1c22d6eaedd8 SHA512 b5b84148b35984109454e1299ee29d287750172e617fb97e65c46b2c9419173348b37d54587bd44a3eacb6380c9b13e4be91af5625009cba797843483be7165d
 DIST gog_baldur_s_gate_enhanced_edition_2.5.0.9.sh 2877124067 BLAKE2B 244e93ae089703c9fae3dcfcad4fb9c1eb32695e7288f7a05b3f2996887f90d6912e745e9b47a93ba45ee3ddda8363e69d22e62c57258ee54c24c47f07b2f619 SHA512 56d4796a959658f29cabef6e7339db5ba9fa792d9fd899ebc375c9b5cf94305b6d11c21d41a8809fcb1cbe38ecb4bc7152158ef19c87395374ab9060f48756a6
-EBUILD baldurs-gate-ee-2.3.67.3-r1.ebuild 1387 BLAKE2B ac79f4eb6836fe9ae9bf6bf7bf232a914d9c65b8f9be3d4fa6ef5417925f080eab9459a95a0e556ebc9579c55c64731268e0e9e7db68754c78a6a7cc41355ead SHA512 a13ac6c7a1b487df96b7e47e7e0dceb4a42ac5929fe871bfe283f40bc15b79c50ff9a5c506f2de2a14fe0a0169b91ca3c3ce36356acd9cc69ac326e5c918d07b
+EBUILD baldurs-gate-ee-2.3.67.3-r1.ebuild 1385 BLAKE2B e9be03f2d475644e076eb7b270cdf46875a24a2432e2bdd38757266b97424a7f7285db227c1f1a4ad104ac40abe0c2f66b44cc4e9244a9bfc93b4ce38f2e161a SHA512 5578756a02d61d806feac450d6932e419c9136d67efdc16b3a4659a3a1a514efd827044a95936d1848729e15d106c358e928b6f362017edfbd8b91dfdcd8c61d
 EBUILD baldurs-gate-ee-2.5.23121.ebuild 1206 BLAKE2B 50a0a824ccb1d5811a6f5978d7eba9d665e2cd812982a9a9f9af41965c029ba2e2a02462335c24493aa1d6c49552890264cb2761eb89443487ca5b07b35df2a2 SHA512 4c90d9c7c5f92d4089b7c2a22673a7346f4cbac47a132bc56fc532d086eefdfddcc55bc3af6b83963ccd873020b4ba310f9cd4776431a61cf69563086127bedb
 MISC metadata.xml 814 BLAKE2B 59a165a1cb3b9c9285f1a7af25abb882badbd57618c8202aeda0cd3ba14248e8138c6a1f03805b98c0926a44b68ecb189905b8e681b0142af2df7513bcf1eb9f SHA512 aeb6e4d4fc900f0dbb0eebf8495ed1e5722af2fd90234893364ee7e45f2ed7ba2137188df23acef65d70e3a99c161c5b0d65245961324abd6d576e386bfee3b5
diff --git a/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3-r1.ebuild b/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3-r1.ebuild
index da5f411b2430..1af12139acf2 100644
--- a/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3-r1.ebuild
+++ b/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3-r1.ebuild
@@ -8,6 +8,7 @@ inherit desktop unpacker wrapper
 DESCRIPTION="Baldur's Gate: Enhanced Edition"
 HOMEPAGE="https://www.baldursgate.com/"
 SRC_URI="gog_baldur_s_gate_enhanced_edition_2.5.0.9.sh"
+S="${WORKDIR}/data/noarch"
 
 LICENSE="GOG-EULA"
 SLOT="0"
@@ -22,9 +23,7 @@ RDEPEND="dev-libs/expat[abi_x86_32(-)]
 	virtual/opengl[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]"
 
-QA_PREBUILT="/opt/${PN}/BaldursGate"
-
-S="${WORKDIR}/data/noarch"
+QA_PREBUILT="opt/${PN}/BaldursGate"
 
 pkg_nofetch() {
 	einfo "Please buy and download \"${SRC_URI}\" from"
diff --git a/games-rpg/bastion/Manifest b/games-rpg/bastion/Manifest
index 85f405a58b94..a3947f2a0258 100644
--- a/games-rpg/bastion/Manifest
+++ b/games-rpg/bastion/Manifest
@@ -1,3 +1,3 @@
 DIST bastion-10162016-bin 1080484945 BLAKE2B 0f755c54ff975afbb3ee087990849831fd405ddbe8ce83a062ba70d25ca6cbe69c9baf2535e8b1892fbbf4375830a3c7fe1ae7eb247d1ed3e46e2b10330270ca SHA512 108e181ad2a9a7eaedc84700f9399fd32d221259eea5200a41dfe21663cf6d3ac8ebd0c168095a7b9f6e71b953cc45203874bb4d32d319ee3547c99da924c8bc
-EBUILD bastion-20161016.ebuild 1488 BLAKE2B ad7dff0f77b173188bb12692b650e25226166d4d0c4a97b0b2bdd2a7d69afd5370208a533d5d2e27ebf89fdcfa9bb7338b1a22e254cfb3b32cfab76dfcd43509 SHA512 f9fce5ddb3eb0d3ae1d9afd53586c79c686d61f2a8a2dd7f5edc2ad2b3f4c15f89e7eeec5d8d1fa5a73fcfdb77a1948c396a8eb9e6c2dad11ea5793ea86f05b7
+EBUILD bastion-20161016.ebuild 1487 BLAKE2B c7ec9097ef2018696a7d19efd9483d859e65be1cd1033580ac935a0034ca03136be2d5ca2fc369d1506619d0c83324cf02e931213fb2ab2ae8d15389269c26bc SHA512 dfb343146559907b9d57eb17896a5484dbeb39d984639bebe0b0ea41f986ac2a02762430e39756ed3572e8b39c3c01bea3581d8f63b5ecb3cb1af272790f400d
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/bastion/bastion-20161016.ebuild b/games-rpg/bastion/bastion-20161016.ebuild
index d0388d065a8f..ecf7ae32af18 100644
--- a/games-rpg/bastion/bastion-20161016.ebuild
+++ b/games-rpg/bastion/bastion-20161016.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+CHECKREQS_DISK_BUILD="2400M"
 inherit desktop check-reqs unpacker wrapper xdg
 
 TIMESTAMP=${PV:4:2}${PV:6:2}${PV:0:4}
 DESCRIPTION="An original action role-playing game set in a lush imaginative world"
 HOMEPAGE="https://supergiantgames.com/games/bastion/"
 SRC_URI="bastion-${TIMESTAMP}-bin"
+S="${WORKDIR}/data"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
@@ -28,9 +30,6 @@ BDEPEND="
 	app-arch/unzip
 "
 
-CHECKREQS_DISK_BUILD="2400M"
-S="${WORKDIR}/data"
-
 pkg_nofetch() {
 	einfo "Please buy and download ${SRC_URI} from:"
 	einfo "  https://www.humblebundle.com/store/${PN}"
diff --git a/games-rpg/broken-age/Manifest b/games-rpg/broken-age/Manifest
index 05addd93b79a..9f4503bf4994 100644
--- a/games-rpg/broken-age/Manifest
+++ b/games-rpg/broken-age/Manifest
@@ -1,3 +1,3 @@
 DIST BrokenAge_linux.tar.gz 2159926882 BLAKE2B 351fd74310ce2a03682151b8112d5831d3d495a6fc9cba68a366205033ce0f35f3446f30ccf98024462f144db3782faf68f73944c814a537cdde8c09f6afbadc SHA512 6642fdae52dc5a22dcbaa1c9db865bfe8dee2365014c1854c53436a1cc4fc842134ad96d9576de221cb494d6e04ea6d30f213c5a62a19f29aaf466740e670284
-EBUILD broken-age-2.4.800398.ebuild 994 BLAKE2B 4c896b3b7300cc79826b76b1f16c094186ef3d2eb6add597a2a1c383b365645875353fd795e626ee19b4cfb735535f868f0a05821b98bcb5964651c98c4dc21e SHA512 3063efd7431b03ee244fc4d3d19fdedde2c970a994782a4385d7b8cd16bedf4d72f7a10d7a7045f58cdd46366ec66349bbd497e08dcae92ab7424df93917c054
+EBUILD broken-age-2.4.800398.ebuild 995 BLAKE2B d24991661db13ee6b877920bf87dec349f26b9333527314196415aa3d87f4d8037707e703e89f7f7413b7c8d0b7fe442bbf565bc2453411e330f072f337ab4fa SHA512 71fb49ec9571d311c9d7acd99a96bdd8c3bd226e5721f2ba4c63eae32d4c594cb1e5e860eea0dead2eb1b5631c94872f9bfc20f42698b7c95e4a1f5e5ac4e626
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/broken-age/broken-age-2.4.800398.ebuild b/games-rpg/broken-age/broken-age-2.4.800398.ebuild
index f20322563208..ea5d444b8f94 100644
--- a/games-rpg/broken-age/broken-age-2.4.800398.ebuild
+++ b/games-rpg/broken-age/broken-age-2.4.800398.ebuild
@@ -9,6 +9,7 @@ MY_PN="BrokenAge"
 DESCRIPTION="Point-and-click adventure from Tim Schafer's Double Fine Productions"
 HOMEPAGE="http://www.brokenagegame.com"
 SRC_URI="${MY_PN}_linux.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
@@ -20,10 +21,8 @@ RDEPEND="
 	virtual/opengl[abi_x86_32]
 "
 
-S="${WORKDIR}"
-
 DIR="/opt/${PN}"
-QA_PREBUILT="${DIR}/*"
+QA_PREBUILT="${DIR#/}/*"
 
 pkg_nofetch() {
 	einfo "Please buy and download ${SRC_URI} from:"
diff --git a/games-rpg/coe2/Manifest b/games-rpg/coe2/Manifest
index bc9270166954..97c655e9f0e4 100644
--- a/games-rpg/coe2/Manifest
+++ b/games-rpg/coe2/Manifest
@@ -1,3 +1,3 @@
 DIST coe2_2007.zip 4937222 BLAKE2B 4640e7819d0e000b3e355f20f364f84d0cc899acd27e33bae95cece843a724918b8a3cc6a538d39478cf5070fd71658637dbc127534d5182a914f6d0f56faff0 SHA512 db0d4ee2016ef3cf7159c227c494346fa0a0e9f9b20a6b520b67899570e3135a4286d6ada2f85d7ea7b55a1baeada41654d4fab29f5996357608f0d2d654b2ed
-EBUILD coe2-2007-r2.ebuild 1375 BLAKE2B fd8a8116058ab4a886009a3b5e9fc069e43790726146f8c6b8e4b2124ed4eb1eeb8d41ec3781fb8bed851faec80197fd9d24d737c2b3fa7a1ae8a07230793b4e SHA512 3085c4c903e698e94b757d2a9743ef142c2ed959fa8753b16dd83dc4b700065f5f2a457857773678f3ab079a6128436dadef5b501d58e4ee580c3b725b667aa0
+EBUILD coe2-2007-r3.ebuild 1396 BLAKE2B 08793d824708ef37dd8e22a9d8d8390bace0ed608d8ac39e2bc1182001cc09be8200c705877782caefcf5c178fbaa799afa439bc9f14f12fa2994b7d6a008688 SHA512 e369d869ea2fd634d978c00596ad19db05bbe783ad40ad46944f93179e580c96f5e6c93dc3b87978fae88c2a3fd814fe8560f0024a95b5c426f57a1e7268cc9a
 MISC metadata.xml 1166 BLAKE2B 344379ff270c13113da4d40e916e8c16505653451d93fdc82ccbb9e0c39585863056030959579f310cb6ab9a01e058d929abc3c28f9886f32d086074dfe874d6 SHA512 60a33d86c244ce321427d325d4f1fb56846940a1ab2b6c965afb317c497b142644574b94bc715fd0d602628d8b07ba9690f5d0addad626163273cc1584ada370
diff --git a/games-rpg/coe2/coe2-2007-r2.ebuild b/games-rpg/coe2/coe2-2007-r2.ebuild
deleted file mode 100644
index 3ac7358ce27a..000000000000
--- a/games-rpg/coe2/coe2-2007-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop wrapper
-
-DESCRIPTION="Precursor to the Dominions series"
-HOMEPAGE="https://www.shrapnelgames.com/Our_Games/Free_Games.html"
-SRC_URI="https://download.shrapnelgames.com/downloads/${PN}_${PV}.zip"
-S="${WORKDIR}"/coe
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror bindist"
-
-DEPEND="media-libs/libsdl[sound,video]"
-RDEPEND="
-	${DEPEND}
-	acct-group/gamestat
-"
-BDEPEND="app-arch/unzip"
-
-# bug #430026
-QA_PREBUILT="opt/coe2/coe_linux"
-
-src_prepare() {
-	default
-
-	rm -r *.{dll,exe} old || die
-	if use amd64 ; then
-		mv -f coe_linux64bit coe_linux || die
-	fi
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins *.{bgm,smp,trp,trs,wrl}
-	dodoc history.txt manual.txt readme.txt
-	exeinto /opt/${PN}
-	doexe coe_linux
-
-	make_wrapper ${PN} "./coe_linux" "/opt/${PN}"
-	make_desktop_entry ${PN} "Conquest of Elysium 2"
-
-	# Slots for saved games.
-	# The game shows e.g. "EMPTY SLOT 0?", but it works.
-	local state_dir=/var/lib/${PN}
-	dodir ${state_dir}
-
-	local f slot
-	for slot in {0..4} ; do
-		f=save${slot}
-
-		dosym ${state_dir}/save${slot} /opt/${PN}/${f}
-		echo "empty slot ${slot}" > "${ED}"/${state_dir}/${f} || die
-		fperms 660 ${state_dir}/${f}
-	done
-
-	fowners -R root:gamestat /var/lib/${PN}/
-	fperms g+s /opt/${PN}/coe_linux
-}
diff --git a/games-rpg/coe2/coe2-2007-r3.ebuild b/games-rpg/coe2/coe2-2007-r3.ebuild
new file mode 100644
index 000000000000..5b443192a0ba
--- /dev/null
+++ b/games-rpg/coe2/coe2-2007-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+DESCRIPTION="Precursor to the Dominions series"
+HOMEPAGE="https://www.shrapnelgames.com/Our_Games/Free_Games.html"
+SRC_URI="https://download.shrapnelgames.com/downloads/${PN}_${PV}.zip"
+S="${WORKDIR}"/coe
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror bindist"
+
+DEPEND="media-libs/libsdl[sound,video]"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+BDEPEND="app-arch/unzip"
+
+# bug #430026
+QA_PREBUILT="opt/coe2/coe_linux"
+
+src_prepare() {
+	default
+
+	rm -r *.{dll,exe} old || die
+	if use amd64 ; then
+		mv -f coe_linux64bit coe_linux || die
+	fi
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins *.{bgm,smp,trp,trs,wrl}
+	dodoc history.txt manual.txt readme.txt
+	exeinto /opt/${PN}
+	doexe coe_linux
+
+	make_wrapper ${PN} "./coe_linux" "/opt/${PN}"
+	make_desktop_entry ${PN} "Conquest of Elysium 2"
+
+	# Slots for saved games.
+	# The game shows e.g. "EMPTY SLOT 0?", but it works.
+	local state_dir=/var/lib/${PN}
+	dodir ${state_dir}
+
+	local f slot
+	for slot in {0..4} ; do
+		f=save${slot}
+
+		dosym ${state_dir}/save${slot} /opt/${PN}/${f}
+		echo "empty slot ${slot}" > "${ED}"/${state_dir}/${f} || die
+		fperms 660 ${state_dir}/${f}
+	done
+
+	fowners -R root:gamestat /var/lib/${PN}/ /opt/${PN}/coe_linux
+	fperms g+s /opt/${PN}/coe_linux
+}
diff --git a/games-rpg/deponia-doomsday/Manifest b/games-rpg/deponia-doomsday/Manifest
index 5d21d5bf41b3..449eb3922f9e 100644
--- a/games-rpg/deponia-doomsday/Manifest
+++ b/games-rpg/deponia-doomsday/Manifest
@@ -1,3 +1,3 @@
 DIST Deponia4_1.2.0267_DEB_Full_Multi_Daedalic_ESD.tar 3179350835 BLAKE2B caf1995f2a6204b083e7b462ec0ab45e8c84cf2bd626fbc20fbac36e066551a267cad391c07293dff5219c555523a68dc7e7a351c948a2d049af35be6ec5573c SHA512 daf3427ff3dd4568bb84a11fd63b630fa1de61331ceb84f70f7668c56abd2908e0cfdf897d9f1caefdb6d51d1082cfce435eb4378d1eeb9b0a3598edd6350c07
-EBUILD deponia-doomsday-1.2.0267.ebuild 1547 BLAKE2B 1c5d5ae193edee7b664820c67d9fa6301340ba7f5bc384fdb157e788ad2a9e880fffa18a4475e180a62dd047d2524e8befa0be1bb3a6034e8f54c68e0cfe3779 SHA512 9067788b392937230157c3c5f5c2f493686d66f121006eb761efdc4ffaad2b2738e1824b9938234156d7db018ce4d0eab66af343554bd79e5658971f60f86498
+EBUILD deponia-doomsday-1.2.0267.ebuild 1549 BLAKE2B 0a6c5ff8788bf06be90f6fff08b26b679f9bd8a3d2f1ea97c9bb2d753c2dccef741fcf42adcb9344294bad64e984b34584724d6af4c1a4fcc45ba2d4dc573429 SHA512 4307f9d8b0a4feefed32aea80209c8b1715074f5425c5e7af837c693c1f23fe5f86e20ac2844a102be55b9865327bc406206626e99b085ae8b6000f85d85b7a8
 MISC metadata.xml 358 BLAKE2B d53c2c790885c7b6bb256ad5f157919f9fba23ef903da6d9a90abf41075ce2946dcf682b9c51d9fd3c3540ff10f0c38ce29689910f22e6a97d06f34e591b2cd0 SHA512 8f4a5456696f919d5387f61806f2270bf690184b4a83d3a06e532da2b5d872016f64de0285f639c9c8ff744c12886f75d5b1eb734cc4b8a19cbd7396f69f436d
diff --git a/games-rpg/deponia-doomsday/deponia-doomsday-1.2.0267.ebuild b/games-rpg/deponia-doomsday/deponia-doomsday-1.2.0267.ebuild
index bbb377287f74..f26a0c328c76 100644
--- a/games-rpg/deponia-doomsday/deponia-doomsday-1.2.0267.ebuild
+++ b/games-rpg/deponia-doomsday/deponia-doomsday-1.2.0267.ebuild
@@ -9,6 +9,8 @@ MY_PN="Deponia Doomsday"
 DESCRIPTION="The fourth and final instalment of the Deponia point-and-click adventures"
 HOMEPAGE="https://www.daedalic.com/deponia"
 SRC_URI="Deponia4_${PV}_DEB_Full_Multi_Daedalic_ESD.tar"
+S="${WORKDIR}/${MY_PN}"
+
 LICENSE="all-rights-reserved BSD LGPL-2.1 MIT OFL-1.1"
 SLOT="0"
 KEYWORDS="-* ~amd64"
@@ -25,10 +27,8 @@ RDEPEND="
 	virtual/opengl
 "
 
-S="${WORKDIR}/${MY_PN}"
-
 DIR="/opt/${PN}"
-QA_PREBUILT="${DIR}/*"
+QA_PREBUILT="${DIR#/}/*"
 
 pkg_nofetch() {
 	einfo "Please buy and download ${SRC_URI} from:"
diff --git a/games-rpg/deponia-tcj/Manifest b/games-rpg/deponia-tcj/Manifest
index f3335d070b9b..f9ceafc0e91e 100644
--- a/games-rpg/deponia-tcj/Manifest
+++ b/games-rpg/deponia-tcj/Manifest
@@ -1,3 +1,3 @@
 DIST DeponiaTCJ_3.3.0156_Full_DEB_DE_EN_FR_IT_RU_PL_Daedalic_ESD.tar.gz 8283369628 BLAKE2B 49d7dd83f14c8a79cbf398accab43e325e605728c24d0dcae9dbe2ab838757f0cfa122472cc665f19543e33a931c3debe70489a2b066716771b1d29298eb029f SHA512 77aa0ea4bd137fcb634e88528660920805e1c627df7db7ebc3fa488ff420b004acdaf17973c6bf3414e53e96df4e2ed6bc48e6f31b322e5ae488521a1477e2c0
-EBUILD deponia-tcj-3.3.0156.ebuild 1317 BLAKE2B b142750c15cdf1f7445d842a29a1c78c8fac471ea0e4a77a7f56c26a6369a41b076c1efb01fb76d088f7cbb6f88b904d1a29bf018dfa11bb278a0c8d04bd83b0 SHA512 098ef8125ddc352e54f7ef01e3f6d6b5a30ff3d5902ac2553e822eb88d65c3b152cc33cda103072b4014f40fe0fbfb6145b834487ffbf9bff127ccbad36ee610
+EBUILD deponia-tcj-3.3.0156.ebuild 1319 BLAKE2B 00a00c4db37b9ca6e01a9cb953453cbb3a2d299537969b416d0f23c7a028dcb3e80fecbed48dadc776f09efc44fd4af3d9096ce90ac8d9cb0d8066efeda31371 SHA512 c12b18159827c000f3db162cd9fe0c900cfb1b48fbccc235d028e828bfa995270c347e889d5e4604c301f2746662d44a18a1d3088d825283c2fd6e04944d031f
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/deponia-tcj/deponia-tcj-3.3.0156.ebuild b/games-rpg/deponia-tcj/deponia-tcj-3.3.0156.ebuild
index eb2f670cf6b4..f53a8fe60eab 100644
--- a/games-rpg/deponia-tcj/deponia-tcj-3.3.0156.ebuild
+++ b/games-rpg/deponia-tcj/deponia-tcj-3.3.0156.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
@@ -9,6 +9,8 @@ MY_PN="Deponia - The Complete Journey"
 DESCRIPTION="The Complete Journey: The first three Deponia point-and-click adventures"
 HOMEPAGE="https://www.daedalic.com/deponia"
 SRC_URI="DeponiaTCJ_${PV}_Full_DEB_DE_EN_FR_IT_RU_PL_Daedalic_ESD.tar.gz"
+S="${WORKDIR}/${MY_PN}"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64"
@@ -20,10 +22,8 @@ RDEPEND="
 	virtual/opengl
 "
 
-S="${WORKDIR}/${MY_PN}"
-
 DIR="/opt/${PN}"
-QA_PREBUILT="${DIR}/*"
+QA_PREBUILT="${DIR#/}/*"
 
 pkg_nofetch() {
 	einfo "Please buy and download ${SRC_URI} from:"
diff --git a/games-rpg/eschalon-book-1-demo/Manifest b/games-rpg/eschalon-book-1-demo/Manifest
index dbbf6a8ef807..23f2b58cbb03 100644
--- a/games-rpg/eschalon-book-1-demo/Manifest
+++ b/games-rpg/eschalon-book-1-demo/Manifest
@@ -1,3 +1,3 @@
 DIST eschalon-book-1-demo-106.tar.gz 83157919 BLAKE2B 71d6cf6d814e871d69b7a3df6549bad7aa3497f6dc6ac546cea8cb009141ee6c4538be5ebd94207b15e5259aa65e50f1c01c31e82a3950773e57dea012aef43d SHA512 7229cb48ad02b1842ac71fec03f5ea3e0df8f895409222a764c8505586a1ceb350dc4b57b4c9eed528ef0984bb60d406f41df26d5b7e8157d0f22b8ded590d66
-EBUILD eschalon-book-1-demo-106-r1.ebuild 870 BLAKE2B 1f2cce9ecee9dbeb9aa4f2e15be8eef437246dc7a49defd5387d556617ad409cfe5e6638a24383a873400054b074e4aad9ef20b6740e8b0b4ac47354c1a93586 SHA512 24c8c3649aa29e9385e911eafdecb599e791dffe7d57f74607022e90faea388c40edd6978f7637f4b24c52ac8025083635c5a5a1c7682b4eb16793a01f514119
+EBUILD eschalon-book-1-demo-106-r1.ebuild 868 BLAKE2B 947325d987f5547bb5613c6354f3eb5c4460dc97390bb085855d16b45dfd16a69ed673139d1fd86c646e0b230e931348490665d3f7a28068b81e9ea43bd17ca5 SHA512 803c0e08ba88811e98cbac9f3104eeae2bdf6d66e47ec750bf80f9a3dc6bea3ec94844ccf7d41ca155a1918ac36f6f1562cca343e9a23e797f0b589561158546
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/eschalon-book-1-demo/eschalon-book-1-demo-106-r1.ebuild b/games-rpg/eschalon-book-1-demo/eschalon-book-1-demo-106-r1.ebuild
index 62333050eaec..20e6153e2110 100644
--- a/games-rpg/eschalon-book-1-demo/eschalon-book-1-demo-106-r1.ebuild
+++ b/games-rpg/eschalon-book-1-demo/eschalon-book-1-demo-106-r1.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
+
+inherit desktop wrapper
 
 DESCRIPTION="A classic role-playing game"
 HOMEPAGE="http://basiliskgames.com/eschalon-book-i"
 SRC_URI="https://dev.gentoo.org/~calchan/distfiles/${P}.tar.gz"
+S="${WORKDIR}/Eschalon Book I Demo"
 
 LICENSE="eschalon-book-1-demo"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="strip"
 
 QA_PREBUILT="opt/*"
@@ -23,8 +24,6 @@ RDEPEND="
 	virtual/glu[abi_x86_32(-)]
 	virtual/opengl[abi_x86_32(-)]"
 
-S="${WORKDIR}/Eschalon Book I Demo"
-
 src_install() {
 	insinto /opt/${PN}
 	doins -r data music sound *pdf *pak help.txt
diff --git a/games-rpg/hatoful-boyfriend-holiday-star/Manifest b/games-rpg/hatoful-boyfriend-holiday-star/Manifest
index 87168c91aaf1..b75145e87ccb 100644
--- a/games-rpg/hatoful-boyfriend-holiday-star/Manifest
+++ b/games-rpg/hatoful-boyfriend-holiday-star/Manifest
@@ -1,3 +1,3 @@
 DIST Linux-Standalone-20151218.rar 347789456 BLAKE2B bb41ebcde9524f2259e9d9a69e19aedc2820ddcf5fe3f4f418f0bdf8cdc9bc228da8c38761febbd68d3ecef1c5f32a5a98fa70480930d9bbcd8285ee3f25c70a SHA512 c59c6d1b54ed59cecf0e7606bdedf25dfa97c8c658800bbf343282eb36b906a569a6f3614271a307008c9946e61abfa2868a1f5ba73193f13138d52333013f5b
-EBUILD hatoful-boyfriend-holiday-star-20151218.ebuild 1411 BLAKE2B ab47a76c61e1756f96d82c41e30e3ed78a424b48db864334adc39ec1c78bd86ca3551f0cd9565252f8bbdcf28ffcdf0103e0362dc209fa9300fa5c7fe44f2e71 SHA512 4fce207f33f9b7b4337bbbd8c74a7b22c7675b0f812a9ca19f11b410423784194ef008d45ed650a7a2c1710b2b1632bee1fd88cf99de3217eddab7e5dc7e7ada
+EBUILD hatoful-boyfriend-holiday-star-20151218.ebuild 1410 BLAKE2B f950692a7a61b332c77b61251995f0594b146b5a95d332be685df609392c819aaa55afce320d3e4d8b7797e03721060e1685846f6c69d829254d42ef4ac82930 SHA512 005fe79b5a42abc3bcf8be142a67a720070efbd72e2c82ac1f1f05e4ff0bc2c15a596c5bf00c5822019609adecfff6822798583bfba25632317fac94c00718ec
 MISC metadata.xml 354 BLAKE2B 620415356736dd403be27ef2547bd0d23a3812b3c16b7976125c582118af837336c258d7c0657dbe70b254ee773041f7e169939a34cc616870a5f54ad8429c31 SHA512 6ae66494681059ab163da720d574906da7db8facc7c383db8b8dd0d5ea78f41deb5f19389b1fd8fc2848cfb7ae5c11bd3ba2750a90799b382f0bfe8f70d48637
diff --git a/games-rpg/hatoful-boyfriend-holiday-star/hatoful-boyfriend-holiday-star-20151218.ebuild b/games-rpg/hatoful-boyfriend-holiday-star/hatoful-boyfriend-holiday-star-20151218.ebuild
index 657a23662d56..5d702783a124 100644
--- a/games-rpg/hatoful-boyfriend-holiday-star/hatoful-boyfriend-holiday-star-20151218.ebuild
+++ b/games-rpg/hatoful-boyfriend-holiday-star/hatoful-boyfriend-holiday-star-20151218.ebuild
@@ -8,6 +8,7 @@ inherit desktop wrapper xdg-utils
 DESCRIPTION="Holiday-themed sequel to the Japanese visual novel and dating sim about birds"
 HOMEPAGE="https://www.devolverdigital.com/games/hatoful-boyfriend-holiday-star"
 SRC_URI="Linux-Standalone-${PV}.rar"
+S="${WORKDIR}/Linux-Standalone"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
@@ -29,8 +30,6 @@ RDEPEND="
 	)
 "
 
-S="${WORKDIR}/Linux-Standalone"
-
 DIR="/opt/${PN}"
 QA_PREBUILT="${DIR#/}/*"
 
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index e20870b422ea..9e47f44d16b5 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/etqw-ded/Manifest b/games-server/etqw-ded/Manifest
index 5a407de82ae6..e12feb2749bb 100644
--- a/games-server/etqw-ded/Manifest
+++ b/games-server/etqw-ded/Manifest
@@ -1,3 +1,3 @@
 DIST ETQW-server-1.5-full.x86.run 452679053 BLAKE2B 01721b7a288671873a87164e438cb4bf3483f86fe282fc0a306043bb44e18bf126736e57f6ee5ec0880057b7f53119e1b2f6c9ddd625f9083a01f3e12c613bef SHA512 8daa5f192330be09b476d9633af79085f8b45d64e99fb50f6dc2ded085171f3d310218308b813bc7fc9a56b5fb34d52d72248a1e926a0e499ce096690407b0cd
-EBUILD etqw-ded-1.5-r1.ebuild 929 BLAKE2B 9990770c1ba5d483cd4532aea3ad73d0c3ce7aa532ffcb2f7c1de7f2a48b14bc07bba9fb3dba91f7ae36b59d30fc2fa359e0313a1d4deaafad3d897b52cedfde SHA512 1fcaa829658cc61bc7a24edd34e01d8fafa265885eb751c42f2af38123d4a5868c225e23ede2e5d8777136a68642c8940d1edd4d3ce02d42a5f1bc7997cc11d7
+EBUILD etqw-ded-1.5-r1.ebuild 925 BLAKE2B 2e1573b15c5a1bffcac2974332c710f3bf0a00ba2fc579374dec30dccb9d35cd630bc4e6ba3c39737b300a9432d9ed670d7b5520dd915309f4e69259516b28b9 SHA512 c7ba3befe43f92a05ee6dfb4ba3b7e88b501145bd51b6bdc8734a6408a19a1c08c1c86d710682c0eadb4793fe4c745215b2abe46bde61a8ebeddfabc9787d031
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-server/etqw-ded/etqw-ded-1.5-r1.ebuild b/games-server/etqw-ded/etqw-ded-1.5-r1.ebuild
index 52c453f64cc0..44d2f825a9c6 100644
--- a/games-server/etqw-ded/etqw-ded-1.5-r1.ebuild
+++ b/games-server/etqw-ded/etqw-ded-1.5-r1.ebuild
@@ -1,28 +1,28 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit wrapper
 
 DESCRIPTION="Enemy Territory: Quake Wars dedicated server"
 HOMEPAGE="https://www.splashdamage.com/content/et-quake-wars-standalone-server-linux"
 SRC_URI="ETQW-server-${PV}-full.x86.run"
+S="${WORKDIR}"/data
 
 LICENSE="ETQW"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
 RESTRICT="bindist fetch strip"
 
-DEPEND="app-arch/unzip"
 RDEPEND="sys-libs/glibc"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/data
 dir=/opt/${PN}
 
-QA_PREBUILT="${dir:1}/pb/*.so
-	${dir:1}/*.x86
-	${dir:1}/*.so*"
+QA_PREBUILT="${dir#1}/pb/*.so
+	${dir#1}/*.x86
+	${dir#1}/*.so*"
 
 pkg_nofetch() {
 	einfo "Please download ${A} from ${HOMEPAGE} and copy it into your DISTDIR directory."
diff --git a/games-server/ut2004-ded/Manifest b/games-server/ut2004-ded/Manifest
index b1bb46537305..fe8832529b2a 100644
--- a/games-server/ut2004-ded/Manifest
+++ b/games-server/ut2004-ded/Manifest
@@ -3,5 +3,5 @@ AUX ut2004-ded.initd 320 BLAKE2B 34e3fdf38eb9e5bc2623581c73fea3af040f9dca829c8c4
 DIST dedicatedserver3339-bonuspack.zip 914213907 BLAKE2B 883253d9817b4ee7f9594bf611e9d440d7e90c8cd43d34b366cfb4e781d4ad78e2812a0aa4f5acaed4880b1bc47f0dffed6fbb0caf9cc53477c01bc92d891325 SHA512 353161a7c811ac5c688c6438e3ecfad1aa37bcfd13a3e17f2a9deaf510eda9311a423524bd4635fcf972001cfe24c1a1b71a2bb6a060c37a24351f3bce0c7f26
 DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 BLAKE2B 9852f9d55804b7f2927a31be86aee1552aaebeb38d2a40fb206154c236e9d6eff47f7594024c0d9b25c7216d3ca62571b1f89f23f72ee9e135b2e6451bcb006a SHA512 0d6f26d5a811efd64be8c304e928e03f546d9a8eaba6b074843e2b7e76e0670b39df95200a2fe2040d72bbd204c7157ed0115649a5c85396a76d9e0b7ec284b1
 DIST ut2004-v3369-3-linux-dedicated.7z 5013927 BLAKE2B 72d24d7bc37c777f3697b767a03e052ad9b547005dd6da73833e439496e87a9c1ebbe01f88d62b29a41b2bf6380a3b3bd745e6883fbb6d0f2b7e52998d4af276 SHA512 3b2a7b64934a3647c02c9fec48565c5c2c35370d635b2af4059eb76587bfa13f46e6a4e14fdb0494ba7a4182497ed5963601986f4fcfa318e69a8a8a8c0178cf
-EBUILD ut2004-ded-3369.3-r2.ebuild 2644 BLAKE2B d37232ef03a437e498946166ef59298278ae27dd25d882349d2ee2cf5ae0ef45154032b02da1e7ab8b4aaff2ba311039cd9b5add7514637cdfc520590585584b SHA512 f7c341ec050c3fa3f3885fba3d3df72895bcd2ede75161506d30eb26fcff61552f29bab382137b775e04bed46c955353425a7ff489b56e0503177b908c6d0fcf
+EBUILD ut2004-ded-3369.3-r2.ebuild 2644 BLAKE2B d675ae515fb4add3f8c35d73257df78d7fcd22dd883ced8db28b4768ba324024a8b55fddb3ecfa449d67da565d2c3b3870760b9dc0c1a75f0c513f95f5233631 SHA512 6ee6a7d10e390fc38677ac13a72a992c98d544cf7c65d0cebae91b70689127a04110c0c6d0d8ae081351d162bf60a74483b2f7fed415525b67d5358ca22f480a
 MISC metadata.xml 641 BLAKE2B 6f4b33ffb4810e9161f185859d8a822bf655f70f40220968a1638398072506486a72180065d2f1589446f09d61416b2cc379bdfafd540162bf8b817834002849 SHA512 637588c313e117912d01da6345324d455f7c1c658e413d936b60f1fcceff88d8ecae084e11727479c8cf72438f14412336d9c81d94cccc1ffb54a5ec2d69ebc7
diff --git a/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild b/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild
index c46e1f1ae9b5..9a28a79d6bce 100644
--- a/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild
+++ b/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild
@@ -14,6 +14,7 @@ SRC_URI="
 	http://ut2004.ut-files.com/Patches/Linux/${PATCH_P}
 	https://dev.gentoo.org/~chewi/distfiles/ut2004-v${PV/./-}-linux-dedicated.7z
 "
+S="${WORKDIR}"
 
 LICENSE="ut2003"
 SLOT="0"
@@ -36,7 +37,6 @@ RDEPEND="
 CHECKREQS_DISK_BUILD="2G"
 QA_PREBUILT="*"
 
-S="${WORKDIR}"
 DIR="/opt/${PN%-ded}"
 
 src_prepare() {
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 99dc446840fa..c48d37002e46 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/bcs-demo/Manifest b/games-simulation/bcs-demo/Manifest
index c43af842ddac..cb08c0c883f2 100644
--- a/games-simulation/bcs-demo/Manifest
+++ b/games-simulation/bcs-demo/Manifest
@@ -1,4 +1,4 @@
 DIST bcsdemo_v1_3.sh.bin 5965217 BLAKE2B ba69858933c5ff1fbd966cc5038ecf891abea70cb6a7f09e40e698da495a7f3578460f90e033c1455918f7d188e37839ae0f140be8c419911d520e4cef13cd48 SHA512 b3916ac72d21e80a09b80a406ea18ab4365d9c1b8139eec848f2e5d697d3d5afb6f27de5dac31c6b6fd860e3b406a3eae8a28aac0e00134629dbd5906bde816d
 DIST openal-alan-hack-0.0.1.tar.gz 86168 BLAKE2B 77ab97ef9b31b4c3ab00c89afaad7094b6ecc388e296b31969bfbbe3953b812036c1cb4a04a09ad0ca986941d2508469c40f5ab7d458c1ceb5fa78b1f9ca7c81 SHA512 1794461cb917dcf2130977bd0ac9f09bf93cd235dd742d29e50a3e2666e6db60865bacd1927fc4607a4b308dcdf421fa2a186ad2a06eea778069ce712a89d943
-EBUILD bcs-demo-1.3-r1.ebuild 1386 BLAKE2B e753e0d2787b34fe13249e917942774b6b473089166f374ebf6655aaa7c82c0b454bd4f4ec31fb83cf5602506d92409e3ad24b6d22482fdcaab28a9529672343 SHA512 ee872f42ac112252f41e892c3caa6fd471d3379f0fad6107f0dce8a2b5007f3fed22792d701dc0fb31a04f946d8a48a0801a7aa8b107bd1aecb4bb4ae5a76952
+EBUILD bcs-demo-1.3-r1.ebuild 1387 BLAKE2B 7c6669c1b31b536e4dd12dcb13e862341a41a576b0803221141bcad8f8f4a98848eeec0eda6746fe09eeac6ec968356f2c4f79b135234a81e4d5a25b777b7b0d SHA512 91b7994dcee3625d4a40943c88411083248ff3b05a7dd316c86a584851642df2de25794428f8440d8db0f1836196224a7b76193ef7512836ef1cfb3b1d94cb17
 MISC metadata.xml 1473 BLAKE2B 98ce5cff21aaefe1ebe09f390be6e01780902ef652e3f0ddee815b0018652678719c061ef7a88dae81824170f2bdc7fa8b7b024227a2c71f03f04f783d831504 SHA512 2813c65cdae4aa2f8e0d0cb15e3b45af6d842e2ad02bc45783d3eb9fc8acbbd8467241ce7af2fa420bedc39b7c449b398f339cdc868fb6e45e0b5cec68b538c2
diff --git a/games-simulation/bcs-demo/bcs-demo-1.3-r1.ebuild b/games-simulation/bcs-demo/bcs-demo-1.3-r1.ebuild
index af09bc0dcf69..d5e8c9c23407 100644
--- a/games-simulation/bcs-demo/bcs-demo-1.3-r1.ebuild
+++ b/games-simulation/bcs-demo/bcs-demo-1.3-r1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit wrapper unpacker
 
 DESCRIPTION="design and build bridges and then stress test them with trains"
 HOMEPAGE="http://www.chroniclogic.com/pontifex2.htm"
 SRC_URI="ftp://ggdev-1.homelan.com/bcs/bcsdemo_v${PV/./_}.sh.bin
 	http://www.highprogrammer.com/alan/pfx2/openal-alan-hack-0.0.1.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="BCS"
 SLOT="0"
@@ -24,8 +25,6 @@ RDEPEND="
 	x11-libs/libXext[abi_x86_32(-)]
 	virtual/opengl[abi_x86_32(-)]"
 
-S=${WORKDIR}
-
 dir=/opt/${PN}
 Ddir=${D}/${dir}
 QA_PREBUILT="${dir:1}/*"
diff --git a/games-simulation/sky-rogue/Manifest b/games-simulation/sky-rogue/Manifest
index 01a1c0cc5bf2..7fdebdc2c4ad 100644
--- a/games-simulation/sky-rogue/Manifest
+++ b/games-simulation/sky-rogue/Manifest
@@ -1,3 +1,3 @@
 DIST sky-rogue-linux.zip 153094990 BLAKE2B 2129f624a7b56ec0ddbf6869a75f94468d4efe9efade4d47549b2ae1eebfb4b6e4939190d97acd820c2f46a1a9b2d52614e5a1c7ace717071d482db21b1bd1e1 SHA512 f25dfed7d78355fdbd5a643ec11f948020256fce38e80f9bb8084b875203b26490af6b0164684c187493697a132c7fdc9b40af6b793fd50c9a176285c508d8df
-EBUILD sky-rogue-1.3.ebuild 1163 BLAKE2B c786f5bded94e90dce41734979f3f7bafb3995d92d7fa93831cb7bf1c6ef54824bf0dcd3ed9eb94e59f7267c4c7d2634504aebf833208abb67fd346538813821 SHA512 cfa26e881a8fd16b9682f11ab99d7548abc63d44f11bf75c72327b0583bad584f689138d16c7ccf2078d3b8d28c456d241c246ef59bb2ebfedcdb98319449806
+EBUILD sky-rogue-1.3.ebuild 1163 BLAKE2B 6fdae847e6c38ea851bae8df76ff2894cbc3b10956e7730006920c518e0d19cbf28cf148df3a6d800005e204fed6af918503c835109d85be737abcf2ebf3ea05 SHA512 336595a3441d2f89d8a05fce2c3086e290d7cc7cea51afb2fd92bc04e24c0664bf2ac6c1327347cd0ab8dd03f29954bb411aeff0cc4984777ddc4b6d34ef75d8
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-simulation/sky-rogue/sky-rogue-1.3.ebuild b/games-simulation/sky-rogue/sky-rogue-1.3.ebuild
index 8f7e9f217ce8..6c6f0c4dc910 100644
--- a/games-simulation/sky-rogue/sky-rogue-1.3.ebuild
+++ b/games-simulation/sky-rogue/sky-rogue-1.3.ebuild
@@ -9,6 +9,8 @@ MY_PN="${PN//-}"
 DESCRIPTION="A fwooshy rogue-lite action flight simulator"
 HOMEPAGE="https://skyroguegame.com/"
 SRC_URI="${PN}-linux.zip"
+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
@@ -23,8 +25,6 @@ BDEPEND="
 	app-arch/unzip
 "
 
-S="${WORKDIR}"
-
 DIR="/opt/${PN}"
 QA_PREBUILT="${DIR#/}/*"
 
diff --git a/games-simulation/slime-rancher/Manifest b/games-simulation/slime-rancher/Manifest
index f5e1e2d26bcf..18bda302abda 100644
--- a/games-simulation/slime-rancher/Manifest
+++ b/games-simulation/slime-rancher/Manifest
@@ -1,3 +1,3 @@
 DIST slime_rancher_1_4_1c_34605.sh 637631767 BLAKE2B e3742178acfb9b80429117a37e8c7ec226345fb20b762ef80ca7ff7d58bcde039a199db5f352e78ce6935b6b261924780f54c84dd706a8031b427c9bd52de2a7 SHA512 c9124a7685c12dab942cde3e4b7e4140156c9d1551043d450c0c2f2eb02d1db61b99f22803b1058634abff86e783c889badf5834f0c2f7048a97dc168c962908
-EBUILD slime-rancher-1.4.1c_p34605.ebuild 1193 BLAKE2B cb44c1fdf80ccc1b90052625e09b522853a5b94a219a8d8a8d49ea03525992d07a8f9323b0a77b7f0b55006610f0c1ef4e2db68baaaac52502609af2e68d06c3 SHA512 96b5ab016c603491eebcace2382268ae1889ea8373b74fa93e9c925df8b6eed7084bd7a4459d376825e55275aac879560848474881d3a0f49495c5e5d97ecd26
+EBUILD slime-rancher-1.4.1c_p34605.ebuild 1195 BLAKE2B f1ea26363f00c583bf917a916e1dbb9f41e4bc0a3532c36752912aa571413fee195dbcf12fea936757ffe42a3d610729948f8414fdf7ac02f644b24ecf08d6e4 SHA512 886e50d33b6b1f917b62ea5283b33797a830300b1790a984143f1af70ca6e5c794a3b0a03f6a5d8e6e12cf00f58590953a7eb6e26273e1594771a37a4459c326
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-simulation/slime-rancher/slime-rancher-1.4.1c_p34605.ebuild b/games-simulation/slime-rancher/slime-rancher-1.4.1c_p34605.ebuild
index a27ed01cb70f..f27ad052cfb3 100644
--- a/games-simulation/slime-rancher/slime-rancher-1.4.1c_p34605.ebuild
+++ b/games-simulation/slime-rancher/slime-rancher-1.4.1c_p34605.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 BDEPEND="app-arch/unzip"
 
 DIR="/opt/${PN}"
-QA_PREBUILT="${DIR}/*"
+QA_PREBUILT="${DIR#/}/*"
 
 pkg_nofetch() {
 	einfo "Please buy and download ${SRC_URI} from:"
diff --git a/games-simulation/train-valley/Manifest b/games-simulation/train-valley/Manifest
index 119a15666551..40f4f0adf6ba 100644
--- a/games-simulation/train-valley/Manifest
+++ b/games-simulation/train-valley/Manifest
@@ -1,3 +1,3 @@
 DIST train_valley_1_3_31403.sh 196066169 BLAKE2B fe9e6ae5b0ef76794823dc86ed100fdac355d3929d85a9a12096f79cf9e6f946e2c85b5b737ebcab813ceef29094734f74546fff06124fe4bf07ef224d5842ff SHA512 16fd627f8ca6399579b17d7a4ce29caba554fbfb0dc72b40827f1c3a061d8c238a7faeb1b5171917362d381642e8cb066cdad5556fb71f4d27225bf227d735cd
-EBUILD train-valley-1.3.31403.ebuild 1336 BLAKE2B 18ad6bf78caf1d3ea41e73ba8068ba1a25242c084ce66532a1118457c872852032eef85b25f7ba16d1268b31158db4309b1b1a0857a1b78db37380b449f526ce SHA512 60f6a5d23feda96e4f4e66bd40ed8e0c494be49eb4ed65844e59a213647391584489ea89435a559b2501fb2a34650bc4a882e3a2561d94199efe066bfefeb80c
+EBUILD train-valley-1.3.31403.ebuild 1338 BLAKE2B 344ef1532c3dc65ef86077741fd5c5583720fcd4ccab9802f92c6b7b9f8ee24b6957892b1ffd9936c3ddfec3bcb0dbaa4449e6f13f03fe8db745efac98c82216 SHA512 0d5543a7f88d313fca8023a9d7b8f01a73a494053854d5f51c9b5c11bca819edbd0d4608ec1c9c4a4260f574e7905516b6fbbed35233685c2e67bf3e8d82cc44
 MISC metadata.xml 354 BLAKE2B 620415356736dd403be27ef2547bd0d23a3812b3c16b7976125c582118af837336c258d7c0657dbe70b254ee773041f7e169939a34cc616870a5f54ad8429c31 SHA512 6ae66494681059ab163da720d574906da7db8facc7c383db8b8dd0d5ea78f41deb5f19389b1fd8fc2848cfb7ae5c11bd3ba2750a90799b382f0bfe8f70d48637
diff --git a/games-simulation/train-valley/train-valley-1.3.31403.ebuild b/games-simulation/train-valley/train-valley-1.3.31403.ebuild
index a1e958982c2d..344e63467d7d 100644
--- a/games-simulation/train-valley/train-valley-1.3.31403.ebuild
+++ b/games-simulation/train-valley/train-valley-1.3.31403.ebuild
@@ -8,6 +8,8 @@ inherit desktop unpacker wrapper xdg-utils
 DESCRIPTION="Build railroads in order to connect cities, tunnels, and bridges"
 HOMEPAGE="http://train-valley.com/tv1.html"
 SRC_URI="${P//[-.]/_}.sh"
+S="${WORKDIR}/data/noarch/game"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
@@ -25,10 +27,8 @@ RDEPEND="
 	)
 "
 
-S="${WORKDIR}/data/noarch/game"
-
 DIR="/opt/${PN}"
-QA_PREBUILT="${DIR}/*"
+QA_PREBUILT="${DIR#/}/*"
 
 pkg_nofetch() {
 	einfo "Please buy and download ${SRC_URI} from:"
diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz
index bd9119b76f5e..d8541731e452 100644
--- a/games-sports/Manifest.gz
+++ b/games-sports/Manifest.gz
diff --git a/games-sports/speed-dreams/Manifest b/games-sports/speed-dreams/Manifest
index 36d8bb5d5487..d3a6a0b1eb41 100644
--- a/games-sports/speed-dreams/Manifest
+++ b/games-sports/speed-dreams/Manifest
@@ -1,13 +1,7 @@
-AUX speed-dreams-1.4.0-asneeded.patch 4214 BLAKE2B e0cf81e4bc04dd0a41ca813e2fbd66145bda4ad81b0137d9e09ef8cb0be5c458b7328be75605a3795f7a63f00104a85ebfe4bb34bc5437d58dee709edabb556f SHA512 908ca897a843c5bc1e1a1260adea227f445a2d7a3e09cc2cf7deb1cc85d4163fd89046db95679b8ed1288e2c104585322380765abdd65f2edd10b6027b7b4bab
-AUX speed-dreams-1.4.0-automake.patch 995 BLAKE2B 04280a67277a420108db5ae2675e99d6cdb3461120e9c04313cc6be4f910572cb87b6703d65444cb199d4b5ef2018239a843e1b64cdcb0820e4efdbdb30b0c38 SHA512 2300dd95087d0b7f0aada40041eea70976046085a9d9dc467c86691cf21058855941e642547a7eda26786b5a756d5930867616fb62534a0a2da1301dab3af8f0
-AUX speed-dreams-1.4.0-libpng15.patch 516 BLAKE2B 0464b8a006cc8a35442345d024bb301b0e3a1b4fb16110098aa27422cea35bbb67ccbd2fd689e8cc93b811ca37a4426799c9bd180e4bcca5ae3c20c76462f5b7 SHA512 f945622e791d15020370a1e31d328bc1329e08163a3c4f66fd63987e2dd357e2708338402fcfb5b2e994d4339a3d8d6df7f908b2ecbdff5cb6bd865259d40fa9
-AUX speed-dreams-1.4.0-math-hack.patch 1426 BLAKE2B 9457a89d48dc5fe1e5879ae1ee036ce87fdf51f7042fe7bb0c2213dad2e14d6009d21effc7b7a6a8832a269d0a8ed7c8e6b7e957815a24991fcf01d0a42e64ee SHA512 6187e0948b4b9b29f9934d4a760fb9bfdd81bd083d9f01a119f023fcacfe3f6163f8950934241cde24678ec4e4e081eafe6183263bc09c5f9f4db00c5f90259d
 AUX speed-dreams-2.2.3_rc1-xmlversion-rpath.patch 365 BLAKE2B e8e515f75c0300638a2354b7f07c7cf5b7c8a9cac31e1aa4f4d497fb058ec22776b032f6593558add6a301112a128e55d6f10cbd161354f6a5301cc78e567d25 SHA512 a54cb7315aaef8cf14432f7694aae9368d5e687677cdc9baf4b0270580cef15e9e15155c295e8c8d1fb840a0f66f87b1fc502d137cf7d609089caa2791b4258b
-DIST speed-dreams-1.4.0-r2307-src.tar.bz2 332667666 BLAKE2B 17455c6fc6bbe0cb4b5e00d4217eb49e0f6e39a8aa389f304771e32429c48e2e6bc834d8d0c7a01927376c5b37ae8e7b27399da88784b5f46b9549d46d01222f SHA512 6ae88691f52480351825c20c8bfb3ff54783b84bfbbc385ae2c0578991fa9025b16dcdc4ce136b85246a2a479452f2b209ecbec2be0a7ae85818929ea5fa1195
 DIST speed-dreams-src-base-2.2.3-r7616.tar.xz 238067340 BLAKE2B 5250a295fd077ab5c773bfb066416a2b0abfbd667e99c5c7a360898121af9dc757cf6afd003e220b9e76e687040d80687f8f78d445d6b98064efa396f5b1b4b7 SHA512 a98913625a78a67f7428649c6f3c426d32537b5f1b9331540bb32926568d281e1ec0e80bf45e5d847f43ee00b2d0c5945be96d86ac36d840b79dd3da82920960
 DIST speed-dreams-src-hq-cars-and-tracks-2.2.3-r7616.tar.xz 578705056 BLAKE2B 8b354211686ca6183ada892c844fa0345f2b751b786194d2d52e37a25c8dcf048e91862f2964c337e02765fba4e7bafa81539355a2b00af68476704ddc85c817 SHA512 4a488daeb1161dbc61ca95c5152d38864f759bbc2d0d8cc4d4c4a258aa143dedab55f16ba3343657b2fe8544e1f33ee0bc82e2cdeda7a7087a283e2513a8b6c6
 DIST speed-dreams-src-more-hq-cars-and-tracks-2.2.3-r7616.tar.xz 668751780 BLAKE2B f4c528eebdecc337394a08100e45eb66a8ad5e85164813a27a406d6b54089cd640874d37680588bfffcf3f1fdc274fd2329defb9d052ef2833c86dec8be21c9d SHA512 e8256c28697dd78794c41f2dc659d7aa455f0e5967b3178fbe17eb4adf6ef93ed719621f38afd78c8d0a548bcb7b61bb0859755b4867fee21096fe0925acfd89
 DIST speed-dreams-src-wip-cars-and-tracks-2.2.3-r7616.tar.xz 409517248 BLAKE2B 5dc7af87df13f87e3561dbc139366a1b7041130812d02316c103707102b352de9c3dd111411576f168b813d4c735656a098e681e70e274593762e552aabb517c SHA512 693ebd5f1f81629fe62c7c086de8a924833b3ee1b4a25f803b7214b58f8520b16f4d45cdd96e941f1f884afa3f53afd66ef9a500fda42b928c7124ae9205060a
-EBUILD speed-dreams-1.4.0-r1.ebuild 1786 BLAKE2B 2ab52173cc2029a066a241d7b48bebb578f5d8ad637fc11fbc9c9b86316e3ffaa9c8336e51c087d4556c640d3a00fef2caf97bd10adc7b28c3aeb9fba8171ae9 SHA512 6d6cf5bcb934167eb38aad7de10d2d32b71507293281e08f9413ff180428caa5387096572d962e0427c1055bc8a1ba9a0af0075153790186d372f349bec90438
 EBUILD speed-dreams-2.2.3.ebuild 2454 BLAKE2B 904bdfb5926d22f050933306c0a1270ef63467c3f9ddbb5dd1ea31d2239f77712b2e8d40fa689e1b9d5090b2f0056f1e90e4e94bd14085b779a84a924d11bc0c SHA512 e9145c46e6a685899e80f02478fef611425721c5c14bb2942d1b6b7f877d19dcbba1ba58042b7f5443199138c1e8fded37faadc9e388354d589e3647d74ebb97
-MISC metadata.xml 643 BLAKE2B a9a526d2b3abfb2ba3935d7e62c24fa39f9e43c6f68d9e9128a709bc95aa02681327594eaeb59ab63e2759066fb563360d51eabeb8c0e86ec8bbfb47cfafb5d9 SHA512 274c8d4ee746f6af0faf237710fb3406a440a5a6a660ba53312858195652875fd2a047ef6e43fd692bb0a178c617a0e004bffa03ce41b22f361655b46e8787f0
+MISC metadata.xml 572 BLAKE2B df20855fe0a1319dfbc2a7eb94d10f2d58fb0fb2d94f8d127cafea2947e7d384561725e63f531d53c906145a928d2b2b78689d5314b1954a94ee727f3157d6ab SHA512 49bb95b9a6012dbeff393980c09127531521a3162c4dcfab556d8c4a950b16bca3b526db8db629ad4792faf7c96c33757513d1ecc3dad5fe5cff18621276665a
diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch
deleted file mode 100644
index 779119d995b1..000000000000
--- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -123,8 +123,7 @@
- AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. Please check config.log and if you can't solve the problem send the file to speed-dreams-users@lists.sourceforge.net with the subject \"Speed Dreams compilation problem\"]))
- AC_CHECK_LIB(openal, alEnable,, AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on http://www.openal.org/]))
- AC_CHECK_LIB(alut, alutLoadWAVFile,
--	LDFLAGS="$LDFLAGS -lalut",
--	LDFLAGS="$LDFLAGS")
-+	LIBS="$LIBS -lalut", )
- 
- AC_CHECK_LIB(dl, dlopen)
- AC_CHECK_FUNC(dlopen,,AC_MSG_ERROR([Can't find dlopen function. Please check config.log and if you can't solve the problem send the file to speed-dreams-users@lists.sourceforge.net with the subject \"Speed Dreams compilation problem\"]))
-@@ -141,7 +140,7 @@
- AC_CHECK_LIB(glut, glutSwapBuffers,,AC_MSG_ERROR([Can't find libglut. freeglut can be found on http://freeglut.sourceforge.net/]))
- 
- dnl Checks for plib libraries.
--LDFLAGS="$LDFLAGS -lplibjs"
-+AC_CHECK_LIB(plibjs, main,,AC_MSG_ERROR([Can't find libplibjs. PLIB can be found on http://plib.sourceforge.net/]))
- AC_CHECK_LIB(plibul, main,,AC_MSG_ERROR([Can't find libplibul. PLIB can be found on http://plib.sourceforge.net/]))
- AC_CHECK_LIB(plibsg, main,,AC_MSG_ERROR([Can't find libplibsg. PLIB can be found on http://plib.sourceforge.net/]))
- AC_CHECK_LIB(plibsl, main,,AC_MSG_ERROR([Can't find libplibsl. PLIB can be found on http://plib.sourceforge.net/]))
---- a/Make-default.mk
-+++ b/Make-default.mk
-@@ -402,7 +402,7 @@
- ifdef PROGRAM
- 
- ${PROGRAM}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
--	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${SOLIBS} ${EXT_LIBS} -o $@
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 
- installprogram: ${PROGRAM}
- 	@ createdir="${INSTLIBBASE}" ; \
-@@ -420,14 +420,14 @@
- ifdef LOCALTOOLS
- 
- ${LOCALTOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
--	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 
- endif
- 
- ifdef TOOLS
- 
- ${TOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
--	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 
- installtools: ${TOOLS}
- 	@createdir="${INSTBINBASE}/${TOOLSDIR}" ; \
-@@ -478,7 +478,7 @@
- ifdef SOLIBRARY
- 
- ${SOLIBRARY}: ${OBJECTS}
--	${CXX} -shared -o ${SOLIBRARY} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} ${DEBUG_LIBS}
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${SOLIBRARY} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 	@D=`pwd` ; \
- 	createdir="${EXPORTBASE}/lib" ; \
- 	$(mkinstalldirs) $$createdir ; \
-@@ -509,7 +509,7 @@
- ifdef MODULE
- 
- ${MODULE}: ${OBJECTS}
--	${CXX} -shared -o ${MODULE} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} 
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${MODULE} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 	@D=`pwd` ; \
- 	createdir="${EXPORTBASE}/${MODULEDIR}" ; \
- 	$(mkinstalldirs) $$createdir ; \
---- a/src/libs/client/Makefile
-+++ b/src/libs/client/Makefile
-@@ -23,6 +23,8 @@
- SOURCES   = entry.cpp mainmenu.cpp splash.cpp exitmenu.cpp \
- 	    optionmenu.cpp
- 
-+SOLIBS    = -lconfscreens -lraceengine
-+
- LIBS      =  -lplibssg -lplibsg -lplibul
- 
- EXPDIR    = include
---- a/src/libs/Makefile
-+++ b/src/libs/Makefile
-@@ -23,7 +23,7 @@
- 
- TOOLSUBDIRS	= txml
- 
--SUBDIRS		= confscreens racescreens robottools txml tgf tgfclient client raceengineclient learning \
-+SUBDIRS		= confscreens racescreens robottools txml tgf tgfclient raceengineclient client learning \
- 			  portability math
- 
- PKGSUBDIRS	= $(SUBDIRS)
---- a/src/libs/raceengineclient/Makefile
-+++ b/src/libs/raceengineclient/Makefile
-@@ -23,6 +23,8 @@
- SOURCES      = singleplayer.cpp raceinit.cpp racemain.cpp racemanmenu.cpp racestate.cpp racegl.cpp \
- 	       raceengine.cpp raceresults.cpp
- 
-+SOLIBS       = -lconfscreens -lrobottools -lracescreens
-+
- EXPDIR       = include
- 
- EXPORTS      = singleplayer.h raceinit.h
---- a/src/libs/tgf/Makefile
-+++ b/src/libs/tgf/Makefile
-@@ -29,6 +29,7 @@
- 		profiler.cpp \
- 		hash.cpp
- 
-+SOLIBS  = -ltxml
- 
- EXPDIR  = include
- 
diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch
deleted file mode 100644
index 72c755af9ebd..000000000000
--- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/configure.in	2012-03-13 08:15:34.891163505 +0100
-+++ b/configure.in	2012-03-13 08:18:40.154092687 +0100
-@@ -14,9 +14,10 @@
- #
- ##############################################################################
- 
--AC_INIT(Make-config.in)
-+AC_INIT([speed-dreams], [1.4.0-r2307])
-+AC_CONFIG_SRCDIR([Make-config.in])
- AC_CONFIG_HEADERS(config.h)
--AM_INIT_AUTOMAKE(speed-dreams, 1.4.0-r2307)
-+AC_DEFINE(VERSION, ["1.4.0-r2307"], [Version])
- 
- dnl Checks for programs.
- AC_PROG_CC
---- a/Makefile	2012-03-13 10:43:30.563720337 +0100
-+++ b/Makefile	2012-03-13 10:44:26.339794119 +0100
-@@ -88,17 +88,7 @@
- -include ${MAKE_DEFAULT}
- 
- Make-config: configure Make-config.in
--	rm -f config.status config.log config.cache
- 	./configure
--	rm -f config.status config.log config.cache
--
--configure: configure.in config.h.in aclocal.m4
--	rm -f config.status config.log config.cache
--	autoheader
--	autoconf
--
--aclocal.m4: acinclude.m4
--	aclocal
- 
- distclean: clean
- 	rm -f config.status config.log config.cache
diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch
deleted file mode 100644
index 6b09ce2a41c8..000000000000
--- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/libs/tgfclient/img.cpp
-+++ b/src/libs/tgfclient/img.cpp
-@@ -98,7 +98,7 @@
-		return (unsigned char *)NULL;
-	}
-	
--	if (setjmp(png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
-	{
-		/* Free all of the memory associated with the png_ptr and info_ptr */
-		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-@@ -229,7 +229,7 @@
-		return -1;
-	}
-	
--	if (setjmp(png_ptr->jmpbuf)) {    
-+	if (setjmp(png_jmpbuf(png_ptr))) {
-		png_destroy_write_struct(&png_ptr, &info_ptr);
-		fclose(fp);
-		return -1;
diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch
deleted file mode 100644
index 32b4f85a2000..000000000000
--- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://sourceforge.net/p/speed-dreams/tickets/952/
-https://bugs.gentoo.org/580054
-
---- a/src/modules/simu/simuv2/simu.cpp
-+++ b/src/modules/simu/simuv2/simu.cpp
-@@ -61,7 +61,7 @@
-     if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
-     if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
-     if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0;
--    if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0;
-+    if (isnan((float)car->ctrl->gear) || isinf((float)car->ctrl->gear)) car->ctrl->gear = 0;
- #else
-     if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
-     if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
---- a/src/modules/simu/simuv3/simu.cpp
-+++ b/src/modules/simu/simuv3/simu.cpp
-@@ -61,7 +61,7 @@
-     if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
-     if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
-     if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0;
--    if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0;
-+    if (isnan((float)car->ctrl->gear) || isinf((float)car->ctrl->gear)) car->ctrl->gear = 0;
- #else
-     if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
-     if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
diff --git a/games-sports/speed-dreams/metadata.xml b/games-sports/speed-dreams/metadata.xml
index 98a79c4a7da3..11c234f855bf 100644
--- a/games-sports/speed-dreams/metadata.xml
+++ b/games-sports/speed-dreams/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="osggraph">Enable the new work-in-progress 3D engine using <pkg>dev-games/openscenegraph</pkg></flag>
 		<flag name="webstats">Enable support for sending racing statistics to a web server (experimental)</flag>
-		<flag name="xrandr">Enable support for the X xrandr extension</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">speed-dreams</remote-id>
diff --git a/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild b/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild
deleted file mode 100644
index d57867be7fb4..000000000000
--- a/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop versionator
-
-DESCRIPTION="A fork of the famous open racing car simulator TORCS"
-HOMEPAGE="http://speed-dreams.sourceforge.net/"
-SRC_URI="mirror://sourceforge/speed-dreams/${P}-r2307-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="xrandr"
-
-RDEPEND="virtual/opengl
-	virtual/glu
-	media-libs/freealut
-	media-libs/freeglut
-	>=media-libs/libpng-1.2.40:0
-	media-libs/openal
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-	xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}
-	>=media-libs/plib-1.8.3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)-src
-
-PATCHES=(
-	"${FILESDIR}"/${P}-asneeded.patch
-	"${FILESDIR}"/${P}-automake.patch
-	"${FILESDIR}"/${P}-libpng15.patch
-	"${FILESDIR}"/${P}-math-hack.patch
-)
-
-src_prepare() {
-	default
-
-	# https://sourceforge.net/apps/trac/speed-dreams/ticket/111
-	MAKEOPTS="${MAKEOPTS} -j1"
-
-	sed -i \
-		-e '/ADDCFLAGS/s: -O2::' \
-		configure.in || die
-	sed -i \
-		-e '/COPYING/s:=.*:= \\:' \
-		Makefile || die
-	sed -i \
-		-e '/LDFLAGS/s:-L/usr/lib::' \
-		-e "/^datadir/s:=.*:= /usr/share/games/${PN}:" \
-		Make-config.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	addpredict $(echo /dev/snd/controlC? | sed 's/ /:/g')
-	[[ -e /dev/dsp ]] && addpredict /dev/dsp
-	econf \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		$(use_enable xrandr)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install datainstall
-
-	find "${ED}" -name Makefile -exec rm -f {} + || die
-
-	dodoc CHANGES README TODO
-
-	newicon icon.svg ${PN}.svg
-	make_desktop_entry ${PN} "Speed Dreams"
-}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 30e3c805d8ce..803c1b1ebbfa 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/colobot-data/Manifest b/games-strategy/colobot-data/Manifest
index 1a3764cd565b..58fcce820993 100644
--- a/games-strategy/colobot-data/Manifest
+++ b/games-strategy/colobot-data/Manifest
@@ -1,4 +1,7 @@
 DIST colobot-gold-0.1.12-alpha.data.tar.gz 54732267 BLAKE2B 8cf36911764beb921e2b1009fd8550a1a146f594033cfc4de2d8587866780e22f060949735b03c2e355fab412c70c8557587f859edb86ca815ef249edc348926 SHA512 599cc72e1383826b5c840446f52f53b0f325b1de2ce08826bbd6b04072a51f1c4007b5683f2608dd7be67ab358ef2856e790bbbe5c73d8514141e3284be47508
+DIST colobot-gold-0.2.0-alpha.data.tar.gz 57792452 BLAKE2B 10cea12a220bb69db239e220a2ab4935177deea2c18181815b7a8dec9375c0f791f1fbabf7ac086bedb893e3a5b9543492635bf59cb3ab913ba4b3404bf273a5 SHA512 e36af1ad1e5470bec22a4923580be3ea5da69407b79af7c82a9d8c6ceff566b2f1e8e5aeb42f07098bbc459cc77ec391900ee79e8d0315a5abed7b36c44eafbb
 DIST colobot-music_ogg_0.1.12-alpha.tar.gz 55596353 BLAKE2B 63be871fc2000c1cb041658b7395d5175cefc24c81661b366396965951efdadf1cf064211f3f543c4a4b1b7da5bd91db5e397844f1e8771318302c9d80788eb4 SHA512 486d084adc1b28a9fe36c530d261e48a89553c822989f493b0a92dabb9c3435953bda6fe98fcdabc72c6969b5e9be4ff9f3803066f6115fc7740c3de5d183764
+DIST colobot-music_ogg_0.2.0-alpha.tar.gz 55596353 BLAKE2B 63be871fc2000c1cb041658b7395d5175cefc24c81661b366396965951efdadf1cf064211f3f543c4a4b1b7da5bd91db5e397844f1e8771318302c9d80788eb4 SHA512 486d084adc1b28a9fe36c530d261e48a89553c822989f493b0a92dabb9c3435953bda6fe98fcdabc72c6969b5e9be4ff9f3803066f6115fc7740c3de5d183764
 EBUILD colobot-data-0.1.12.ebuild 1039 BLAKE2B c2658bd81072ded20b278b3ebc792a8d1802794f059685d0c14c0dd927df5627c1d2c403f3ed7af40a9435bde3dd54bc4b9b6060b6ba5be38b3bf67a64036ea5 SHA512 024503c4e1cc61569c16a69b67e9310afd9137a8b8816e408876912c3abbebe0d8cd0d48cd296d0e26552b5ca1a1a1cc57a4de56b1ea41532fe5d66745b33629
+EBUILD colobot-data-0.2.0_alpha.ebuild 1050 BLAKE2B b4a1194180962b53168dbe5c54ec871b21884e5fb4b2b97a147e9db89757bcce6d72799c7777371b2530fd892a28e451d6f31114f00cb459714ad11cf847d7ff SHA512 1fe064c2b4a84192f749071472ec559454f9b8afc8d362d9f4a5154d7b1d943db378de962d8c311dff4325d5a69c57a6e894a1546acfc169ed8e9463ba7365b1
 MISC metadata.xml 396 BLAKE2B d99c9c0508c946e227c6fd3802a8c93594c1807b6b911aa77f2b19968a98fb2d1cefc81f332a260e52b16aa54e568368a88c7a5bb1b0097c8b3a43e6cd94498b SHA512 e7a8f625253c57cdd9a02b68a191adf58f28744a34049794d26a0fe217c1adf77a5260245ea11b1f96be358a74b01604cfe09f78e4ba3b2681f7427d9acb7ad2
diff --git a/games-strategy/colobot-data/colobot-data-0.2.0_alpha.ebuild b/games-strategy/colobot-data/colobot-data-0.2.0_alpha.ebuild
new file mode 100644
index 000000000000..4800d0ed10c1
--- /dev/null
+++ b/games-strategy/colobot-data/colobot-data-0.2.0_alpha.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake python-any-r1
+
+MY_PV=${PV/_/-}
+MY_P=colobot-gold-${MY_PV}
+MUSIC_P=colobot-music_ogg_${MY_PV}
+
+DESCRIPTION="Data package for colobot (Colonize with Bots)"
+HOMEPAGE="https://colobot.info/"
+SRC_URI="
+	https://github.com/colobot/colobot-data/archive/${MY_P}.tar.gz -> ${MY_P}.data.tar.gz
+	music? (
+		https://colobot.info/files/music/${MUSIC_P}.tar.gz )"
+S=${WORKDIR}/${PN}-${MY_P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+music"
+
+BDEPEND=${PYTHON_DEPS}
+
+src_unpack() {
+	unpack "${MY_P}.data.tar.gz"
+	if use music; then
+		tar -x -f "${DISTDIR}/${MUSIC_P}.tar.gz" -C "${S}/music" || die "Failed to unpack music"
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use music; then
+		sed -i -e '/find_program(WGET wget)/d' -e '/if(NOT WGET)/,+2 d' music/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMUSIC=$(usex music)
+		-DMUSIC_FLAC=OFF
+	)
+	cmake_src_configure
+}
diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest
index e9e582c03a53..58f8b5c99c71 100644
--- a/games-strategy/colobot/Manifest
+++ b/games-strategy/colobot/Manifest
@@ -1,6 +1,8 @@
 AUX colobot-0.1.12-includes.patch 1283 BLAKE2B 0f1e402e770d57365d53488b86838f401815e0749065bf2581d228a566873b31d021a1486ce7cf4a051407b96c540c954ce56ef9efc168522f0ea94ec1606fcd SHA512 26c1bbbd9605482a5a6ffef4b3a919518224e3802bcf0d7248bba94227039bf69a5d6a41bcacdb1ec170e58e719f1cde722f869c4ec26cf20ecd7d1eae091cd0
 AUX colobot-0.1.12-sndfile-link.patch 2114 BLAKE2B 11aebe223c809301fd7851ed20ab0867f47ca6d41d198951a81dc4d23a80d203a6955bc4df06dd09f9131fc6ed5f5cb5c1c001503564e89dde3143f58fa7cb59 SHA512 c4f15073aa7f9f84ca369f56944d8c3daba67b419f7d1a4e886b23bd210f84268beddeb13bb9dcb88a86e9dd1bc24a4364ed4bd2065062eac771002f367150e1
 DIST colobot-gold-0.1.12-alpha.tar.gz 1468594 BLAKE2B 2b470e8b074e4a973b751062dca2358396066d8816c2b1b5b44649b798610dccd73ab5fed4086f2aa8d4495f3de69dd8b72b45f97f23f66b18a50fc976bf25ef SHA512 63647a16b376db6544830f96e7d323c0f58003645bf636abd1cab0ffd47b39b0bef47191d584f5156b75324d75dfdfdcabe8b89be565087c37c367ca366f3cbe
+DIST colobot-gold-0.2.0-alpha.tar.gz 1514455 BLAKE2B 9cc1480d342cfa14b12e437c41ce8e65b173cd30ca5f62e574ac17f452e6cd0622b5c2706fcfd427222cf78fce1700cb07b82fac75dd9b4a3ace4389ea3381bc SHA512 9c35ce6da319ef20ff68a9722f0b683adaa2fcada2b89bb322ba5772dfd9371adacd045ae160550780083902c024400c29e1d1f11dcb8b6547ba7d48e401c4c3
 EBUILD colobot-0.1.12.ebuild 1616 BLAKE2B 0044f75977deebfdd035bc6b0a0815613a2f9bc00aad6a5898737b8884089842d2d8d1185bbb0cfdb04356a431ee35aea37c53610daaf6276088a7d7f55d811a SHA512 58ffa32138e8f26109bbfcd8604bfa358db0fffb49949ae5efef9d3e638643b9edd1da7f972278e4285fcee0bbeaacd69dba82a828ad89accd1564d7dbfdf4fb
+EBUILD colobot-0.2.0_alpha.ebuild 1546 BLAKE2B ae4f3a686c65dd258a7b06c8bb542c1094f06e72e390e3f6af22a91292f0294c91b9779cc99739930028d96a881dfdb92ead0ac29153cf4c4e6e52e772d79446 SHA512 0d6d66e343ef4a2363b72e899c0d101dadaf27352e95c10707f054682d02e5b6f7cbd77f38dd8d70d70505f7de14c2f42b8c5d7e0a2bf03b7d80d94c52145849
 EBUILD colobot-9999.ebuild 1377 BLAKE2B 98d1de0557f5edc06166bc191e5fe1beb4bf0f7f8975069d81f2a8aaf005c17348f649f477a3c16ab5aa5b35130a10607bb5395266c1c983816fed0b9f811bb2 SHA512 61b61b0cdb4c29348333c30a13c1986d69587164734bc2c52e07e63b1d5b795270bae19642055662155563b1cc91cd5cb7697b1172fecd1ae375702e879dcbe8
 MISC metadata.xml 418 BLAKE2B b30194895d7f35dc6b2bf5ed2d6153ab03832eff44536e837058b4c5641760c55ea846a3ffe91027d8892ab7ccd4a36be688b89a5909c57ca57a18f8a610f022 SHA512 6ffc5220d200c722b0e7da2ee8734282ea0fabd7d319f8a21cd88da6743312c869f44bd3b14af7031ce970feb9b6c4349236db2a7aee69ea8041e3b000812e3c
diff --git a/games-strategy/colobot/colobot-0.2.0_alpha.ebuild b/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
new file mode 100644
index 000000000000..3897d69816c3
--- /dev/null
+++ b/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+MY_P=colobot-gold-${PV/_/-}
+DESCRIPTION="A real-time strategy game, where you can program your bots"
+HOMEPAGE="https://colobot.info/"
+SRC_URI="https://github.com/colobot/colobot/archive/${MY_P}.tar.gz"
+S=${WORKDIR}/${PN}-${MY_P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="devbuild doc +openal test tools"
+RESTRICT="!test? ( test )"
+
+# perl for pod2man
+BDEPEND="
+	app-text/po4a
+	dev-lang/perl
+	sys-devel/gettext"
+DEPEND="
+	dev-games/physfs
+	dev-libs/boost:=
+	media-libs/glew:0
+	media-libs/libogg
+	media-libs/libpng:0=
+	media-libs/libsdl2:=
+	media-libs/libsndfile:=
+	media-libs/libvorbis:=
+	media-libs/sdl2-image
+	media-libs/sdl2-ttf
+	media-sound/vorbis-tools
+	openal? ( media-libs/openal )"
+RDEPEND="${DEPEND}
+	~games-strategy/colobot-data-${PV}"
+
+PATCHES=(
+	# https://github.com/colobot/colobot/pull/1453
+	"${FILESDIR}"/colobot-0.1.12-sndfile-link.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# we need to call it explicitly to help Ninja figure out the deps
+	cd desktop || die
+	po4a po4a.cfg || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDEV_BUILD=$(usex devbuild)
+		-DTESTS=$(usex test)
+		-DTOOLS=$(usex tools)
+		-DINSTALL_DOCS=$(usex doc)
+		-DOPENAL_SOUND=$(usex openal)
+		-DCOLOBOT_INSTALL_BIN_DIR="${EPREFIX}"/usr/bin
+		-DCOLOBOT_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-strategy/darwinia/Manifest b/games-strategy/darwinia/Manifest
index 49678acdeb37..77f0c48c741e 100644
--- a/games-strategy/darwinia/Manifest
+++ b/games-strategy/darwinia/Manifest
@@ -1,3 +1,3 @@
 DIST darwinia-full-1.4.0b9.sh 4228121 BLAKE2B f1cae61e3ad6802a1e04fc5306bfbb7194ad08df29a82a376dc7f1945ab8f1f99620653800bb2458941f2004488abf441c211bc3f6d7c65e4d3f47cb9155e5f6 SHA512 ed228943d4e70fc5799bbe7566b4fd862f2494f9d02bcd874f0d1b93d7bbc9a2c24a98fb5b8219fed20759bfe2af54d6ea33c60ddd8d8850e591a89822b41bb5
-EBUILD darwinia-1.4.0_beta9-r2.ebuild 1414 BLAKE2B 9b1aaa2591799c7beb3f72bd5b8eebe69c909e5dc6339d889063c9237e5cf8cb92123565f4da676007649e1cc589a4b125cfdf032a01c37f2b0a562e6b8fb3d8 SHA512 2ac79b583b5619d8183fdabf513b10a50e4fa11fdea59d13d5f9fc80e9ac426c7bd29544f37c0e19de16e56f008a4e9cb32c14b3bdb5f53dfe58838664c2636c
+EBUILD darwinia-1.4.0_beta9-r3.ebuild 1415 BLAKE2B 96e11331f404639669c60f0d4bcade0cc52834d26f3a76568c9f8ad3c600ddd461029317df023d08662117bbeb7db8d3a2be4b6437303144cd6161534bd9bb26 SHA512 26db42dfa0cfcbe11d4559d0b3549ca107ae4571a073d594b2fdf1acc8af4eccaa115fd1b8d467ba2e53f4507b6efa1e1d60ad3b1db6ce3ace92b3f08075d6ab
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/darwinia/darwinia-1.4.0_beta9-r2.ebuild b/games-strategy/darwinia/darwinia-1.4.0_beta9-r2.ebuild
deleted file mode 100644
index 562267b62e43..000000000000
--- a/games-strategy/darwinia/darwinia-1.4.0_beta9-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CDROM_OPTIONAL="yes"
-inherit cdrom desktop unpacker wrapper
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="The hyped indie game of the year - by the Uplink creators"
-HOMEPAGE="http://www.darwinia.co.uk/support/linux.html"
-SRC_URI="http://www.introversion.co.uk/darwinia/downloads/${PN}-full-${MY_PV}.sh"
-S="${WORKDIR}"
-
-LICENSE="Introversion"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	sys-libs/libstdc++-v3:5
-	media-libs/libsdl[abi_x86_32(-)]
-	media-libs/libvorbis[abi_x86_32(-)]
-	virtual/glu[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-"
-
-dir=opt/${PN}
-QA_PREBUILT="${dir:1}/lib/darwinia.bin.x86"
-
-src_unpack() {
-	use cdinstall && cdrom_get_cds gamefiles/main.dat
-	unpack_makeself
-}
-
-src_install() {
-	insinto "${dir}"/lib
-	exeinto "${dir}"/lib
-
-	doins lib/{language,patch}.dat
-	doexe lib/darwinia.bin.x86 lib/open-www.sh
-
-	exeinto "${dir}"
-	doexe bin/Linux/x86/darwinia
-
-	if use cdinstall ; then
-		doins "${CDROM_ROOT}"/gamefiles/{main,sounds}.dat
-	fi
-
-	dodoc README
-	newicon darwinian.png darwinia.png
-
-	make_wrapper darwinia ./darwinia "${dir}" "${dir}"
-	make_desktop_entry darwinia "Darwinia"
-}
-
-pkg_postinst() {
-	if ! use cdinstall; then
-		ewarn "To play the game, you need to copy main.dat and sounds.dat"
-		ewarn "from gamefiles/ on the game CD to ${dir}/lib/."
-	fi
-}
diff --git a/games-strategy/darwinia/darwinia-1.4.0_beta9-r3.ebuild b/games-strategy/darwinia/darwinia-1.4.0_beta9-r3.ebuild
new file mode 100644
index 000000000000..73c5504bd035
--- /dev/null
+++ b/games-strategy/darwinia/darwinia-1.4.0_beta9-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CDROM_OPTIONAL="yes"
+inherit cdrom desktop unpacker wrapper
+
+MY_PV=${PV/_beta/b}
+DESCRIPTION="The hyped indie game of the year - by the Uplink creators"
+HOMEPAGE="http://www.darwinia.co.uk/support/linux.html"
+SRC_URI="http://www.introversion.co.uk/darwinia/downloads/${PN}-full-${MY_PV}.sh"
+S="${WORKDIR}"
+
+LICENSE="Introversion"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	sys-libs/libstdc++-v3:5
+	media-libs/libsdl[abi_x86_32(-)]
+	media-libs/libvorbis[abi_x86_32(-)]
+	virtual/glu[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
+"
+
+dir=/opt/${PN}
+QA_PREBUILT="${dir#1}/lib/darwinia.bin.x86"
+
+src_unpack() {
+	use cdinstall && cdrom_get_cds gamefiles/main.dat
+	unpack_makeself
+}
+
+src_install() {
+	insinto "${dir}"/lib
+	exeinto "${dir}"/lib
+
+	doins lib/{language,patch}.dat
+	doexe lib/darwinia.bin.x86 lib/open-www.sh
+
+	exeinto "${dir}"
+	doexe bin/Linux/x86/darwinia
+
+	if use cdinstall ; then
+		doins "${CDROM_ROOT}"/gamefiles/{main,sounds}.dat
+	fi
+
+	dodoc README
+	newicon darwinian.png darwinia.png
+
+	make_wrapper darwinia ./darwinia "${dir}" "${dir}"
+	make_desktop_entry darwinia "Darwinia"
+}
+
+pkg_postinst() {
+	if ! use cdinstall; then
+		ewarn "To play the game, you need to copy main.dat and sounds.dat"
+		ewarn "from gamefiles/ on the game CD to ${dir}/lib/."
+	fi
+}
diff --git a/games-strategy/majesty-demo/Manifest b/games-strategy/majesty-demo/Manifest
index 5791c6236172..db63bf78a447 100644
--- a/games-strategy/majesty-demo/Manifest
+++ b/games-strategy/majesty-demo/Manifest
@@ -1,3 +1,3 @@
 DIST majesty_demo.run 36582366 BLAKE2B f972f5d98eb0a907d7b34dd09c8a1eabb67ded08287e147f08125a6b6e833e4e7c18f8374873b532f765a6c121a6885a46f06645eddb4245db93e801f5a67328 SHA512 0573b29fa2635aeb0aa6ebaaa55c924322b3805e120f49fde51409cc6f101d7ae41d72ed0d086ffeac4d591ba75ee8bc190c46a3b71adb6b36d867df16be2c79
-EBUILD majesty-demo-1.0.0-r1.ebuild 1037 BLAKE2B 378bc88678bbd709ed38b0bde6146df60a4e4a020fb8f39a58becbff298ea17aaaad61d1472af7d66dd595267b70cbacd60811b68e5cfbdc575f50ef937dfdb3 SHA512 033c411cb301c5e5f23201726416783f91ba4092332198f526118bd20b84df56f3c4f3f8df43ca4674fac0ef61762ed14e9ecc0db2b2b623e7b83e4361faacf3
+EBUILD majesty-demo-1.0.0-r1.ebuild 1026 BLAKE2B e22eca8ffccd32bcf1ecce86d5891bdfffe8a4387c457d487165b0be30fad90c25f590a15e6aa5df45700892f3b5ef9339cfac14e5e64a5bf311f1478d26d1f1 SHA512 c542f830fa5a65eaa8191e8aa541a06817ec2698b740319b7f9d6ef3aedb4e622221252d258a3b8d0d6a653c3cbce3f5cb6b89dbdcbd865d0197e7efc7f7cf6d
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild b/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild
index 1511d51ed930..663dd0a28811 100644
--- a/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild
+++ b/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild
@@ -8,6 +8,7 @@ inherit desktop unpacker wrapper
 DESCRIPTION="Control your own kingdom in this simulation"
 HOMEPAGE="https://www.linuxgamepublishing.com/info.php?id=8&"
 SRC_URI="http://ftp2.za.freebsd.org/pub/FreeBSD/ports/distfiles/majesty_demo.run"
+S="${WORKDIR}"
 
 LICENSE="MAJESTY-DEMO"
 SLOT="0"
@@ -22,9 +23,6 @@ RDEPEND="
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 "
-DEPEND=""
-
-S="${WORKDIR}"
 
 dir="/opt/${PN}"
 Ddir="${D}/${dir}"
diff --git a/games-strategy/satellite-reign/Manifest b/games-strategy/satellite-reign/Manifest
index 15f0eee9f976..4be94bd167f2 100644
--- a/games-strategy/satellite-reign/Manifest
+++ b/games-strategy/satellite-reign/Manifest
@@ -1,3 +1,3 @@
 DIST SatelliteReignLinux0113_06.zip 674306806 BLAKE2B 4525fdb2568d631422a23ba9b3fcffaf3e2f62e146e96c3468c3305507589698ac94f60302d4fe7cde0e3359dd1ad1f88232f6c749be1d63450b121cd8c219d1 SHA512 66ec91728c664975cb2c45b287465fb38fd40e1dcaa7cfe19bbbdeb040cefab1ce349f160e46171a276f3bdd068a4a584379e9899dd7052c4fd1ecd74936c43e
-EBUILD satellite-reign-1.13.06.ebuild 1412 BLAKE2B c51985529ef215f3119141a3b6026a31045bf745ee1a2fc9ad9ea250ae22e4796f283a3a18e969588bc089eb66112e4e017baff79abf9fe8e7265a5c7479129e SHA512 1f24a760223fa26f67d961c5b1d0366633f890dea9b3fd316f7e9ed9f392a654ace06ad88e246a3b126c9e6d2f70607158cbb0879dd8a83aef1f5c6acb03c6ed
+EBUILD satellite-reign-1.13.06.ebuild 1414 BLAKE2B 59ed3344a8c57e884590f7096ff734cc50074f311100ffab24876dcef06538315199da76810f4f5b0d7b20f89e1f08c018f0fa601bea7aba78da96d4efdeebf2 SHA512 c2fe18c1a51b157d0018421aaf823dd3343356d359245211417b9236a878cc84e458b6741fe3d5b0321bb75174dc1fb5de1ce4bc173b30e7d9ecdeb43bf4472a
 MISC metadata.xml 354 BLAKE2B 620415356736dd403be27ef2547bd0d23a3812b3c16b7976125c582118af837336c258d7c0657dbe70b254ee773041f7e169939a34cc616870a5f54ad8429c31 SHA512 6ae66494681059ab163da720d574906da7db8facc7c383db8b8dd0d5ea78f41deb5f19389b1fd8fc2848cfb7ae5c11bd3ba2750a90799b382f0bfe8f70d48637
diff --git a/games-strategy/satellite-reign/satellite-reign-1.13.06.ebuild b/games-strategy/satellite-reign/satellite-reign-1.13.06.ebuild
index a8fdb593abcb..71dbf59f2de1 100644
--- a/games-strategy/satellite-reign/satellite-reign-1.13.06.ebuild
+++ b/games-strategy/satellite-reign/satellite-reign-1.13.06.ebuild
@@ -12,6 +12,8 @@ MY_PV="0${MY_PV/./_}"
 DESCRIPTION="Real-time, class-based strategy game set in a cyberpunk city"
 HOMEPAGE="http://satellitereign.com/"
 SRC_URI="${MY_PN}${MY_PV}.zip"
+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
@@ -32,10 +34,8 @@ RDEPEND="
 	)
 "
 
-S="${WORKDIR}"
-
 DIR="/opt/${PN}"
-QA_PREBUILT="${DIR}/*"
+QA_PREBUILT="${DIR#/}/*"
 
 pkg_nofetch() {
 	einfo "Please buy and download ${SRC_URI} from:"
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index a47299713fff..6f606497c559 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest
index ea1dea51c224..735e428f68e3 100644
--- a/games-util/joystick/Manifest
+++ b/games-util/joystick/Manifest
@@ -1,6 +1,4 @@
 AUX joystick-1.6.0-build.patch 831 BLAKE2B 942038f6997caa84cdbc8c05a6353dd448c1b70f9229f38084e2b8c80df2f8d3df3eb8a0da754a7ba56863aaed58375eec22267f08d304bd550d2237054f6e16 SHA512 071b15e16a1688e2d743dbf0bc44c784184ee93698b660394c83bed719d579952c9d73680e3e24754a41d5de69a65559b61255b0366c3437a193fc526c3d6064
-DIST linuxconsoletools-1.7.0.tar.bz2 52960 BLAKE2B 438e69e7aa220ea3fc92a9a72bda081c7877663c451f3101bc30e344a7a0f0f20b1c2f4ecd78c0db501b6442e2cd20e9f288c9c331118e8c666a61c3ac4b6851 SHA512 260667e167281dd6f4de0904c2852a5bf3d9d0fe9d603135d4849c5a6610997306c9b476f64e4015d17a4dc8e4a8d36e96e01b9b63664fc7b493201fe12b4f56
 DIST linuxconsoletools-1.7.1.tar.bz2 53153 BLAKE2B e05d04454fefdd4009d0c75f1caf2e6675a8e5f494f6f2f491f4de3c57101a6323b4de5795fccb9fd6a557a1e7bf4befa312661b022ed0503da83ac4dd3ab7c5 SHA512 2ba97e6c5b57aa5d6b08369bae050256f4d039f5b8479ad03cef4a7c43bf772db312de54d9e70a8a92c9ed7933b524715f1ce5448ccf508e6ffe8646a9dbd349
-EBUILD joystick-1.7.0.ebuild 872 BLAKE2B 3d08dc3fb669b9e23b7a21623244242ed883f41c38a0f3bda97e90e7f6dfc5ddb0148c2f73ec4d14a7ec28dc5b850a078032b76dd873dcf13fcd6c51d81cf086 SHA512 ddeac2a9eb45be7d5199f885b44363c17da17163ed2e62534318967158927e0e754f568d3472166a3653d602630e3c42e1e03b48aec9e1fab59e8fcf311f0063
 EBUILD joystick-1.7.1.ebuild 870 BLAKE2B c26d1ee35834da9a7261ebf7c5cbbe4cbf40f529f82260a2f6b0a70a1d32185387e1d316e34fb0f00499a4e2068ff25a41ac3b61bd6e605476be61a1bf637d84 SHA512 22433c957fef2dcf7b5ba89f7030cd18fe282151ead4ee366f70097f27ed9b22bf36bb6f0413fd65d4de7db28d497f5b9b90ef640fe5d0f7415e112373019c44
 MISC metadata.xml 335 BLAKE2B e83ffecd1afda0861555f62d9bad50f99c8e1bebb296f303bbdb8624ea283eb04d30d76a74d9970f519e303e851991ae33b232f74c9d2fdacce16b59fccdf9f5 SHA512 6440a6652a98c7439b22df51f22089ddd867be3e07e6c04001aa15b1fc01fd84dc8d3244f106abe4ae89caf7561aa45fe2526f2f9e8e8844a5e44f9f8a51df41
diff --git a/games-util/joystick/joystick-1.7.0.ebuild b/games-util/joystick/joystick-1.7.0.ebuild
deleted file mode 100644
index 31d58e9a6d02..000000000000
--- a/games-util/joystick/joystick-1.7.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-MY_P="linuxconsoletools-${PV}"
-DESCRIPTION="joystick testing utilities"
-HOMEPAGE="https://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/"
-SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="sdl udev"
-
-DEPEND="sdl? ( media-libs/libsdl2:0[video] )
-	!<x11-libs/tslib-1.0-r2"
-RDEPEND="${DEPEND}
-	udev? ( virtual/udev )"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-build.patch
-)
-
-src_prepare() {
-	default
-
-	export PREFIX=/usr
-	tc-export CC PKG_CONFIG
-	export USE_SDL=$(usex sdl)
-}
-
-src_install() {
-	default
-	if ! use udev ; then
-		rm "${ED}"/usr/bin/jscal-{re,}store || die
-	fi
-}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 9ce77b0551ab..626ea09bfea9 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 47d5c58fc635..f3b55491e382 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -5,5 +5,5 @@ AUX gconf-3.2.6-mconvert-crasher.patch 1514 BLAKE2B 3e48d07777268faa3a1c98f168d3
 AUX gconf-3.2.6-python3.patch 6699 BLAKE2B 20e24d3f55ccc3455a62fd72fcb054c6fd33308bda419f21426417dd4f9a79581cc5cd03449bad9063e4e927875ed020a99254609517b3c86ebb1b65f268d3d2 SHA512 def5cd74ec7b9d06dc1ccd05364bfa500f8d9685ea3016f219c53df925b09f68dfaf547277dd0dfb9eed266be4de650875611a09a84bc0db3d0a7b907c7beb73
 AUX gconf-3.2.6-spew-console-error.patch 2594 BLAKE2B 6a6f27024289b1c578f6718c184e7604f0f1dc285ea58a8095fac06f5fa38273329c8b2535b4de8c17c8359f09f82aa474fa5ebcef739b0e2dd6e7d6fb7726d7 SHA512 abdddbcab24d80870691a45cdf8d4baa7021f363efa26ba140221afef0bd96756b7234fb1d61ea46c4d137854f59d2589f2e1f1d125fdcb1fad3acf9215a8602
 DIST GConf-3.2.6.tar.xz 1559904 BLAKE2B dc71bfc6e334b0a3545b6009fc1a592f3ba6adb1471aacc98aaa1ded9e89676f97415c26a3d17e297a846a7efca7ee695107c136ea28b2431f90dc966a3d64cc SHA512 35f5f659f9d03f7531a7102adacbda0eb310d8a55a831c768c91a82e07dae21247726e00e0e411f63b1de9ade0f042ded572a3ea4a4b2ad3135231f344540b58
-EBUILD gconf-3.2.6-r5.ebuild 3834 BLAKE2B 28d3fe636cbf8af56249cb8522ac80e01a76d10070004964f60008a505366c8e9dca50545800a7cfbe8dac57df63200dd5d829f7fbf6a5ddaec030b443d0ee91 SHA512 d99b0f947c18fc2fc9e18e00ce8cf2230a92e8fefe937ed1b700957e3301901addbd08934a2a6b68481db32aa90421742725e501958ca5935d679ad889f6c4e2
+EBUILD gconf-3.2.6-r5.ebuild 3841 BLAKE2B 1deda25c38bd232bdb288bb4e8728efb48af0ff9e602ae47534da2c5e4d07bbf535367444c052a5209579b44a08ba77448d0f187cd83ee0a40d00b70a01a59e5 SHA512 4f6c4d3fad67c4d4bcdebbbbc04e390bc9e545e1c7c71adbb0967a50aa42a77d8342400e923499ab5a37ddcdcc4eb33772e6a298fece66e6b0c59e740ce32e3b
 MISC metadata.xml 430 BLAKE2B e2fce04aae8a1df05cb55972ab86e903186e034c0c48115f29d754f215e0be20a9b204aa2be12ed045b3dfc2010eea78be83252a3b86aa7cbbb8cde9b7433923 SHA512 820c350a185014ad888ba9cb43afb5ae7f21a0000a224d68461abbee4efefcbd972db79d7086b8f7f023de0828fa6f01a32502cbf74439160003fad146d33ca4
diff --git a/gnome-base/gconf/gconf-3.2.6-r5.ebuild b/gnome-base/gconf/gconf-3.2.6-r5.ebuild
index 54c7cfefd334..2102f9517875 100644
--- a/gnome-base/gconf/gconf-3.2.6-r5.ebuild
+++ b/gnome-base/gconf/gconf-3.2.6-r5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://projects.gnome.org/gconf/"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x86-linux"
 IUSE="debug +introspection ldap policykit"
 
 RDEPEND="
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 55e377b9822a..cb47726a26df 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -4,5 +4,5 @@ DIST gnome-desktop-40.3.tar.xz 721788 BLAKE2B bfdb77995d8cb392805a9d4a7a1276608a
 DIST gnome-desktop-40.4.tar.xz 721840 BLAKE2B f663460ce6a2b2d03543e92eab9e2f127da4a7c8e800149842f5f30e4f885c104786806be8e8f32e0783003b18015d39b4501f3ceccdee0ab94206031bf671b4 SHA512 4e91438c17faa2d12e7d6a9914fe4308543bbd5f8821e94dee9052f087110e2a3776109c203de6ef7bf66ae1825fc5e890d969ce2ebab2654cc157e9629fe6fc
 EBUILD gnome-desktop-40.2.ebuild 1947 BLAKE2B 8b2233b157b3b50cb779149e18d46a14b5f2d4c6492f10d55767e4bc444bbc9bbf0b2eadbb10b8333b02675ffa2931ead810343f99b1ae5efa7adf71f45f89e6 SHA512 fe87b2876286c3d550bc9d353c5b347dc99d5a8f261e09514885798cb796ce2ec8917dd9652cd65631bd00e34d67da42a5bdd4c0c58ddfd2a0bdc6e1fc49b5b2
 EBUILD gnome-desktop-40.3.ebuild 1947 BLAKE2B 8b2233b157b3b50cb779149e18d46a14b5f2d4c6492f10d55767e4bc444bbc9bbf0b2eadbb10b8333b02675ffa2931ead810343f99b1ae5efa7adf71f45f89e6 SHA512 fe87b2876286c3d550bc9d353c5b347dc99d5a8f261e09514885798cb796ce2ec8917dd9652cd65631bd00e34d67da42a5bdd4c0c58ddfd2a0bdc6e1fc49b5b2
-EBUILD gnome-desktop-40.4.ebuild 1950 BLAKE2B 8fe295cc9783c308c77d371d374cce48596c6582d64afe5a49a98c19fbb342fde1d9110b472c02ade8126334684be1029d0ac2e913a65d5a2bab70b1a41c1e99 SHA512 961cbd1337b0b36f881f5500ccb03712ebcf70d284b11ceeba3fafbb6a6d0737f9514a4017fe06c31623e4a40aa101f5990c60f7f4188d911ba0b43325957dd3
+EBUILD gnome-desktop-40.4.ebuild 1957 BLAKE2B ca51a90b096af4077bc1deaf3bac12eab1f18d23f4ce1a29bfbc341224a27075aa30e92df4d7f43336764488f450a36fba69667a7793afd54b70f60d0accf926 SHA512 bcf6327c57538516fccb0b8ca6bd0fe644d09aec3a2ed0e058041958c0ca23339ddd9c93ca0b4f9dd4a66e30f2a508e23e75c91eb597e00668bb0ebc32603f7f
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.4.ebuild b/gnome-base/gnome-desktop/gnome-desktop-40.4.ebuild
index b42b6b81c1b1..2df7a40bf2c3 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-40.4.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-40.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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 127ab4748f52..428d443f5dd8 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
index 9c98d7cd853c..35828daacd97 100644
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20210614.tar.gz 14863 BLAKE2B 11133a5bf6ea06acd2fce6f215fcc6a37a658857161b9babab51246d6d7d382773e92f395796410fafa903ace656aa664c749a501bcbd4d05ebbd81ea9fd5018 SHA512 06f6329a6a2b2e03cacd305e1dad81768b81d6193782739caeadc51f141da9238d2bff563276235673e492ad7f13977fe7f1eaba73ca940a410b94defbeae5b0
+DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20210721.tar.gz 2592 BLAKE2B 205309c4057094301e3469471b0f2da06a6cdf6f36b430b636f5341acde98ae999a537ca3a815a257fd9e3abde8f30bffb9a78f38926224eea3ec29d92548f2b SHA512 d314227588dac2f51b1d6946bac29501607b3e4fa6c3394b4bf56576453d6e6aa5a76fb2b576e216d5e62dabd8994418f11838d95bd90f134d261223fab04dd8
 EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20210614.ebuild 1338 BLAKE2B 1a24cb39abe74cc8fb7a7681e327f62bafd8db533e854834d804baa7435c90ab15892d71fa21694fa22d8854edf0c9913357fb103d9f420f1055af477ea64d2c SHA512 d8ad8ff5ee49f55ec35ee425030dcd43a02c2c67a61a2367b46ee030c10ce8eacfb68440e03536c80250ba82d912ee32d669df7c6a17b4472ec3d42eb57dce68
+EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20210721.ebuild 1322 BLAKE2B de49e1f79be1d78eaefd37c710c219493d7ce995526af0ffbcbda9eaea6a92f008a4622ff4207cf8513d716762ea44ee059a836f78891ad217ee2423f60ec207 SHA512 c7a01133b35c7f7e0a9fa6bd5113d4b88230826468cd4dfa4960028a6b144e96883fa195a05af10834a6f620a074b763c2bd1ce8916b05bef4f103d949e39147
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20210721.ebuild b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20210721.ebuild
new file mode 100644
index 000000000000..65e9829e48ef
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20210721.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils
+
+DESCRIPTION="Control the blur effect on gnome-shell lock screen"
+HOMEPAGE="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen"
+COMMIT="1dc40c2a9e3bfdf851c7726b041484c8663b28e9"
+SRC_URI="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# glib for glib-compile-schemas at build time, needed at runtime anyways
+COMMON_DEPEND="
+	dev-libs/glib:2
+"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-40
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+extension_uuid="ControlBlurEffectOnLockScreen@pratap.fastmail.fm"
+S="${WORKDIR}/Control_Blur_Effect_On_Lock_Screen-${COMMIT}"
+
+src_compile() { :; }
+
+src_install() {
+	einstalldocs
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf LICENSE README.md schemas
+	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
+	doins -r *
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
index b36ae12e3e77..ba3e75823d06 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
@@ -1,3 +1,5 @@
 DIST ding-0.18.0.tar.xz 73584 BLAKE2B 26a98d4b16ce559b710154707a4365df32001e1f3f4a16f427d5d0aa8b22ba6d94db86928297c88a4e31d6df251778ca841946dc5ecd692cfaae38c5d1ce7459 SHA512 2a269d944d283db229247a028c1882ee9eafd1a543840b4309ea3ae87ab0b8753eb19fd0052236c585888d8ef461626326bf41db184527bc2a447e26e3cddb31
+DIST ding-0.20.0.tar.xz 82000 BLAKE2B 56bdd067985281daa836b34b2969a487314e056f0eb2d60014122f4a3ee8eff159948c4b6cce20b327e7189d88a3cc0311720171f7b407b6b82928b4c1a03cfc SHA512 71cef5993c177f393c77889676b5e593de9beec936f42dbc4d5cac0f415706517598f73fc6aee0a0786eb77f3140852b791cac9a2dd5d01545ba8955a02f4a9c
 EBUILD gnome-shell-extension-desktop-icons-ng-0.18.0.ebuild 1001 BLAKE2B 7ae257dc653e9cfdadc3d261cd89ae38bed022949aec1af6e7f172c3fe6969ceb91dd1bc55b9b07a432cda6af4f02220b04d75dfd09f4f31cb4bd95ab0a86621 SHA512 11755a7aab2f0cf7c48e654de9aa7de4d293c7d98a5c7a812c93b876f3fd00312191b9c79fc64b33343ad012da763abf95a0053c6916cbcb2b8b963c5e1c75d2
+EBUILD gnome-shell-extension-desktop-icons-ng-0.20.0.ebuild 1003 BLAKE2B 86284c0544a596ca172977dbe7213b9dfe008d9a80fa6f00846e2551bedf8a0b0391751e6e720f2156b0c8e73f77d5188d3a665b74b85796b044dffdfbd2d5f9 SHA512 b4c65878bcdddac9be0b5b561b8933044dfc77ece5c3254f3166a01b31987e12004e457c6dd6a6e27a7cfd0ce5882dbc75a67268a880f8332931d9f619c796d0
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.20.0.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.20.0.ebuild
new file mode 100644
index 000000000000..b0a84f278e6e
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.20.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils meson
+
+MY_PN="ding"
+MY_P="${MY_PN}-${PV}"
+COMMIT="093f01a7b52a77bccfc094f1b771cdac"
+
+DESCRIPTION="Fork from the desktop-icons project, with several enhancements like Drag'n'Drop"
+HOMEPAGE="https://gitlab.com/rastersoft/desktop-icons-ng"
+SRC_URI="https://gitlab.com/rastersoft/desktop-icons-ng/uploads/${COMMIT}/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.38
+	>=gnome-base/nautilus-3.38
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+extension_uuid="ding@rastersoft.com"
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 41e7bf4cc716..d1af4b9974c2 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-shell-extension-gsconnect-46.tar.gz 735155 BLAKE2B 86a7288953fe6001cfa15277dcc38feac3dd63fc60b8cca86dd95632b4d022587654393c3e6386a7e2cf7ad3af409efbae2e5ffe49eb36a9093887d0848cb080 SHA512 584348407a0f41f4317f52cddc1cc7e1e622fdd765e3eaa0b8012cc4bf46c09adedc97f9701a8c94aaa63dcd46d20fae35f49bfabe8c0d4abb4b407d8ac2c199
 DIST gnome-shell-extension-gsconnect-47.tar.gz 737392 BLAKE2B d2f09ae4650c17cf9f5ef90c18beb2ff46c3c077d27e4ea11fdb5f41522cb231aea47b168848c5da2c0ae35fbd1df734fa11f13c38abbde2ccab585137b7e116 SHA512 c1e900b225cda8edbcc1b3a16883b58d09a110b67cb503f3e7e71f8e0abafb565081528958cbd44e5685a1de2d7f54cee88a87a8e35f2344571eab8935b80c91
-EBUILD gnome-shell-extension-gsconnect-46.ebuild 1613 BLAKE2B edc2b6614b2c3a69f1046b19b8de629b8bd35114cc1950ae2479b71d46d076407c63b96f9239945bda69b25ec6c190313b7d21d44ac5237c841d74adec754fca SHA512 f6485927888161e1ddf82a17941e91947486b96eb80f492bed6928e6771201aaf4985357bb9e22087b8dda402e2f13a72f7f3168eaa1372a48c6da543dcf4441
 EBUILD gnome-shell-extension-gsconnect-47.ebuild 1613 BLAKE2B edc2b6614b2c3a69f1046b19b8de629b8bd35114cc1950ae2479b71d46d076407c63b96f9239945bda69b25ec6c190313b7d21d44ac5237c841d74adec754fca SHA512 f6485927888161e1ddf82a17941e91947486b96eb80f492bed6928e6771201aaf4985357bb9e22087b8dda402e2f13a72f7f3168eaa1372a48c6da543dcf4441
 MISC metadata.xml 345 BLAKE2B 77e44add98d26f7ad351ad6ba3a11852499b76435ee6e49b6c37f30aabd406fbbf65498463bf668fc5971ff03dcd7226e5f263e2e87fab7c208048f6ce6210e6 SHA512 5402440fca2d10c50ad20eac8225d99df4a0e6f13c3758f4b08a692d11e8b8bfa35a89909777b60a3675f229d2122a19861cc5832510122474be99f5c1addfa1
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-46.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-46.ebuild
deleted file mode 100644
index bc9f45487557..000000000000
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-46.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils meson readme.gentoo-r1 xdg
-
-DESCRIPTION="KDE Connect implementation for Gnome Shell"
-HOMEPAGE="https://github.com/GSConnect/gnome-shell-extension-gsconnect"
-SRC_URI="https://github.com/GSConnect/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nautilus"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.68
-	=gnome-base/gnome-shell-40*
-	gnome-base/gvfs
-	gnome-extra/evolution-data-server
-	|| ( media-libs/libcanberra media-libs/gsound )
-	nautilus? (
-		dev-python/nautilus-python
-		gnome-base/nautilus[introspection] )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="For knowing more about how to do the setup, please visit:
-https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
-
-src_configure() {
-	# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
-	# https://bugs.gentoo.org/694388
-	meson_src_configure \
-		-Dinstalled_tests=false \
-		-Dnemo=false \
-		$(meson_use nautilus)
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_pkg_postinst
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index cdfab6674ffc..9c15e5da7299 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,3 +1,3 @@
 DIST libgsf-1.14.47.tar.xz 691448 BLAKE2B 7be095fef159ff7a52f2cf4d83b59b5bb591e0d4fb1d69d88bc6f2eba4286337af2a2c46ac7d6603d5a68b9b6f03d41f647d34b0bee5e61244696c5ba02be569 SHA512 143d48eb02be8202b9eb97e29e5909061a0e1a562b86e4bb4b2eac3fb0a42b139ead131ed1ffa4dfe304b65527089777823122223a74ebbc9df94c17d013f97b
-EBUILD libgsf-1.14.47.ebuild 978 BLAKE2B 1b400b6d6fea9f9880c53333cf0c80f67920420bd4fad5d7af3f642516667545e8b5253215ccfe9180e73274ff1d979cd30d8c5e95c54823e6065df71fd8cd56 SHA512 ed566d1c5098c86b3b26f5bbf040085abed199ca7523a029c9015862c45a6582cf3cb0330f9d3c076aecb000c363590c667e06a0de741fa20a0ae4f16ec71abe
+EBUILD libgsf-1.14.47.ebuild 985 BLAKE2B 2853a0a472b785b671e4bb32b98882279cc37ef8c9e6a85985fa733b9d8c535f12e9cc2748dde22e3f117d444f27d174344bdd21557eb62d2665a316089044e8 SHA512 b7e3fbd56479859ca174a1fd4ce38d4e05b4eececbcddf709f19ecb1b302c66de5ed72a0cda6197fedd2880141522820076903740c8ba9682e6e99303a97f761
 MISC metadata.xml 320 BLAKE2B 0724d11438ccaab9b8665d8bc0c9787fce2fc77c1d7b45b8400a66bfcf82c904c73dda016327ab27c81eb2c1574a0f568bcc04ed579c5cc0f8f15dc6d52762a7 SHA512 605b3ee95fa1f26d46a52ad9e9e6f14b4ee193bd2427336afa2a2f6379287bbb121cb98629afbc146bc46fb721871143c73dd9af805b27a1d1ac0d912dd7a4f0
diff --git a/gnome-extra/libgsf/libgsf-1.14.47.ebuild b/gnome-extra/libgsf/libgsf-1.14.47.ebuild
index 0999181b32d0..6e26ff2caed7 100644
--- a/gnome-extra/libgsf/libgsf-1.14.47.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.47.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 gtk +introspection"
 
 RDEPEND="
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index e5653ab75f3e..602fade020b7 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index b98a3d43c572..dd29f00321b6 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-4.2.1.tar.xz 25809520 BLAKE2B 63183950703375b092ce451be93d16d1149eb2095b5f304578a064422821546ae161235b46617647cd67a7d8898e2c3854d87bf31ede0cd6db2138d7e5c36c30 SHA512 a2721d6b9a72be481460081aedfbd713842cb5abdb24d810ec48e346342d0d91271f4ace321a9697214477ad4829d0b0ca67754ea316e719784f01c43f0fe732
-EBUILD gtk-4.2.1-r1.ebuild 4721 BLAKE2B 50285313c536e1b4fe14b6e33221fc248567351869c00d277cb6fb69837c110d154463f9deb83b83b5235024c82ca20ea5831367caaf0e218b5e5895af916876 SHA512 93734cb50a64e897b0bf8cdbfcdac49919776e51c7fbc7f78749d36921ebc00e8b5fe8d762f87ec6414c8b09e3aa396cd6310596d8b8636e18eb7badcedc21cb
+EBUILD gtk-4.2.1-r1.ebuild 4728 BLAKE2B 37a934bec76c3873609c2fea885cade94b7360fb0fd7ed98c8196e74477ad3e30fadda4dd73c1a5cff8cd26aaef2b6d54907ebbc3ec52280500627206ee74a2e SHA512 5dfd6053ddf368e9ea0a2fad4acf5ac7245fe533d945f80c2c7554057590f4b5b83f5477f3c8e59affb8d277479ed61abaaf1af5eb463436abdfd2267686d7d1
 MISC metadata.xml 762 BLAKE2B ba9cb841a877cab910c5517bd4ddd5ade8eeeee9730842412ea371c745a90c5b69d06d95d2f77adff6b90daff589173525914139bb6bde699f241c3ddaa5662b SHA512 8678e380c257cb7cdbee752bec79bc53632b453bbb72a6c05c9ecbd791285e964ea3a57197dd247b0cd881757f3e5210551755e043126a3db9913f96a0f142ae
diff --git a/gui-libs/gtk/gtk-4.2.1-r1.ebuild b/gui-libs/gtk/gtk-4.2.1-r1.ebuild
index 81c46977fd48..c6d949ef1027 100644
--- a/gui-libs/gtk/gtk-4.2.1-r1.ebuild
+++ b/gui-libs/gtk/gtk-4.2.1-r1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 COMMON_DEPEND="
 	>=dev-libs/fribidi-0.19.7
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index e74d87a74e65..5fd4f82a1483 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,7 +1,9 @@
 DIST wlroots-0.13.0.tar.gz 503575 BLAKE2B bfcd40ea5cf9f85157b9a44a4a49f0fef1c82c2199ee428316b578e8d53cc39276b42d0a2c4b6b94d1a1f49df5d312539cdf4d053ea2472e0de93254e39dc015 SHA512 1c942a6b8a628383e2b68cd9096d3525021347c5c363a8239a3b4fb0d5736ffcd3e2c1333fdd7d95ecf214dd04bf01062b4f1b4fbbcd88d1d086a55261ca0c82
 DIST wlroots-0.14.0.tar.gz 505461 BLAKE2B d2fa28f64014ef9d840838cb5938af23f6f6b211b62dc352d0d5bb824ccaa7d7a85531e1eca14feeb06d31d59955ff9a913e40a73cad21ed1ebfe76ada39d558 SHA512 83f001133cb4b11a72bb9532b7321655428826662848f67de8e3220a33d9dff4d37c859602bdc319929949d387d014a257b0347039a6649944d7b084c76bb611
+DIST wlroots-0.14.1.tar.gz 505840 BLAKE2B fca4d259cdde62da0c196344ce1d0f5dd679d012ff33e3ceb5385b9374667e16d91059a2ba6a318153e79ac2f0a6464e3066e614a13398f8c433f442560d84d2 SHA512 4f557c827f9673eccf208a3644954de80e7355b95cc374cc5e851a47087b227f196e0936c0913d21a6c776c29b74de2d028a100931264e41934c747568d8ebe0
 EBUILD wlroots-0.13.0.ebuild 1950 BLAKE2B 680b6a39783806291c950dae086800ead41f337ed611b6d86655bf342bb80e13b63f97a32f11f58c8875e4ee14b7f53e1d122fe69fbb67c91f998baab57da70a SHA512 8497307be27fe7884384986cea09a5cead3fa25a205ec13eec37026ebf5bbbf89aab1d9384970b4a1b4798589c3c30205567979d0accd50b5b61efd17a4f5e82
 EBUILD wlroots-0.14.0-r1.ebuild 1494 BLAKE2B a6279c9bc36a7569a63ca4b4a74c72f8bb223923bf5e7aab6b58136a7dbfe87c0bb17c1ca72518e39a3aaf4b7dbbea20aaba3680ff0e30d1c101a36a0ecb89cc SHA512 cc06ee5e250be6cd332bd2829f86766597006e7769aee64afa6ae4fe5ed78c875f47def60ab3d40c4ce4f84b9406686beb86a8f7c2061aa97c2ce596fe6355ad
 EBUILD wlroots-0.14.0.ebuild 1506 BLAKE2B d67c5855d2fb9ea65a419177f1963153385e681f5ea0912018685782f4106d59fe2fcd9d17699bc291616ec05c1c4fa8d74f55067847ba8d4dab7b920b552d83 SHA512 db4304a09f07cb28fc3ac723e5b4147f0226697b3168ed90e92c32a0d50abeddede51a5ed6f715ec0c6d0eed3b0198def3106bc20529125aa6f69ad7294a8e5d
+EBUILD wlroots-0.14.1.ebuild 1497 BLAKE2B 32863ba14c6cd9ebddaacda70d96d07c4843b4ae61f4c03bbdcf272bbf68c6262567bbcf6db48387f0a537fde62d4c0f2006b2efc9ef67b474c3f44957c7c4c1 SHA512 f46165d4cb9defbc53f2b3f7b607618d3323e7b03e7440864e36a5c24f5f3ee601ebe5b29dc0a22042e555236d367ab85673af814d7fc5df9631f3d271775f30
 EBUILD wlroots-9999.ebuild 1497 BLAKE2B 4320242063f128e1984aafef1e611400a88f754da68c4c90c5160be7ccd502514f60cfd76127820a7b61460f67f22ef8523caaf228d3eeebfb02c36b011e0f3b SHA512 f0c4b0178dc66593d6ebbf149c8beb051123a793f384292aeff1f6697183e37b4ab45247961d4cfb966b516067cfccde4a550a90c33174ac963dfb666fc47f23
 MISC metadata.xml 1719 BLAKE2B 363f75063f67b87b9447f4aafa37c528a6b418f8bf8039453c79a9d8a7e4c9bfb60c36b181f311f21dc26c854b51d98b060fd3367d0f45787420c61cec426577 SHA512 a75cb0f8f9b3ce1576c4e688b0abff4f2c68e57a4661b1ffb46a1d3b0d6edd3cea2a8bcf69558ff9210d654daba38c7fe5d8b1ad2c1cacaa78387f6623089633
diff --git a/gui-libs/wlroots/wlroots-0.14.1.ebuild b/gui-libs/wlroots/wlroots-0.14.1.ebuild
new file mode 100644
index 000000000000..07ce77c9d01a
--- /dev/null
+++ b/gui-libs/wlroots/wlroots-0.14.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://github.com/swaywm/wlroots"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+	inherit git-r3
+	SLOT="0/9999"
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	SLOT="0/14"
+fi
+
+LICENSE="MIT"
+IUSE="x11-backend X"
+
+DEPEND="
+	>=dev-libs/libinput-1.14.0:0=
+	>=dev-libs/wayland-1.19.0
+	>=dev-libs/wayland-protocols-1.17.0
+	media-libs/mesa[egl,gles2,gbm]
+	sys-auth/seatd:=
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	x11-backend? ( x11-libs/libxcb:0= )
+	X? (
+		x11-base/xwayland
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-wm
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.17
+	>=dev-util/meson-0.56.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
+	local emesonargs=(
+		"-Dxcb-errors=disabled"
+		"-Dexamples=false"
+		"-Dwerror=false"
+		"-Drenderers=gles2"
+		-Dxwayland=$(usex X enabled disabled)
+		-Dx11-backend=$(usex x11-backend enabled disabled)
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow your compositor"
+	elog "to access input devices via libinput."
+}
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 776334007e12..0c661abfc6ec 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index d26e337918d5..4efacc8df9ff 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,6 +1,4 @@
 DIST sway-1.6.1.tar.gz 5550126 BLAKE2B a4ecc93df0eb16fcd9037ce62dd39c63e1712b3bc9e8ae36331a815759b18576f4a2c1b78a26545922038974f226f02e2d91f78d6e3933125d9b808871b7a887 SHA512 7f37fea99970db42c5485277df06d69bef5225fa03d25be179893b14d73c1d681f0355a1bc74091b4173bbccc88994a63ad0f9322e070811ba963648cf68cdeb
-DIST sway-1.6.tar.gz 5549909 BLAKE2B ee0d7aad2fe8c57061e23e9b875ebb8e991e2fb30483dee6cf7d7faa3ec782a3f28676bf9fe2183c0e643b5ed744535eba07d7e5cf20ec0756c8e5407c0f34e2 SHA512 f62477aa4a20de99c41078c6866ec67d04d0d1824f4cb21a0c40213dbadf6394e31cd239b74376bf604d20d03ce047ba97f1728043568fd49fcef43f5101c750
-EBUILD sway-1.6-r1.ebuild 2998 BLAKE2B 796d81e98d317d94c28b5f8c8c7a8b163cbf462a416b23bde8e65ce502f760240a87966ab36b0fba47aafa2e7ddd4212d6f9acdf2a1669b65a7b391259ff602e SHA512 bad3207e2c207c7043d100ec09c405889020f4e291de6cc883b71221d106e07b4cd34fec3de4441a52a84c28764133726e8e1922f2c9222044bdd2f493b7bf26
 EBUILD sway-1.6.1-r1.ebuild 2344 BLAKE2B 68447972210cbecf79dbc7fcffdf70296d574c94ca9ccb7270c3f416f41cba7d430c8a0b8655dc52625d3906351c7fa6fe7b3f7ce982d08b04e122f27455707e SHA512 89b0e797a827702c60e4f9c7f81bf283e71803138c4e69230e73bf60979c36b17319475897a48921a80938b54c5dba1106b7674c7dd1a9fd54f263261c97cc76
 EBUILD sway-9999.ebuild 2340 BLAKE2B 57e417902e201901b1b983e3e7ac9e6da4c314cfd43cd676037c689427b88e5e766dce5a75a136230a0bde42e6d1fe2279da2d7cab972b278b1353514f0d3f2a SHA512 a83c7d868f6653d2e15deae9bfc4de6041bb31bfd160e1886572c4d0432956a6e93200d4bf0101b29c8e81178935286943584b4af834ca974ffe9aa7d50d34b0
-MISC metadata.xml 2359 BLAKE2B bd2cbe17846cba7121dd4d13b42e1f909fffaf8bed2ff278d3b1b4f9f0df9e476e166d385e228a46e8792784b4aae1d827cf7c9cd8ae4c9e2d6a6ca035095fff SHA512 82ca9cfc5b4e1f64fd29b6960e10fb5eb6788e8c2199cc0aab6fe0b7bd4ed47f490edb448ae65f197f86d40a4ac0b9ac9fafcdbac9f82ace708d8b0188f44593
+MISC metadata.xml 2187 BLAKE2B 700399f0647c77f518c8a3fc48a683e7aa95a734178763d6334a46c319e5ad205d54317ce0081201ceea906f67ef6d3faaf55c685fb03748bc69d4c865f69a32 SHA512 7608895649328cf94587e42977cf7f4e7a98b52bb2ee52d2b98ac3dae303bbf61a769a161b87d1982638843c8a87e586677d232f25133f9e5f640cfd35202e43
diff --git a/gui-wm/sway/metadata.xml b/gui-wm/sway/metadata.xml
index d807b577f5b8..62b75a87a154 100644
--- a/gui-wm/sway/metadata.xml
+++ b/gui-wm/sway/metadata.xml
@@ -26,8 +26,6 @@
 		something else.
 	</longdescription>
 	<use>
-		<flag name="elogind">Enable support for rootless session via elogind</flag>
-		<flag name="seatd">Enable support for rootless session via <pkg>sys-auth/seatd</pkg></flag>
 		<flag name="swaybar">Install 'swaybar': sway's status bar component</flag>
 		<flag name="swaybg">Install 'swaybg': allows to set a desktop background image</flag>
 		<flag name="swayidle">Install 'swayidle': idle manager to run commands when user is inactive</flag>
diff --git a/gui-wm/sway/sway-1.6-r1.ebuild b/gui-wm/sway/sway-1.6-r1.ebuild
deleted file mode 100644
index 9b861ded4885..000000000000
--- a/gui-wm/sway/sway-1.6-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="i3-compatible Wayland window manager"
-HOMEPAGE="https://swaywm.org"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
-	MY_PV=${PV/_rc/-rc}
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="elogind +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X"
-REQUIRED_USE="?? ( elogind systemd )
-	tray? ( || ( elogind seatd systemd ) )"
-
-DEPEND="
-	>=dev-libs/json-c-0.13:0=
-	>=dev-libs/libinput-1.6.0:0=
-	dev-libs/libpcre
-	dev-libs/wayland
-	x11-libs/cairo
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	x11-libs/pixman
-	media-libs/mesa[gles2,libglvnd(+)]
-	elogind? ( >=sys-auth/elogind-239 )
-	swaybar? ( x11-libs/gdk-pixbuf:2 )
-	swaybg? ( gui-apps/swaybg )
-	swayidle? ( gui-apps/swayidle )
-	swaylock? ( gui-apps/swaylock )
-	systemd? ( >=sys-apps/systemd-239[policykit] )
-	wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
-	X? ( x11-libs/libxcb:0= )
-"
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+="~gui-libs/wlroots-9999:=[elogind=,seatd=,systemd=,X=]"
-else
-	DEPEND+="
-		>=gui-libs/wlroots-0.13:=[elogind=,seatd=,systemd=,X=]
-		<gui-libs/wlroots-0.14:=[elogind=,seatd=,systemd=,X=]
-	"
-fi
-RDEPEND="
-	x11-misc/xkeyboard-config
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	>=dev-util/meson-0.53.0
-	virtual/pkgconfig
-"
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
-else
-	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
-fi
-
-src_prepare() {
-	default
-
-	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
-	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
-	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=$(usex man enabled disabled)
-		-Dtray=$(usex tray enabled disabled)
-		-Dxwayland=$(usex X enabled disabled)
-		$(meson_use wallpapers default-wallpaper)
-		-Dfish-completions=true
-		-Dzsh-completions=true
-		-Dbash-completions=true
-		-Dwerror=false
-	)
-
-	if use swaybar; then
-		emesonargs+=( -Dgdk-pixbuf=enabled )
-	else
-		emesonargs+=( -Dgdk-pixbuf=disabled )
-	fi
-
-	meson_src_configure
-}
-
-pkg_preinst() {
-	if ! use systemd && ! use elogind && ! use seatd; then
-		fowners root:0 /usr/bin/sway
-		fperms 4511 /usr/bin/sway
-	fi
-}
-
-pkg_postinst() {
-	if ! use systemd && ! use elogind && ! use seatd; then
-		elog ""
-		elog "If your system does not set the XDG_RUNTIME_DIR environment"
-		elog "variable, you must set it manually to run Sway. See wiki"
-		elog "for details: https://wiki.gentoo.org/wiki/Sway"
-	fi
-}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 715118c04970..b2a66dcb9132 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index d992d67e26d7..ac4ccf27ff61 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,10 +1,11 @@
+AUX konsole-21.04.3-dont-close-window-while-split.patch 2592 BLAKE2B 22c438734d6e3959f965b54dd76fc683566ed17ef8d368984c5d54b9ec6f95612ab2c993f1266367933b2327e937164eb655d386dce9cd82178f229a136c5789 SHA512 641eb0010bd320868538ebb3254e5883b84e4e17d06bd0ddea961e49b00eb3f811c0a163fc50096ac4d194a53a22db5ad9d3b6c007a85a40299eab03f36ba394
 AUX konsole-21.04.3-no-flash-on-session-close.patch 2711 BLAKE2B 0a50eb56a282be8189cb6c0c54abdab9d674fd2fa01842786af558671e2a51d752298ad084e285e1bef96a99ab28cdd5714f28cf9032238e8e172f497b9ee92f SHA512 577b3ebfc91543a3e4a5eebc9fed4db9414daab630b8e31c6530ea5d5de3b8944738527627ba7f47b9ca30fe4d428cd3d98beb7e73d7dd1097b09867256e774e
 AUX konsole-21.08.0-fix-KXmlGUI-toolbars-and-MainWindow-size.patch 2818 BLAKE2B f8b8f3c9a5d709d8318e4e8a7e29eb74fde3106e2f50abeac4b535147d4fb2cc685a70e0609b1035e19c1b92aa9d4efd202b5a8b743ac32ec7a760091b41337c SHA512 18ae7cd7a52ddbe3ee1eb5899f2f177d126b7d3aa7ca030fc32abfbc13ad2bd6e76dbd9135c529f352814b474be8fbda23ff1ec563b66d12e6026681a8e440be
 AUX konsole-21.08.0-fix-MainWindow-size-w-o-saved-size.patch 3076 BLAKE2B c84ec4cf530973bf5eeff173a8a1f0f0e833229bd9f01f83ea658357d2fbd852923824234f0650ec485be2f3062730bfa401e7eab8569ea04e6bfe9c98f8a964 SHA512 4703e6282884e093d38cb9071fbe9b083d7b986632a3eb26fddc5bac180f92412e5fef82c1caaedf1feefefcc9df3fab30ef4cb79b254611a57b52b5eaa0bfc1
 AUX konsole-21.08.0-fix-crash-w-blur.patch 1613 BLAKE2B f4a54da701a24031f5a530896b6b4861bd90c0b4f6be9a32046582187da8dc35752e768a9f05e3492f6174990ef371a7570d556cf3e135a4c73049491d369e92 SHA512 fd600b7c3752364c311c727461627b6183e31084b5af36768f7ff2b84e024494b5ec1121202184e2301cbff72549fb99dd8c2475f749ce440ec6192ba70eed15
 DIST konsole-21.04.3.tar.xz 1336960 BLAKE2B 2cbcdb3edaae0fec913d82dd0eb2ca80aca70e2b9d749ae1c22512946df8bf5e99aa8444996e41b7bc162727119c8f9216b28b5b15051dd0c6a89221fcbbd355 SHA512 490271a51304d5a64111f6ae74422a6b3143a5349359e55af0845c04a6e6d405fadd1f300dc4d866b7730c0cb852bebfddbb33b0ca9e68d22f264e379d1868e8
 DIST konsole-21.08.0.tar.xz 1373652 BLAKE2B 52661bf8296cb1f64b065f32d0d6a7d4bcf689a45e54c18165b5d4bf6893b7312daa6b45418b9142042154801b34e22388d04998af7d406fed53ab20073dcc11 SHA512 7b59b43e1dd1374001570c7bc611c00c7de738cdf7030954173a8d5b901412cb5653616c12f0b85af38a48e3598bf64d6bce9ca068b520a6683f5fb7bac3c38f
-EBUILD konsole-21.04.3-r1.ebuild 1876 BLAKE2B 42e78abae3fe19c1f7fcaf1bfeca2598f8d0154702cb23b366450482c3e4d3c4d9ff35e88b4c927b1433e6c87df71ca85297364baed3765d307986856fc4f462 SHA512 42ad313c1a56514934ece7efaf1a6c682eafa06e5cd9906188e4ef7c1aafb4333d0630f3b45fe9b9afd3aa05c57c98d755209e7e5645a32fc0f194873da71f6c
+EBUILD konsole-21.04.3-r2.ebuild 1944 BLAKE2B 8e6d9258327dbf326a78f273de429468319198dc222c7152dbdb67833b198dac3324f16b7e06f6fe6bacbc785b531a47e79481940594334dbd5c930fab47ccb7 SHA512 b649a9b9aed3201db1cb6f5b4ef30c9487c8a55aa5d220472ba526a14a616876913326b16ca7429b3c2cf477e6329d32f5124fb87b7340e138593ea46e54b8d8
 EBUILD konsole-21.04.3.ebuild 1796 BLAKE2B e7db09011bb97c8aab943455427555f3c6058969f80ff517c8e8176a53660e6a30e6a7820a32497715d304c5c5f3c18d26460522c778f57fd653144ef1ed5141 SHA512 c06b7598f239d43263bf5dcc5741bb9c0c2eff6b741b44fa925097fb63bd21496950c87d7035b71fe1c4932cca3fe252f02f7bff5c060e26cc33903b617d7991
-EBUILD konsole-21.08.0-r3.ebuild 2025 BLAKE2B cfbd472fe689ffb0615360df13ffb30f09cd789e5393a1fd920857c63374ec6f27d3d2b100ba23437827be16bc059879686322d35dfe3408a3bad6f24e65a02e SHA512 788a7af8cfb4a6ba647631d5f5bd41f8c3add0f36847d35816298b7f40f8cee9f59dcc3b0206c087bcdae1d99a72d92646e5b29bb8040f0ea6133df21c31be74
+EBUILD konsole-21.08.0-r4.ebuild 2103 BLAKE2B fef690ac0acd9a048558fadda69f81e31fa3cf49eac4d80313f02ae3c986d0661b1ffa13982d74e5467dbe2fdde680d5afca1b96fe7d9094705c5045c6f34a04 SHA512 c6aad12645884d602d1f76db0259a0b137e637a574e6e947c952020bfb067af40243eab461cac1ae18a3ab60da21b247ad4ce0a5dd9716352b07178ed182003e
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch b/kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch
new file mode 100644
index 000000000000..20762b109574
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch
@@ -0,0 +1,76 @@
+From 2591a9489a4d3a43c7a7f00764e9f84822d4946c Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Sun, 15 Aug 2021 15:51:33 +0200
+Subject: [PATCH] When closing a session, don't close the whole window if there
+ are splits
+
+When closing a session, we check if that is the last tab, and make the code
+close the whole window, but we also need to make sure it's the last view,
+i.e. no split views.
+
+CCBUG: 440976
+FIXED-IN: 21.08.1
+(cherry picked from commit 4a3cab03f5d853f4dd48531979fc3fb57dde5e2e)
+---
+ src/ViewManager.cpp           | 6 +++---
+ src/widgets/ViewContainer.cpp | 9 +++++++++
+ src/widgets/ViewContainer.h   | 6 ++++++
+ 3 files changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
+index 9c006e2bd..426040b78 100644
+--- a/src/ViewManager.cpp
++++ b/src/ViewManager.cpp
+@@ -494,9 +494,9 @@ void ViewManager::sessionFinished()
+         return;
+     }
+ 
+-    // The last session/tab? emit empty() so that close() is called in
+-    // MainWindow, fixes #432077
+-    if (_viewContainer->count() == 1) {
++    // The last session/tab, and only one view (no splits), emit empty()
++    // so that close() is called in MainWindow, fixes #432077
++    if (_viewContainer->count() == 1 && _viewContainer->currentTabViewCount() == 1) {
+         Q_EMIT empty();
+         return;
+     }
+diff --git a/src/widgets/ViewContainer.cpp b/src/widgets/ViewContainer.cpp
+index 2d7bfd13b..b25c00cdd 100644
+--- a/src/widgets/ViewContainer.cpp
++++ b/src/widgets/ViewContainer.cpp
+@@ -145,6 +145,15 @@ ViewSplitter *TabbedViewContainer::viewSplitterAt(int index)
+     return qobject_cast<ViewSplitter*>(widget(index));
+ }
+ 
++int TabbedViewContainer::currentTabViewCount()
++{
++    if (auto *splitter = activeViewSplitter()) {
++        return splitter->findChildren<TerminalDisplay*>().count();
++    }
++
++    return 1;
++}
++
+ void TabbedViewContainer::moveTabToWindow(int index, QWidget *window)
+ {
+     auto splitter = viewSplitterAt(index);
+diff --git a/src/widgets/ViewContainer.h b/src/widgets/ViewContainer.h
+index 3cbacf2cf..8e0a0986a 100644
+--- a/src/widgets/ViewContainer.h
++++ b/src/widgets/ViewContainer.h
+@@ -135,6 +135,12 @@ public:
+      */
+     ViewSplitter *viewSplitterAt(int index);
+ 
++    /**
++     * Returns the number of split views (i.e. TerminalDisplay widgets)
++     * in this tab; if there are no split views, 1 is returned.
++     */
++    int currentTabViewCount();
++
+     void connectTerminalDisplay(TerminalDisplay *display);
+     void disconnectTerminalDisplay(TerminalDisplay *display);
+     void moveTabLeft();
+-- 
+GitLab
+
diff --git a/kde-apps/konsole/konsole-21.04.3-r1.ebuild b/kde-apps/konsole/konsole-21.04.3-r1.ebuild
deleted file mode 100644
index eb5601c28fcf..000000000000
--- a/kde-apps/konsole/konsole-21.04.3-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-no-flash-on-session-close.patch" ) # bug 807933
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_bogus_dep KF5 Completion
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# drkonqi process interferes. bug 702690
-	local myctestargs=(
-		-E "(DBusTest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/konsole/konsole-21.04.3-r2.ebuild b/kde-apps/konsole/konsole-21.04.3-r2.ebuild
new file mode 100644
index 000000000000..c95192f968c4
--- /dev/null
+++ b/kde-apps/konsole/konsole-21.04.3-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+IUSE="X"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kpty-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-flash-on-session-close.patch" # bug 807933
+	"${FILESDIR}/${P}-dont-close-window-while-split.patch" # bug 808510
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep KF5 Completion
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# drkonqi process interferes. bug 702690
+	local myctestargs=(
+		-E "(DBusTest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/konsole/konsole-21.08.0-r3.ebuild b/kde-apps/konsole/konsole-21.08.0-r3.ebuild
deleted file mode 100644
index fe8cab4b97f8..000000000000
--- a/kde-apps/konsole/konsole-21.08.0-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.84.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-21.04.3-no-flash-on-session-close.patch" # bug 807933
-	"${FILESDIR}/${P}-fix-crash-w-blur.patch" # bug 807905, fixed in 21.08.1
-	"${FILESDIR}/${P}-fix-KXmlGUI-toolbars-and-MainWindow-size.patch" # KDE-bugs 430036, 439339
-	"${FILESDIR}/${P}-fix-MainWindow-size-w-o-saved-size.patch" # KDE-bug 437791
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# drkonqi process interferes. bug 702690
-	local myctestargs=(
-		-E "(DBusTest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/konsole/konsole-21.08.0-r4.ebuild b/kde-apps/konsole/konsole-21.08.0-r4.ebuild
new file mode 100644
index 000000000000..d4600f096a87
--- /dev/null
+++ b/kde-apps/konsole/konsole-21.08.0-r4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.84.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kpty-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-21.04.3-no-flash-on-session-close.patch" # bug 807933
+	"${FILESDIR}/${PN}-21.04.3-dont-close-window-while-split.patch" # bug 808510
+	"${FILESDIR}/${P}-fix-crash-w-blur.patch" # bug 807905, fixed in 21.08.1
+	"${FILESDIR}/${P}-fix-KXmlGUI-toolbars-and-MainWindow-size.patch" # KDE-bugs 430036, 439339
+	"${FILESDIR}/${P}-fix-MainWindow-size-w-o-saved-size.patch" # KDE-bug 437791
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# drkonqi process interferes. bug 702690
+	local myctestargs=(
+		-E "(DBusTest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 7e5a5932b8cd..adc342496ebe 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index 314408a76b76..efa45a76f114 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,5 +1,5 @@
 DIST bluez-qt-5.82.0.tar.xz 101788 BLAKE2B b9e67c22a8c3c6e8756fb140622d5847c52dbc536ffe4cbba6811af7a49996abb3613dc2fe481dea98c16badca9a560d9636653dd180dfea6256cb4b6e298ddf SHA512 defb301f7095730e183e63d267fa774dd6466b8d62eee2377d4f1d8a77393a848caf7f401c778b3ae7fcbaf1b0c408fff365e2a13d109120e07ddbd2735dc3e8
 DIST bluez-qt-5.85.0.tar.xz 101768 BLAKE2B 43dea08e7370f13247908c4545a6f755f259b3a76d6a3600b08889e7ac7a1b0cb71cac45435012ec6efde9765aeb5e315fd051463feb3d80401caf83e3fe837d SHA512 cc86562edc55ca0b7db2a475068bff8a0094f74780be07c5080000f14d0568f21bf9ebd239a886023ddcb664cec7b4fc393133c5fa8bd2c0cae8b9aec74aec77
 EBUILD bluez-qt-5.82.0.ebuild 678 BLAKE2B 526dbd4248cdca726126cb5197a190be1590ba4b08cc5f519d83dca1f088cc5d152e0c2fbd5bbd68547d66e9c4dc3bc982439cc095406f79729523377a480467 SHA512 e94d087e0f794aa71a3e0b8de2c19e0c75610cffd8ce876c81fd3504944e2fe326e1511bcc45aa9bae1bacb3a778ecf4fb8d198dedb6c8d6a385928b1779a97b
-EBUILD bluez-qt-5.85.0.ebuild 681 BLAKE2B 97e954e047764ac249bb1bcef0b4f8068e8c26d08bc87a1b00e61d7e5bdd0391156b1669b9528289e66aac8774887988ee21aa72e27cb98fdc312fcac802ee41 SHA512 9b40d1adf6cfa24aa340a05c571caf41823721b35e6897f52b90b89e8979527d795db411e7cfa787a20658ce73a1918d043f5a235764f527312877f0bfe695a3
+EBUILD bluez-qt-5.85.0.ebuild 688 BLAKE2B ac3902f3d178bb4daad19eac62086fa0f7c79dc4549fe60dfb77b1c474e05d3ecfd320fa76e83259d5d01e9939b6df35f99b4de8f1f75c328748ebd87f331d81 SHA512 327fe60b77e6ae885c1b3220b88aa7f1b002e8df2489a2efbf8e933f9dd7c4aa38d9082dedecf7bb0af7ea3188c991a24d67fc7661aab6618a4f48917402c122
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.85.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.85.0.ebuild
index a55ee208fcbb..6ff9eb8b8e90 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-5.85.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.85.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org udev
 
 DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index 5c2a070c60df..043a3427cd92 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -2,4 +2,4 @@ DIST knotifyconfig-5.82.0.tar.xz 84692 BLAKE2B 44d8cc0bb1caa2115fc54af5f8a042d29
 DIST knotifyconfig-5.85.0.tar.xz 84852 BLAKE2B e8d8a9580241ec2f57fc32208aac536a0d86f00946a1c2c56fdab1bdc1461a0dd8ec4d4b3df33c68a8c46d30fa4c6c1db1253c7f1595e6fa37795b84cd7e3820 SHA512 0bada9636e8c97e85d1405054dc5def34c25ecc8ce49dade8407de2213830f3802e044a4cc8782ae8bd4c89fdd982624454b6b77c469981b1fbc811b40edb326
 EBUILD knotifyconfig-5.82.0.ebuild 768 BLAKE2B ee48866fcd791abee06fff79971f03aa3fbea7037b4089acf9e1bf14a2bb5954200810542665185d44ac0be686808b26ff58943cbb7dee2d3e09ceee331c567a SHA512 ffa99af357dbac4b5966320ed633b52c4ba4e5ae20ac54908f8874022a165118b2e1986a8beca775715ca4b7e3fd640d72e5bf43aabbc8c50495591f4aa553f5
 EBUILD knotifyconfig-5.85.0.ebuild 778 BLAKE2B 3616e95c2d4a0437bbb996b81f997d474ce0e185fbf27f7a7cba04f704ee0c38250d1820a17d9f5722a90242b9a30eec8e674b99a962d833922cef74389ee154 SHA512 87bbb12bfadd75e4a7bde22ea1d66f898ab7a25431629cf4e70275f24cc0e81d4247d6a406d9c8423213571797ba17f236d000de0b1e5c5c2789baeee2dbf890
-MISC metadata.xml 550 BLAKE2B e04104d6b1736c38722bf1bb01243337d334111800a23afca62e1b21fc8ec6c8c7f87a63903a08e79e93f9558cca67bb0b26fe4720e5a769069585f8e57b44ea SHA512 9d1e8e824ce29723f7ba50f02d21fe89523ed097c0a337f9c95b75bc4cf39ee6bdca8e8dd66d88e6050de69d10d4359016d10b42fc71e9da78ce6f3b00b18628
+MISC metadata.xml 602 BLAKE2B 1426e53945801c0cb01739985cb1fa71ca0cf46adf42ef7b00230b3675c363f05052cc053ff948aaccba1169e4529b65008e1254d6cad65e2ea461d87b0229ed SHA512 0597ea9467df6dd209663feb3573dd1b81fc0fd1e5dd66b07ec91d57aecb0230ac1ed95bd8f07f3cd7b6a89ddbe3a88ad5a6fec9d735f03a7aa72804b256113f
diff --git a/kde-frameworks/knotifyconfig/metadata.xml b/kde-frameworks/knotifyconfig/metadata.xml
index 7f803e26fd4c..3d6bb9a4a6d4 100644
--- a/kde-frameworks/knotifyconfig/metadata.xml
+++ b/kde-frameworks/knotifyconfig/metadata.xml
@@ -9,7 +9,7 @@
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
 	<use>
-		<flag name="phonon">Add sound support via <pkg>media-libs/phonon</pkg></flag>
+		<flag name="phonon">Play notification sounds via <pkg>media-libs/phonon</pkg> instead of <pkg>media-libs/libcanberra</pkg></flag>
 	</use>
 	<slots>
 		<subslots>
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index bdb21eda6191..b708c955d4b5 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,5 +1,5 @@
 DIST modemmanager-qt-5.82.0.tar.xz 112524 BLAKE2B 1569dd2defb8b99b41d3ce8c94e010a8274e04012dc72b442e13761d287a1ed6f3e281ab0f03659f1d034fe6e79c70bd6ff3c07c7a4189fbc4d154fea122a1ae SHA512 129b1618f9bb5a59c79a7a202e297c3dc6f90829c2e4841a0cd2ac15440fed19ea78ce16d2ae3b012fe02db568d337210bafcda183db9cb8a1dba0d087f16ee2
 DIST modemmanager-qt-5.85.0.tar.xz 112436 BLAKE2B 8e86d6c330a048a6f2ac522f1b59d89e3b1951d21c3667254c2f8c6d3e01f0d2e53ac55d4bd6a4edfa6cf68413dac6afb71ee1c6ba59780a4d033614fcd24b06 SHA512 535cb520bb2102fc50ee884b50edd02689c59528ee9c9fdfe958d14dc1c57c1e3805256ad15c6ab8e0aae43441139ae659a850b5cef350011da4d2b554e3aec5
 EBUILD modemmanager-qt-5.82.0.ebuild 466 BLAKE2B 26bf07c44b1d2e8d42bac5f58ad8d3257376eae6fa3d93bb87d78f8a3e2c7aafb7dc7a2ffc24c654fb4d105650847a3b4e1529cfa7ecee0c9f72185977ef5a2a SHA512 bc73ff5231ccddc78992d4d2389628fc3f50555d69694ed761cc43de87f8721f5aafb1272a00e6c74b7af4e9fff0bc969fc30f0f8f07f9f09cf418935fc0423e
-EBUILD modemmanager-qt-5.85.0.ebuild 469 BLAKE2B 222dda89dcdf348936f8e5a5acf1253f27c3e06cdd3fb2d18e9446b683c44cbffae23bc26ba68dbe60d2517784a75522b70c0834ac78075887444fe4c861442f SHA512 ab23ce00bbe30ac77765ebfe455b277ece07cbc38ee9302df39609df5ea6dfc6813b613caaba1b85433d8b1954da76b9d2424e136611835282d06f9eb8fa77d8
+EBUILD modemmanager-qt-5.85.0.ebuild 476 BLAKE2B f0caf506908a78d2eb49f776586e655a8adad8314c11f1693bfc178da0d46f9c4ff4f942635295cda63f735dd7c7bcc8d4d5fc3f94f441c86d1359f785067e2d SHA512 2d2a8b499b92cf62bcac5c2f1b2414315aba51eafd21f542a8b51bf935fc0d3cc5cc79bb63be6f25055318fe97c89eae92bf90ebcff7d302c09d59d1b639d5ab
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.85.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.85.0.ebuild
index 921f6471f11b..a0128939e5b2 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.85.0.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.85.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="ModemManager bindings for Qt"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires running environment
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index aaf896b81846..325327d40405 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,5 +1,5 @@
 DIST networkmanager-qt-5.82.0.tar.xz 195688 BLAKE2B fbda99af246ed652f39c48bed432b934ba3aeeda7c7009c238464e2f0c586a226343dac3bdc1612c970766b3801ae0e03492dad7c73325d0254437f27d428cf3 SHA512 07d3d0e5a9f526ecea5942f5d16aa97c3ee8ab3f2481cabc01a9132e85c92a3dd1a3da744accf413d8239dbca1fce3d1ae022ffafea620f9212bda2a8fce00fe
 DIST networkmanager-qt-5.85.0.tar.xz 195996 BLAKE2B bbd41b95ca8c9f676941240bdab40f2d9ac76ca6ccb3eb0cf133aaf4e8bd7bffaf13a91f0a3cae06ea617ee11dce2c198536f134f9e17246897a9afebc89348c SHA512 84bb0edecb6162834caa495d9fa34947ea25f69cd915ba7a516657077492fb7f6c0fedd7a127d7e2caa7d8c038520410505b829eadd19d3ef9daa445442b090f
 EBUILD networkmanager-qt-5.82.0.ebuild 651 BLAKE2B db20b2cefb809e8f759a2643e15bd1e665dab4a60b3759db61a5461deb3db027cdd7c1a6566b5e7b22d0606d50503b1246a84fb1f1eed0858a0b2bd9c38b8014 SHA512 0cac1b4354ff95c8adbcbf405a88a9ecf48fe197b7558ded9a4c718c895225dc4f22a947889488f1ad18ec870b615b6091bb51f0b23e760e3283f084042245ed
-EBUILD networkmanager-qt-5.85.0.ebuild 654 BLAKE2B a01139df3b79d6c1f168326d529cd22e25688fada5fbcfe6d92f92a815c23acf4259971d19b215d464e24b7df1cdd4f4e0097ba2c71bacb1463fbfe475ce17a5 SHA512 a0c4078af169efbcd4c4175b3c6dfddb45c7918d2f0418de8a486309158c68ad2e43211beaedc944c4cc01afcabbd31b072b652436a24287417aa5b8ff8a0086
+EBUILD networkmanager-qt-5.85.0.ebuild 661 BLAKE2B eca869b72a3d292a69a65378f69fe9fb0578ebdfddc92e1c73d83af65cf375b8ba342f8ae8b0bb5e398002c084d25708fdf27cfcafaf6d3cd8ae081bfed0c288 SHA512 ec242148e20063a37b42969086c8d76302b9e50d05aaa3f3a7d4efd641c327775743e3aeaf1d3e1399eb6e9f4b6038b80ebcc1e3f7f8e720f186cf6816930297
 MISC metadata.xml 527 BLAKE2B d1acb2ad3f6e1c8e384d51a778e8364ada61503a3ea1a627a3a5c4b46952d0af9c33d2f1131da4012b96a9de7987d5d096be40b190bae0c0236f1a665513c021 SHA512 1a5d43d030054ed46eecae2fa74989f6fc8ffa45bf6f9b97bc6588ffdf55b6267968ae479cc7f64a73f85559bdc7f7b25ce3309eae9854c8579d173e6f348386
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.85.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.85.0.ebuild
index 23b69f5bf65c..644aa4f7afa9 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.85.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.85.0.ebuild
@@ -8,7 +8,7 @@ inherit ecm kde.org
 
 DESCRIPTION="NetworkManager bindings for Qt"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="teamd"
 
 BDEPEND="
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 157706748e79..6002ab052a72 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/latte-dock/Manifest b/kde-misc/latte-dock/Manifest
index 7b5517fddff3..797465cdf10e 100644
--- a/kde-misc/latte-dock/Manifest
+++ b/kde-misc/latte-dock/Manifest
@@ -1,6 +1,7 @@
+AUX latte-dock-0.10.1-dont-hide-warnings.patch 1023 BLAKE2B 0920f2e8de0e82b64357b63489f9fe266189bd9aa9bc70055b34b50bb65cf05aa3a738089f3b827ed68d1312e0e077704aebe92c349649aef60bf243b8aa614d SHA512 b087b10bd320b5adf8add3d0b677fad3d30cd983bad56dcf698dcddf244486a94ea57f162032f0eb9c9adbf2021d7b0e339930ef595989c02ce153414b2df802
 AUX latte-dock-0.9.11-kwindowsystem-5.82.patch 1071 BLAKE2B 11e2dc4b344395aa135521d96ab8a1b486f13ff6dad02ac023c2448058c53cf18044be8903ed80e78587bafa2a444c0af82a611f395f0e3a4cd405f8df9c3d4f SHA512 122e5884399b8bca924880ff7389552eb21b96a16e0f5b9f5788fef9759f01c6f70e3174c309d55a5f3574ccd0dd2f339d99b19b63fe255e67992170f90a8525
-DIST latte-dock-0.10.0.tar.xz 983700 BLAKE2B bda14f660f7959c912904173bc13d57e8722e99648880e6ab2651db44b943e130fe9c0e78a3f3476b63e4cda01f63d2cea3fa6fefb6155bf9c0bf29b80d9904b SHA512 894e427cc895564a1d46fb7d47f8f58156fa658c5e7d86dbf27d391bae1413ac8878789d2eb375ea8bdce0a8f3ede620dfc04588266e58ba870fa11d6d097cda
+DIST latte-dock-0.10.1.tar.xz 983932 BLAKE2B ebd565a2ec45048fe2578bd39554455843d0f8099701d8ab88d47588ff5e97b55754e51bdb78e092591772c4e04e84c1c1c4d70004cec442084bcc0b1f2813e4 SHA512 bed37de00ea58a7984351daa89b5def537f7504a108d0bd9683cf56852bde90f9b7ff6ce62db0fdba1a7bcd4cd7a3fe6d524fbfcd2c6655a364f7ebd67ba560f
 DIST latte-dock-0.9.12.tar.xz 741208 BLAKE2B 634805e78c618e0958d0d2d071fd6f262bee34f4aeb0106e42ba9cef0ba245a0382c2930e7e947df99bc93574721f6d5fc035c7eab3ac761cefd51c829ad409b SHA512 11538e90b110522bfc6a56737f7c2ef22e0a0aff1153a2d85413dae3e643b3b660c36cb4d2162b902b61c55b50d798b070f3c47da0c3709dcaefa09c3eeafd7f
-EBUILD latte-dock-0.10.0.ebuild 1615 BLAKE2B d5eeed2da3e95b32d796d7bb3628e43803b14f9a1d594ecaca78718156a983cd6b93d4c17922d0f1519a57fdec7f4bbd2d8994ff93d6fcb64eb2c9c48c6f5f90 SHA512 0c1818c018add4ee8665382e9aa8fbbdfddbe78a99eb8d2e742457c37a7e5670f66e720a49ee92121c20053c03f443ad6f05584f22ce88ba6c498475540e1088
+EBUILD latte-dock-0.10.1.ebuild 1672 BLAKE2B 707e5130b9c22d463e64aa1fc6197818ce93f7b3b32593c112bbbcf8d33ff098794bcab56de068e7ea9a2b6744c1aa5f3163ec8d0f0d48bca02993a88209e5e4 SHA512 4b5dbc241044d710d6ccf7704323d17fc7016d184e281852ce2c997c807b6bdcc4d0de28f11eeb652762b86f891058c7081f64177f955d418f715c0f80fa4bc8
 EBUILD latte-dock-0.9.12.ebuild 1601 BLAKE2B 174b30caa9e5b6e9f0a1d84823777108e4e855d858a3349e0f8ca8ed2b50158c2961a2e1686071c70ffc04a07da7edc83e78d205064508cffee29a3e10c693c1 SHA512 5fc4cb1b9192fcea0187ac5eb21bc12082d66073772ce499a7ff8ed7a776926f8b3bb6f2ba036207d18631459c3c39487def4066a72dacf0c265e54f243a6e7f
 MISC metadata.xml 335 BLAKE2B f82ca43580b9ff4695a6f5ec12918e8d2b1955d17b0feea996494fa53725da09fbfcc1a99091e7799fb42feecb1e1da4f7d7ff88b0f52c1dda7fc3f65218c08d SHA512 c887c4c3536118fb9f6af0b4ff8e656d5a63e039e1725429cf1d00cbb2564da4528518ab300b6889b0feecebd0b69cacd5f206793f8c24db6a97b86057597cc2
diff --git a/kde-misc/latte-dock/files/latte-dock-0.10.1-dont-hide-warnings.patch b/kde-misc/latte-dock/files/latte-dock-0.10.1-dont-hide-warnings.patch
new file mode 100644
index 000000000000..2128e2304683
--- /dev/null
+++ b/kde-misc/latte-dock/files/latte-dock-0.10.1-dont-hide-warnings.patch
@@ -0,0 +1,31 @@
+From ac28e1e851c7d00137a3e94ccca33601d33edf9d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 25 Aug 2021 12:02:26 +0200
+Subject: [PATCH] Do not hide warnings
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1ee5ce24..a6024baa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -77,13 +77,6 @@ include(WriteBasicConfigVersionFile)
+ 
+ include(Definitions.cmake)
+ 
+-#hide warnings
+-string(REPLACE "-Wall" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+-string(REPLACE "-Wdeprecated-declarations" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+-string(REPLACE "-Wreorder" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+-string(REPLACE "-Wunused-variable" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+-string(REPLACE "-Wunused-parameter" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+-
+ #add format security check
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Werror=format-security")
+ 
+-- 
+2.33.0
+
diff --git a/kde-misc/latte-dock/latte-dock-0.10.0.ebuild b/kde-misc/latte-dock/latte-dock-0.10.0.ebuild
deleted file mode 100644
index ee551deaf2f1..000000000000
--- a/kde-misc/latte-dock/latte-dock-0.10.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Elegant dock, based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/latte-dock/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[X]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5[X]
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/xcb-util
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/kde-misc/latte-dock/latte-dock-0.10.1.ebuild b/kde-misc/latte-dock/latte-dock-0.10.1.ebuild
new file mode 100644
index 000000000000..c420a523a9ad
--- /dev/null
+++ b/kde-misc/latte-dock/latte-dock-0.10.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Elegant dock, based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/latte-dock/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[X]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5[X]
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/xcb-util
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+PATCHES=( "${FILESDIR}/${P}-dont-hide-warnings.patch" )
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index cbe7fcc1b396..ab60a495a334 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,4 +1,6 @@
 DIST tellico-3.3.4-no-khtml.patch.xz 7944 BLAKE2B 8dd11c68a3ecdaf706860aca466fb4a2afc6018578025ae3c3050656be213889dad676cca25e6ab4634e097443e81278d527b6d9602abc85e92525e6436dcf32 SHA512 f4d84043fac034113f69bf12e500a1413c908c530a077f4caf06f5ce69902ce17b71723aa253572678b41043d7a8a031d9c5b563e59e4979e5dd50df2f0ea29d
 DIST tellico-3.3.5.tar.xz 5664868 BLAKE2B 8870fa4885a38aafdcdc8821c0416db6f89a57d2bc6266b9ee60cecb5cce3c3bece8ce472175bfb0ed3751b27306699425f4083dff29968a4888a2153bdc1c26 SHA512 3ee030befd22d87d7e429c4161c5253e9134729f5258768cd6a73006db5f64b0d61626be6d1cce04d6c57e57d8ca37361add98f551cf519594f61baa0fe051a1
+DIST tellico-3.4.1.tar.xz 5832916 BLAKE2B 64696eb988e4dfacf5b16ff35142a7069a78c1cdc5889dc12b24483991109ef0cba806db8baca6d58ac6c76a8afc4f8fdbd8a0f170c7ace9c83bc5ef222bb386 SHA512 b73ae82acd2eb3c4cd1f4e0534da693a0868dc5bb706e103da1b9227d47770fc879cf97a529b6cb080160c78cb41d9728f91b09c9952814dec4d98fca970e8c2
 EBUILD tellico-3.3.5-r1.ebuild 2408 BLAKE2B 313f45c532306fb4e6165c6e6456b13bcf514920558c5dd481035705b5d5a8246266070ef787a0adfdb9508f860839669432b14ca8bfb774761a9e9be9afb242 SHA512 b63198e841ada9a2e132477f35434ee5ae1a3105d6e8ecc90bf9a299a7bdc6544ec7eff6e06f14f48f860125f2b18be1306c460a6032ddef032aeb8a1e989856
-MISC metadata.xml 734 BLAKE2B c03d94b32c294dcb8bb38e2908a1c793704a18cee7c713d86e388119c3f16f1b38b31b58f77910799693a6bb34407a18f0ff9c9324ec0be07cea72ef733664e3 SHA512 2addadd05b10dca5f91a9277f2ca0c32276a94eb1a8a83c00ba79bf8ef0e19a026cfc99ca45ecd31e78848cadbde15286d1093e346cb8bc9cf021201fbb8784c
+EBUILD tellico-3.4.1.ebuild 2381 BLAKE2B faddb7bcdf9047daa750402daf137f06ada634b0b07f2a5a6952487f10bf2fe05206a1cd7a5d40bc4d26e6e8021ce8f94482b5736303efa5e255e6e35dfd5f06 SHA512 d6250b02756ffb6e85c3ff71c93ceafd3f1bfcebbf37fba2d64678113f0e479dafb9fa4e95c61e8fe86905df10cfeb8252b6e6fa2f5023ce659dcc27c9738a65
+MISC metadata.xml 847 BLAKE2B 96b1e08e1e9762404e02950ea7d82686ede4f4aa469cfa5f1927e1f2585f1127c8a9fbdc81e0b7603727fe0ed3db525f53ad39133882475f8983d4f4ce2c86a3 SHA512 c93d1eaf0fadad99e89430cd7945e39ec6fa3710281c3bc50707c6319a959814f75a90812ebaecc96863e9581e5886de76ecafa8ebb9ea194bbc264bde79215b
diff --git a/kde-misc/tellico/metadata.xml b/kde-misc/tellico/metadata.xml
index d4a07bca2744..b7a9e81c38a4 100644
--- a/kde-misc/tellico/metadata.xml
+++ b/kde-misc/tellico/metadata.xml
@@ -14,6 +14,7 @@
 		stamps, trading cards, comic books, and wines.
 	</longdescription>
 	<use>
+		<flag name="bibtex">Add support for bibtex importing using btparse from <pkg>dev-perl/Text-BibTeX</pkg></flag>
 		<flag name="discid">Add support for reading disc IDs from audio CDs</flag>
 		<flag name="yaz">Add support for searching Z39.50 databases</flag>
 	</use>
diff --git a/kde-misc/tellico/tellico-3.4.1.ebuild b/kde-misc/tellico/tellico-3.4.1.ebuild
new file mode 100644
index 000000000000..b135fa60b84e
--- /dev/null
+++ b/kde-misc/tellico/tellico-3.4.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Collection manager based on KDE Frameworks"
+HOMEPAGE="https://tellico-project.org/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="https://tellico-project.org/files/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="5"
+IUSE="bibtex cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
+
+# tests need network access
+RESTRICT+=" test"
+
+BDEPEND="
+	sys-devel/gettext
+"
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-qt/qtcharts:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	kde-frameworks/karchive:5
+	kde-frameworks/kcodecs:5
+	kde-frameworks/kcompletion:5
+	kde-frameworks/kconfig:5
+	kde-frameworks/kconfigwidgets:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kcrash:5
+	kde-frameworks/kguiaddons:5
+	kde-frameworks/kiconthemes:5
+	kde-frameworks/kitemmodels:5
+	kde-frameworks/ki18n:5
+	kde-frameworks/kjobwidgets:5
+	kde-frameworks/kio:5
+	kde-frameworks/knewstuff:5
+	kde-frameworks/kparts:5
+	kde-frameworks/kservice:5
+	kde-frameworks/ktextwidgets:5
+	kde-frameworks/kwallet:5
+	kde-frameworks/kwidgetsaddons:5
+	kde-frameworks/kwindowsystem:5
+	kde-frameworks/kxmlgui:5
+	kde-frameworks/solid:5
+	kde-frameworks/sonnet:5
+	bibtex? ( >=dev-perl/Text-BibTeX-0.780.0-r1 )
+	cddb? ( kde-apps/libkcddb:5 )
+	discid? ( dev-libs/libcdio:= )
+	pdf? ( app-text/poppler[qt5] )
+	scanner? ( kde-apps/libksane:5 )
+	semantic-desktop? ( kde-frameworks/kfilemetadata:5 )
+	taglib? ( >=media-libs/taglib-1.5 )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	xmp? ( >=media-libs/exempi-2 )
+	yaz? ( >=dev-libs/yaz-2:0= )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
+		-DENABLE_BTPARSE=$(usex bibtex)
+		$(cmake_use_find_package cddb KF5Cddb)
+		$(cmake_use_find_package discid CDIO)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package scanner KF5Sane)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package taglib Taglib)
+		-DENABLE_WEBCAM=$(usex v4l)
+		$(cmake_use_find_package xmp Exempi)
+		$(cmake_use_find_package yaz Yaz)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 76aaf1f02cb5..cf2f3fe51343 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 42dde348cfb4..1c9b4e474d2c 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -2,5 +2,5 @@ AUX plasma-nm-5.21.5-missing-include.patch 930 BLAKE2B e73b80967df714f8b9a5afbdd
 DIST plasma-nm-5.21.5.tar.xz 902104 BLAKE2B 8b881f39e01b7de0107b897c81fffb7bfa429a0bd7d8eb58026328ac42c411d5dd8e154e843767098731174a492e64b6c8a28c8af474584862f58081d9a5e751 SHA512 ac074e50d5ee3be99bab515b02522e391b14936c1c8152ca067c7513af7a8e8b81cb55ab9b412ca703554f3e35fc9392368159c9872d8c372017089a4a65e3fa
 DIST plasma-nm-5.22.4.tar.xz 900192 BLAKE2B 33f5030500b8e9700e50fb1394830fea5a74bfe01f62364cb1971f6362c630a773991489d555b975586cfb7a03c89a461cf6e59bddb07d60bc6fafc552fb23eb SHA512 4c4f4f8341fb73dcd47f201f4f48a2309c9880c6bc611ab0ecbf9680b5a0bcf877faa10be8800894f141843c4fb87b1e2219dd23a44b560d14ac4f9c5a757cb5
 EBUILD plasma-nm-5.21.5.ebuild 2333 BLAKE2B 79c1df7a5e2f57323c73e9ea432093a05918f93956ad4ff3b13d308d04f62648ae8a34f8884fef890a786ba2183134eb4667e8e2ef979b51488bbadff4823b48 SHA512 04a6eb5b20bab5ee3372f2b0cc9d0ba21731119e70704ffc6cc6865af3ddef64621a69f49e25f0d01961511c9d4fde86e4501e35ebc4f612fbdd842051c6a7e1
-EBUILD plasma-nm-5.22.4.ebuild 2282 BLAKE2B 0c40591b0d7cd42ae7b2b1316e6ff56fc7f1e3c49ab7faba2d8280bdf07aaf36065cfefe6f702f06abcf7e0dbedb2d430256ef3380e95c32da18105d2bf8ec8a SHA512 5927837b3aa98afb40262bd5d8ef039d7da3139ce75bfb35ca3af872840073445b1a4318d8d51718d7d537268ad4d7ac6b7ad7769b0ac99ffe265d8f84f17223
+EBUILD plasma-nm-5.22.4.ebuild 2289 BLAKE2B 97f810f4c12e3540a8e99b6bb762d492797a852ba5c94b4c48625604a041f0a1256a6384dc05ae4dbf942ab68a1df3c00c6cd223c4d16c84ac63fb64c7c00558 SHA512 14758a8294dc991218f4638a57dadc6e3c05ade2c8d4902595d15e08d73b314fb981719fea38058fd329c329a5bf5c276211995966de766f537ab67ee510364b
 MISC metadata.xml 547 BLAKE2B 494a59e4527773e8075dc3f9d4b2b62eb193d66225764644fca3071b4b3bab4bc8c0ad0628a8dee16c89ac023d54ba051af594b4302b2d8f82e5ffe91bb6dc9b SHA512 cba9726aa3cf865d115bac78be3cd43c05e98dbaf56cfeda7f68191c875385b3d5f48228a8a405808b458baf7f50688ce5617968d1551139dc1141f5eca29277
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.22.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.22.4.ebuild
index efbeb893a417..8d8b48eda04c 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.22.4.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.22.4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma applet for NetworkManager"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 2d3d1838c069..d9d05b702ccd 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/libmilter/Manifest b/mail-filter/libmilter/Manifest
index d2671855f3d8..3ff03f16b363 100644
--- a/mail-filter/libmilter/Manifest
+++ b/mail-filter/libmilter/Manifest
@@ -11,7 +11,7 @@ DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc
 DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638cf69b72839d358ae6863c95c9e0965d1b7fdd5b1807bec1ffdf87bca0c7c9ba91060962e6de5da5bf14422f6279ea SHA512 d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2
 DIST sendmail.8.17.1.tar.gz 2284027 BLAKE2B 4cbbc2bb536a48ea27994721e9dfefff7739ef1c825bbc0397202e600d8dad8f9a2572a777204693cf9630f767865d50566f0827be6b52be41c1e25532cb394c SHA512 ae42343fb06c09f2db5d919d602afc4241914387dfdae0f15e0967dda3be25bf1d3a4637b57266763679646a3cea6aa07e6453266fd9b7358c1a09ec2b627a15
 EBUILD libmilter-1.0.2.ebuild 1903 BLAKE2B 1623fdd49f8cbe33bfb2f197d3fb18b6e107734e6a2ddd8b5e8fe2795d5d199a6dd9afb7d9f89ec739f05c9504bd67082c90e7a3bf2c4039ceff9c7fc4d0fdfd SHA512 af0dd4f1051f90235abd91cbc7e39939c5079487c7ade83d82fb25b39e5d5f802e06c0be2fee82d7bf07bf44ff95ff17dd40d71935d6457fbdccb5cdacb032b0
-EBUILD libmilter-1.0.2_p1-r2.ebuild 2222 BLAKE2B f2ac06a33e4ad53c4c8e503d2801ae6401731e24c820f9933a89bbd74b6e7f14303be5e10b34eb224a38b8dca104b925b1eda5fd0ebea09e4dedb2088d217554 SHA512 394e15dca1bb8a8ad09b3cdd454588eeb5f40cc9b34fcad600bc171578678adc10d81bda70d7afe9f40b8e10a571f55c1da1700367ce913f3750d38d91b7bbe2
+EBUILD libmilter-1.0.2_p1-r2.ebuild 2215 BLAKE2B e34ec8367a7a3077566dde4671c1fd72ad1883f5ed2d2e3921a7fd91fbc7a8f9f5518152f895c5157c946dd4a5d5491c4306bf880fd1ca478cc788dc0d3d053c SHA512 588fb4abf1450fdb6be2eacb0b2af4e8995525660b7a36d110e870c6e3b57d8a8d8fcb5aefe3e2f940fa2dbcffa8052a089396eedc808baa25e4cb46fde69841
 EBUILD libmilter-1.0.2_p1.ebuild 2214 BLAKE2B 8452d0976b146f92d7a8684986c5ef8e9dceecbc504806b3b53e2778d982d8a51bf4e440fbbe04dbd3392386fd5b1afdc62106e4e5d0faf3e863215a9b9622e8 SHA512 128027206c5978e49ccec7469ef14b1a67f977478b8182dec00a478671dafb0599a7a3a8338f2d8c2077ec806209faa6cc51070c6bfe70164d5fc344a4fc0013
 EBUILD libmilter-1.0.2_p2.ebuild 2589 BLAKE2B 00e621f39053d177496959a7fb2fe77f472f633b10dee23c91ec22baea0e4a0fcf33bc43050579f06d7c71e5f86e11a6758afda3d005adad95bde8c851a61b10 SHA512 f73dfe2f656fe328bdc570fee09d9658c7dcdd1c6cf31835388ea410bb972d8e02eb49f30073d756236b4162fb3ef2a70bae67ee31a5c3c7e228ebc256d819b0
 MISC metadata.xml 241 BLAKE2B 7e817e3e8547331152f2d3378fe5681d02cccc2ec04dfbe21833282edc6c826a93b9493110f5f0afd05edbbbb84a1a185db7e17d154399aabd1e70ab044c3ecd SHA512 bec8ce3a2140871a48e34ad88eeefd1bf05b2d6508e2a5ca4c406aa0ca2729b0b827ae02dd4fd707630894e1c8fc367cdb9840b791ad8ee596d067d40c36aa42
diff --git a/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild b/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild
index 924c4295b379..9646d468dabf 100644
--- a/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild
+++ b/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/sendmail-${SENDMAIL_VER}"
 
 LICENSE="Sendmail"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="ipv6 poll"
 
 RDEPEND="!<mail-mta/sendmail-8.16.1"
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 4a5577340849..2491065dab11 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,16 +1,16 @@
 AUX rspamd-2.5-unbundle-snowball.patch 758 BLAKE2B 4e419c4e70d5726309c17ca759b8917feb2d52842cde06453821a8b1964ed8165a5f3536ab917a8362b44b40858d1660ae7c7887fee513e9e6fb681d24589255 SHA512 5257921bdeb5febef99feebd03d291aad009a6b8a44c325305532bae7aec35456042b4813338f175c4a59aa80cce3178118d9e1e4bc5a500f42e5364c06a4dda
-AUX rspamd-2.6-cmake-lua-version.patch 954 BLAKE2B f0d815908763af100ceb9c79d394ff9616eeceabcc2363609d6fcbc29fea407cfa33640a0ded204047e848cbc93abd1c25372145bb567515ee92ebc227b87422 SHA512 9e8df1f2815e58463d06b16fe8a1a39b344ba30c18392e6f8827d65adf0bbe923da56febbea591efbabc2c5f733a63ace06a4baacf218229dd8dc345315e1511
 AUX rspamd-2.6-unbundle-lua.patch 1344 BLAKE2B 0d5e07043f5bff29ef484e7708cd3b0fda36e500c6846772c6299fd43499e46c0f453c873c89a82a48b7402e6cbb5cd2d20f4547d831d490ceac99f0aecc7926 SHA512 1c95ce0b6cca05671d3dee9b373dfaf0be1dae45702b5e1165c482141b8b87c367bd5cfbf482309c00872468b379a2a82034d6983ec219e6ef18ae50d4ce48a2
-AUX rspamd-2.6-unbundle-zstd.patch 4085 BLAKE2B aba3487956b3a92296adffc748775ef88dfbbd8595fde5c50e33e67a9d6d517e8f73dc22a288aee73b4131b8c49f84968b9e6aa5c697c7e7a0a68b7f938cac38 SHA512 9c9a2ac7bd25fdc9dd2ae6aebd18a1a88358b5de0f2b7bb63b7af5c405125e0517df0869e6007f79c87d5f650395589f543581c189b91d1cbc1e8ab76c2df0ee
 AUX rspamd-2.7-cmake-lua-version.patch 1121 BLAKE2B 7fa15211805ebd90655eb696cb39d59215315fa55e2e286555f05c505af629119fa0e851dc2a7dd00779e06610d20e590cd57e08aca8557c752c3ab1bfc49bd3 SHA512 2977a94e4e2878a4148e292bc36f605df850145e011e8ef4c35d590ff203327c457c3856a8033d527428bf23673f54807acb912fb171c0550195b3cbf605cb6f
 AUX rspamd-2.7-unbundle-zstd.patch 4047 BLAKE2B 2a93a17980915a5dc12e20f89922d2e58a73df555ba41c7e8e39a65ccb507673d900fee4b25f1539a7cf516fcf92e1ecacfc5eb1f0c154830700e2ca95acef8b SHA512 ae589dcecfb15980ec94924d1a5c4e27d8a297fa11ae8c9c40ca4b8fb523039df1f8ee193c936b30b4c6e1fc31b301ce07fb08645778defefe3351ea6df43dd9
+AUX rspamd-3.0-cmake-lua-version.patch 1444 BLAKE2B b44ada90d1d4d59f000ab75a5d28545902235c85ccab3408eefb8f034bec0c86f6a62678cc5632c7db61b19e7cc1afff2b92a8f1493c64fbe831b3eca3836322 SHA512 f382af60698dd23e69469d6dfaf3c18cef0f413b22918725aec5dd09ee3f8c339d3a6ce92f46ebca89690ce57cab3295ab3093b502af7bce4ce5576c7fd3de9a
+AUX rspamd-3.0-system-libfmt.patch 1860 BLAKE2B 50754cbcc3bf687fb0274af69d5985b3da2278444819c43d7b51ee11b97776eb49e303f0d606538dd67295efb1e66d0265cc44ad8882a482c01b7733cfc46228 SHA512 6d64681d4ba6f6e93dc2f021041e0cb72309e369daaeb93f42ff9ee34ce6a9ea05db4a7ff21948788717d18d89287d2c0a9454a60b3f9bb9f72dab5be60ce7b2
 AUX rspamd-r1.logrotate 305 BLAKE2B 58e816e54fd0a7e977dd2f6dcf97617c188888ffea66769ef60ce799f980e2814221734fee7b47c93790a5bbfecbb2f315f93c84bec9dd29b0f80c15e1b9e349 SHA512 0515d31a890058194106d9b8960d77909914986e73619dede751be2efb9592a41f90f15599310b5d6d027c3a203df412c8379ade7df09ecdfd4dcf43bfff4fa7
 AUX rspamd-r7.init 1357 BLAKE2B 90227e0980397a256e6136cac4a4a4d143130d82a211bfd4894d5f8deb85113e0b219e6453257d548ec3d80de24241e6ecfc2b0a4178cb344c8c6549d96e549b SHA512 89a079d32b7d8c5a037c7bb2ab6825624ce89ea4b25893bcf6f49befc0c7b924b51d48b30bf61c4b3ea5bc3ccbaba16664c7df52236debda0bdb58f1adf8867a
 AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb2696bfb32b70c31ceeaded873f06c759a471d534fb872656907e73ee095150fae384de4df6e9946 SHA512 753011de167af9261cc67676357aadf34d0b160d343a20d5efe8b3389e8a604775b7a6abbaad3174acae7df5579b52b4ba8a0a714419084befedfa96a3a8a9b1
 AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4abe3b3d3e6046d362dae9efc723dd675dff8f1c1df9d05c09e539fcd251382cd9fc5e92351ece8a9 SHA512 1c7e6b79a05cdf9a886c6e233417a0d7b398a1e27ddd3b19c3a595afd50e502a7fd7c09a3499cb9fe6e0291b8493d150550b094c8bf6e2221b71915239c72ef8
-DIST rspamd-2.6.tar.gz 5079444 BLAKE2B acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372 SHA512 79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a
 DIST rspamd-2.7.tar.gz 5126227 BLAKE2B 70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930 SHA512 8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
-EBUILD rspamd-2.6-r102.ebuild 2678 BLAKE2B 043739d93a7efa4696d8b17676fdda23edeaa3531901018101de0f2e6e86fa52023aad25bcb34ed517f497aa0cd2e56dedcf36d2a9dc11db0ce79976a340e176 SHA512 c50ae90d349c5b002f0e44af063c5539f6b20c3b35c0595c5e4e1a4493ae709235bcb620844811be9469627be55c0d4dfccb899eaafe3725c9f1e764249fa294
+DIST rspamd-3.0.tar.gz 5535659 BLAKE2B 605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa SHA512 1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4
 EBUILD rspamd-2.7-r102.ebuild 2678 BLAKE2B 22cbf33c83da07e9dd087d8350efe5a900fb9bce2b9d0da7ee9380259bddc09a8263f279f019ce52f463bea8ef6bfbbf08828dfc98f07f376b039680ae5614b2 SHA512 767b03d9fb333edf5d4854e20392e4bd585de4f8adcc125dfaa3bd0c102dd2dc46431eae5e2dd7d5d3bdd945343312fe3464872b75236fa0c031ae13237dd8f3
-EBUILD rspamd-9999.ebuild 2680 BLAKE2B e881d40635fedb395eb2579f88ffb617264049b162f675ae4c8ffdcff81106c147302fdf3b5cc959fee00bbd2fde95104800a20a3c6a57996e03fdd10792d243 SHA512 7c185029e5a1de614fd7a207331909093a261a4fd5ecc4af37e37f44683d4721c0ddfceac4beba7bcbaea7d365023cb0c1299a1b3b8dd2d7e1bb6ab462cc8b77
+EBUILD rspamd-3.0.ebuild 2845 BLAKE2B 1189974898087b675103d9aa84506c391fe4809ddb2b5b0f68ed0bf8f3d971a6068d251aecbd853a1c94811467eec809e27b66b3864ca0628cd4725094e12a78 SHA512 484dbdce9fe79ed25474b0fcfdcc01459564b9d01e1fecaf5345ccfe5100fef0d3bf7d4bf10ceffa396757c5308e5f3a06bc1cdae1f718b2262d0affb7585b8d
+EBUILD rspamd-9999.ebuild 2813 BLAKE2B 33ce7c32935fd0799dc00723d239cf1a05ffef2f37f2bf734047b1bac8b365ce174e04232c8f68688006e7774e02b8ef010fd2d8d179898eb32593d2fb6cd1f9 SHA512 8070cc687811f657b6cd7d0853cfae544b40b179d4eea0e1ad1bed288b449f731fa26bb0cf6093e6e42e324f7a5969eb84178106ed5cdad801ef0ae1d7bd25d2
 MISC metadata.xml 683 BLAKE2B 88aae3128d411106650ed6fc0558c5b36419fffc01a6c09a0b23e85bdc6f4a02fa8f086f794dec814a78e40956f0ca3256de5700574ff4547309b868869fbb16 SHA512 a0367a901b8294cab8e725dce17ce5e9c9195aa9a62a1b5925b213875e5706509973d9d7bd2ee3057ee9892a05132f868f81cf2a0193f9fdc5eb9235c09093aa
diff --git a/mail-filter/rspamd/files/rspamd-2.6-cmake-lua-version.patch b/mail-filter/rspamd/files/rspamd-2.6-cmake-lua-version.patch
deleted file mode 100644
index 141b13dfa8af..000000000000
--- a/mail-filter/rspamd/files/rspamd-2.6-cmake-lua-version.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -139,40 +139,8 @@
- ELSE(ENABLE_LUAJIT MATCHES "ON")
- 
- 	ProcessPackage(LIBLUA LIBRARY	"lua"
--			"lua-5.3"
--			INCLUDE lua.h INCLUDE_SUFFIXES
--			"include/lua-5.3"
--			"include/lua5.3"
--			"include/lua53"
--			"include/lua"
- 			ROOT ${LUA_ROOT}
--			MODULES lua53
--			OPTIONAL)
--
--	IF (NOT WITH_LIBLUA)
--		ProcessPackage(LIBLUA LIBRARY	"lua"
--				"lua-5.2"
--				INCLUDE lua.h INCLUDE_SUFFIXES
--				"include/lua-5.2"
--				"include/lua5.2"
--				"include/lua52"
--				"include/lua"
--				ROOT ${LUA_ROOT}
--				MODULES lua52
--				OPTIONAL)
--
--		IF (NOT WITH_LIBLUA)
--			ProcessPackage(LIBLUA LIBRARY	"lua"
--					"lua-5.1"
--					INCLUDE lua.h INCLUDE_SUFFIXES
--					"include/lua-5.1"
--					"include/lua5.1"
--					"include/lua51"
--					"include/lua"
--					ROOT ${LUA_ROOT}
--					MODULES lua51)
--		ENDIF()
--	ENDIF()
-+			MODULES lua)
- ENDIF(ENABLE_LUAJIT MATCHES "ON")
- 
- IF(ENABLE_JEMALLOC MATCHES "ON" AND NOT SANITIZE)
diff --git a/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch b/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch
deleted file mode 100644
index 1a7f4453c86f..000000000000
--- a/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 90caf4048..e2e5d182c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -198,6 +198,8 @@ ELSE()
- 		ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3)
- ENDIF()
- 
-+ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h
-+	ROOT ${ZSTD_ROOT_DIR} MODULES libzstd)
- ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite
- 	ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite)
- ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h
-@@ -615,7 +617,6 @@ ADD_SUBDIRECTORY(contrib/http-parser)
- ADD_SUBDIRECTORY(contrib/fpconv)
- ADD_SUBDIRECTORY(contrib/lc-btrie)
- ADD_SUBDIRECTORY(contrib/libottery)
--ADD_SUBDIRECTORY(contrib/zstd)
- IF(ENABLE_SNOWBALL MATCHES "ON")
- 	ADD_SUBDIRECTORY(contrib/snowball)
- 	SET(WITH_SNOWBALL 1)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 54b2e4083..e0e2edd58 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -181,7 +181,6 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-http-parser)
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv)
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb)
- TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
--TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8)
- 
- IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
-diff --git a/src/client/rspamdclient.c b/src/client/rspamdclient.c
-index bcb25672e..48ca58e94 100644
---- a/src/client/rspamdclient.c
-+++ b/src/client/rspamdclient.c
-@@ -19,7 +19,7 @@
- #include "libserver/http/http_private.h"
- #include "libserver/protocol_internal.h"
- #include "unix-std.h"
--#include "contrib/zstd/zstd.h"
-+#include <zstd.h>
- 
- #ifdef HAVE_FETCH_H
- #include <fetch.h>
-diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
-index 78e3fc79f..40110c693 100644
---- a/src/libserver/cfg_utils.c
-+++ b/src/libserver/cfg_utils.c
-@@ -36,8 +36,7 @@
- #include "contrib/libottery/ottery.h"
- #include "contrib/fastutf8/fastutf8.h"
- 
--#define ZSTD_STATIC_LINKING_ONLY
--#include "contrib/zstd/zstd.h"
-+#include <zstd.h>
- 
- #ifdef HAVE_OPENSSL
- #include <openssl/rand.h>
-diff --git a/src/libserver/maps/map.c b/src/libserver/maps/map.c
-index 8b9f522b2..8cf03ffd6 100644
---- a/src/libserver/maps/map.c
-+++ b/src/libserver/maps/map.c
-@@ -23,7 +23,7 @@
- #include "libserver/http/http_connection.h"
- #include "libserver/http/http_private.h"
- #include "rspamd.h"
--#include "contrib/zstd/zstd.h"
-+#include <zstd.h>
- #include "contrib/libev/ev.h"
- #include "contrib/uthash/utlist.h"
- 
-diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
-index 9d1276064..6f0a66fb8 100644
---- a/src/libserver/protocol.c
-+++ b/src/libserver/protocol.c
-@@ -21,7 +21,7 @@
- #include "worker_private.h"
- #include "libserver/cfg_file_private.h"
- #include "libmime/scan_result_private.h"
--#include "contrib/zstd/zstd.h"
-+#include <zstd.h>
- #include "lua/lua_common.h"
- #include "unix-std.h"
- #include "protocol_internal.h"
-diff --git a/src/libserver/task.c b/src/libserver/task.c
-index 53da0dae6..6538abdbf 100644
---- a/src/libserver/task.c
-+++ b/src/libserver/task.c
-@@ -25,7 +25,7 @@
- #include "stat_api.h"
- #include "unix-std.h"
- #include "utlist.h"
--#include "contrib/zstd/zstd.h"
-+#include <zstd.h>
- #include "libserver/mempool_vars_internal.h"
- #include "libserver/cfg_file_private.h"
- #include "libmime/lang_detection.h"
-diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c
-index 0787736d5..21474317a 100644
---- a/src/lua/lua_util.c
-+++ b/src/lua/lua_util.c
-@@ -17,7 +17,7 @@
- #include "html.h"
- #include "tokenizers/tokenizers.h"
- #include "unix-std.h"
--#include "contrib/zstd/zstd.h"
-+#include <zstd.h>
- #include "contrib/uthash/utlist.h"
- #include "libmime/email_addr.h"
- #include "libmime/content_type.h"
-diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c
-index 4ed8cfab7..5f8808e40 100644
---- a/src/rspamd_proxy.c
-+++ b/src/rspamd_proxy.c
-@@ -36,7 +36,7 @@
- #include "libserver/milter.h"
- #include "libserver/milter_internal.h"
- #include "libmime/lang_detection.h"
--#include "contrib/zstd/zstd.h"
-+#include <zstd.h>
- 
- #include <math.h>
- 
--- 
-2.26.2
-
diff --git a/mail-filter/rspamd/files/rspamd-3.0-cmake-lua-version.patch b/mail-filter/rspamd/files/rspamd-3.0-cmake-lua-version.patch
new file mode 100644
index 000000000000..55665b887c3b
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.0-cmake-lua-version.patch
@@ -0,0 +1,64 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b53793008..5d092d654 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -147,55 +147,8 @@ IF(ENABLE_LUAJIT MATCHES "ON")
+ ELSE(ENABLE_LUAJIT MATCHES "ON")
+ 
+ 	ProcessPackage(LIBLUA LIBRARY	"lua"
+-			"lua-5.3"
+-			LIB_SUFFIXES	"lua5.3"
+-			INCLUDE lua.h INCLUDE_SUFFIXES
+-			"include/lua-5.3"
+-			"include/lua5.3"
+-			"include/lua53"
+-			"include/lua"
+ 			ROOT ${LUA_ROOT}
+-			MODULES lua53
+-			OPTIONAL)
+-
+-	IF (NOT WITH_LIBLUA)
+-		ProcessPackage(LIBLUA LIBRARY	"lua"
+-				"lua-5.4"
+-				LIB_SUFFIXES	"lua5.4"
+-				INCLUDE lua.h INCLUDE_SUFFIXES
+-				"include/lua-5.4"
+-				"include/lua5.4"
+-				"include/lua54"
+-				"include/lua"
+-				ROOT ${LUA_ROOT}
+-				MODULES lua54
+-				OPTIONAL)
+-		IF (NOT WITH_LIBLUA)
+-			ProcessPackage(LIBLUA LIBRARY	"lua"
+-					"lua-5.2"
+-					LIB_SUFFIXES	"lua5.2"
+-					INCLUDE lua.h INCLUDE_SUFFIXES
+-					"include/lua-5.2"
+-					"include/lua5.2"
+-					"include/lua52"
+-					"include/lua"
+-					ROOT ${LUA_ROOT}
+-					MODULES lua52
+-					OPTIONAL)
+-
+-			IF (NOT WITH_LIBLUA)
+-				ProcessPackage(LIBLUA LIBRARY	"lua"
+-						"lua-5.1"
+-						INCLUDE lua.h INCLUDE_SUFFIXES
+-						"include/lua-5.1"
+-						"include/lua5.1"
+-						"include/lua51"
+-						"include/lua"
+-						ROOT ${LUA_ROOT}
+-						MODULES lua51)
+-			ENDIF()
+-		ENDIF()
+-	ENDIF()
++			MODULES lua)
+ ENDIF(ENABLE_LUAJIT MATCHES "ON")
+ 
+ IF(ENABLE_JEMALLOC MATCHES "ON" AND NOT SANITIZE)
+-- 
+2.26.3
+
diff --git a/mail-filter/rspamd/files/rspamd-3.0-system-libfmt.patch b/mail-filter/rspamd/files/rspamd-3.0-system-libfmt.patch
new file mode 100644
index 000000000000..a6439b465e92
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.0-system-libfmt.patch
@@ -0,0 +1,48 @@
+From 309bb213cffb23e6bee98157b53cf5db31f97ef9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
+Date: Sat, 21 Aug 2021 11:24:35 +0200
+Subject: [PATCH] Add SYSTEM_FMT cmake option
+
+This gives packagers option to use system version of fmt rather than
+bundled one. It is disabled by default.
+---
+
+Merged-to-upstream: https://github.com/rspamd/rspamd/pull/3855
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c38758f3..fc4175677 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,6 +58,7 @@ OPTION(ENABLE_LIBUNWIND    "Use libunwind to print crash traces [default: OFF]"
+ OPTION(ENABLE_LUA_TRACE    "Trace all Lua C API invocations [default: OFF]" OFF)
+ OPTION(ENABLE_LUA_REPL     "Enables Lua repl (requires C++11 compiler) [default: ON]" ON)
+ OPTION(SYSTEM_ZSTD         "Use system zstd instead of bundled one [default: OFF]" OFF)
++OPTION(SYSTEM_FMT          "Use system fmt instead of bundled one [defalut: OFF]" OFF)
+ 
+ ############################# INCLUDE SECTION #############################################
+ 
+@@ -117,7 +118,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/"
+ 		"${CMAKE_SOURCE_DIR}/contrib/lc-btrie"
+ 		"${CMAKE_SOURCE_DIR}/contrib/lua-lpeg"
+ 		"${CMAKE_SOURCE_DIR}/contrib/frozen/include"
+-		"${CMAKE_SOURCE_DIR}/contrib/fmt/include"
+ 		"${CMAKE_SOURCE_DIR}/contrib/doctest"
+ 		"${CMAKE_SOURCE_DIR}/contrib/fu2/include"
+ 		"${CMAKE_BINARY_DIR}/src" #Stored in the binary dir
+@@ -650,7 +650,12 @@ ADD_SUBDIRECTORY(contrib/libev)
+ ADD_SUBDIRECTORY(contrib/kann)
+ ADD_SUBDIRECTORY(contrib/fastutf8)
+ ADD_SUBDIRECTORY(contrib/google-ced)
+-ADD_SUBDIRECTORY(contrib/fmt)
++IF(SYSTEM_FMT MATCHES "OFF")
++	ADD_SUBDIRECTORY(contrib/fmt)
++	INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/contrib/fmt/include")
++ELSE()
++	find_package(fmt)
++ENDIF()
+ ADD_SUBDIRECTORY(contrib/doctest)
+ 
+ IF (NOT WITH_LUAJIT)
+-- 
+2.31.1
+
diff --git a/mail-filter/rspamd/rspamd-2.6-r102.ebuild b/mail-filter/rspamd/rspamd-2.6-r102.ebuild
deleted file mode 100644
index fc005db11e85..000000000000
--- a/mail-filter/rspamd/rspamd-2.6-r102.ebuild
+++ /dev/null
@@ -1,115 +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 cmake lua-single pax-utils systemd tmpfiles
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/rspamd/rspamd.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Rapid spam filtering system"
-HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
-SLOT="0"
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	jit? ( lua_single_target_luajit )"
-
-RDEPEND="${LUA_DEPS}
-	$(lua_gen_cond_dep '
-		dev-lua/LuaBitOp[${LUA_USEDEP}]
-	' lua5-{1,2})
-	acct-group/rspamd
-	acct-user/rspamd
-	app-arch/zstd:=
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/icu:=
-	dev-libs/libev
-	dev-libs/libsodium:=
-	dev-libs/snowball-stemmer
-	sys-apps/file
-	blas? (
-		virtual/blas
-		virtual/lapack
-	)
-	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
-	jemalloc? ( dev-libs/jemalloc:= )
-	dev-libs/openssl:0=[-bindist(-)]
-	pcre2? ( dev-libs/libpcre2:=[jit=] )
-	!pcre2? ( dev-libs/libpcre[jit=] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/ragel
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/rspamd-2.6-cmake-lua-version.patch"
-	"${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
-	"${FILESDIR}/rspamd-2.6-unbundle-zstd.patch"
-	"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	rm -vrf contrib/{lua-bit,snowball,zstd} || die
-
-	sed -i -e 's/User=_rspamd/User=rspamd/g' \
-		rspamd.service \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFDIR=/etc/rspamd
-		-DRUNDIR=/var/run/rspamd
-		-DDBDIR=/var/lib/rspamd
-		-DLOGDIR=/var/log/rspamd
-		-DENABLE_BLAS=$(usex blas ON OFF)
-		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
-		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-		-DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF)
-		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	newconfd "${FILESDIR}"/rspamd.conf rspamd
-	newinitd "${FILESDIR}/rspamd-r7.init" rspamd
-	systemd_newunit rspamd.service rspamd.service
-
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-
-	# Remove mprotect for JIT support
-	if use lua_single_target_luajit; then
-		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
-
-	diropts -o rspamd -g rspamd
-	keepdir /var/{lib,log}/rspamd
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-}
diff --git a/mail-filter/rspamd/rspamd-3.0.ebuild b/mail-filter/rspamd/rspamd-3.0.ebuild
new file mode 100644
index 000000000000..1a472d6db57b
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.0.ebuild
@@ -0,0 +1,123 @@
+# 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 cmake lua-single pax-utils systemd tmpfiles
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/rspamd/rspamd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Rapid spam filtering system"
+HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
+SLOT="0"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 test"
+RESTRICT="!test? ( test )"
+
+# A part of tests use ffi luajit extension
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	jit? ( lua_single_target_luajit )
+	test? ( lua_single_target_luajit )"
+
+RDEPEND="${LUA_DEPS}
+	$(lua_gen_cond_dep '
+		dev-lua/LuaBitOp[${LUA_USEDEP}]
+	' lua5-{1,2})
+	acct-group/rspamd
+	acct-user/rspamd
+	app-arch/zstd:=
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/icu:=
+	dev-libs/libev
+	dev-libs/libfmt:=
+	dev-libs/libsodium:=
+	dev-libs/snowball-stemmer
+	sys-apps/file
+	blas? (
+		virtual/blas
+		virtual/lapack
+	)
+	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+	jemalloc? ( dev-libs/jemalloc:= )
+	dev-libs/openssl:0=[-bindist(-)]
+	pcre2? ( dev-libs/libpcre2:=[jit=] )
+	!pcre2? ( dev-libs/libpcre[jit=] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/ragel
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake-lua-version.patch"
+	"${FILESDIR}/${P}-system-libfmt.patch"
+	"${FILESDIR}/${PN}-2.6-unbundle-lua.patch"
+	"${FILESDIR}/${PN}-2.5-unbundle-snowball.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	rm -vrf contrib/{fmt,lua-bit,snowball,zstd} || die
+
+	sed -i -e 's/User=_rspamd/User=rspamd/g' \
+		rspamd.service \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFDIR=/etc/rspamd
+		-DRUNDIR=/var/run/rspamd
+		-DDBDIR=/var/lib/rspamd
+		-DLOGDIR=/var/log/rspamd
+
+		-DSYSTEM_FMT=ON
+		-DSYSTEM_ZSTD=ON
+
+		-DENABLE_BLAS=$(usex blas ON OFF)
+		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
+		-DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF)
+		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build run-test
+}
+
+src_install() {
+	cmake_src_install
+
+	newconfd "${FILESDIR}"/rspamd.conf rspamd
+	newinitd "${FILESDIR}/rspamd-r7.init" rspamd
+	systemd_newunit rspamd.service rspamd.service
+
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+
+	# Remove mprotect for JIT support
+	if use lua_single_target_luajit; then
+		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
+
+	diropts -o rspamd -g rspamd
+	keepdir /var/{lib,log}/rspamd
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+}
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index a78a8bfb768c..ebf109b74cd2 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit cmake lua-single pax-utils systemd tmpfiles
 
@@ -19,10 +19,13 @@ DESCRIPTION="Rapid spam filtering system"
 HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
 LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
 SLOT="0"
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 test"
+RESTRICT="!test? ( test )"
 
+# A part of tests use ffi luajit extension
 REQUIRED_USE="${LUA_REQUIRED_USE}
-	jit? ( lua_single_target_luajit )"
+	jit? ( lua_single_target_luajit )
+	test? ( lua_single_target_luajit )"
 
 RDEPEND="${LUA_DEPS}
 	$(lua_gen_cond_dep '
@@ -35,6 +38,7 @@ RDEPEND="${LUA_DEPS}
 	dev-libs/glib:2
 	dev-libs/icu:=
 	dev-libs/libev
+	dev-libs/libfmt:=
 	dev-libs/libsodium:=
 	dev-libs/snowball-stemmer
 	sys-apps/file
@@ -54,16 +58,15 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/rspamd-2.7-cmake-lua-version.patch"
+	"${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
 	"${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
-	"${FILESDIR}/rspamd-2.7-unbundle-zstd.patch"
 	"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
 )
 
 src_prepare() {
 	cmake_src_prepare
 
-	rm -vrf contrib/{lua-bit,snowball,zstd} || die
+	rm -vrf contrib/{fmt,lua-bit,snowball,zstd} || die
 
 	sed -i -e 's/User=_rspamd/User=rspamd/g' \
 		rspamd.service \
@@ -76,6 +79,10 @@ src_configure() {
 		-DRUNDIR=/var/run/rspamd
 		-DDBDIR=/var/lib/rspamd
 		-DLOGDIR=/var/log/rspamd
+
+		-DSYSTEM_FMT=ON
+		-DSYSTEM_ZSTD=ON
+
 		-DENABLE_BLAS=$(usex blas ON OFF)
 		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
 		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
@@ -86,7 +93,7 @@ src_configure() {
 }
 
 src_test() {
-	cmake_src_test
+	cmake_build run-test
 }
 
 src_install() {
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index c36cf0bbcf97..34858f082682 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index cb3fa901b670..9950f363c67c 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -15,6 +15,6 @@ DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc
 DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638cf69b72839d358ae6863c95c9e0965d1b7fdd5b1807bec1ffdf87bca0c7c9ba91060962e6de5da5bf14422f6279ea SHA512 d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2
 DIST sendmail.8.17.1.tar.gz 2284027 BLAKE2B 4cbbc2bb536a48ea27994721e9dfefff7739ef1c825bbc0397202e600d8dad8f9a2572a777204693cf9630f767865d50566f0827be6b52be41c1e25532cb394c SHA512 ae42343fb06c09f2db5d919d602afc4241914387dfdae0f15e0967dda3be25bf1d3a4637b57266763679646a3cea6aa07e6453266fd9b7358c1a09ec2b627a15
 EBUILD sendmail-8.15.2-r2.ebuild 7199 BLAKE2B 801a30a6d9d71d3aa34ddf3910c9bb4658d687905b3df1e17052b9bbab692db74d2e703906cff948ba173684e08668f44274afb2fd9d269f51607dd2318a8d46 SHA512 9a8e3c5118e64bad84082d34b9593aec4b3bbf7bee23aea056a32b1d5bdae797086d4a0e342f217cd91bec9dc112cd387b7c02401eb800ac7f613fd5eecbcbb2
-EBUILD sendmail-8.16.1-r1.ebuild 6152 BLAKE2B bef102ab5a1c63b6e55ad7b170a43d55147a98fccabf0715fddc51b94e71421801ffb33babc1f22ae35e1d3f91b72e0afac9c80f8400034471f052e7a590b789 SHA512 c2b27b940a3ab8fa675f7460cce64cd6b0ae97eadacfec3253fc6eababe267f3b59bf9ee30b9729d3e78a60554c72c9934c0573fd6450fcdb4c9c4639a2f8654
+EBUILD sendmail-8.16.1-r1.ebuild 6146 BLAKE2B 747051af91275349853db7e69fe8aca920b56ec065afb6d22a8961a7821f003b1b405413d8afe9b55b88f4cbb3b8d0e9aaf1b482b88eee55107cfd4e21d2f872 SHA512 745c60d10b74289043c5fd13754afd275aa76b163d5276b1184c8e96e5ffe69c6ba01af687435c276944c136790d7a94047db88aa510082621cb625790c11ad5
 EBUILD sendmail-8.17.1.ebuild 6149 BLAKE2B 17395bc10d88d312057472a4852749a31f2123da2430f2b647b5c78ad3afbb312401801eb1fc5edca0dfad2dac73796b5878e3624dfd1e393d6b8c1e6b4500bb SHA512 38cf933f9ac83640d342afcc00246943c39cf1f19f5083e9a6aa69644fbb094e2720e33966f7882d6222b490313d97837ac88258f6c54a3780c96f6d24d14a4c
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/mail-mta/sendmail/sendmail-8.16.1-r1.ebuild b/mail-mta/sendmail/sendmail-8.16.1-r1.ebuild
index 95ef65582be0..78ea5e0bfbae 100644
--- a/mail-mta/sendmail/sendmail-8.16.1-r1.ebuild
+++ b/mail-mta/sendmail/sendmail-8.16.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
 
 LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="ipv6 ldap mbox nis sasl sockets ssl tcpd"
 
 BDEPEND="
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 5dcb56e774a5..b91661a2d37c 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
index 61ae6ce69ab0..b1300a40f215 100644
--- a/media-fonts/noto-emoji/Manifest
+++ b/media-fonts/noto-emoji/Manifest
@@ -5,5 +5,5 @@ AUX noto-emoji-pngquant-verbose.patch 407 BLAKE2B b737b10535b8a04ca2d17d6803fc7c
 DIST noto-emoji-20201214.tar.gz 69885567 BLAKE2B 21d251a25740bf474e4c7e138c33d90f35cfea93ff2c72904e38a8bead0124408c67a731ed142fe96da07bbf8afb7d929293518a366157fd1393dacc560bf12b SHA512 b3ad1f31bbb48bd5de2fbddcac5c3f27891a805ae4ac8d0b69b07c1d7259c6a5317eca9ac7e3b068d24ed5d3acd3523cfb2036f2e9f08179b85fd81dd5c9b570
 DIST noto-emoji-20210715.tar.gz 166643705 BLAKE2B 355e993aee720e634d174fceb4d0d6b16ebce91cf948657428861fa63283120eef7fb706a5e6139f0ff7c13f0d72dc1c906ab30bc9b7509644ae6a56f4156e16 SHA512 2b1071c39d85f834baf4c9b6c59f9b06f1622bf972bac6087e0f44bd034025933b9a85a9a63a307f2e4b6337f8fbf7b11ba14838cd4bc13c8075b7ffae65ae78
 EBUILD noto-emoji-20201214.ebuild 2664 BLAKE2B ff8686ce532ce325ae93ecd32e8555b254e49203fc125ec515421cb2eb798547a4eddc43974109a2b9750099b0fc502ed0409a34b0149e5e5854ccb7a56f1806 SHA512 d0d59ecb4e2184b3e3fbb04a465ec7d702c9b1af26ef58d0bdf221d1b73e55dc4b16eff610e2096cce75d362bfe594f4e26f539b0dc6095523936d9932ed3f12
-EBUILD noto-emoji-20210715.ebuild 2704 BLAKE2B f89a442da846e56cc016b633747370a44109c6f55dd1a1a3b3a97599855c1e63a03becf89e761203bb3c5948ef9acf287eec10235765267dabc5aff7c478ac74 SHA512 740a79723bd54c251cb8271436a15da9e868ebe1695d4c7f780c45fc58fcea02278e659232a917469b8564ea2af162bcb4e7ec92d2706f2f2a9e05d017f9dff0
+EBUILD noto-emoji-20210715.ebuild 2703 BLAKE2B 044e1282f76c46b4d7df3745e6cf04a913ff1023ca4cadba0533570814a3fc760983ac47b4de9bc48699e1a4e8ebf94700a7bc9cae8e7c268937d44b4506c7f0 SHA512 1c925ef825c57dff9ac02a2461308e4a63ca6c3ee6f9a2630226414afbd8b85b1f0ac572a15ae4a8213c2ffe8823fdce63f6a9468b3e7e0bb8caecf8cd68e38b
 MISC metadata.xml 331 BLAKE2B 66a5d106e581cd60216e1f288d6a7431610e92ae605ffecc3e97a3bb381cf1c29671610412d6c5c69970cac946c9653a91998d53785489d630cf9837e11a8d8c SHA512 746b080cb25302ab0d7130e666ce9b8e7682dee919affe70d18fe65e62bc878a6f30174844c9df8918eab14ecf22cc4450050d292747da032eca9ce83637943c
diff --git a/media-fonts/noto-emoji/noto-emoji-20210715.ebuild b/media-fonts/noto-emoji/noto-emoji-20210715.ebuild
index 788243bb076b..274882f9fcba 100644
--- a/media-fonts/noto-emoji/noto-emoji-20210715.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-20210715.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/googlefonts/noto-emoji/archive/${COMMIT}.tar.gz -> $
 
 LICENSE="Apache-2.0 OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="buildfont"
 
 BDEPEND="
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 6f4413478b17..4ec589bef88f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index 181410999e41..68c60824ffb3 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,5 +1,3 @@
-DIST chafa-1.6.0.tar.xz 417888 BLAKE2B f9837a9062396f92974088ea2e59e050089b462442ac01af17dc7f47f4c3a24542facd4c977cac2ee9db3c4af9bae2349cea9186f9d0362cf7bb74f4e83d345b SHA512 47843b8bf1b0555ae3570f688229e9f848e2e30c80aa277278230196f6fdb583b7f9170d1740171f2f4c5d5d915e00df407722067bcf6f2dc888804b7bd074da
 DIST chafa-1.6.1.tar.xz 418720 BLAKE2B 5f6c42311d81bf508f5ec890d72508fd2255e226102b8a7c5c71a9bc1293cd75b08c6b640ca4e6fe9ae34ad47e4e408e25a1aeed7057a5bd823550bea4526f4a SHA512 96cf772638e1a6874d94636a69d6c76d1040d956a16be851ea818292f5b2252867acd0891fede3e030de591b5567d820cf062c5a103a0943a0ea2f2ba34eea77
-EBUILD chafa-1.6.0.ebuild 764 BLAKE2B ce21bd3bc7e46e99b53e6f9ae564cc1171a1a270dee7069e86fb680ccecedfbeba030611f485b68e7c1761d7eb9d90bad7fd9d753bd37e31279be2c9d2952aa7 SHA512 ce16aca3d3019961a6cbee7b2f78661dfdfc58218839ac5992a66bc9b2649c62d7d0bb5d5c3a0d3507d050f77c8a56203cef16403ee6140023614e91a21b5123
-EBUILD chafa-1.6.1.ebuild 745 BLAKE2B 1f025237511947ebb81c04a9ad2539bbce32cf28352044a0772b801f3629fb090fa7d5f944d98d52871ebdf0ab2078b3e0fba61fbab4b4aacda12ef2c3bfca85 SHA512 5516b5b7727e243fb25a1c84c1c84bff4f0765f3ce07a1e3e9d0cd32f79c1b31ed82a0ddd0a7c9389070f74d22c91fca075949efe2194ab12b5f383b17587e59
+EBUILD chafa-1.6.1.ebuild 744 BLAKE2B f45a1b29f5d37253413c759b66888035e16a69318e95c4b46062549f441afecf3d43377d4132ad5c789cea2108fe4e25f69dfaeeb307a19b65cd9ce626f5f63a SHA512 336aa03393a3cccb5e44a317e66f50d0dd86bdec5bba2fd8550f78d0491ed262bb0292c5a23ad292430ab19f0e0063b46bccc93389ab2c77e046da25404c6c9e
 MISC metadata.xml 546 BLAKE2B 9a2ccaaa61addeef86ae9c684d1030c1396c36a87b45df6e0af8b5e70ed4c25cfe808cf854758882e0fc5e265624f4e86b0ddeb1a7e495f8a2fb353b054e9978 SHA512 8ca7185a73da0bcaf78cfbc33bdb7546832877829e5ec6ac227c76b037623915e862e661ea14bfe5cae31deefd3af70698c8a4d8b34c7764652d0b7f4dec4541
diff --git a/media-gfx/chafa/chafa-1.6.0.ebuild b/media-gfx/chafa/chafa-1.6.0.ebuild
deleted file mode 100644
index 9f4b4afc62fb..000000000000
--- a/media-gfx/chafa/chafa-1.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer"
-HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa"
-SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+tools"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-gfx/imagemagick:0=
-	tools? ( >=media-libs/freetype-2.0.0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-man \
-		$(use_with tools)
-}
-
-src_install() {
-	local DOCS=( AUTHORS NEWS README TODO )
-	default
-
-	use tools && doman docs/chafa.1
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-gfx/chafa/chafa-1.6.1.ebuild b/media-gfx/chafa/chafa-1.6.1.ebuild
index ebdeee6fb061..aaee185d5da3 100644
--- a/media-gfx/chafa/chafa-1.6.1.ebuild
+++ b/media-gfx/chafa/chafa-1.6.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+tools"
 
 RDEPEND="
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index d77801610eba..f3b52dd8b8fa 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -7,5 +7,5 @@ DIST darktable-3.6.0.tar.xz 4691608 BLAKE2B ecbb6b4b4aba1f499f8d459304f174f348c1
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
 DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829 SHA512 62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd384bbbb2ea8888cba26278510abaab1e0cc335
 EBUILD darktable-3.4.1.ebuild 4458 BLAKE2B 232c71684688619c4f6248325b4805f2fec2840fd3198651c871eb9c73f0ef82e85ed0a985a89c5de3133939b469e40bd40091d72a612172b775a2d3c6217e4a SHA512 0264c756bc1dee91a6d6a447975fb0bad98995cd4974cde9686a0cdea3858b8a01498f3619286bd9d7651f4ded636e6236493605735a4394d300c4927536eb4b
-EBUILD darktable-3.6.0.ebuild 4431 BLAKE2B fd1b7cd67b2671e00a52696e063a94479da82392db7bb48d57b51152aeb5b1b078d451289166ddd6035c329b4c821cbd09f16655d17c9f58d7aa0f3d0dfb20b2 SHA512 1610759b81986d8c738d186731c6219134adc52ffb000eab8af444c0aedd718dbf35e380ff8db3154f7730ef403d7cc13d09db16f788b2418f88f83837125667
+EBUILD darktable-3.6.0.ebuild 4430 BLAKE2B 9cc005fedc325eafd135d0e3fd5fdbbf008608ad2f58f6ee80224f6069b912b7dd2b7b6878c74ab4311e97e1f28436f9571b8ae92b1d97963d0029d675d635a4 SHA512 f4dec0bb0e167b79aca7aad13908ce2483ae14b8f4aa2e5f4b578ab5fae1ee793c0ce72b954cfce0c9b94b970614839ed942b80cf396dd95b92822b515186a9a
 MISC metadata.xml 1151 BLAKE2B 45fdf41338969512b2790e0dc3fb75b1633244c398c8f2eb67b9264ceba3b41c64d19713bc6727870465d03ebc37714c464a537c5ef4c7b1b7f52711a8e8c268 SHA512 784be9b2454a021f7547894cafb4e2e0fdbda8e30dbfbf78a0d234f596ab8321a5e5a0b8944af8f55d0ce7b466139837d4f0f5139152e2fc691ae528c0e3eef8
diff --git a/media-gfx/darktable/darktable-3.6.0.ebuild b/media-gfx/darktable/darktable-3.6.0.ebuild
index ad4c79e2d6ea..383ae12c1b1e 100644
--- a/media-gfx/darktable/darktable-3.6.0.ebuild
+++ b/media-gfx/darktable/darktable-3.6.0.ebuild
@@ -25,7 +25,7 @@ else
 	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
 		doc? ( https://www.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
-	KEYWORDS="~amd64 ~arm64 -x86"
+	KEYWORDS="amd64 ~arm64 -x86"
 	LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"
 fi
 
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 6e701f9517ce..dd88ebb4ab05 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,6 +1,4 @@
 AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e
-DIST gmic_2.9.7.tar.gz 7401418 BLAKE2B 528edcd45c27fce22b16a9ec279ac91465a720fafcc87ac5fcb6ab2bb8a914581592ad3e4e2cd5a64934bd35b13b65d0832e1ca5e07525205c45f9d3c10a719f SHA512 d54a2a8f61f40dcc90f497f223484b63f9658c499e39720ea7b90b06d00cfdc057497ada4790dc757191e2905ed9bd36ca4076019c519cf79393cdc123b24730
 DIST gmic_2.9.8.tar.gz 7311372 BLAKE2B 6438198cbaefe1de712ccd85179887b858ec1f7e039a080f0070e5ed454fd52b9414ecbd7c93dce740261df501f086634ab0bd291b70bb18778979faf2331486 SHA512 588362de60d51b1814cbe08f7402b143b656712bf2b4dc33830196068d7464394fe314d1c0dcee608a7408c7b7507596e88dee588a54f0eff1cad9e826b19bb3
-EBUILD gmic-2.9.7.ebuild 4259 BLAKE2B 7596e851d7ad3b53e29c21a8e65c7f893d30bea57889237b844befe1124c8cdf9d5bf5d8fe8c71f90adbcb44d3809473214e0117877f53b2b2b85218b9756b0a SHA512 a124e2cbc12aa50bdb444114afc9b22ed85cb269c315370f75a5aeeeabb29cb11bbf17bbb8e2104fbca4c67f7b7a9e68324b455fe627c42d9cd6ede70c79b142
-EBUILD gmic-2.9.8.ebuild 4261 BLAKE2B 491c23d5ff965f1a2306a8e50dff270248276ffb649e97c5348bf53c108aaca16aa4ee1d8f5d2846b81246b900181a125daf1f177c35cc927ca79abb5a6a2d52 SHA512 227c5317bc6d35bd08b1a0f8f14648a13f0740cfaa2c405d2d4055d0fe09f24db81cf1219ead42f4c44f897e35bd6f29c460c402b61920f3a11b1af9b2d37599
+EBUILD gmic-2.9.8.ebuild 4259 BLAKE2B 7596e851d7ad3b53e29c21a8e65c7f893d30bea57889237b844befe1124c8cdf9d5bf5d8fe8c71f90adbcb44d3809473214e0117877f53b2b2b85218b9756b0a SHA512 a124e2cbc12aa50bdb444114afc9b22ed85cb269c315370f75a5aeeeabb29cb11bbf17bbb8e2104fbca4c67f7b7a9e68324b455fe627c42d9cd6ede70c79b142
 MISC metadata.xml 533 BLAKE2B 29dc054d7e7f718782ad0bb914bd8ce7b2dc6519826c4fe21be1cc20c4ddd21b99355c565106123de39bec8dadb08c1ca1fcb10989cc6fe984e6a6ea7e611c5f SHA512 2eb6d59dfa0d092625b755e952dbddf6c6dda811ae19768811ea7dc8a07771cfd3e4d074e8e996ec2de5e74243721c8b82d7cb8fc86300246096e18b782b5a2c
diff --git a/media-gfx/gmic/gmic-2.9.7.ebuild b/media-gfx/gmic/gmic-2.9.7.ebuild
deleted file mode 100644
index 5e85c6f688ac..000000000000
--- a/media-gfx/gmic/gmic-2.9.7.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use openmp; then
-			tc-has-openmp || die "Please switch to an openmp compatible compiler"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		# respect user flags
-		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
-			-i gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		# Bug #753377
-		local PATCHES=()
-		cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}
diff --git a/media-gfx/gmic/gmic-2.9.8.ebuild b/media-gfx/gmic/gmic-2.9.8.ebuild
index c225ea989d79..5e85c6f688ac 100644
--- a/media-gfx/gmic/gmic-2.9.8.ebuild
+++ b/media-gfx/gmic/gmic-2.9.8.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"
diff --git a/media-gfx/gpicview/Manifest b/media-gfx/gpicview/Manifest
index 3848a897d2af..7202b6926903 100644
--- a/media-gfx/gpicview/Manifest
+++ b/media-gfx/gpicview/Manifest
@@ -1,6 +1,6 @@
 AUX Fix-displaying-images-with-GTK3.patch 6119 BLAKE2B 84733027ba1740eb78e4d62e67b6ca0dbae58dfac1c3bf44b1dd07a7b33248a255728e2b9c6b87f534ef1463b20d2f5df8f2e07bb619b97b428fc14e9f8939e4 SHA512 6eb044a143acc0decd64f90578b98a41a82c05a0bbf90e35646af1007e685d0d37a08ad3e90674bc6b5fedf460695b27f771a2776bfb391af03f6c1674592060
 DIST gpicview-0.2.5.tar.xz 349536 BLAKE2B c215e812693a30d55d3e606b9958d308b5d7f564ba0c3fc60e7606c492ec3ddd9997ae63f0865a6bebdf79c0a18e6a8b26a1e2c8d5dd7e2174d211130dbbe817 SHA512 afc7e67c7ae1252f9c1816ee46fe69e96ea7be9a60e03406a539f17b2e4f0e4b93a028c6f3f1c455f5433d6d7d78a58dcee2cb0ac91ea53093a21935bf454afd
 EBUILD gpicview-0.2.5-r1.ebuild 652 BLAKE2B 543b90065074488e91faa5ae0f310d10a0bcd84913c3a0143f9fce8c367c8a6b1659c69c2b824c012b889163a5afce282d5b49f38fa7c7352ebcda245fb448d8 SHA512 5b7a0856bb9cfa2296c4d588bb4e2232204c50955928a10f6c94507aba495452937b89ba5d49bb32fcbdeb7a92ad938aa70ba638e14ddf41396972f0e47b053c
-EBUILD gpicview-0.2.5-r2.ebuild 587 BLAKE2B d96a5f1a08c1a404f868158266c30dd4d09531c523d3fd53439aa9fdc5f0c65c87ea79dbc48266cc712919b7dc1c1591cc55bccf64c2d93ded559ef7ec3cbbbf SHA512 e11da0c9ba2efa20e65d2984cdc423504169e72248facc7f865aa145f4ec4f2e2e61a1a10972e2b4b90bc8892a162c2829e0ae6ec724e468ef50fe313f49353d
+EBUILD gpicview-0.2.5-r2.ebuild 584 BLAKE2B c516ee79e12bae2b18df55c5c0d9075fcda781eb952589ab57bf64e8f5b03fd7e0822532f9925c74d1c77a0279f05785006207c35d293378f268c400be917b92 SHA512 9d92cec718d8a71cf788d372d0a83ec7832c533c2c34d0f750448931e7f29e2f00b214c2ef33567c6ccf9d161ba87c983f0b012dfa575ad0d215e864e5ee58ea
 EBUILD gpicview-0.2.5.ebuild 548 BLAKE2B 7402a49ee6252fdc380528d96b8fb251da0f2f10c21c87867f8376630bceeaf025c26a2cf9b926be879184849c5786d752a4f42570e7f9b1a5de6feffd86ed5d SHA512 c65d2217ad28d00169b53997497ed000d0fd90d42c121071a69e7c7ff5d4305d8169c3b749409afa0aaa1fd3a3bea76a2ab33ad5e92e45940a7f93d24f6e00b0
 MISC metadata.xml 326 BLAKE2B dbbd9ecc73f5ec8f23b39346f657c68efd9b673e1faee5930e503a9a5694cc9f8931a97083e282006a931a30bdb577d1b347b6c2a8dd3cc959011e4837dab9be SHA512 0a80530a6a1e3884352fb68ea8e4f0cd0fbf685201ef28de590233fd43b111c23f6f5a2a3eccc450c0bc9f08d58c565c90e80f04418cbf8880b101f93ca1aa3b
diff --git a/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild b/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild
index 104042801fa6..efac811191b8 100644
--- a/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild
+++ b/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~riscv x86"
 
 RDEPEND="virtual/jpeg:0
 	x11-libs/gtk+:3"
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 9305c3447eff..14348023b014 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,3 +1,5 @@
 DIST gthumb-3.10.3.tar.xz 7582472 BLAKE2B 1e8274720428db05d4e14bb6a37ff55a74fe009ea551bda6fe75506f7187e03685903c2743fb6e66a33da73c974188528afad866c568bb14cc6f05749e08af7c SHA512 2d157644c6efbf4f4ab31c525a4eecc69fbdf31003f922d5fdf8866ca6bbb44e5b8bd7f809be12de41178ddcef30bb49029ea06eb4feb8398a6aa1b052c6ae38
+DIST gthumb-3.10.4.tar.xz 7581416 BLAKE2B 7afc94c18d819a5eef7d075489533cf99e7f6d5eaf409b163524a2f62d9c22a40edbc114b16d6d7b7960df53d49cefda9196ebeaa2bc0c19e5760f584628209b SHA512 90f7d83d2fb6db12ef16e5ce29d9310ed5aaccb269004d72df985dda839c1ce738354942f537a23f63cbe724a351a0f13f2eb1e659ada50196af1bc60d5c5d27
 EBUILD gthumb-3.10.3.ebuild 2315 BLAKE2B e60ab33332e0296ef56c20420489a6b35d2c27372d263beb1007cf381988349d7219f6637dd7fc27576809cfba97bd78758def1659378dcfb418c72116e419ca SHA512 a47743acb43b1582085e769074e66d62b1b97fceeef388f714bb80497247d170b03f67ed74e27848c2071645233896c2b61ec06f05140a1499985f7a62ed6209
+EBUILD gthumb-3.10.4.ebuild 2317 BLAKE2B 32c04189936eafd18d6584bd118e36c7eaffee0a251cf6f78e8a061e26a133bea31b5f0846bbf60a23805b7f161a423d8d936497ccd7d71d71bc3da39c54d786 SHA512 4b918fa60d44212cbdaf4cfd9a4ae2d582e872ce1522b35d1fbed90094e3a888e4592810776879ae61752173951e6d73ea727ddb306220d3287e59560f0cebf0
 MISC metadata.xml 420 BLAKE2B d43a138708de7341b7b449d8bc7cbd6dedc471844ee9edac0b4cfa075ba582d5079d6eeacef69031cbfe9ef78493e50cc8f6810f3b80991cb552ffb3a2ca2757 SHA512 856096108784110fbbeeb1c3c5072697f7555edd733f31cfa4820f57e24a1e384f4ab609c77c3ce3a0d8e873c0193e493ea90085509b77686ab46e3f9ff3fc2d
diff --git a/media-gfx/gthumb/gthumb-3.10.4.ebuild b/media-gfx/gthumb/gthumb-3.10.4.ebuild
new file mode 100644
index 000000000000..6d4489f581b1
--- /dev/null
+++ b/media-gfx/gthumb/gthumb-3.10.4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="Image viewer and browser for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gthumb"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff webp"
+
+RDEPEND="
+	>=dev-libs/glib-2.54.0:2
+	>=x11-libs/gtk+-3.16.0:3
+	exif? ( >=media-gfx/exiv2-0.21:= )
+	slideshow? (
+		>=media-libs/clutter-1.12.0:1.0
+		>=media-libs/clutter-gtk-1:1.0
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-plugins/gst-plugins-gtk:1.0
+	)
+	raw? ( >=media-libs/libraw-0.14:= )
+	http? (
+		>=net-libs/libsoup-2.42.0:2.4
+		>=dev-libs/json-glib-0.15.0
+		>=net-libs/webkit-gtk-1.10.0:4
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.11 )
+	cdr? ( >=app-cdr/brasero-3.2.0 )
+	svg? ( >=gnome-base/librsvg-2.34:2 )
+	webp? ( >=media-libs/libwebp-0.2.0:= )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	colord? (
+		>=x11-misc/colord-1.3
+		>=media-libs/lcms-2.6:2
+	)
+
+	sys-libs/zlib
+	virtual/jpeg:0=
+	tiff? ( media-libs/tiff:= )
+	media-libs/libpng:0=
+	>=gnome-base/gsettings-desktop-schemas-0.1.4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+	dev-util/itstool
+	sys-devel/bison
+	sys-devel/flex
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Drun-in-place=false
+		$(meson_use exif exiv2)
+		$(meson_use slideshow clutter)
+		$(meson_use gstreamer)
+		-Dlibchamplain=false # Upstream still doesn't seem to consider this ready
+		$(meson_use colord)
+		$(meson_use tiff libtiff)
+		$(meson_use webp libwebp)
+		$(meson_use raw libraw)
+		$(meson_use svg librsvg)
+		$(meson_use gnome-keyring libsecret)
+		$(meson_use http webservices)
+		$(meson_use cdr libbrasero)
+	)
+
+	# colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; some of upstream HAVE_COLORD code depends on HAVE_LCMS2
+	if use lcms || use colord; then
+		emesonargs+=( -Dlcms2=true )
+	else
+		emesonargs+=( -Dlcms2=false )
+	fi
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 6d08d708df8c..78a05e3e5e9e 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,13 +1,13 @@
 AUX hydrus-client 98 BLAKE2B c08af22c2ee9ea3d5c95ed3196ceb9b74b9c886bfa9b91141584f7ea884830fbdd300c948af199ac82a016e1a9dd7314e9c7fdfa8f47f07a9336eff9e2bd2ce1 SHA512 453ac6f9685325b6510c7f833b658491f01e92be213ae26da0d86490033951d3a825f9b15fd33d8a0727992cd83bf7ed491b88f0808674d6fdc23af90c7911a5
 AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941325eb67149064c1276f462732e62db294acce75d111f948599698615e9fa15be43fe74ce444cd SHA512 5b7f9ca4b364ff529e5f4feb6fb11c91aff9cf1ad3ae6c12ff301915fa1d7b9920d51028b820000635d071a049a4e98a0e4e815ffa6ca31d2e67bec5a78afdea
 AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
-DIST hydrus-446.tar.gz 38830223 BLAKE2B 5ab44f9cfbd15eb10144135eb4cc1d8493c20f2a931db4332a61aa186fddff96cb3a3b29eb2b210f070bb4be8210d552beb2578a7287a169a7364f02363e05f4 SHA512 bdbcd1177c3bf6ee85089e1a653587bae41c524bc2313bb5d481dee074c7da1c533a91957dc3b03d1c0b515e705809887e290ac71b866a51664f2a9a34bbfb6b
 DIST hydrus-447.tar.gz 38833157 BLAKE2B 8d7cf37a1419ef40fa7816958a01421ecc335d2a8c975fcf16d3ea5dfbdb76d872e4e597bdbade28eff7727914de5de7fb6ffcc7ecc27a712410031efa8433fe SHA512 85eaab40f192f2414be828545464811af2590b55e1a2fea7bbf64f27e4bb9a8b6c6c86cb25c1f7e9f48449173f079dcd749ea25ed22559bebb11adddce62da94
 DIST hydrus-448.tar.gz 38851906 BLAKE2B 2b60174ffea3dd0c3816afef12378546582dfc39f80406534fa8b868c33052dc8497fa750ed724388467fd9ed4f1a7245b7ef91745750b9ede834a94e2da9638 SHA512 a16879dfd3417a784ca900b6cdab5fb4079d8ca4179224ac69e37321e165f35483d476b40994f2445c846998b2f154498da3cbd9c695a9d96b71f187e788b7b3
 DIST hydrus-450.tar.gz 38861101 BLAKE2B fd7993a4d9f82da43b4a6ae83426452b8bb79bcc32a9038ff129c4673c618b89db4a79301d06d2cc7c244053904cd201e88d496e05f7fcf723874e929275af08 SHA512 1c55a173863f7fee90288e1bc85203d12aaf812ab4afb506bc72c24d9b25dfea8ef1785043d801c2bea6302c65d4342ec2f58f47927fbb2d274ba433d29d8230
-EBUILD hydrus-446.ebuild 4099 BLAKE2B 93540a9bae12018d900d173f98c7a1cc1ecd857ae9a8cdfac60f6549903b85d90159339c40a7afdc08fb2b3f933887490a85f80b7d452046e3c728b5bf9bba06 SHA512 fbcab2b8a2c1a61eadb4c1eb3d711a0832603b1372f5fde8c48aa9c6c428a1a893ddd0cb2e6d0d4df6745c3434ad9d782e51cbd81aaacf70b0b68dfc6da69848
+DIST hydrus-451.tar.gz 38867387 BLAKE2B 80a7139ebcc1447b8eb35754dd65b54127a2b5107bbb8bdb371476f9db984bcd5b9ff388ec726ed5fca31acf69a180c288e1c6cdfabfdef1c72772402d22f3f0 SHA512 482095c03d44979e99e4f3027fa9b6f5c9b90692e29a28246f1e0b4c6fa20c6ed3b1d9e421d3b9bb723a094c1f0aea6aa7468247e23b54570ee99e26dce41654
 EBUILD hydrus-447.ebuild 4099 BLAKE2B 93540a9bae12018d900d173f98c7a1cc1ecd857ae9a8cdfac60f6549903b85d90159339c40a7afdc08fb2b3f933887490a85f80b7d452046e3c728b5bf9bba06 SHA512 fbcab2b8a2c1a61eadb4c1eb3d711a0832603b1372f5fde8c48aa9c6c428a1a893ddd0cb2e6d0d4df6745c3434ad9d782e51cbd81aaacf70b0b68dfc6da69848
 EBUILD hydrus-448-r1.ebuild 4099 BLAKE2B 93540a9bae12018d900d173f98c7a1cc1ecd857ae9a8cdfac60f6549903b85d90159339c40a7afdc08fb2b3f933887490a85f80b7d452046e3c728b5bf9bba06 SHA512 fbcab2b8a2c1a61eadb4c1eb3d711a0832603b1372f5fde8c48aa9c6c428a1a893ddd0cb2e6d0d4df6745c3434ad9d782e51cbd81aaacf70b0b68dfc6da69848
 EBUILD hydrus-450.ebuild 4099 BLAKE2B 93540a9bae12018d900d173f98c7a1cc1ecd857ae9a8cdfac60f6549903b85d90159339c40a7afdc08fb2b3f933887490a85f80b7d452046e3c728b5bf9bba06 SHA512 fbcab2b8a2c1a61eadb4c1eb3d711a0832603b1372f5fde8c48aa9c6c428a1a893ddd0cb2e6d0d4df6745c3434ad9d782e51cbd81aaacf70b0b68dfc6da69848
+EBUILD hydrus-451.ebuild 4099 BLAKE2B 93540a9bae12018d900d173f98c7a1cc1ecd857ae9a8cdfac60f6549903b85d90159339c40a7afdc08fb2b3f933887490a85f80b7d452046e3c728b5bf9bba06 SHA512 fbcab2b8a2c1a61eadb4c1eb3d711a0832603b1372f5fde8c48aa9c6c428a1a893ddd0cb2e6d0d4df6745c3434ad9d782e51cbd81aaacf70b0b68dfc6da69848
 EBUILD hydrus-9999.ebuild 4099 BLAKE2B 93540a9bae12018d900d173f98c7a1cc1ecd857ae9a8cdfac60f6549903b85d90159339c40a7afdc08fb2b3f933887490a85f80b7d452046e3c728b5bf9bba06 SHA512 fbcab2b8a2c1a61eadb4c1eb3d711a0832603b1372f5fde8c48aa9c6c428a1a893ddd0cb2e6d0d4df6745c3434ad9d782e51cbd81aaacf70b0b68dfc6da69848
 MISC metadata.xml 750 BLAKE2B cd037e9ecd9d7ff2a50d3b306a8394ddab3cfdfc74e67940e6f1cff8f90c5ba20bae42118b2c0df9309d4d13ea55fa6e39a9fc6615e2b0d4fca9f568392b0a10 SHA512 5838ad0aaab213af703b44749dd36159b828226a2399f1366783084e918506de5e79c953358403e976bb8f4f2dced8cac6e05d3c91210f002a5a697b828a3f97
diff --git a/media-gfx/hydrus/hydrus-446.ebuild b/media-gfx/hydrus/hydrus-451.ebuild
index d52bbf98e3b2..d52bbf98e3b2 100644
--- a/media-gfx/hydrus/hydrus-446.ebuild
+++ b/media-gfx/hydrus/hydrus-451.ebuild
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 78320a762253..748f1070431c 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,8 +1,12 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
 DIST ImageMagick-6.9.12-19.tar.xz 9183520 BLAKE2B 144a31c9f5a0e3489d362bf42a0ba5b3835f3d3e6b85d8573a9ca5188f04e0c5e6c16bd59510621805b2941331df412d845a0650d19a05bc97dac1e0c06b8e1b SHA512 1175d6330cd9c4dc8f4b7c1dc178a4654a9fcb17e209c10dc8eb776cb64233a8fa1c512d72ded50f0588ec35a13979d30e37e966ddce27fbd175f48698946b88
+DIST ImageMagick-6.9.12-20.tar.xz 9174816 BLAKE2B ccdb4775867224d08871b7147fa20e6b09305f6501a07de85ad53b862c47921c5b6b39eaf62fa86258c1a6fea1abe417817b4a4887a981a6f5a786636fa57946 SHA512 2ba849ef7212b0255f1db6509b718f7dd3825d16e45ea115a77ecf6b8afc41cb823ba0ddddc124aa0afe5605f1aa5e2865daa00da88568bf5874225de6620fe3
 DIST ImageMagick-7.1.0-4.tar.xz 10310828 BLAKE2B f7504d47e95be57b5b2f02f0ac8ea526c0b6f60cd0e3ace3445e6d52cc7cf9d4287e1cb24d4451587807809e671f459c107b1dfcb3a99436d112591a32fa5365 SHA512 21bd565227eef40bf967a23061e799dc0cb767c226717a66135ecc07a812495fe62c0d36c38b5c801356c63a9e4bf5a48b04fc56fcf6c0f5e37c2ccf52fce855
+DIST ImageMagick-7.1.0-5.tar.xz 10308228 BLAKE2B c65f0bb04133a6390770cb06ed4a102fef58647b6d03c09ad840a0b0abf18a5875c244c5d8fb10492f5ccc62d976c170659ead93ad7b8a8178c88fe3778dfa20 SHA512 1fc66c57e4dbe01c2730508c42cd8a8e94be087751b3ad460318e1d4a7aa2c1af95d22b2f432037590af5e7f4a8e3cdeb276278423ed30d485267a907c7006d6
 EBUILD imagemagick-6.9.12.19.ebuild 7182 BLAKE2B d971cfc66508d794a3409e00c6165f9e78c7dfa40ca8e631499368be50efaa8d12ed08d2712c8bd0fc392245c22471bff5f2662c6abe89b301badeb9dc82de42 SHA512 8ebf8dd67a2efe586495f245bad587616a746bb8d161217d9680adbc714bb461403a171d3be4ff843c20e45f090de81fb5cb50ae5b128a5813d8199bee88fa12
+EBUILD imagemagick-6.9.12.20.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
 EBUILD imagemagick-7.1.0.4.ebuild 7396 BLAKE2B e824e8d1c9b1b1561bcfe59e6bfa2fd6770508453c1a4246b88cdd671470f35a5576d0c0a76803501d76bb31768d87c5066c92f1f9f786ed6d01e77e5792f96e SHA512 bdfeb146f22e581bcab707407229a31debf6623b7861141d8fec50cea8d134232fe83066a9898a2136553edf946bf727d7a8e5724a7f979c0bac39868356b191
+EBUILD imagemagick-7.1.0.5.ebuild 7404 BLAKE2B 2a92a400e6b41a28bd9ff356ad4a40656c61df367ec298c685b663a22463cbc090fb368f12aae33a75dda7ade766464822d0293bc302ad11db790b7b3c7a4a8d SHA512 758697ee60c9d674ea02c32d1e997466809f515bd7ea361aaa5ef77528b9705eccb16d906cc548c0df9a3d0054e8a7615be665797cb6d9cb3eab6d06510c5dcf
 EBUILD imagemagick-9999.ebuild 7397 BLAKE2B 9845d38817e2dbcfbc3c970d6ed508588caf22adc844178de2c2fae9f12c12cee60e7c97db29b99393720675a9401d1175e2114b8f5c3bee664335bdd4703823 SHA512 8832088aa61e5c7f6293d970f4460dbc629c2a7a0a9b70a44b8e7de9473823b7ee156e0f40981eb327eb222a9b604e21f3bbffb41ffff580b036c67d7da996b8
 MISC metadata.xml 1226 BLAKE2B 09876ac633363817b503a307e2cc0a500cfdcc1256cbb3b3e595600a0c913aa7ad252eb4dbe18b911bfcc9f06ec7b8046e0c2e3882eec305e471080bd76de906 SHA512 da1bb41d877614a237ea14379614a509fb58d58f4e93e56500e6aa0007c0515e6d90731c5df9e387f36632a210276a6983784cede64119453c965a9fc7e2ea4d
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.20.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.20.ebuild
new file mode 100644
index 000000000000..d17773f5081b
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.20.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	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"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/6.9.11-60"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+		)
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.5.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.5.ebuild
new file mode 100644
index 000000000000..42e594451118
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.0.5.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/7.1.0-0"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+		)
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zip? ( dev-libs/libzip:= )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zip)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		--without-jxl
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index a2ed9f0a5f80..974c1d77dbeb 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -1,7 +1,5 @@
-DIST img2pdf-0.3.6.tar.gz 91006 BLAKE2B ad89b42be4613c30383770f336b07773bf13e87061fca61eb7d5e25d6489662fc2bae94d9a6d61d531a77f41b9e94492d0db1f32570f6d471fa9f8cb0816630d SHA512 2a9d31b9de52123941fd650123a483f4dc0757edda304da994353b5f3167bddbb25fa1ed8fededcf859c5d07b65b9c2d5185000949002a68dcae1e7bf0f1547d
-DIST img2pdf-0.4.0.tar.gz 107027 BLAKE2B 0bf13e2d4a5aff68779130bc14100a5c6d1ac4eaca9da28ceb50104550b6e4331f6a2202514bcdac0480c0148794d18e9f2dd46ded68bbaa301a207460f91c85 SHA512 bab9ee6ef5273a686cb10e52bdeb62b6df3c0da99d0f0558677e07dc7ad776c2d62829a2f5e9c5639acfb9fc6e9c5e3a81aed42dc288c2a39d245775f1d4391b
+DIST img2pdf-0.4.1-imagemagick-7-tests.patch.gz 2586 BLAKE2B 3d905b22c02fadf69e6329001cf7d6562d5809ba27842a5e630d87054979d953b641afb0b461f37bc9e379af808d0dc9e95478bdd5143047ea19d13d38e04593 SHA512 c9c5e88aea344a17bb57ff6b4540d7010537df0987cd3884e36220236753a42a71377468b556c17090ba22497a50c7d9365373aaeb007b75240ad55d21e9032a
 DIST img2pdf-0.4.1.tar.gz 96699 BLAKE2B f5a41a3a3d1b1ae7caadab4f37df644ad28a3ef4bd7a56a339253f0aead4d2427f05373dcfd16b10d82a6167243b3b03906e9f95b7ae0dcdbea6a666905c45a2 SHA512 e71833250509d52b8782a8bc9e12a8de6ab7ae06d5e6e235c0b3787bfad1070b5ed90934b21e4decc9b2c7008eeb0424f9df27e44ec66259916d3a2fdb73d1f1
-EBUILD img2pdf-0.3.6.ebuild 561 BLAKE2B 2a2400caf780866c957a7f102bf587eab18fe4f3906b585d24b173b07ccb8f40e9c29844e5e40a58d8555707e0943fea7ae098f2e186133a08cbafb1e14f9621 SHA512 6d03d49992770664c2cd3cbd25e6416d07bce3b084c5ea8ef45863b6f0beb5d8d0f9d07e03ab10f2c56f373fbda308d02a98927cebae89e0d5fe9132662e6429
-EBUILD img2pdf-0.4.0.ebuild 1234 BLAKE2B 121a5c328b846954b7b10ecc4f0561677f260fdd109b672ca3d76f547cd0362cd34794f8d5b599e1d39ef226b64beb5d54669cbb4777794d112b79f9402d6df8 SHA512 4a0e069457d40140e05e4a8caca931d8da22fa0885d16f5b2ee9279ce8654ee0c1b4a77db1cdb615b1b415dae52d33f79897ead0e324379cb2a1c89206d468a2
+EBUILD img2pdf-0.4.1-r1.ebuild 1484 BLAKE2B 4d08bcdebfa7374ee57e2cf83c0244dfc2237f57c040817173c22542f5fb488b2fa3517a38eda12c982f9085d0c9f7b85153a269845a274408f3c580b285d512 SHA512 1980c100b90c02d2d416ee86eb121619e9174346c8d74bd049b5cd5adff2c384f5dcb214b7b13cc40dc42f0c29b16373ff8ed47748e8b28bc04eb6de26ec29e3
 EBUILD img2pdf-0.4.1.ebuild 1196 BLAKE2B efc374a4b091c1f169dbf0f166ce1a753db695407150f98aca398e8569685f453263903eb8a2ccf0718dd6f06042305428a5ff4b755606838f8cbcc53e62e817 SHA512 3c7c2c21794fa6ec33b9dcf6e1d391ba5478e963d8f212d0d892fbe3fb4ae3697cff68d49eb3bfe28bddcdb75dfbbbe59a09ddf18d50f1253c5c0d213765aca9
 MISC metadata.xml 1150 BLAKE2B c2965f6da972330edd169a1503dcd77cfab0b870a5a6a3cf5727e80692088ceac35b559bb52580e50a70c1298eaa3484cecb380b912636fe5262f7c95e2dd19f SHA512 bab59fd09cd1eee4fb3f3896f9c0553a89ab878f9cb34a87efd324467712958bf5213c8e9d3d5de84b7a39d09c6e4d5dc0bc15281896c09da2858446761217d3
diff --git a/media-gfx/img2pdf/img2pdf-0.3.6.ebuild b/media-gfx/img2pdf/img2pdf-0.3.6.ebuild
deleted file mode 100644
index b706261bef31..000000000000
--- a/media-gfx/img2pdf/img2pdf-0.3.6.ebuild
+++ /dev/null
@@ -1,22 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Losslessly convert raster images to PDF"
-HOMEPAGE="https://gitlab.mister-muffin.de/josch/img2pdf"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="test? ( dev-python/pillow[${PYTHON_USEDEP},tiff,zlib] )"
-RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
diff --git a/media-gfx/img2pdf/img2pdf-0.4.0.ebuild b/media-gfx/img2pdf/img2pdf-0.4.0.ebuild
deleted file mode 100644
index 03f64a2071de..000000000000
--- a/media-gfx/img2pdf/img2pdf-0.4.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Losslessly convert raster images to PDF"
-HOMEPAGE="https://gitlab.mister-muffin.de/josch/img2pdf"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gui"
-
-# missing dev-python/pdfrw dependency and
-# require old version of imagemagick
-# waiting new version
-RESTRICT="test"
-
-#BDEPEND="test? (
-#	dev-python/numpy[${PYTHON_USEDEP}]
-#	dev-python/pdfrw[${PYTHON_USEDEP}]
-#	dev-python/pikepdf[${PYTHON_USEDEP}]
-#	dev-python/pytest[${PYTHON_USEDEP}]
-#	dev-python/scipy[${PYTHON_USEDEP}]
-#	<media-gfx/imagemagick-7.0.0[jpeg,jpeg2k,png,q8,q32,tiff]
-#)"
-RDEPEND="dev-python/pikepdf[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	gui? ( $(python_gen_impl_dep tk) )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_python_prepare_all
-
-	# Remove gui executable if there's no demand/support for it.
-	if ! use gui; then
-		sed -i '/gui_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	pytest -vv src/img2pdf_test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/media-gfx/img2pdf/img2pdf-0.4.1-r1.ebuild b/media-gfx/img2pdf/img2pdf-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..8568129c5e2e
--- /dev/null
+++ b/media-gfx/img2pdf/img2pdf-0.4.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Losslessly convert raster images to PDF"
+HOMEPAGE="https://gitlab.mister-muffin.de/josch/img2pdf"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~sbraz/${P}-imagemagick-7-tests.patch.gz
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui"
+
+# pytest-xdist isn't really required but it helps speed up tests
+BDEPEND="
+	test? (
+		app-text/ghostscript-gpl
+		app-text/mupdf
+		app-text/poppler[cairo,png,tiff]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pdfrw[${PYTHON_USEDEP}]
+		dev-python/pillow[tiff,${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[jpeg,jpeg2k,lcms,png,-q8,-q32,tiff]
+		media-libs/exiftool
+		media-libs/netpbm[jpeg]
+	)
+"
+RDEPEND="
+	dev-python/pikepdf[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	gui? ( $(python_gen_impl_dep tk) )
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# Backport: commits from 853a1ec3634961ec1ebd5a06771d2770037ea802
+	# up to 152f6fb629581ab2f45a3b520f9468e99b0bc6b8
+	"${WORKDIR}/${P}-imagemagick-7-tests.patch"
+)
+
+src_prepare() {
+	distutils-r1_python_prepare_all
+
+	# Remove gui executable if there's no demand/support for it.
+	if ! use gui; then
+		sed -i '/gui_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	epytest -n auto
+}
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index 0396bb5d691f..e6f9ce00a289 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -1,8 +1,4 @@
-AUX imv-4.2.0-add-string-inc.patch 275 BLAKE2B 40e46bd1e7531477d6701ac14013405ee37562305286223a4b5800f3f644f63d366bb1ae08a0ee575b088351013605c9ecaf0356a046976d6a520d55dcaaf2c0 SHA512 2ef9ae3e8a6543476000a2e19fee4f383e01a25b5ed6ffb674f12f843761f9d8fa6ae394e2043260ba88d88fa300ebe3bb03027a02aa3afde5d4cdf897174958
-AUX imv-4.2.0-wayland-roundtrip-after-scale.patch 583 BLAKE2B b71b428bc7c3fd566ab9fa650cb714a2abc455df0512aa7372f82e1c331530bf8515cd0f005d54aa9d20de2156eddf7a0fb3b892775825a4a8af64a0bc66735a SHA512 c081fa2656d2611ef78df072826718ccca56fc376860277f74a9248e0b9771547af28e9379dbf820c4e67f33ffad021c10b5e178f1da2c309e33d25692a38218
-DIST imv-4.2.0.tar.gz 77809 BLAKE2B a0c8aeb4d50d252818f4a4bedc145a8e2ffffa3ae14d888ef4623fe17a714bd17397399064019b32a48e6ebe3613f592428b075988ed533166c06c2b885d245b SHA512 7b64c6d4e5e484fd2ef4e28e2ba5cc74e4d28f8e2fa329ae7c744bd77ce8a345123f9cc3c77e015ff780938d5add97cfe9ed4e5a3a52b03a91b7bb6bb50e7115
 DIST imv-4.3.0.tar.gz 79031 BLAKE2B f620e1d05827f93eae03a01f62cbb1426a623b4ef2e758a5fea2539193292fada0b8bf34276443d787b5a1537e92cd66e94b574a646319c3c37fbf2557bda4eb SHA512 1735c03c48888004b11b3aaf0215a9530c035468a8efdb210d856551ebb75030c906eee2b6ab80e5d3646206e6051a73a8c5e15c010dd09bca7f9e90f9b0e34b
-EBUILD imv-4.2.0.ebuild 1934 BLAKE2B 923576182f4d8756bd7d9afc2c718674fbd9c95a386b99d2bac370a87c9cc03558f8e1f8833ccefa735fc0299984dd3d7f2823be51a1fa0ad915756a87d2c6a5 SHA512 ba9014b318ecc18b2473dfe92b25c208b6f8ce4cd329f0482c925e3fd86b3cab7aef43a71ccaa89e01294b5d877ba42617b70b7dc27d7f7da21e90648418faa8
 EBUILD imv-4.3.0.ebuild 1878 BLAKE2B 2f77f1bec8b37018ef3c5d6187248568041694230b39ba8ad0b545f10f4ac078beb32144832f10d7fa6f50ff8cab8f34a27cbed79eff3801543cd67442d35956 SHA512 72280fd22dbeb2b315c0013b4faf52a60b0a91107cc4a8780c388abcb9f9ade23ec16243a87ee379c3d1e3e7cb58f508abbcfd818bf169096e7cc365be07a798
 EBUILD imv-9999.ebuild 1878 BLAKE2B 2f77f1bec8b37018ef3c5d6187248568041694230b39ba8ad0b545f10f4ac078beb32144832f10d7fa6f50ff8cab8f34a27cbed79eff3801543cd67442d35956 SHA512 72280fd22dbeb2b315c0013b4faf52a60b0a91107cc4a8780c388abcb9f9ade23ec16243a87ee379c3d1e3e7cb58f508abbcfd818bf169096e7cc365be07a798
 MISC metadata.xml 487 BLAKE2B 75fef8f34eea6c032dd6d31b3b185b18acf2c38d15a47a5aea71f7b50d3604b53242f1750ad88bc6e07e3ab4b73ef3ea6d1a60fcb71e484ac9f0595ae0e1c7ef SHA512 6da579aec4f921665773f8163e40a5151954176a4d4004432bcaa51ec48b1d5c808cbb541e99e247d3775f8a592159294a9b7011b017bfede3ab9df0ec0746a5
diff --git a/media-gfx/imv/files/imv-4.2.0-add-string-inc.patch b/media-gfx/imv/files/imv-4.2.0-add-string-inc.patch
deleted file mode 100644
index e726d7b093a2..000000000000
--- a/media-gfx/imv/files/imv-4.2.0-add-string-inc.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-https://github.com/eXeC64/imv/issues/299
---- a/src/backend_freeimage.c	2020-12-17 15:30:42.000000000 -0500
-+++ b/src/backend_freeimage.c	2021-01-23 12:03:46.175921640 -0500
-@@ -8,4 +8,5 @@
- #include <FreeImage.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- struct private {
diff --git a/media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch b/media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch
deleted file mode 100644
index 381013329062..000000000000
--- a/media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/eXeC64/imv/issues/305
---- a/src/wl_window.c	2020-12-17 15:30:42.000000000 -0500
-+++ b/src/wl_window.c	2021-02-02 19:03:52.598901093 -0500
-@@ -545,2 +545,3 @@
-     wl_surface_commit(window->wl_surface);
-+    wl_display_roundtrip(window->wl_display);
-     size_t buffer_width = window->width * window->scale;
-@@ -636,4 +637,4 @@
-         .height = window->height,
--        .buffer_width = window->width * window->scale,
--        .buffer_height = window->height * window->scale
-+        .buffer_width = buffer_width,
-+        .buffer_height = buffer_height,
-       }
diff --git a/media-gfx/imv/imv-4.2.0.ebuild b/media-gfx/imv/imv-4.2.0.ebuild
deleted file mode 100644
index c3beeda396a8..000000000000
--- a/media-gfx/imv/imv-4.2.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/eXeC64/imv.git"
-else
-	SRC_URI="https://github.com/eXeC64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Minimal image viewer designed for tiling window manager users"
-HOMEPAGE="https://github.com/eXeC64/imv"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-IUSE="+X +freeimage gif heif jpeg png svg test tiff wayland"
-REQUIRED_USE="|| ( X wayland )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/icu:=
-	dev-libs/inih
-	media-libs/libglvnd[X?]
-	x11-libs/libxkbcommon[X?]
-	x11-libs/pango
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb:=
-	)
-	freeimage? ( media-libs/freeimage )
-	gif? ( media-libs/libnsgif )
-	heif? ( media-libs/libheif:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	png? ( media-libs/libpng:= )
-	svg? ( >=gnome-base/librsvg-2.44 )
-	tiff? ( media-libs/tiff )
-	wayland? ( dev-libs/wayland )
-	!sys-apps/renameutils"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cmocka )"
-BDEPEND="
-	app-text/asciidoc
-	wayland? ( dev-util/wayland-scanner )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.0-add-string-inc.patch"
-	"${FILESDIR}/${PN}-4.2.0-wayland-roundtrip-after-scale.patch"
-)
-
-src_prepare() {
-	default
-
-	# allow building with libglvnd[-X]
-	if ! use X; then
-		sed -i "/dependency('gl')/s/gl/opengl/" meson.build || die
-	fi
-
-	# glu isn't used by anything
-	sed -i "/dependency('glu')/d" meson.build || die
-}
-
-src_configure() {
-	local windows=all
-	use X || windows=wayland
-	use wayland || windows=x11
-
-	local emesonargs=(
-		$(meson_feature freeimage)
-		$(meson_feature gif libnsgif)
-		$(meson_feature heif libheif)
-		$(meson_feature jpeg libjpeg)
-		$(meson_feature png libpng)
-		$(meson_feature svg librsvg)
-		$(meson_feature test)
-		$(meson_feature tiff libtiff)
-		-Dwindows=${windows}
-	)
-	meson_src_configure
-}
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 9d7b1ba388df..d4a31b30ab09 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -5,6 +5,8 @@ AUX krita-4.4.7-pykrita-crash-on-exit.patch 1583 BLAKE2B 077ebf5108badd615d9bc10
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc SHA512 9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4
 DIST krita-4.4.7.tar.gz 254871508 BLAKE2B c7e964ddec3fdf16db0644f6d61daa278b0fed2969bbcad99ca476240196ff4da3371af718049482ffe09e314bc96d40f28929fccb8cf0d3a9c98d7f20658695 SHA512 b1fbab9f69e700a1e9e562adfa1776c2de481a5dd92cee2a0ea533a0233a7277b512823023736784c41b387210a35c07cc23b3e2b3a89ed9cb60d440cc5906d5
+DIST krita-4.4.8.tar.gz 254887779 BLAKE2B 251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb SHA512 53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81
 EBUILD krita-4.4.5-r1.ebuild 3566 BLAKE2B 2ed6de5f9a8cf257d63397647621c51b716a1be2e5147ab1e22d4b698acc026b1ed1b5b09ba4ca45a6deaa7e53de87bb28b9ef1ae92a5c5c6f052d5f5863fa41 SHA512 004b3e83eb730b8212c9c50134e378e36cbf60cabfa7672a29c139b512daf2f73ab214cf8685f73e257b2dd0aec7d8b0f69c6a5db78f0ce08329a0098af10c7e
 EBUILD krita-4.4.7.ebuild 3511 BLAKE2B 26a779a209dfc361e5f80b44b266eadca7af2f9c2f6f0b9ef6db88f87e40afdc9fbca812bd9029bf9f192cd2962ef45eef96659d950f6771311454af84ef5293 SHA512 3618ebb0d61ed181ddb11b7ea614e7f0721d63c50c7fe674c3aa2517cd8fadfd30bca6a63b1c056e6bdc6dbe6c2651e57f86e80dc64be8413ec03fe4294166c0
+EBUILD krita-4.4.8.ebuild 3517 BLAKE2B 142433d0bed8e43f1c232405b49d7c85d43af4fdc66bfab975fca89e3c532c0e1ae817f0303548ac2ea467b111c076445b7a40ad0a3201397dcdd62978e7fd5c SHA512 ac33a66f5f4dc6c6b0fc0b56e3f23897e6d2ec6355b0fefb944bc2fe2d8f41a4427715034fb212fac4af9aa16bc08a761370f1445e6f19ee55357cc9d94b7ac8
 MISC metadata.xml 764 BLAKE2B b54f93efa3355522788dd1434ae168eb53ec402784307cdc8fde54e9855b4c5133a3e56f019f2f4812bf3963f51c43be2b5735ed745c2cc6bfec7500d45b527f SHA512 8c123214add6f8bb8a79827a6c7d070a5a6057be04493156a5ce2ce2f40fa1b0a17ef6eb503a3f79c41be29d3a6b939ff7ea777c43da3b20521e14083a3cfede
diff --git a/media-gfx/krita/krita-4.4.8.ebuild b/media-gfx/krita/krita-4.4.8.ebuild
new file mode 100644
index 000000000000..30ca71bc92a8
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.8.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{8..10} )
+KFMIN=5.82.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz
+		https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
+
+LICENSE="GPL-3"
+SLOT="5"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# bug 630508
+RESTRICT+=" test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	dev-libs/quazip:0=
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+	')
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXi
+	color-management? ( =media-libs/opencolorio-1* )
+	fftw? ( sci-libs/fftw:3.0= )
+	gif? ( media-libs/giflib )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( virtual/jpeg:0 )
+	heif? ( media-libs/libheif:= )
+	openexr? (
+		media-libs/ilmbase:=
+		<media-libs/openexr-3.0.0:0=
+	)
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+BDEPEND="
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+	"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
+	"${FILESDIR}"/${PN}-4.4.2-quazip1.patch
+	"${FILESDIR}"/${PN}-4.4.7-pykrita-crash-on-exit.patch # KDE-Bug #417465, git master
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_prepare() {
+	ecm_src_prepare
+	sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
+		$(cmake_use_find_package color-management OCIO)
+		$(cmake_use_find_package fftw FFTW3)
+		$(cmake_use_find_package gif GIF)
+		$(cmake_use_find_package gsl GSL)
+		$(cmake_use_find_package heif HEIF)
+		$(cmake_use_find_package jpeg JPEG)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package qtmedia Qt5Multimedia)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package tiff TIFF)
+		$(cmake_use_find_package vc Vc)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 476539e9e9fe..75d619b2783a 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index f9bf4f831966..f4e23561bc5e 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,5 +1,5 @@
 DIST codec2-0.9.2.tar.gz 12244006 BLAKE2B b7fdff34e41f93f237235db5cf1352e7165565ae13bc88cfe41bc6eb280e16f49c71f6b9947ced81612b0fa6b2630a9f2f75fe257ff09bae5eef1a0b6b39c95b SHA512 30a2eb95f7b0f47f0c0c7f08c9118f089acc32adf8b27f5b4354c89139efe80607d6d0ca5e0a9eefddf3640f02c483b9c804ad52c5dec6295968b7267f3a716c
 DIST codec2-1.0.0.tar.gz 15019266 BLAKE2B fa33a8c30a7472e5f5ab0aac070431579913248d9d27cbc82542b6d7071f7a9fee6bafe374300bf6e09d636b9ddaf85795aabf12cbfd3923efd0cac82f06b38c SHA512 bba8ccf915600b093252c85059c5472804e843f5a4e331cc6e01f31b4131d84362d8385d0a1d8703be36064ca498e58181c2b7fdedb76d0be58bf6f13ec929b3
 EBUILD codec2-0.9.2-r1.ebuild 706 BLAKE2B a218f37e38b20790cc280773b409675fb38bdbb242e1c5a7ed580428af548fc74af642a922994ad1e660b2aedbbe9bca856e67e7e30bbe540e70d83f3b560fc7 SHA512 5643f89600c13da66732d4ebae57cc6679b66c4d0b1ebc9551ed546d71c3efb9f33613df88ae6315283553c5eff4e010df5e7b13d53618a1eae353b73006905f
-EBUILD codec2-1.0.0.ebuild 712 BLAKE2B 28fbe76fe07095a516ccf1fa16b09de47eb0fb55c5efba4029890cd37ea63d1f3efa8715baa7c1b16771b65bda1707517616a435540db476bb6410e0f7e39f29 SHA512 9ed090d2db68b30c7bb08f094a681cbe34699bc1021c792b6771c20172e3e96fb6b4d25a56409172194343168513bc6d464d130de299802109df679a17dbc65d
+EBUILD codec2-1.0.0.ebuild 719 BLAKE2B 4916b9c96aae9b647bb1035900de6c8b336fd7107d51b7d970d2b6d29cbb680962b80efc58bf6c5e4e723ae707ef5c1dc926f3305fc345441b061358c13693f8 SHA512 92d7dbcbe6632f5b64209b5aa208df6cebf5e0d2cd17dbb40e531bfaa404605fdd91a956ac3d2982f1401f385bd31b05c5709aff662260dbb3d03da05a29a336
 MISC metadata.xml 325 BLAKE2B 8895125c208d04f4583087f7d5d6bcf5fb84db2800feb33ec8f0370ea2eabd36bbbf4914df33bb7d580fb966af35873bb39633d7248d9d69d48b8968a8f7776c SHA512 427760a65fe9d84a527287e815ff6e4f783bbb5ebf28fd52c225721c649eaab738edf090a6af72547b57e2c1a80fd616d8af1a2af931398819de748c4306c0b7
diff --git a/media-libs/codec2/codec2-1.0.0.ebuild b/media-libs/codec2/codec2-1.0.0.ebuild
index b90705d61a95..43e5b77c8f43 100644
--- a/media-libs/codec2/codec2-1.0.0.ebuild
+++ b/media-libs/codec2/codec2-1.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/drowe67/codec2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="examples test"
 # Not yet passing, but infrastructure added to run
 RESTRICT="test"
diff --git a/media-libs/dumb/Manifest b/media-libs/dumb/Manifest
index 6dd20585008b..aa3aea16856f 100644
--- a/media-libs/dumb/Manifest
+++ b/media-libs/dumb/Manifest
@@ -4,5 +4,5 @@ AUX dumb-2.0.3-pkg-config.patch 667 BLAKE2B 1607438fc49682500cdbeb4af8aa2eca5b4a
 DIST dumb-0.9.3.tar.gz 167379 BLAKE2B 1a9f62b784f8e8ba5b30b892bc9588bbebca7d5270b5d1161230c1c538d1aed8c6d2f2afa6a9087858ad45dccee9c640498548a845b2f046a0c390e7a84525cc SHA512 9ecdea460858b7e6ad7ca2534ecb3581397e6c1fa904459affe19ce49f528e580e143b42b13413b292ae7b57901a8008e6a9ee3821824f6ff7914b136f75c658
 DIST dumb-2.0.3.tar.gz 186576 BLAKE2B 0bd2e512b88260e67b11856630aecfdda2f11a8c5f931c1da3451dbfc15cd5e7e38e718d12b99e0598d9522cf259317a98c5d3088dd979c487a8971fd562ee3f SHA512 18b10a507d69a754cdf97fbeae41c17f211a6ba1f166a822276bdb6769d3edc326919067a3f4d1247d6715d7a5a8276669d83b9427e7336c6d111593fb7e36cf
 EBUILD dumb-0.9.3-r3.ebuild 1946 BLAKE2B 9cf6f12f20dfafa9bea7bdd7d1075ea9b78a38ff4c3835f0b11f929da962b80f633a8dff3c924eab60de00f59fcc3feb0b7f5e966a42f8faa4849e001e37ea96 SHA512 7b53f9a0b2e4169672542b2acdfe5b348907d89d1789d12daf12997d2052ccd27bbd292523d5fb52a04ea1e15a1adf31184303a489b49bceaf76f097b96a0998
-EBUILD dumb-2.0.3.ebuild 998 BLAKE2B c2ee6188812d133ae338971effd0cd819325a40031fcc8867f9657430bbd7aef22ac6ef07d50af764ee408dfecbdd70d9dc91e0f28afbeb296d6e1324eabb6e9 SHA512 694296195f43adeb76d63f95668971a76c35af56b32e48df5dad1b0c52695c83effaaf52ea380d9e7cbadf2e46ce1a79751845b250c219ea06c6e387131e6eac
+EBUILD dumb-2.0.3.ebuild 1005 BLAKE2B 096d43cd95b49da42f9e607e4f7454017381716af6b47b5fc724c7b4fab193a4e110c5bfdc948523ec34b720a43e42a48f3764f0907fd6f61c9c3638eea0fa4b SHA512 93abb2de45dc3abab1b9f84613fceb336228a7222e88c19c4cb51ec2ca00d288e4ae3d5809342124b6e800a9a5478d1f53de81184257fcdbd086917a13fe1ff9
 MISC metadata.xml 449 BLAKE2B 559267d1804b59df90c5215e6a188c3140673a3727c092fdcce9dafc10b016e22d7a13abd0b174cff1c29b90e9778909e49df70ff84643045c71dcc730e883c8 SHA512 dfb5c4d19a6406fd6dec98b07ca901c22a1690137e308b27e4c64973ff2bcd2cb042ce5f1b062fc619e5739da7ecc67d50923baf527c0b9116e5a196351de543
diff --git a/media-libs/dumb/dumb-2.0.3.ebuild b/media-libs/dumb/dumb-2.0.3.ebuild
index ee4149c06893..48f6112a722e 100644
--- a/media-libs/dumb/dumb-2.0.3.ebuild
+++ b/media-libs/dumb/dumb-2.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kode54/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="DUMB-0.9.3"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="allegro cpu_flags_x86_sse examples"
 
 RDEPEND="
diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index 75c64af677ac..0fcf62ec96d0 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -1,3 +1,3 @@
 DIST faac-1_30.tar.gz 241750 BLAKE2B ee3cf1ad44c14ec289036c9a6f087df3a1cf81c9b0f60b6a2121f5badba3f3cab983001437bb6051ab2306c0e5e14ee8e3c9439116bd82c370f808d912ce2c13 SHA512 8582cd580dba2a347d15dc4fab42020d7120d0552c54ab74cfaf59ba1b270abb94c67e39d42459a14cbc6e98f3fd00cbda589e1b4f0c7278e41bdef6ae7b6554
-EBUILD faac-1.30.ebuild 994 BLAKE2B d8c43384007ade7717378dfb141947dba184ebf14e85b160879407465e93977a695786eb906ea39274d23c60bb366b24976c3cda3e9f0c2057ffd005c21e079f SHA512 62f3c8cd32e2298afff38076e3e526c6824a427f3a17de1440e7399d44902b02756846716072913f848685a446033d8ddf6081c502678d556032eda2476c70c2
+EBUILD faac-1.30.ebuild 1001 BLAKE2B c20caa085a7c4b4a54da6df4fbea6dc9e73ef5420221c9df31950040ab322abb07472680c302440c5c407b69e92841bc88ea6cdc02df91d1b6bd5bfd08d5435c SHA512 894b185bbf6b06acbb0fb3476e71bfde1f25fd9b9338dcaa0db41065f416f5caad703ca0e6fa7a93977a8bf55ffe26da93f9249441c0ea1ebc832e34a5f282ef
 MISC metadata.xml 573 BLAKE2B 73b7c56106260dbcd9039d6f9bef2e709b609eb00dbb304f08c127ce6cde28cefd61e4837f3007d318a586bbac0b88ee1051084afb507cfe765716916f1ed691 SHA512 ddb938e2c8d837eec016dc7257bb5bdf2ec0e40e5d14cd22c7afc08c2815dba22123443734d5d95a3469996c78746e304d7fd75c0645d1bb2f723859c8f40c69
diff --git a/media-libs/faac/faac-1.30.ebuild b/media-libs/faac/faac-1.30.ebuild
index 8408e4c839fd..4711e15bc3e7 100644
--- a/media-libs/faac/faac-1.30.ebuild
+++ b/media-libs/faac/faac-1.30.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPEG-4"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/media-libs/gavl/Manifest b/media-libs/gavl/Manifest
index 368187e020bd..dd97b89e50da 100644
--- a/media-libs/gavl/Manifest
+++ b/media-libs/gavl/Manifest
@@ -1,4 +1,4 @@
 AUX 1.4.0-x32.diff 759 BLAKE2B f122756759da4cb2a122ff702b688c63bf878801e75080d0482bd8583a935448bee42fe00f50bbd99679e5cc5a3e96b01854dad2882a12a64432782b368750c6 SHA512 4c4408ec7d42e81f4e5913ec4d97cc88290a3729d5990910f0c7d2a86da511cd496bd20574f340ff8786e533f09687c0788ba790746cba56a43403e11b638a3f
 DIST gavl-1.4.0.tar.gz 4592701 BLAKE2B 2ed47cf63d8ce3424d0714e202a11ecef89c5a9c160a6045e238bae4179c02398600fc9c6d914784bb24a86c501f93971631461bdecaa8a70743a674748a2ec3 SHA512 beda0073cab865fdb3a55de5d5c800fabcd40b21c5bb5b5f9d43046db3602d8967fb8b893325fcdaca3fa66d978aa3cae79a4a797d43d40ad50ea5af752a650a
-EBUILD gavl-1.4.0-r2.ebuild 1361 BLAKE2B 795f27739120d2b886af44959b0340ac983278a9407ad4579f840dd32c9829a6694a7c7a908f6c9db81bbe255e419fbdd574a50b588941f037905d7f59d2ae3a SHA512 e7af92925ce929a0e88422671f8e1085242856371f9f31140541e6c9c429e5531799dbaff3c2188e008f83552e8935453e56293f990835d3e1df3e6a1cc30d1d
+EBUILD gavl-1.4.0-r2.ebuild 1368 BLAKE2B 8573c21343c51ea56787089e71c08dd3b73b367669b3473efd9a69d9387eeedbd5459d6d2585550ebc6abfee662eaae4a69c37d912011b1bd0175966f46e04fb SHA512 485a180770ab23b6fc2cb83584294bdc5d7bceec4343ef89297d68b2afb47d2c4250a653b2a463b2df6dfbc3155c442d871d89cfc2700aa31ac8c240ae1f546a
 MISC metadata.xml 300 BLAKE2B f5a360e6d1615f750c91512bcb7ddeefd0e0e43c7f682931fecda80e3ba489175786e759d5566077248efe3a2f45d6f8da4277fd97b886e6a4421390ed06dea7 SHA512 d7d3c4fda38db5a9b9496c557891d6c9f620d614a2d17b166b21426356d0c431c484c25909db20d619ff43d948b67719a240245254d89ff03447be53ada09ead
diff --git a/media-libs/gavl/gavl-1.4.0-r2.ebuild b/media-libs/gavl/gavl-1.4.0-r2.ebuild
index 71259eefe9a6..660445f8eb00 100644
--- a/media-libs/gavl/gavl-1.4.0-r2.ebuild
+++ b/media-libs/gavl/gavl-1.4.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gmerlin/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 ~riscv x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index b3750af99085..bdb743526bc4 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -2,6 +2,6 @@ DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f1
 DIST kvazaar-1.2.0.tar.gz 486455 BLAKE2B e7b9ceee4e4edeb051128cfa798e59114cd9175b5ba8a4531c7e872327658c58d22ad21ce40b1b71c632e94cef96b78b77646048629683d24bf69107497f1acd SHA512 5a28c1b21e47d9f45e04ee40a253f478c4ce3c6c41134db8301e843ef0b5d620bce493eacf82ce1ddda88140aa4d2e9401612b63ff592fc2273cf532458d2bb4
 DIST kvazaar-2.0.0.tar.gz 589661 BLAKE2B 253085784bb3481b578206d5a406d0c25c002905f420337939489d01604f7b5f4ee13a17e596ce96e5d577c508f93f72d2befa5851ab95d7ba9db2030de02550 SHA512 9b2564643f4470d59160f7addffbc6b9e22c0d8bd04dbcd77705aa7263dfdc0195a8642255c45b94049b88ba9cbf4ffd49f968d766e31bc404c612b8f18bdbca
 EBUILD kvazaar-1.2.0-r1.ebuild 1834 BLAKE2B 80e47155391be5fccd67ccde5f2ab8865a23ef63b03e4d4695314f27cde4e4b613637b646831ff0c0b4166b8dd623ca0a846bf256c899936d31f45bbde7c431a SHA512 f8b0b8842293e298092852c9ffdadaf34263a850c5f7a170f52ef8af8f514a0b87a65a317f4580e97ae358e9cd8c2399f3b2c9e9b4807c418bf8ef029637d9dc
-EBUILD kvazaar-2.0.0.ebuild 1834 BLAKE2B 2c7336af0d2ce04c3f6cc02f6a4a2507524d3a2c15467b5f8bb41cf85363ea365d269b305097c4d9bc9999ba9cf607d5e3c4ac39314c3431b8b0fee408adb243 SHA512 648b759c0a51ed7b6e7336be96a34205dcc141a58fcedf25ed96650aea0f25a24ee80fbf9b7a2db6e0ca26509a62257eefd68262f97e91c93cd9f55794392078
+EBUILD kvazaar-2.0.0.ebuild 1841 BLAKE2B a4c3319f5e05a32bf1e50530b5402812f81984cfcfdff5093be402d3795cdd3d989d014876f9f431eff7ae3c45497a2dd5197c52feecc0609216b0dfcdcdbe79 SHA512 ab82cb5d378bcc45f1ccdf1429a3bf121a3050b9cdd36794440fc292f4ff7e573d8d58951743e5c886b1d3441ebe98411707f490fcc800aeb1ca67255c050d6e
 EBUILD kvazaar-9999.ebuild 1841 BLAKE2B 8c301cc10d60875ccee438af2a7e663a81f6facaa1d456b5b316758ddd3e0f4e75cb22e3a3b11d27c9483e70ea116aff6ef7ef6eed83b4b37d19b5162a2f90d8 SHA512 a95bdb2ef91e1d50ee24734200edcb09aefc008dec2a3c7bf1c8f483511a169abf49efd052bccf9963042ad0049b5baa3b372555f1e7b2dcad72aa70ab6928f7
 MISC metadata.xml 306 BLAKE2B 9556e4fbc08c1634b447aa9ebbc78c7b8b55a088e71db8cb7ada5c45645a2ea809f50b956a2b3b54dc1493a59861e9f4c405405edc00a49991e543125017f32b SHA512 8210924e0f6d879f473b353a9806e95ec136ceaef507b1911162c7d2bfbbc4e072f9e59ac105af2771b64ba625f3b4f922b60bba7072d1d87a079c221511d927
diff --git a/media-libs/kvazaar/kvazaar-2.0.0.ebuild b/media-libs/kvazaar/kvazaar-2.0.0.ebuild
index 9ef41a2530fb..34ceb7d503f6 100644
--- a/media-libs/kvazaar/kvazaar-2.0.0.ebuild
+++ b/media-libs/kvazaar/kvazaar-2.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]] ; then
 else
 	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 fi
 inherit autotools flag-o-matic multilib-minimal toolchain-funcs
 
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index e2318ae5d247..351ef9e251f2 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -3,5 +3,5 @@ DIST leptonica-1.81.0.tar.gz 14056128 BLAKE2B 21a6be10d8579746855b6c12785ecd75ce
 DIST leptonica-1.81.1.tar.gz 14056320 BLAKE2B 09a3859d8d2bbef4ea5d450c81dd5af1c95752501e4b40779a57d099eb30934fbfe4099ab2d7abadf518af25cbd3c36269261c9c6d3850a44a2b16c2eb795801 SHA512 3c24e30eab21b634094543a722172553e35d928b3a50bfe78e9b0123cd16d710b4be8714acaac87344b22292b460d6ffb06b05a8e7f3df060544a2bbf3f8a7d2
 EBUILD leptonica-1.80.0.ebuild 2037 BLAKE2B 118a97e20f0951c04290529e17865b3e527b717dad7686b098dd92cbae65d05cf306c781e0b0328e49145740804f81ccc3e9b5a45ed4bf2db37b949484feb7a0 SHA512 697d321bc53a898e0ce098a76c6b124f20745df63263ce75c11a9d113cc1074ec00961012deaee93010b966924e0418e8c04efc1669816897937b40d8f9805e7
 EBUILD leptonica-1.81.0.ebuild 2043 BLAKE2B e1369630fd7ff85619ab25ed5a17435358165fd23a9f3dd488e4d2f5fd786fc0d9360b2032738c4bda57d48b39465cdf4cb83bec6d62ad91573f7b5167a041f4 SHA512 e2c8a8912cc0ebbdd51ff9f459be8c697988ce6f64f529c8652b0ad3da1cd101860e6da91af4d2b0e3de649cf7597f7543209e1abfe9d31b7b2b4defbe78420a
-EBUILD leptonica-1.81.1.ebuild 2043 BLAKE2B e1369630fd7ff85619ab25ed5a17435358165fd23a9f3dd488e4d2f5fd786fc0d9360b2032738c4bda57d48b39465cdf4cb83bec6d62ad91573f7b5167a041f4 SHA512 e2c8a8912cc0ebbdd51ff9f459be8c697988ce6f64f529c8652b0ad3da1cd101860e6da91af4d2b0e3de649cf7597f7543209e1abfe9d31b7b2b4defbe78420a
+EBUILD leptonica-1.81.1.ebuild 2055 BLAKE2B f8f26bcef94f9250f4c9cf58a49641c14a873074f4cf666f7ce263b3d20e6a233bf34479664bbd0feb46eb11aeb2ed5e504c8bc4b34b335671c725bc6f218f50 SHA512 2bde386640d2edef03337bb8e23887469554b9c023f12839842ff0d415c752ee6fe27602e4ce08d55efb6f978978c7ae8dc170883a113d286248d34dc09728e9
 MISC metadata.xml 605 BLAKE2B 3c47d84994e9f22d37cfcb6a44497f2ceff828f8f130dce86038f1452c21403349636474aa78c39283d7d5a47183018e2d1f39546f0ecccb12ab7e169f15608c SHA512 0b78929d92cca2ee68c6174088e7c8abaa11dfde1af747fa52a9d1833e6319d8e5df0b060f627b6f6ef6707ac1440eb124091ac1eb05d47d35f7d9eb1cc7a893
diff --git a/media-libs/leptonica/leptonica-1.81.1.ebuild b/media-libs/leptonica/leptonica-1.81.1.ebuild
index cc3881a79ba7..f831a57c4e72 100644
--- a/media-libs/leptonica/leptonica-1.81.1.ebuild
+++ b/media-libs/leptonica/leptonica-1.81.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
 IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
 # N.B. Tests need some features enabled:
 REQUIRED_USE="test? ( jpeg png tiff zlib )"
@@ -29,7 +29,7 @@ RDEPEND="
 	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
 	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	test? ( media-libs/tiff:0[zlib] )"
+	test? ( media-libs/tiff:0[jpeg,zlib] )"
 
 DOCS=( README version-notes )
 
diff --git a/media-libs/libbs2b/Manifest b/media-libs/libbs2b/Manifest
index ce806446a0d3..f447e687398f 100644
--- a/media-libs/libbs2b/Manifest
+++ b/media-libs/libbs2b/Manifest
@@ -1,5 +1,5 @@
 AUX 3.1.0-configure-ac-use-dist-xz.patch 515 BLAKE2B 577998bdd3192e998f7859b3e16d9ecb228b82deddce58ef02214622756520e0dc9ee12928e2601eba4cd52dd72eaff76d259900e87e53fcec84eecf0ccd3ec2 SHA512 1e1d910ac30150e48420c56a77e0e176c2fc4b03bc8626d555fa1925d39888b238d34231bc03e1bf3321f9d015f91ffcce3d1a01cac8632980a2f9e3197cdc2a
 AUX 3.1.0-format-security.patch 369 BLAKE2B f64d562fca5b305abbb3abed2c431fab6b3daa961406c83db5bfc39e2316dda288c6d6045e9a4f6fd045f8c05308744f7e01b2616a161a0f22aa5097c7a91c49 SHA512 77a803c030c4b6ce782584c9163299289e8a8cc748d08e5040ae912651ebdff92884be70f1efa1db9df4eba3f0060c77d430062dbe1143682685df3c7e7b1fbf
 DIST libbs2b-3.1.0.tar.bz2 606283 BLAKE2B e70becc06078ff72a4a4fb69d9ad4e906f1ca2062cd770e36fcf1ad2a6c58e6284afa7958fca89573ed83cf9a76b42f0c8367942075eb6c77ab12fa6c2e741b8 SHA512 50cf477ff9ce6adf26fa8a696831c3a4f219c80a21ec4c93be8ec3f67f077447c17abbd9588a9de5eeb3ddacac1564a7138807468fc80e853bc78f193b4afbc4
-EBUILD libbs2b-3.1.0-r2.ebuild 822 BLAKE2B e9181d168cfdc9b41080765cd9dbc40d5922293e1c5b2c8f9b18cd60b4771c9f047aba90f2dc880c7c14042408e06bf34c0ea9fe08e52648341f2f22d108fd93 SHA512 4791a831b2b20d545dfefd008acf9f8edd4f6262d918e64cea59548398b26829b53e9011f5c4d57a086e7a02de9640bc5072aa75e3829cf8bc55003fbb7ed051
+EBUILD libbs2b-3.1.0-r2.ebuild 829 BLAKE2B 6f15f732cd23c31f2b08ba3fd57321023f6b0d240b6b2939baca593289e8c43d9dee00965862a63b7b619e78cfeaab56ff7a1420f3b52ab3fa803f6909219518 SHA512 98473b516613e0a93b570ddef62bb2ba5cbf9bd2422a10018b043ac77888e58eceb6476cb215ea20619b54c2f0c47aa3af79ad40a8a816d0a2ef70f54754249c
 MISC metadata.xml 337 BLAKE2B cf97a0e6ef65870a72025796f214ef41ac6b0d936da6ecb1cb84875ae3805fad84954121925ed5eeb888262c3d96081efa94c2c4195c812c2351da2f05c03f90 SHA512 01eed065aee1d5c761a268b129e5919328b94abbf73f81b515c340fc85b30f1a2e66a4beed61e410f98c2fdf6b375729c188421aac259ec8af5ca61a7d4d2337
diff --git a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild b/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
index d4f26c28ab28..19f67ed144eb 100644
--- a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
+++ b/media-libs/libbs2b/libbs2b-3.1.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=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bs2b/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND=">=media-libs/libsndfile-1.0.25-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-libs/libdvdcss/Manifest b/media-libs/libdvdcss/Manifest
index bcda93f85fd2..244416db6825 100644
--- a/media-libs/libdvdcss/Manifest
+++ b/media-libs/libdvdcss/Manifest
@@ -1,5 +1,5 @@
 DIST libdvdcss-1.4.2.tar.bz2 366824 BLAKE2B 106ec0f46eeb4969d0c878ef1e2ad05ac9c0b0ce0d2781c0d68d9d5e08f9c6154b43c4b2e0cd2db0d530eb0a94914161384e788b307af4c4fca3351d270cbe9a SHA512 e46ccded1951046ec481604c5b533c435be14cd0e734cd5315b61868836a20edf4cdc7c1466c2f4ed374de4382c5e758ace700e84aadcb29513001d696f1049c
 DIST libdvdcss-1.4.3.tar.bz2 388404 BLAKE2B ce654b78ce3b30961dddd3a4b80d6fb520ed07e5e1ccf76ed09b65c7a4164212b12868a6c0bf91bc8893498539ae0400208087ef7c00dd1fd1cfd18fbc4352ae SHA512 0f9c0244feff5ca62459823810a39ede745b63fedb682707fcbaf0dff11fff42998cef31a281bb6380930123d079780d37a79871f6e628cdca9cfa06c64befb6
 EBUILD libdvdcss-1.4.2-r1.ebuild 765 BLAKE2B f4b85c73b1ea1633927f92e91f95cb10297094ed27808418624cc21f2f4b35e683a128ea47c32216476f109c1beb05361a726b4f0ab362677b73b92ee0e2e19a SHA512 cf7f224e80f7a945ed71547df5441467b7bb2b0b9c5072f23cd8c8411fff0108f39d118afb4aaa81eaf72a84adbb6546771b5b5c99c2298b36caf7a2c4e21d48
-EBUILD libdvdcss-1.4.3.ebuild 779 BLAKE2B 0d3208ee1cb3acca24d5e98cd8c6e0404650a5a61d6eb6873719640e662c2f22593f72febcaa97d8cbf40b56e1827459cce9e6eae1a0ced4f0c244fc0dcecfff SHA512 ddbd09cdc0837aa9ba9033efcbe096ee3fc030da29463a05d6b2e1b9e4c18053656d1d3ead4ae5b6304538f391d7788a675297313e0de768186b36c7e2c7adb5
+EBUILD libdvdcss-1.4.3.ebuild 774 BLAKE2B a7238580dc03ad6431fe02a2dd3ff95bd8647406e95796c148f941eb548d2d22fb68872780041c8a588a7c44eda3ddf5a88ae19afb49a6b43873106bb5156ca6 SHA512 199d6f6229cc871f9cdbde59912ea4cb292be4029f58a69a73c3de4b005c6aea3d541ca6bab5d410de94e6188cc1dea39e3d5e6ef298a2da487f7c56b82df363
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.3.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.3.ebuild
index 9b8f11263901..208549d9ec1a 100644
--- a/media-libs/libdvdcss/libdvdcss-1.4.3.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/media-libs/libfreeaptx/Manifest b/media-libs/libfreeaptx/Manifest
new file mode 100644
index 000000000000..4c4a22ca740c
--- /dev/null
+++ b/media-libs/libfreeaptx/Manifest
@@ -0,0 +1,5 @@
+AUX libfreeaptx-0.1.1-fix-version.patch 571 BLAKE2B 0fa43bf3b7180b5ec90e3cb2fc633959d5b484954bd50f468903a6c0c9b0646fe77be1618b68746692b57224e46270e538133ccfeb3f320ff71780bc5cd4297d SHA512 b8d3bcadeba8534979c02e55ad129bfce147e920e2e881f99ac9d579095fb944b6e88351a74dc410d141e0a6b89f17c15ddc21019e63cc3cf362a20d5e9b37b6
+DIST libfreeaptx-0.1.1.tar.gz 27902 BLAKE2B 0aa015b0317db7f6dd61ae667cc1b7b10c7f7457d057144c1457572a214891848b81512960eb8643138c638a0f691b53a7bbcb36ad434ac29335d92b108a43fa SHA512 53dd7f348120fea0425b365f26668925dd435a8a3a0c5e98476764a452c7d729f2a3556e953c557d0ccaaa65391265c8c3c61fc29377cf60079fa0bed2cc20b1
+EBUILD libfreeaptx-0.1.1.ebuild 1033 BLAKE2B c9ab3dc9e51ec6b86975e13258447485f4cdd12a606b89b3d19ddb1782ed58e12aeca75e608db7551604a3c66a602ffaf70a1cdf7855f17a7e0cdc362c5cbac1 SHA512 fcd48ce7125aac0dff532c024094337d36c03d2a2d44fbbf6a953c4c02a06d9fd5cd7b465a6ccc9cf7b29f06fe605485c7df0ce9b6f5ba5bfd161ba4b718d8d6
+EBUILD libfreeaptx-9999.ebuild 1068 BLAKE2B dfdd16452e91a07ec2b728c737bbd233c1b72c8a00605929992e52d8e6ca6b77e60ad1a5acae67007040a829699ac415d27e47b640df7f96c4ebba0d7fc1491b SHA512 a1f4554be7a4c9b070f771a486955a412cdffbb6963ecb98f6eaefc9a14ea003dd663e43270b36ac2af8050a77be8bcc2681912061f8e74ceaca08398c0a7add
+MISC metadata.xml 442 BLAKE2B 29e3ffb1994b3f1d5e6fc14ee66e0152a047a02a8a3e86b7be8a853ffe0b425e5ba378586dd46d6b323b8d53853748e148b1c2b782f6da24873e2425d5624711 SHA512 22a1530dc7165756acb23275cc3901e93eadda9933da297992b185c5210bd78425d1b5eb86187506cebb0cdca446090cf57facefce425b420a543cb9f83c1576
diff --git a/media-libs/libfreeaptx/files/libfreeaptx-0.1.1-fix-version.patch b/media-libs/libfreeaptx/files/libfreeaptx-0.1.1-fix-version.patch
new file mode 100644
index 000000000000..0a738fd9c81a
--- /dev/null
+++ b/media-libs/libfreeaptx/files/libfreeaptx-0.1.1-fix-version.patch
@@ -0,0 +1,20 @@
+Report the correct version rather than the old libopenaptx version (left over from the fork point).
+https://github.com/iamthehorker/libfreeaptx/commit/c176b7de9c2017d0fc1877659cea3bb6c330aafa.patch
+
+From: Hunter <wardlawhunter@gmail.com>
+Date: Mon, 9 Aug 2021 23:51:49 -0400
+Subject: [PATCH] Fixed libfreeaptx reporting wrong version number
+
+--- a/freeaptx.h
++++ b/freeaptx.h
+@@ -22,8 +22,8 @@
+ #define freeaptx_H
+ 
+ #define freeaptx_MAJOR 0
+-#define freeaptx_MINOR 2
+-#define freeaptx_PATCH 0
++#define freeaptx_MINOR 1
++#define freeaptx_PATCH 1
+ 
+ #include <stddef.h>
+ 
diff --git a/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild b/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild
new file mode 100644
index 000000000000..e761be0ee4d6
--- /dev/null
+++ b/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild
@@ -0,0 +1,50 @@
+# 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="Reverse-engineered aptX and aptX HD library (fork of libopenaptx)"
+HOMEPAGE="https://github.com/iamthehorker/libfreeaptx"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/iamthehorker/${PN}"
+else
+	SRC_URI="https://github.com/iamthehorker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="cpu_flags_x86_avx2"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-version.patch
+)
+
+src_compile() {
+	tc-export CC AR
+
+	use cpu_flags_x86_avx2 && append-cflags "-mavx2"
+
+	emake \
+		PREFIX="${EPREFIX}"/usr \
+		LIBDIR=$(get_libdir) \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		ARFLAGS="${ARFLAGS} -rcs" \
+		all
+}
+
+src_install() {
+	emake \
+		PREFIX="${EPREFIX}"/usr \
+		DESTDIR="${D}" \
+		LIBDIR="$(get_libdir)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		ARFLAGS="${ARFLAGS} -rcs" \
+		install
+}
diff --git a/media-libs/libfreeaptx/libfreeaptx-9999.ebuild b/media-libs/libfreeaptx/libfreeaptx-9999.ebuild
new file mode 100644
index 000000000000..f849a9cc545a
--- /dev/null
+++ b/media-libs/libfreeaptx/libfreeaptx-9999.ebuild
@@ -0,0 +1,49 @@
+# 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="Reverse-engineered aptX and aptX HD library (fork of libopenaptx)"
+HOMEPAGE="https://github.com/iamthehorker/libfreeaptx"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/iamthehorker/${PN}"
+else
+	SRC_URI="https://github.com/iamthehorker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+IUSE="cpu_flags_x86_avx2"
+
+src_compile() {
+	tc-export CC AR
+
+	use cpu_flags_x86_avx2 && append-cflags "-mavx2"
+
+	emake \
+		PREFIX="${EPREFIX}"/usr \
+		LIBDIR=$(get_libdir) \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		ARFLAGS="${ARFLAGS} -rcs" \
+		all
+}
+
+src_install() {
+	emake \
+		PREFIX="${EPREFIX}"/usr \
+		DESTDIR="${D}" \
+		LIBDIR="$(get_libdir)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		ARFLAGS="${ARFLAGS} -rcs" \
+		install
+
+	rm -f "${ED}/usr/$(get_libdir)"/libopenaptx.a || die "Failed to remove static lib"
+}
diff --git a/media-libs/libfreeaptx/metadata.xml b/media-libs/libfreeaptx/metadata.xml
new file mode 100644
index 000000000000..889e237efe92
--- /dev/null
+++ b/media-libs/libfreeaptx/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>codec@gentoo.org</email>
+		<name>Gentoo Codec Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">iamthehorker/libfreeaptx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 2080ccf7eef7..d415fbca23f1 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,4 +1,6 @@
 DIST libglvnd-1.3.3.tar.bz2 715179 BLAKE2B 781550cbda489dca31596115c78edd1d4f1fe66062218c83ccf6cb34707501fce839b649c2b0aee3621c283397acca8fb40ad16c0388551ce7caa7fd79b7dbf5 SHA512 7da9e12c010a8f109cd24ca4c2ffc846dd7d23f82157e1e39b8ae69575fabcc9592c0b639b23d2112fe2026b679f1536f1b705a5c948fefea105418803e1b629
+DIST libglvnd-1.3.4.tar.bz2 715616 BLAKE2B 77866bcd80b80dc27accbe960d63f45b5052ad110590890ed4707db0c2d7efd6882755f7258fc007b3b11bed9cee02477103ed65003185f9d7d2f6e82bef7df8 SHA512 3132bf2a547d5b7ffe12c6f1574b62c666cce8708d0311dccdbdb82063e5b6efd6f889ff1829d550af903305cd7c5bd2f7c5e0253234b25e0ea98234769e7ccf
 EBUILD libglvnd-1.3.3.ebuild 1421 BLAKE2B 57e539198bac90ce3aae81b68c211fa6a31e707078d524a19cd02707eee3fb7ce7bce4cb4f2c7a8d6be3605a45a2580704ca035445a1b588ca7e0c5508644ae0 SHA512 d9a6a3a57915fa03117c5b9d252478718e818adbfe2663bf045858980b98191c7fd77358caf8b8fecf989501e24cabfdf55428464079eec08f99f8b11e3d89ec
+EBUILD libglvnd-1.3.4.ebuild 1428 BLAKE2B 35ad17719893213a5a0b18d75df985a5bb45415240c2dde7eca37e5f37c6b8787d9797b6aecbbdbf0c1fac4815524977425acf72d78e71f6fee68a48511064be SHA512 6931b29a79a836234703201b4e377940f110db26567d1da8e78a2b3402c2747cc0b106341e1bb48b8c00b6cc38b2c88b2cde298fd6daccfa97ef74cb889635a8
 EBUILD libglvnd-9999.ebuild 1428 BLAKE2B 35ad17719893213a5a0b18d75df985a5bb45415240c2dde7eca37e5f37c6b8787d9797b6aecbbdbf0c1fac4815524977425acf72d78e71f6fee68a48511064be SHA512 6931b29a79a836234703201b4e377940f110db26567d1da8e78a2b3402c2747cc0b106341e1bb48b8c00b6cc38b2c88b2cde298fd6daccfa97ef74cb889635a8
 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/libglvnd-1.3.4.ebuild b/media-libs/libglvnd/libglvnd-1.3.4.ebuild
new file mode 100644
index 000000000000..430500414962
--- /dev/null
+++ b/media-libs/libglvnd/libglvnd-1.3.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+PYTHON_COMPAT=( python3_{7..9} )
+VIRTUALX_REQUIRED=manual
+
+inherit ${GIT_ECLASS} meson-multilib python-any-r1 virtualx
+
+DESCRIPTION="The GL Vendor-Neutral Dispatch library"
+HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+	S=${WORKDIR}/${PN}-v${PV}
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test X"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
+RDEPEND="
+	!media-libs/mesa[-libglvnd(+)]
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+src_prepare() {
+	default
+	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
+		bin/symbols-check.py || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature X x11)
+		$(meson_feature X glx)
+	)
+	use elibc_musl && emesonargs+=( -Dtls=disabled )
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if use X; then
+		virtx meson_src_test
+	else
+		meson_src_test
+	fi
+}
diff --git a/media-libs/libilbc/Manifest b/media-libs/libilbc/Manifest
index 48a593da5282..3d8ac95cc271 100644
--- a/media-libs/libilbc/Manifest
+++ b/media-libs/libilbc/Manifest
@@ -1,5 +1,5 @@
 AUX libilbc-3.0.4-respect-CFLAGS.patch 1217 BLAKE2B 69e46ed5ee1f9ef082b54b6049d078dfa3a007d63b8d0a79c1f07dd8335eaa0402dcc08bc30c0bf8c9329b1244d638231c10fa46396a9c07cdcdab8539fa6c5a SHA512 7de1bb74f552dadccbe3a31c4a2cef7da7525fae47dc7e5d22c78e59604ac9e07e3f4123acc35e174dcf9fe25f4c7e3b6e51a092f77c4f604b23af1ed724cf4a
 DIST libilbc-3.0.4.tar.gz 1307591 BLAKE2B a914b79c1134536f45910d367216b1ac27d4acb08f4c9b9dd3f01eaf181ecf0f6dc351b944039b05445217360a7e4b868b3aba9f8d6265eeee62a90ce0641a42 SHA512 2239a915263c2a73d83836354d42c670e4fe1173a38b3d1a9cef169778038ae5f4901d8202d6c5367d00db76e034e72bcdf6ac81bf0188f6a3f928e7d36d5a31
-EBUILD libilbc-3.0.4.ebuild 599 BLAKE2B 5476326bb06e7c351926ab0364a42ffcdbc025af8e03ec2663edffab7b78307a12ab021a5af977303887fb46e4f2ad5698af1d321d7104abc0c8640ae357b49d SHA512 40e44020521fbae740f457a9e104c412f4cebfe8c295cb06b5a7490825239b7b371ef16fc03f3d9806339df00eb9206646942cd89bdc177fea73d01544986626
+EBUILD libilbc-3.0.4.ebuild 606 BLAKE2B d62db3872ec1090defca3df406d74d2eaa6136f6e326ea050eb1fba609cf87e43f5def6d9caf5aa0f46ba23b5134c21c6671f3905dcc2a6684a7ed9d9e6bfd97 SHA512 baff9d09a9787a73624833aa60db197e6fc5c92c8f6516b11585794b79ddfa25a7ade0aacf3d2840b4bc1f465994811420e4303afc32cf3d4bc139531f33ba98
 EBUILD libilbc-9999.ebuild 605 BLAKE2B 08f27610431b3c863541e0d4c51f0e8d3116ec42785327a81da682c8a1fa45a90580f78d8a76d796572bda0db142873287c9128b92e1381cb62a8bc8eed58956 SHA512 d10afec68a9394333f48804c2844d217f9d774b645b0d32950ad3291c30efc303c54f3ef495a86141af67015c1e17c74740657215a773e944c0e76c36ca1f66b
 MISC metadata.xml 333 BLAKE2B b0f35100492df931d4a504ea070e7c5df977bb452e013cdbcb6b82d949b42d9b751862c5b9462b67d3669bc401f843eef664e5e1612400cb9418f22b208b2f3a SHA512 9081154d8e099e7b355ef3b11a49e7580bf1ef2a62dfe3f183694041a0a1ef247a111a982af1ba9cefb3a64dc26a4b0edd45b374087e4bbf044f468eff7195ec
diff --git a/media-libs/libilbc/libilbc-3.0.4.ebuild b/media-libs/libilbc/libilbc-3.0.4.ebuild
index 2425e78987a0..285925de2aed 100644
--- a/media-libs/libilbc/libilbc-3.0.4.ebuild
+++ b/media-libs/libilbc/libilbc-3.0.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/TimothyGu/${PN}"
 else
 	SRC_URI="https://github.com/TimothyGu/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Packaged version of iLBC codec from the WebRTC project"
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index aab6c8e47304..9ac2b514b5a5 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,5 +1,5 @@
 DIST libmatroska-1.6.2.tar.xz 65460 BLAKE2B f746f0dd519b8e3b4f98057d3f83e23a79595ab95e71f0c45c1128b2cbe093d5955a38d9d0565be9336f3d53279e20bddf0a2b4a54378c78faf4ee8f94586686 SHA512 c0b2b475f01e01b064348e96a4cd25f594e93b21ab6f66236d6872d1242b6076d501c155a19dedd642ded8338c0a71be09450fc086e77802099413c8849abab1
 DIST libmatroska-1.6.3.tar.xz 65612 BLAKE2B b72553ba32358b996b98fb1b4a3d05b4026c95406c31312d43cf7ad875192683de05d8813e5f0bed04502543c80b83524b02c7caeb860f79860760d926b92754 SHA512 271557c4f8836411782991c069a16cd49d7f9b6f209d1f96f6694f0e8bdfdcda3bbf76512c328555252a8c3e45c5adfcfab1e738304bb2ea85786a6f45af3f41
 EBUILD libmatroska-1.6.2.ebuild 629 BLAKE2B ac32392e700a32fad8bf0c12f43a6a784d77590370a94286b76dfbab95636c2db91d3919eda79c5a3f862d3f0c9a39518ec80d927d1b4d83b488c31b7ed42788 SHA512 250be02d4b44d04d462f336cc5f0850ac3d7464ea89ea3c4f413d44ea8a0458f7eedd54dd88dd33616094397a59d4243f90badabdf2a5220029226031a0c602a
-EBUILD libmatroska-1.6.3.ebuild 635 BLAKE2B be7362151e4c294af36989c84bc88aef3e53d004b665f5c539a42859a4043cb7ccbcd75e621e388fa0f9bb3d32bb68d849c656cda1f6c9acd90cc0fd2dff6c5a SHA512 bd602e48917271f871fd9eb265e6afcf8a3e09c4608534ae09a85be0b86c2ae07d91206e72d0abe9a3c5f7c51f51da9d5589a354f5ec6dffa47797b34315b01d
+EBUILD libmatroska-1.6.3.ebuild 628 BLAKE2B c26a6f32eda428d34c3eca51cdd4d1c7cd69190306305725e9e15be7da5a048696ff84e1ea3804752da9d09fece8c68ebba55239e6d904e8095f28c7ee62a2a5 SHA512 ed358879e9a78200ed609e07fd37ac000b22b98af5cd3025fdafce7946257ae72edce5fb0a093f51cdd4317be338484187e3cb289f0f53eafd91fe85f09910b2
 MISC metadata.xml 320 BLAKE2B edd6b2e35a7833d3510edec80f3771a319cbb257cbb203e0f71f33636431496c620cb3307b2bebb44360d6932a7e4376b0d134f3f42d26fc9271423c2eed11f6 SHA512 5c1dad06e1fef24b1ec68fb6b12d0d17b4bd05f22b1953f713c25a513340cb08540eebaec32fbe7c6607ba2142a057b8e6e5743a929b7368665d91bc014f35a9
diff --git a/media-libs/libmatroska/libmatroska-1.6.3.ebuild b/media-libs/libmatroska/libmatroska-1.6.3.ebuild
index afc1f9120261..baa2c32dc6b5 100644
--- a/media-libs/libmatroska/libmatroska-1.6.3.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/7" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~x86-linux"
 
 RDEPEND=">=dev-libs/libebml-1.4.2:="
 DEPEND="${RDEPEND}"
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index 78958a7f7d7e..6e7ed7c00087 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -1,3 +1,3 @@
 DIST libopenraw-0.1.3.tar.bz2 565458 BLAKE2B dec7cda78b6ff4b1411b93c0d48758920b73e087eaca3c262a0850eb5a3423fee38ba7537694b1a04bdafa6bbb34b290c059f483a5a6af339b76c132ac77c413 SHA512 c56d84610f0cf5da970c4c0c791fccf2f7e9f7c7dacf2aeac0b2702ce9a0cd3aaa2f6db0794b0466e1dd8316771973db1e64d013f635c1166b7ff2eebdcbf029
-EBUILD libopenraw-0.1.3.ebuild 1050 BLAKE2B 17d4a60c14fe01a686a539d7fe231e0b6f3bddf26f4cf3dd6c529ab320a98869f094364c55b3528dc717638e3c32661a24226bac9a69d9d32c63dbacaf0d0f2d SHA512 06ee1756780eb54b1d9a54955a0c814785df3b7d0441892e41a9a154513be9df4a6f804b0e0aa10f3500eb7603560495dd4eb4a858179ecd9fa010322aa4925f
+EBUILD libopenraw-0.1.3.ebuild 1057 BLAKE2B 47414c86de583b9a7c493aa31eddebc3cd1425003a6959520b05baec499729bafc08ff5d14962117580b97021e89f638d865c9673bc466b17cba8db3459a1b97 SHA512 3e0e106a572dc14e6e2e91f512a9871ea6e5a823f120cb8f2d8839310d743fe63e10f08f8ced74d2651d7955d0f65c1cb339e2304a181f81d1161dbc30512542
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/media-libs/libopenraw/libopenraw-0.1.3.ebuild b/media-libs/libopenraw/libopenraw-0.1.3.ebuild
index e004a6a8e899..5b957e3c1f60 100644
--- a/media-libs/libopenraw/libopenraw-0.1.3.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index 15a7f05fb2ea..c51ae4b1b845 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -5,5 +5,5 @@ AUX libquicktime-1.2.4-ffmpeg2.patch 4046 BLAKE2B 1db6a761fa94a32741a05919d12d02
 AUX libquicktime-1.2.4-ffmpeg29.patch 13436 BLAKE2B 8a1e7b5df65f5297f59aa17c4a52706413c1ffd88d8645de7359ec26f7059101ab81ac135cf7ef707a8acbeb709e1a6dae03d6a7e7f70c7e88185ebb271acbe4 SHA512 2a7e06c03b0f64f02b923c1a0e7121f4e1ea735f19a6df8ce8daf18177ead132d1ae921c64f3770042db3bbf29f15a7fcceece835d475e052c4c3bb7139c9e2e
 AUX libquicktime-1.2.4-ffmpeg4.patch 14723 BLAKE2B bd1299c24b738b3752e4d8d50ed1b2fa2f208c83e577876118d115fca22293e102614ae0cdc168060115f7145d951d290bccf21154fda4aabf55329d310b6aca SHA512 1b11a82d694654976a5f79cd8feb27eec3810e09a66dc58ca576eaf1f96e4948abd4dae7955a7da6cf99ae6ffef9e183b39090d96cc6b5fe216b4c4f4faff7a8
 DIST libquicktime-1.2.4.tar.gz 1028626 BLAKE2B 6c50965be5d19fb4c57ea6b36f2581ebd575d78a34f2df7029ce2c6ee560e8135a953a2e85d91d189e2c01b97c99804d0eab602866b88a5f07c36351174680f0 SHA512 6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd
-EBUILD libquicktime-1.2.4-r3.ebuild 3623 BLAKE2B 4924bdfe77b93c6b2dc7e2b5a3a1de3d07f9b4bd0d7d6eab2209428fa0ec65149b4691b501c3834d18097a45fd6af2e876243a9db49406ed62450d4a83bf81ea SHA512 10cc454da1a6b60aa6ac34f891f510002f511dcc827f6afc862422ebec9fec6452cbf9301655ef8d821179228eea3ecc9803fd7fbd5e84588937bdddf54e03a1
+EBUILD libquicktime-1.2.4-r3.ebuild 3630 BLAKE2B e469410bef7d2f98c85999db95517795ca56481b44c08344cda777178807692bcc3078544430d4c8087faa5c8534aa1a5feac81db50cc19f436df21dc403f340 SHA512 de08b8b81804ab395caaeacf82d37f56d744fee2f5ec1e156bccfe2f5f33d255ce8f4bb8e36c2305e01a0aee640b510a5a4afc6577d6fa09f0da25fdc5bda7bf
 MISC metadata.xml 305 BLAKE2B 6d9bada3e0a351337e65ebe3b38f821d76707bf4fd85c5d91fe186d019a2e179614d132cacf99d4d9d72ac0d15b93f6ebaac5758773736f2ac867ee5fbd1d473 SHA512 2f35d071d5211038792c700f90bf585c5d427ccf6aa98f41b38ca3faad0bcf6f2445c98985b7a51f751a2cf6287693ce21966cb1e98ce8162fc57fa0617ff166
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index cf8f4821192d..a56c905c7c94 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame cpu_flags_x86_mmx opengl png static-libs vorbis X x264"
 
 RDEPEND="
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index 2f0e0b1f5e91..660681bb1b7a 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -1,7 +1,5 @@
-DIST libsidplayfp-2.2.0.tar.gz 794840 BLAKE2B 1641808e5821f824186b0fd7108dde67ca476724dd4c554dbcca9acd2778c1384e9fbc016658c2c399dbe001100f56658b56234e23032a90aaa75a8faed92792 SHA512 29412410ba1690ad6c9e98f172a0cc49e5d1cb828329da152aa76472ef524932d8b2b35f48f831dbfad08d0c78be22440fd939a1e38b7046cf37fbd34555c683
 DIST libsidplayfp-2.2.1.tar.gz 793924 BLAKE2B a1f11cc4100f18bdd1732c704ac87093d5626627f3b6fc215292e43e63061a79ca8870c3e5a6ea945e24f40a4207d3173e7fed5e05ea52981784389bcfb2af29 SHA512 34a8f6abf6a60ea3fa774e5884736e6dfdff1de9290b656e4ae783e1e15d7b197b03bf400ca0018fd569cfc16a2e30ccb41d0008e800c30f895cd6e3432b048e
 DIST libsidplayfp-2.2.2.tar.gz 794119 BLAKE2B eb0fd39e8bffdce45d081f5dab9074db9642e74f9bd06a5f17453254bb1ab4f0348a9b49e43a00a0f5cbff57fe3ddd1408cbf048bd228784fd5b1ac19700f944 SHA512 46882c5edd20a5b00ee5b46b0b6c65c0987c33406532f0b1f1750b0f8faf2968ee45e68ee65e6ca9cc39123273b08e139a8614ba9878d14099388e647e3bad1b
-EBUILD libsidplayfp-2.2.0.ebuild 665 BLAKE2B 563e14bd896eb511e1ce667406a261d5c52ab95b0373da739fd03027637bf1f1fc5acc63f5402a40748c3bc6a13920f7e92de8ee837ac3dc325ef04a83746c56 SHA512 65e3fb6b69d93de476b10cbe0c19581e3354d005eb4c3abb89e3f1ec883e8f9b7c75c169dc8cc86157b78817ea2d0a67ab2d1b11fc4a09dd2991a446b317de05
-EBUILD libsidplayfp-2.2.1.ebuild 667 BLAKE2B 967fc98eaf34234ffa21cc42000363ebd8c897d16aa627b8620f1042759d08edafdd7882d038e42e1d8d64650ab84073d52365ddb9722137b2e07123fb9f0ce9 SHA512 90a1367d0ce9d9022c83636dd8ed761606abb211580c882ad1fc83992d1e3b7161a1b5a2ccdd7c55bf494518fc2d27580d8a249ed7df98374a0f519a5de418eb
+EBUILD libsidplayfp-2.2.1.ebuild 665 BLAKE2B 563e14bd896eb511e1ce667406a261d5c52ab95b0373da739fd03027637bf1f1fc5acc63f5402a40748c3bc6a13920f7e92de8ee837ac3dc325ef04a83746c56 SHA512 65e3fb6b69d93de476b10cbe0c19581e3354d005eb4c3abb89e3f1ec883e8f9b7c75c169dc8cc86157b78817ea2d0a67ab2d1b11fc4a09dd2991a446b317de05
 EBUILD libsidplayfp-2.2.2.ebuild 667 BLAKE2B 967fc98eaf34234ffa21cc42000363ebd8c897d16aa627b8620f1042759d08edafdd7882d038e42e1d8d64650ab84073d52365ddb9722137b2e07123fb9f0ce9 SHA512 90a1367d0ce9d9022c83636dd8ed761606abb211580c882ad1fc83992d1e3b7161a1b5a2ccdd7c55bf494518fc2d27580d8a249ed7df98374a0f519a5de418eb
 MISC metadata.xml 338 BLAKE2B 8f2f847b878e42e85fed57021162ccfd8cb8b54e6c285cea2691b9dd89ab320a59e4df38ae12414eaa81d7f781f81fd6d102e37f0121f98a2d9355ac8e9c131a SHA512 8f2ffc3fd7b2b6af0143e4125cad702a68da198e0433fd3d22775ca1f64d8689acf3cc0fdbd205d7fc0815b95c1c88fa1cca71c3f5572f3aa3b25bb8b3a9b76e
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.2.0.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.2.0.ebuild
deleted file mode 100644
index ecc3f9988790..000000000000
--- a/media-libs/libsidplayfp/libsidplayfp-2.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library for the sidplay2 fork with resid-fp"
-HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/6"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	# fix automagic. warning: modifying .ac triggers maintainer mode.
-	sed -i -e 's:doxygen:dIsAbLe&:' configure || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.2.1.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.2.1.ebuild
index 219eebf19780..ecc3f9988790 100644
--- a/media-libs/libsidplayfp/libsidplayfp-2.2.1.ebuild
+++ b/media-libs/libsidplayfp/libsidplayfp-2.2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index df72a764d09c..cab4c30ddae5 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,3 +1,5 @@
 DIST soundtouch-2.2.tar.bz2 527571 BLAKE2B 0ed67604f0996a9112cbabad9eda39c314aa1f3b1b70aac2a014f76880cb5ad06aeb697f44e9229ad197c9245ce8f684f5fb9b31ce31ae631400a17fe825679f SHA512 8bc1b9aa60031145e8be7ab48d10d93da84b0f5032eb2d8cf46291d4267b6810513f284f6fa72dd6f343e30eeec03070a7485cd933f30bace2ebf995bc843143
+DIST soundtouch-2.3.0.tar.bz2 528840 BLAKE2B e76627c323c223a067db6fd65a08661f39c9b55e0eb8ead7d643f92707dc56b8d235eded27a95d5eb1ea751d15336d4cb4b757c4abb2f6780258d81899484241 SHA512 f85974d7afd010bd874a4ffc51abf4013694334bfb09071f1c4d478641d34b5eecb9efc6ac41d8f0e6a5d1cb4095289316c124c522b4ca3fbd6a91b6cfc83083
 EBUILD libsoundtouch-2.2.ebuild 1520 BLAKE2B 705d5129d3a63288122abea8678e54ef1e390dd5ff7257eec7843b4e1f41e3eeaf121922d30fac9ce0c231fd864eb6c441a2dc735d04db5786797427941cfe17 SHA512 78764152c7b4cc941422515013cc82c63c4fe992de1dfbea87213fbf81fec3122405905837ec26da80d93d7ba4dbfdf75453d0427acfa37d5a51c3bc858a39f5
+EBUILD libsoundtouch-2.3.0.ebuild 1524 BLAKE2B 5dfeb54696c03bcc4d95d28798230ffd4dd60c63a40abfcf1498ff5dfd10300e84e568aff4ed7a01715d315b953f92d935182550c8cfb0d9570894837039ed08 SHA512 d8b236a447e751fbf04d45069748260efb46db7628b4e5e9e0fffcc8d86f2c8088ebecb830b6155780214bbe97ffda2bf4079d1c2398b15cd89909b0b38c5fe3
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.3.0.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.3.0.ebuild
new file mode 100644
index 000000000000..05a3b1ff14d0
--- /dev/null
+++ b/media-libs/libsoundtouch/libsoundtouch-2.3.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+MY_PN=${PN/lib}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates"
+HOMEPAGE="https://www.surina.net/soundtouch/ https://gitlab.com/soundtouch/soundtouch"
+SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+# subslot = libSoundTouch.so soname
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="cpu_flags_x86_sse openmp static-libs"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+	sed -i "s:^\(dist_doc_DATA=\)COPYING.TXT :\1:" Makefile.am || die
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		--disable-integer-samples
+		$(use_enable cpu_flags_x86_sse x86-optimizations)
+		$(use_enable openmp)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index 89939125ac27..3cd24f9e0478 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,3 +1,3 @@
 DIST lilv-0.24.12.tar.bz2 427404 BLAKE2B 47efe553c6fc249ed0cde47a47a01e0b3496ea4dfac88849b75d9720cb3a158fa1c95959ffc1a09e606f8ba3831e79382ba08ad100ee17cf19c7f1ffa186d6e2 SHA512 ea22db4e995792b62d60d793169c792549b8fb0255c2cf7a85780dd149811921e2fae5eaea0fb83465f01b14dfa66361af3be40bf7cb3733e98655b943f4faee
-EBUILD lilv-0.24.12.ebuild 1769 BLAKE2B 7c782bb72a3638dfe4bb2023812dfeba9042560fce7fdc7bbe0299e4c89046e72b9acbf5c7be7177e53ace2244284b62dc14fb1369922a6a435f18a4e117c998 SHA512 6d257bce34ef19d7fdaa9d62881169b8cb3fae36d2975d5d2bb8d72c37f9951b53612490280dc1cbf718be65860f4b6bc64b76f6a35be19b78570a99cbc81e48
+EBUILD lilv-0.24.12.ebuild 1774 BLAKE2B 540844f9ade3ee4f084e59f9a232b9cec5ce8577939d7865bab145006fef66624598b7cc1c33424dba1adc3c249d6ab7b4abc221376a450446a913f611980610 SHA512 1755dc13e1ae9598be28c0f0c9ff4aa3a872698851848ca3626129542f6cbdc774c57da7215724a1e0e1a639e49bafd98fe985b0a982795748e0cc203e7829db
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.12.ebuild b/media-libs/lilv/lilv-0.24.12.ebuild
index afa0f80e6fa2..422b03eec611 100644
--- a/media-libs/lilv/lilv-0.24.12.ebuild
+++ b/media-libs/lilv/lilv-0.24.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-single-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc +dyn-manifest static-libs test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index ab59495dcf4b..119fe5acf609 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,3 +1,3 @@
 DIST lv2-1.18.2.tar.bz2 538345 BLAKE2B 824c7bc2ce62de858308d856d0f89c6285c183764be3727eba5074f42543a1bb8a5e1cdd8a85bf0a4ba1103e1243c843013bd516d2d6e7ade09c46380bca3cee SHA512 d5bdcf94d3cf9a569e29964002a038ae73cd6ae7f09f7d973f8fd74858c8cf9d01bbed85ae8bf0a00efcb2b3611357a64571222a89972091941449c36d76b0ef
-EBUILD lv2-1.18.2.ebuild 1344 BLAKE2B ca4f75798164a38b7475229cafe087f9e0f2995d4fe4a5d5978c90cad059e475d1f7765960be93fe8bbbf241bd696e1200f286f555b37026d13d81d8bb273d1f SHA512 57d251c8b3f607bcd2ad9a47f326b07159f4c6896e99bb19b17e39916d0b68fb823071c4ceecab8d00717709552d2907ab291ef7245e97016028da3bf968515e
+EBUILD lv2-1.18.2.ebuild 1351 BLAKE2B aed3b80bd3e44053a840f12880c29fb35cbec56b65a6d7d4fd6a029e3ba9cfaf97a284755f36bc2f0ae77a2a54e3e12528e01cf19ff3a6c74f1173bb73cff19b SHA512 0de0b39cb1291003b15e6839c111eff8850fc2c171ce1e616f28f82e98b11f65bcded5e48b9d4d27a580f2513bc8d4d4d2948648941efcf7f2fa4259ff6dd1f6
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/lv2-1.18.2.ebuild b/media-libs/lv2/lv2-1.18.2.ebuild
index 24693c0ff469..7c9f510ca0a5 100644
--- a/media-libs/lv2/lv2-1.18.2.ebuild
+++ b/media-libs/lv2/lv2-1.18.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://lv2plug.in/spec/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc plugins"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-libs/munt-mt32emu/Manifest b/media-libs/munt-mt32emu/Manifest
index 5d822589e6f0..a7506af8c935 100644
--- a/media-libs/munt-mt32emu/Manifest
+++ b/media-libs/munt-mt32emu/Manifest
@@ -1,6 +1,6 @@
 AUX munt-mt32emu-2.4.2-docs.patch 518 BLAKE2B 15ed5513d3ef11dbfdd9304a1295d82b3e54f223dcf448285392c9cdc24635c5823a8b5ad4b0954908627ba2ebd450e2f849a9cd725fd78b70e578d0a3d68c43 SHA512 2a1ba4731a13c2f54d5eccad6971b0544b75787df922d31ab2ae68471f078e0585d2c386f09461b89db38fa2bf57b2e402ad98c07f6d5773fbd93856d1c27d6d
-DIST libmt32emu_2_5_0.tar.gz 526300 BLAKE2B a458e402a094e0ea6a42a408f0422c9d12a23126d5c6e5c2b69a15b5264463a436c02a963aaf2c30e3198df1dfb01845b279bc0b4e5f5680b372e98a706c866e SHA512 e86733bb26714a2a5f54a1b443db1e6f320bc3373dde6bbbe6662ecfb5b36c8ba0811919f2ddd54a11f264551add76e7032cd51f5803c502bfd4b1020fafb86b
 DIST libmt32emu_2_5_1.tar.gz 526351 BLAKE2B 34af97107f54e22513e31cd36d35c155acb2f83cfc5dd670ace9d888a3f5bb5a9af1b5424379b3904253073f2b7fe736099c08b17bd7cfc24406d118b81a9b6c SHA512 8775f095c6a759db6d62b5f0693b64b13408806549349760f703553f6eae5e0face7b84577cf2511f25da9f87eb2bd14d4df6153fb53ff5109510ff1876f1978
-EBUILD munt-mt32emu-2.5.0.ebuild 595 BLAKE2B 0cd8c1168845910ecdcc3a7bc60753ef5dd5efb152ddbe0ff0e602f2c17ca52f9e2a32415f8d5851a58f4dd12dba1f179dc1d524743af344a6b6b84b7ad393d3 SHA512 27fb007e9682f3657a2d03e60189e7a2c515ddf091e3c7de2e616e71e03fed47c61724b34617c6750cd55e1b679ddebe77adbcb0df438fc65142f9ffaf795dc0
+DIST libmt32emu_2_5_3.tar.gz 527698 BLAKE2B 1ca31f2da92d77f9c3d34bb8c9f19e34e83cc82751ba08dfda1240a28b49e36c2acf3a6d8aab6e62107df4d88645e77d447e332968007fe865882d54e71475de SHA512 c801e22e861898281316109533ca6264f5a9cf778d4f0bb14b49bb6d04d53b7e60cd8320d5b29a63534f6c470b4feb67c881e86c49b7860a98639ce01b99debf
 EBUILD munt-mt32emu-2.5.1.ebuild 595 BLAKE2B 0cd8c1168845910ecdcc3a7bc60753ef5dd5efb152ddbe0ff0e602f2c17ca52f9e2a32415f8d5851a58f4dd12dba1f179dc1d524743af344a6b6b84b7ad393d3 SHA512 27fb007e9682f3657a2d03e60189e7a2c515ddf091e3c7de2e616e71e03fed47c61724b34617c6750cd55e1b679ddebe77adbcb0df438fc65142f9ffaf795dc0
+EBUILD munt-mt32emu-2.5.3.ebuild 595 BLAKE2B 0cd8c1168845910ecdcc3a7bc60753ef5dd5efb152ddbe0ff0e602f2c17ca52f9e2a32415f8d5851a58f4dd12dba1f179dc1d524743af344a6b6b84b7ad393d3 SHA512 27fb007e9682f3657a2d03e60189e7a2c515ddf091e3c7de2e616e71e03fed47c61724b34617c6750cd55e1b679ddebe77adbcb0df438fc65142f9ffaf795dc0
 MISC metadata.xml 620 BLAKE2B be9835ba92d5c8d4cf03c2a716886e422e2539ae773a8e281f4e804192caae29c185e8bac79a5b3a0ca9f7e639f9c5aa099c1ee8f496e1a508b096d4216bc1a9 SHA512 80cde499938128dc44148fdce298a26a49a8cd2660508cd5c6b0e5a9ed8c07eb9d067561d96f8fa94798edff7aa439d9d9269b9ee19a2f83759f574e08e192b3
diff --git a/media-libs/munt-mt32emu/munt-mt32emu-2.5.0.ebuild b/media-libs/munt-mt32emu/munt-mt32emu-2.5.3.ebuild
index f1a27e25b8c9..f1a27e25b8c9 100644
--- a/media-libs/munt-mt32emu/munt-mt32emu-2.5.0.ebuild
+++ b/media-libs/munt-mt32emu/munt-mt32emu-2.5.3.ebuild
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index 1e57832f283d..fdaeec910dac 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -1,3 +1,3 @@
 DIST mutagen-1.45.1.tar.gz 1285455 BLAKE2B a1e29698d96b4c98f16e18dd8b3f902e41dcc4409d01da861a726a6a9fbd7f116e07b4e1872b8b3857f0eec080d18bac736de741635746f5c71416a3a8ef6e78 SHA512 c5244efa01b9de5ec22ceca39e55f34b933ca4a5bec0f2088fd3adca657f0230cbe85cd5e156db1d90fb44d9339bc94dc3bdcd3e49f1b0d46bc3d71ece6b45d8
-EBUILD mutagen-1.45.1.ebuild 889 BLAKE2B 407d723d35d35dc071d8f8f3bec2662360083d56692d5073311f71b6cf7da8c2690b1da423f7e0575a3aeb90fb135dd60fcc3778446e52c62b0ecb829920dce1 SHA512 625f03657f1a8e4504928abb9e60e3ac115c6d9be072e1d71fc73492527b01e3c271f7e18cade12ce515f2378f78dcb59b379ec1ff38e0618d7ef5e2d5410a92
+EBUILD mutagen-1.45.1.ebuild 896 BLAKE2B c5c4940f3a90e7553d984b1322008867709986e00a3e8a2b2c0d319e2c6e6962e97d1a97aa1970e1e50394d04e4566f40b60cc3ae16e86fafb6ea89b9354b3c7 SHA512 39a4c373854fa896f0a7483b10811743d7cb2cd138a4395f39c991f192a3368bf1c9b8adf74a8faf0a50f596488d75e4f59a5dc2d835a45ce7a6eb71aac96ddb
 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59
diff --git a/media-libs/mutagen/mutagen-1.45.1.ebuild b/media-libs/mutagen/mutagen-1.45.1.ebuild
index 5f072739dab3..77ec394e10db 100644
--- a/media-libs/mutagen/mutagen-1.45.1.ebuild
+++ b/media-libs/mutagen/mutagen-1.45.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 1729c24ba1d2..5649ef13cc03 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -16,5 +16,5 @@ DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa390
 DIST netpbm-10.86.22.tar.xz 3696588 BLAKE2B eabc11b4928681f2d96c8b6da1e23284868d7ba2f610f496d1ddf5b6ceb34c991160780f79c69b2c905e5210b024a1a5868656b89e23d6b63e587ce0cd70a950 SHA512 5840d0e88158ac77be7dfc5430e696701a740d56c98efdaf02b3c4e92bdf10268572ef0087b3bf263937073e0fbda3183aa7ed56bfe12dba30b3a3ff382bd4ff
 EBUILD netpbm-10.70.00.ebuild 5382 BLAKE2B 8b5a70217742d7f87b59c16d777b040277cd582929a7ae5fdf3d7ca1287e598e5204d498a4b38cd3e54fd3411bfc2d2ead8cf2ee030ce34f0594d3894ff45f7d SHA512 bca0a73ebb20f6eb7543048c0e34eabf5c8a3652c8b43ab357ba3742b649bd1075ff97c522da910b80e9d9feb8125103eea4df5373b00cf7d44851bd9927c786
 EBUILD netpbm-10.76.00.ebuild 5269 BLAKE2B c94c55e373301f8506a9ee6275865f0702c0bcc5ceeccf2b8433dedf71f99834475dd27ef5328db4c9d9eda5b7a5ce3943cd59e3e19e8e6db22bc35741cbf911 SHA512 a79ddc4ab964ed64e29d644ca33fc0bed01e0c90e96a3aa38d6a6be30039b5cff2dd86f8c5a798982df9e353d286e461ae560e8be6c98e008cfdd345927c611f
-EBUILD netpbm-10.86.22.ebuild 5691 BLAKE2B 1ab4be7f537991854dd4407c3d5fd96c578f7f863cd14f1ea5bc04966cdd7f180c76ad93c4842e53a0eb524b3694c7372067492423fb9ea257ccc7c619b97650 SHA512 71c694a08b5ba6187c66b2653f50779787cddba3865a364baf9b3c204e7db66f7d2b7b73089c8ec7618f9c3a58e9649de3cd36617dfea87c4a4c8874192ac64f
+EBUILD netpbm-10.86.22.ebuild 5748 BLAKE2B dd65cbbe4e7928f99c2e4f60bccb0aa86d9c8110ea82a9016ec0ed30faafb9fd2ed9f65629bb59fc99026465cab98b78ccd2f58df5855fc12b07ab8e4ed66d69 SHA512 00095708dc7a5eb74f8620b203875e9cefdc70bc57535b8a2c3371c8b98464a9f9779fde43ed3b9b69059f8dc6db70d880f90fcd210c55fdeae6959886da12f0
 MISC metadata.xml 577 BLAKE2B c70497704f1a34aa7b8bcf905c05560e554957e6350b7c219ea2050815215aa926f4242ae233c9f6b11a1dd9900fcbef0956cb45d50044720769857c15808b4b SHA512 9813c0b3d04c040a54dadbcedb1e88f1d90cbff7001381f7136c84ae3909788423496c7c97242cb989c63bf5127df5196d62e75c503fb2475f14f14cfd3741f0
diff --git a/media-libs/netpbm/netpbm-10.86.22.ebuild b/media-libs/netpbm/netpbm-10.86.22.ebuild
index 048c6e3162e1..4fd56a25b07c 100644
--- a/media-libs/netpbm/netpbm-10.86.22.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.22.ebuild
@@ -112,6 +112,7 @@ src_prepare() {
 			-e 's:(pamrgbatopng|pngtopnm).*::' \
 			test/legacy-names.{ok,test} || die
 		sed -i -e '/^$/d' test/legacy-names.ok || die
+		sed -i -e 's:png-roundtrip.*::' test/Test-Order || die
 	fi
 }
 
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index a080ce0b9ba3..17b61fa2c8df 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -15,5 +15,5 @@ DIST opencv-4.5.2_contrib.tar.gz 60800680 BLAKE2B d96b3c440090d3ab26f99a3822d1d8
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
 EBUILD opencv-4.5.0-r1.ebuild 20519 BLAKE2B d49c3660825ac597bbdb2d8262b9c024c734931140533de7fabab3d561cd0bbaa4c832af41e9063c2eab76729febdce7598307ff694004fd71127ee0f4560c60 SHA512 4612b55bbfc160b42b97d684bc8053e6f499bd460a8a7c5c6ab30e092597e47c5433f7c02176ad80a8c6045568de5b5336bd862dd6e4c3c74b8957bc42642fcf
 EBUILD opencv-4.5.1-r1.ebuild 20606 BLAKE2B d1bdbff23f18fe325f0912704939383e9c03d278e33b5606eebf78049c374a6c2f64d4e8f28b169ac8f191d78115238fb2ac9772080dbbff09330188928b72fe SHA512 fb4cae4db0090c83d6a06eaf2761a639d5c87b1020b88e9795afc49a914fbf1a69bb62f1604a0681a9a13816983b22679523ac80d6f502b66e10555de318e1ae
-EBUILD opencv-4.5.2-r1.ebuild 20611 BLAKE2B 18288e0af05a7476ecf83db758e70e922d179ed0cd96a47570d6652cc9a407ba0cb947c1c855a84f96177901262e2df5f00888f7db451f97902e2aee768f4bb0 SHA512 597f8cb0c7676347c1def2faf9e7f23d695565af4cd920d8d7031839ece247dc61908f3e9f54b5dad37c1e05b381762874cf1f61c143c6e0be75ebff81f3a39b
+EBUILD opencv-4.5.2-r1.ebuild 20662 BLAKE2B ccb2083480da1249a6a6f0159137d6ab3581d04cea8368312c00b6598faae60522385f3c357bcaf6d093c3bb4c2807014a0487265595c39bc7d3e17495ec4a0f SHA512 ab10b7f37426a49b7b6259dd64787e3eef7c53ee2a3803dc6a4258e91f2e6e239110ad875faf99ef707e4f7d12866fa1266cea3e61a5594efd3ef4bd15edcbff
 MISC metadata.xml 3185 BLAKE2B 107d18573676738a6ca8bec19250a4fdc2f839fb183757c19d042effe46825326346cf9090c86bc4e382bfefd05c81735886ad15b91539b1fca7896deb22a8de SHA512 51cf777192755265ed3d5fb4e7a83ba3c5e36c6e40165b770cba1a6b91183bd9e59360cd0130a2e159534c6fed90d8270787c5d204a6066e84d7a1b93e3e4f14
diff --git a/media-libs/opencv/opencv-4.5.2-r1.ebuild b/media-libs/opencv/opencv-4.5.2-r1.ebuild
index d978b3421497..05330abd0960 100644
--- a/media-libs/opencv/opencv-4.5.2-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.2-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 
 # The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
@@ -58,10 +58,12 @@ IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
 # OpenGL needs gtk or Qt installed to activate, otherwise build system
 # will silently disable it Wwithout the user knowing, which defeats the
 # purpose of the opengl use flag.
+# cuda needs contrib, bug #701712
 REQUIRED_USE="
 	cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
 	cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
-	cuda? ( tesseract? ( opencl ) )
+	cuda? ( contrib
+		tesseract? ( opencl ) )
 	dnnsamples? ( examples )
 	gflags? ( contrib )
 	glog? ( contrib )
diff --git a/media-libs/openexr_ctl/Manifest b/media-libs/openexr_ctl/Manifest
deleted file mode 100644
index 0b8bd189e0b3..000000000000
--- a/media-libs/openexr_ctl/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX openexr_ctl-1.0.1-configure_gcc43.patch 858 BLAKE2B a7feae054e1fe6a9d054d2eb70cc5786dc0adbac0bc9be215dfff2fa8eefc5ed61d83f5ea3d817724fd2530e6663af11e6b66df4e81f1a43d1543e84bd30a5c7 SHA512 72be434bf2ca73a1ab43fca50f011fce1db50e7c0063073a6f2d34c51dd85491f576ea43c474e9d78a90fda0c114fceab978ebbf475e33f66a97a2215cd28c0f
-AUX openexr_ctl-1.0.1-gcc43.patch 1240 BLAKE2B 3a0f520eec1d69679ab993f256198e7d767a48169c060a1ef15b25e516a14e9ba87c0e5b3a0e942f3aa897ae9128c21f681f145ef3a54b391dd502c787b465ed SHA512 2c73c0408cc973b3c741f17b4cc2e458401843dd6a7ceb54a08865c82200195e430cdd357bbb25b5c70612e2345d178b69528d62e4ae81486d4a25c325918717
-AUX openexr_ctl-1.0.1-gcc44.patch 457 BLAKE2B 574e0a606769c996ec8eeb556165a0327ba3d2fda789a1cba6e48a287940e00b3f5b7c0a80d7985b03fad2788606df82e8fd4eaf9cc0830682450cb1adbdbcf3 SHA512 b1258f6ea6a7dc5699bfda631c5b39514818f6239de1befbd229cb4f60058d235f0ed4030582c8108b36d3d409971a26d633983390ec1055abff16b30e68b486
-AUX openexr_ctl-1.0.1-namespace.patch 348 BLAKE2B 4bb257667565106034c687efd5d142380c5e1bb662c9d552d8abca29f1e5d0bff96ce1fcbbf6aefc205c7921dd930b21e56a33ac1aef54e5868c8e6a838fde82 SHA512 28f3b0964ccb7ee81dfc4c4600f0747e28d11ada1fe3a3b5beec17c56bdd8d66c37f6d4974272d6a0c54a397445665eda06a81f5ada64cfd96f74c2461cb896f
-AUX openexr_ctl-1.0.1-pkgconfig.patch 632 BLAKE2B 2adfca932aed12a83634c917b5af224e5fceb3e404fc0c4aff3fd4ac225c21813d919d2d2d05902193cd9fb47532c7692deb5eb9b4c04a1641416691ce3973cd SHA512 38c683204ded3aa0c0e5d83506a2eb49cdf33dfa7b44f5dce1502783f18aa154f8f4b5357aa4a07932ccacafb3d8cf32b80ce288cbcf0e75ca917adc2ff5e271
-DIST openexr_ctl-1.0.1.tar.gz 362864 BLAKE2B 4ac3daaeeab91bbf9d8b1e23ade7934d5917b69df4e6b717a1b5a2b27a73b68d6e0fe06eb2b420d7fb5fe3e284c1615a56cc46973eb2de3604c2a321c5456cfb SHA512 831a06dc83ac53ae9b520629dbd24d3a7cd24f3ab5f484de37d1b232dd16fcf71392d163a7b9f9059bb8f30ff249f7f5a9fbc35730211ff98c8e13dcf386898a
-EBUILD openexr_ctl-1.0.1-r2.ebuild 870 BLAKE2B 28f8814c3d6f9864d121937bac5403018e1857bc70199b152804cc6f0d0bb506fa51702540423f232a386c9ea72862b9142bdaabe068b756720b1f82c99b1d60 SHA512 50193eeae532f1a62a1addc0598160ea9ad90e33499b9e874f46dc90e9a0c0f81cdf3e048364f70a388c1b7fe1e0e75b9307fb8227c43701e576f7f664cf7cd7
-MISC metadata.xml 301 BLAKE2B 149874bca2d8b5957909f8749f1b274cec115425510904811eebe3cf19b76b28924a060d86f57f3fb6953c8e8ea55da59dfd8c4d4f83fdc8ee0b7f23f9dbf264 SHA512 6df4d1d337a4c00e4a2415c19a46d07d1a151135fbf29a92de300b077de3ae4fb64277b639448edeb0e64bec87d120f67d829f569cce2368388f3b4478dcd1bf
diff --git a/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-configure_gcc43.patch b/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-configure_gcc43.patch
deleted file mode 100644
index 604d4237458d..000000000000
--- a/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-configure_gcc43.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up openexr_ctl-1.0.1/configure.conf_gcc43 openexr_ctl-1.0.1/configure
---- openexr_ctl-1.0.1/configure.conf_gcc43	2008-01-09 17:08:57.000000000 +0100
-+++ openexr_ctl-1.0.1/configure	2008-01-09 17:10:25.000000000 +0100
-@@ -20851,6 +20851,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- 
- #include <CtlSimdInterpreter.h>
- #include <Iex.h>
-+#include <cstdlib>
- 
- int
- main ()
-diff -up openexr_ctl-1.0.1/configure.ac.conf_gcc43 openexr_ctl-1.0.1/configure.ac
---- openexr_ctl-1.0.1/configure.ac.conf_gcc43	2008-01-09 17:11:25.000000000 +0100
-+++ openexr_ctl-1.0.1/configure.ac	2008-01-09 17:12:17.000000000 +0100
-@@ -108,6 +108,7 @@ AM_COMPILELINKRUN(
-    [$CTL_LIBS],[[
- #include <CtlSimdInterpreter.h>
- #include <Iex.h>
-+#include <cstdlib>
- ]],
-    [[Ctl::SimdInterpreter interp; interp.setMaxInstCount(10);]],
-    AC_MSG_RESULT([The ctl test program succeeded.]), 
diff --git a/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-gcc43.patch b/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-gcc43.patch
deleted file mode 100644
index 349d4f083ca6..000000000000
--- a/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-gcc43.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -up openexr_ctl-1.0.1/exrdpx/main.cpp.gcc43 openexr_ctl-1.0.1/exrdpx/main.cpp
---- openexr_ctl-1.0.1/exrdpx/main.cpp.gcc43	2007-07-25 08:28:17.000000000 +0200
-+++ openexr_ctl-1.0.1/exrdpx/main.cpp	2008-01-08 20:27:14.000000000 +0100
-@@ -60,6 +60,8 @@
- #include <iostream>
- #include <string>
- #include <exception>
-+#include <cstdlib>
-+#include <cstring>
- 
- using namespace std;
- using namespace Imf;
-diff -up openexr_ctl-1.0.1/exr_ctl_exr/applyCtl.cpp.gcc43 openexr_ctl-1.0.1/exr_ctl_exr/applyCtl.cpp
---- openexr_ctl-1.0.1/exr_ctl_exr/applyCtl.cpp.gcc43	2008-01-08 20:30:30.000000000 +0100
-+++ openexr_ctl-1.0.1/exr_ctl_exr/applyCtl.cpp	2008-01-08 20:33:02.000000000 +0100
-@@ -64,6 +64,7 @@
- #include <iostream>
- #include <vector>
- #include <string>
-+#include <cstdlib>
- 
- using namespace std;
- using namespace Ctl;
-diff -up openexr_ctl-1.0.1/exr_ctl_exr/main.cpp.gcc43 openexr_ctl-1.0.1/exr_ctl_exr/main.cpp
---- openexr_ctl-1.0.1/exr_ctl_exr/main.cpp.gcc43	2008-01-08 20:34:32.000000000 +0100
-+++ openexr_ctl-1.0.1/exr_ctl_exr/main.cpp	2008-01-08 20:35:10.000000000 +0100
-@@ -59,6 +59,7 @@
- #include <iostream>
- #include <string>
- #include <exception>
-+#include <cstdlib>
- #include <ImfFloatAttribute.h>
- #include <ImfVecAttribute.h>
- 
diff --git a/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-gcc44.patch b/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-gcc44.patch
deleted file mode 100644
index 08530bdeaad3..000000000000
--- a/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur openexr_ctl-1.0.1.orig/exr_ctl_exr/applyCtl.cpp openexr_ctl-1.0.1/exr_ctl_exr/applyCtl.cpp
---- openexr_ctl-1.0.1.orig/exr_ctl_exr/applyCtl.cpp	2007-07-13 06:24:37.000000000 +0300
-+++ openexr_ctl-1.0.1/exr_ctl_exr/applyCtl.cpp	2009-07-30 11:46:29.000000000 +0300
-@@ -60,6 +60,7 @@
- #include <ImfStandardAttributes.h>
- #include <ImfHeader.h>
- #include <ImfFrameBuffer.h>
-+#include <cstdio>
- #include <cassert>
- #include <iostream>
- #include <vector>
diff --git a/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-namespace.patch b/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-namespace.patch
deleted file mode 100644
index 7c30515f122d..000000000000
--- a/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-namespace.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-http://lists.gnu.org/archive/html/openexr-devel/2013-04/msg00031.html
-
---- IlmImfCtl/ImfCtlApplyTransforms.h
-+++ IlmImfCtl/ImfCtlApplyTransforms.h
-@@ -186,12 +186,7 @@
- #include <vector>
- #include <ImathBox.h>
- #include <ImfThreading.h>
--
--namespace Imf
--{
--    class Header;
--    class FrameBuffer;
--}
-+#include <ImfForward.h>
- 
- namespace Ctl
- {
diff --git a/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-pkgconfig.patch b/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-pkgconfig.patch
deleted file mode 100644
index e35bdfc11a5c..000000000000
--- a/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-pkgconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up openexr_ctl-1.0.1/OpenEXR_CTL.pc.in.pkgconfig openexr_ctl-1.0.1/OpenEXR_CTL.pc.in
---- openexr_ctl-1.0.1/OpenEXR_CTL.pc.in.pkgconfig	2008-01-09 15:17:58.000000000 +0100
-+++ openexr_ctl-1.0.1/OpenEXR_CTL.pc.in	2008-01-09 15:24:52.000000000 +0100
-@@ -7,5 +7,6 @@ OpenEXR_includedir=@includedir@/OpenEXR
- Name: OpenEXR_CTL
- Description: Simplified OpenEXR interface to CTL
- Version: @OPENEXR_CTL_VERSION@
--Libs: -L${libdir} -lIlmImfCtl @OPENEXR_LDFLAGS@ @CTL_LDFLAGS@
--Cflags: @CTL_CXXFLAGS_PC@ @OPENEXR_CXXFLAGS@ -I${OpenEXR_includedir}
-+Requires: CTL , OpenEXR
-+Libs: -L${libdir} -lIlmImfCtl
-+Cflags: -I${OpenEXR_includedir}
diff --git a/media-libs/openexr_ctl/metadata.xml b/media-libs/openexr_ctl/metadata.xml
deleted file mode 100644
index 2e1fb11b8bf8..000000000000
--- a/media-libs/openexr_ctl/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">ampasctl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild b/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
deleted file mode 100644
index dcec21bc9cf3..000000000000
--- a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools epatch
-
-DESCRIPTION="OpenEXR CTL libraries"
-HOMEPAGE="https://sourceforge.net/projects/ampasctl"
-SRC_URI="mirror://sourceforge/ampasctl/${P}.tar.gz"
-
-LICENSE="AMPAS"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="static-libs"
-
-RDEPEND=">=media-libs/ilmbase-2.0.1:=
-	>=media-libs/openexr-2.0.1:=
-	media-libs/ctl:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-{,configure_}gcc43.patch \
-		"${FILESDIR}"/${P}-pkgconfig.patch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-namespace.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index 279ec9257f5e..77b5f179dd15 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -1,3 +1,3 @@
 DIST phonon-backend-gstreamer-4.10.0.tar.xz 98532 BLAKE2B b9182a50810536c46999266bd40996bb59ac982e44d2066c2afd897d3a2feb99e5570e36dcc869098f5b171018f4c339a2e3b8df124eaeb88236073245069859 SHA512 3beaba9ea3a332a6908ebdaa966958e8e8056d79cfb210e82a8edaf08f0a8bacbf8094e91b1b1b936406aa634dabb962e6c1468e4dde3febd9efac1a63ea70a4
-EBUILD phonon-gstreamer-4.10.0.ebuild 965 BLAKE2B 50507e41322983cadaf219607607a6267fa9b42708ac2fcffd8125211d99c536a8a38a2ac9fed20c3ffcd73d04c1b33699d2c23d82696b04a596d1119d12ea25 SHA512 8829d0f26463be8778c7b824831af6defda36dec4426c302d49dd2bb2e98e661ed08ed624752ab9a6d037311625051369cd2e2559905bf7c612c4c52d83cb669
+EBUILD phonon-gstreamer-4.10.0.ebuild 972 BLAKE2B 28a885d04b9571c72cb83bb53ee17ed24165e9f731ede076a761c11df0a92c57b7f4d9fab99d87413cd8a5b6a33a5af22b82ffe28a4701d7b244d491dfd7a827 SHA512 ce9b566f854e55a6da457a48c6c97d85677d038009408b195b72e8db5e20992e34b1541930b01b4df3bef44ba84dd85b16c7a6362a51e211dafe4904e872ec11
 MISC metadata.xml 407 BLAKE2B 050483ed2b870a4046f3ddf834f1bcc224f39861a6a8af6a5e410961c8a009959e71e4333e17b6576043540ddc96e5c06bb5c8e47cd23fe53de778170044782f SHA512 e6e28f7fe3e7c074c1ead2a6158ac6d3ea9ccadc4628f8894ea16d34d3e1dc1b7505346572928ee65ed927c88c8a832efbcc2494701eb582748b6971472318dd
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild
index 0b30bf392228..fb6c46011e47 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://community.kde.org/Phonon"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 2fa63776e33f..c12a245f9f41 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,3 +1,3 @@
 DIST phonon-backend-vlc-0.11.3.tar.xz 67196 BLAKE2B 597ead8300bfcd4dd1a94ee1733e77ea15436eea01924093ba6655d08de7b2334cd39c10e61655adcbf12e5ca1afb239c0ee0bd05fefe2e294cc1cb1ef5c7799 SHA512 11593d15874734d92922bcfd8e038a2a4f528d9145d525d6654aad7bb9d7edb911f31f564d83217341dff3be973c8cf00d91f03b66a90305f4f7ed97c2d57033
-EBUILD phonon-vlc-0.11.3-r1.ebuild 720 BLAKE2B b870872bcdfb3d8860ca5e075a79599981496aa05d35826ae425340489ee587427022f7cd1a8b8d6d8e69be56cb1d36f6b153812c65598c6273d8edf9e2b60fd SHA512 c90f52fdd23f912f93dfd51121145933d7a7bdf215aa182b63e1915b5851f56754231d10e7e831435f7dce017fc552392eac64ab65888591d89f122538d3a793
+EBUILD phonon-vlc-0.11.3-r1.ebuild 727 BLAKE2B f6994c433f5879201533ff72b537a0083540a49bbc784236ff2a119ed8aeb9b4268e552396cb910c110f0f848e34bf192cc5178aba9544256c2df68a7f5e55fa SHA512 79d5ddb2803e493602632563b2074cbff989d712d9474905c447232028330e38d3f28744ca85b8f5007986dd1aa98f423235dfb4a4ef187d6432117d7f94f897
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.11.3-r1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.11.3-r1.ebuild
index b87d9b50405a..37ac819b7a76 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.11.3-r1.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.11.3-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://community.kde.org/Phonon"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index 978431bc221d..d6eed31b9fef 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,4 +1,4 @@
 AUX rubberband-1.9.2-build.patch 6707 BLAKE2B a88eb8a5c647f4d8006f51fc627dca0ab02d1712b920a3c6c41b8981aa13ac5d7155bfd11e33577cb7b1e49a079ca5ea9840d37aaf477deffa0dea609b03fed7 SHA512 035f5549c902c1517ad5e09ee472eca578eed7d7f87f7ee20166dc46f495d5abaebc32902472b9ac6a3a367176c130bfa6fc743159b9efa3227873a16d8b4877
 DIST rubberband-1.9.2.tar.bz2 164178 BLAKE2B dc8e5b4c773dbb5c556331fa56e6cf4a5dd3f8a0fc7dcfed1fbe53d1a7635f12db6a884e775fbff8022e252d98b4e14a46a2395a5d4cb7645522ddf3e6b5482f SHA512 b1c763ab2a428aa2f1f8e5d0be6e9eb669808059ee5389e94f12de25f1a05cd89022656d98906c90b616773da11ab1f596ae2c5a9d300118e88049e1443121f2
-EBUILD rubberband-1.9.2.ebuild 1320 BLAKE2B a5aed87ad51ebd6db178862b58eaf6dcd783fd18e6b0dc7479a85e67350c433cdf6ea2febf662fdac1920767e5e802e020bde2e6954d11ec726d146352d02642 SHA512 5392bc5bcb1a46696207161b557a78f6b0fcfa12f32bd360ea3d73da0bbe00c0e3c1d5840a3dcae390e9b16eccf106814eec0ae97560646bbb69fbb9b61a76cd
+EBUILD rubberband-1.9.2.ebuild 1327 BLAKE2B 664b970e19dfcd36c601c6f42fe0f8fdb9ac35cd6666c52e60cca2f9c45889297f502edf5aa2c1bbcd347a9c88ee96ac42f3e9c7bf59e28291759cb22baf124c SHA512 78686227e171bdea6b3056dc6d96739c5010dc62d06dfbbbdce11a46f9b3bbba503e0cc7d9ecbf64d32586209d8683c8e882d3ad3ad9aa4997e5b8df4d6e29d1
 MISC metadata.xml 490 BLAKE2B 849555ada519e1a558d37977b952b8338d4d19ac3a7e8523a15cc3924b7b7b5faca70df7782597e322c362af7d05b1a35dae64b8cd8f2a998cc5d074ee81f090 SHA512 a1e8673326887e5582aa7a948543341d3061a149e0232a01ef8aa3b6778a499393aae434d5f1c2181910aa309a3cd2f0d80820922dfe668745f75314e0526e31
diff --git a/media-libs/rubberband/rubberband-1.9.2.ebuild b/media-libs/rubberband/rubberband-1.9.2.ebuild
index 23f485140902..f7f615276046 100644
--- a/media-libs/rubberband/rubberband-1.9.2.ebuild
+++ b/media-libs/rubberband/rubberband-1.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="ladspa jni static-libs +programs vamp"
 
 BDEPEND="
diff --git a/media-libs/sdl-gfx/Manifest b/media-libs/sdl-gfx/Manifest
index a5bc2d0151bc..afd2fad08b74 100644
--- a/media-libs/sdl-gfx/Manifest
+++ b/media-libs/sdl-gfx/Manifest
@@ -1,3 +1,3 @@
 DIST SDL_gfx-2.0.26.tar.gz 1771164 BLAKE2B 09556762bd9f3e19989d9db4117ec63deff466c015fe0d7b40595b8d3d0f2e7f17d142d101a1463a71144b6ee7700370513057f4f4753a4b4c605308cd42bc64 SHA512 e571caa0d7575683efd4cf8f0a41ab10f4acf913f9ece216ac823af11da22c8734fc2c0ea049009a3e1a53715e49622f5bfcfdbdafb95e5151990d0a4eb69c01
-EBUILD sdl-gfx-2.0.26-r1.ebuild 1163 BLAKE2B 33d41a7543c6d7d08399c27bcdb71b782b3760233b7238f00960945b011ed080fac8766d8591527c0d76cc1d9393b4d6849d6fd3d0a1c9623194580ec74f484f SHA512 c0d56a2fec8dc8628c9f1087dcb640b7279623b8fb6451a26d6ee55d580c68807d0cf4dbe217b99e90fa3aff2778925532dfa57e000fafb86dfa37cf45560e4e
+EBUILD sdl-gfx-2.0.26-r1.ebuild 1170 BLAKE2B 65b4546e15005269989deeb42c67106c99ebbb2ee946e725c2794283b43e53fbe248fad894376cfd1545cfb310f2cfe1e836c6161ffb58d8dad3de81c0fe748b SHA512 d622c9468b23930f153cfdefa3d5f28b45f261a2bcb57ae82cd95b422b2674ca50a1c543f93166dce3831c6183cf4a25c9bce0994336c7e0bca955e75f00a48a
 MISC metadata.xml 913 BLAKE2B 24b8ef9a2b333c6df842a85ec91f6d3a70c4439ed6bcd829641b158d4fb6f100ac20134cba4b2b2e5732825730ed0a214f55b10ff38a328e6a004770b3d246a5 SHA512 495205062ad772f808daa2da58de9abf6ec504665e06ba9f38392bcae2b4ee343a935be43d5d82e56353d1b282c6e293a859d495f98face961f9c5921503c162
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
index d836fe55697f..ec44827bee64 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0/16" # libSDL_gfx.so.16
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc cpu_flags_x86_mmx"
 
 RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]"
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index e664f2d48f3f..2410032fd9c8 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -1,3 +1,3 @@
 DIST sratom-0.6.8.tar.bz2 327027 BLAKE2B 8e11e03e6a66e9c96f90a0f31f4a65c660ed44304600caa2daad09b955a4829b266f7495b8ed85c62c34adfbc3e7f97790096bd721b51e1038986ac2e3926e60 SHA512 49ec4b230a72005ab7a7a3de0bfa630a27a16f9f811ca8e7f6da7fcf6b34526577217075d428a993f95b813dd2a82a9b6892eeb2e36b66b122ada778fbb3fb95
-EBUILD sratom-0.6.8.ebuild 1271 BLAKE2B 852c884d0562f225a020b1fadc347fd3ea1e7478067c0c6c6bce81331ffea0391a3d34937fdfd955349cb194f4d10ebfad947aa3e61b39ac9a8a48ad891a6a9e SHA512 6355d8dfce903188b9795a7d53842a1e2fcb145a1e5c8989904f001cbc97dc24c0044bd3f521d72b6e0274952bc617c50ea08756780146cb15faf299958a0c95
+EBUILD sratom-0.6.8.ebuild 1276 BLAKE2B 5c81dd8111f20a732f356985ee18bfa22eb0d32a3a25ebe38e397467b8df1444cdbf8a3eec181ac13f3db30206beead1b385361ca9478d70d8d09649ff45eece SHA512 b511b5f6de5a82ade616b804b087112699a00acf43858963bb4846445558f713706a1ce9bd7ded4336d96c29d0780b1e3369ec53e4763825446f12d1f9681e86
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/sratom/sratom-0.6.8.ebuild b/media-libs/sratom/sratom-0.6.8.ebuild
index edd7dc0c1850..3a723575da22 100644
--- a/media-libs/sratom/sratom-0.6.8.ebuild
+++ b/media-libs/sratom/sratom-0.6.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index 8bda56f78f25..ea20dbc99054 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -3,5 +3,5 @@ AUX tg_owt-0_pre20210626-allow-disabling-pipewire.patch 1030 BLAKE2B e81b7fa348a
 AUX tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch 3322 BLAKE2B 61f04506af251a52f77a5b1289471e6519bc00aab1f0e2b0b703deec094109537506297dac55d6ece747beab889a2509a71ae862683c87e6f0c006573b3dffab SHA512 7c5a4851cfe982b069c1ce752414a7771805ab1edf00a88d16e46b11cda8a85692cc2534e04a562aba1519638e2c128b66b11f24ac93f7b8e3b2b9be6d031d55
 DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f SHA512 f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc
 DIST tg_owt-0_pre20210626.tar.gz 16264716 BLAKE2B de500e02789516527c814d0aba87cf1d0e772747f06acff7ac9295508c6e6bce1915cd3a703df618ff17ba8e04dc194538a6ef859fa85b301bb63eceab2c339a SHA512 a5d10011c427d8685bcf0743c356ff8c58c3cad6c59ac2409298b30b15cb04233889a5ed0a18107ac5b3477eee96741fdc85176d4330c866e8e3329753be7d73
-EBUILD tg_owt-0_pre20210626-r1.ebuild 3089 BLAKE2B 62fd8a5d4112b7a2cabdfcc2e9972f3c8588383d651829b74b02ef391ecf7c905e36c0a42114867b0f80aa78702eff0722ae34be081706d619a859cc97f65263 SHA512 d380f9af2d570a201869552dd988ea453ae04e4a19c5d0f98589d4a8f87299ae73a2aa7dcc5b179100efc5f16b48839eae8ff6d1945bda92a507d94482ec2ec1
+EBUILD tg_owt-0_pre20210626-r1.ebuild 3351 BLAKE2B 34e2e5065a860f7753234058968d630ec3860bf192eb30f047db2552d94f0f978cd69f48f5cab92be8ad70fdfd59ffa54aaa68d6c974c85dc517d9f2fb065eff SHA512 9ead14f282706b2363057f7e43117395171e733e06f1b189b1f9f0ddeaf2e8aea8c69c2f4eeece93b732cb71202afd1d6efaeb63694e7465e7173cf2a2e67e8d
 MISC metadata.xml 545 BLAKE2B 43a53f1c6c985be6e22cf2cd686a20637871b0351b4e5698d4a84abb78ad1e78080d32b295b87de7bc00a59bb49a749dcca562ddeeef8c54f315f26752c3f9d0 SHA512 24d6883333db2468df9529211f984c20a049d728794d43dc9608eb61f8154a7d15a92a4aba0bfcabc309c073947e3fb5fe22d258882c89adb5a1dcfb9889aecc
diff --git a/media-libs/tg_owt/tg_owt-0_pre20210626-r1.ebuild b/media-libs/tg_owt/tg_owt-0_pre20210626-r1.ebuild
index 6b1f91230c17..8f7f9f6f3d3d 100644
--- a/media-libs/tg_owt/tg_owt-0_pre20210626-r1.ebuild
+++ b/media-libs/tg_owt/tg_owt-0_pre20210626-r1.ebuild
@@ -74,6 +74,11 @@ src_prepare() {
 	# libvpx source files aren't included in the repository
 	sed -i '/include(cmake\/libvpx.cmake)/d' CMakeLists.txt || die
 
+	# libopenh264 has GENERATED files with yasm that aren't excluded by
+	# EXCLUDE_FROM_ALL, and I have no clue how to avoid this.
+	# These source files aren't used with system-openh264, anyway.
+	sed -i '/include(cmake\/libopenh264.cmake)/d' CMakeLists.txt || die
+
 	cmake_src_prepare
 }
 
diff --git a/media-libs/vamp-plugin-sdk/Manifest b/media-libs/vamp-plugin-sdk/Manifest
index 33bee3c6ba1d..9f82cb6731be 100644
--- a/media-libs/vamp-plugin-sdk/Manifest
+++ b/media-libs/vamp-plugin-sdk/Manifest
@@ -1,3 +1,3 @@
 DIST vamp-plugin-sdk-2.10.tar.gz 316165 BLAKE2B ba206443d4a6f94f56c1e3b7e8f47b7c8f893d2df6601f9d26a613d56bf58fee7d0a4a996964aa0690ecf69fd1d686db28165e73a0d37880a7891c67ecaaae5f SHA512 67a71e5396eab5ce9503e9111b4cfc16fc9755cf6ae2d8dfc99ed29fd91e75eaf0de9a9c55ce8f7751f04c235eb86430856eff18f02adde54f1850a87c917ef0
-EBUILD vamp-plugin-sdk-2.10.ebuild 1707 BLAKE2B 9a4f2a71f35141d4e5da11ac8128a21980349c2b51ce99a3dc6fb89726e5e66ad63a089eac9ca5cc3e152df3c690a1eebb8c95e4c936d0c84553fd16fc7ef2d4 SHA512 0ed16465a1018de572c3793fac4d4ffd940cbe7ebdef43619361d8a448c77c3cab96f2f0f2915c8ffbc7d1127107c326152a6ad1d56841cd1b39fad5ca7b1960
+EBUILD vamp-plugin-sdk-2.10.ebuild 1714 BLAKE2B 781f33740ac67ee63a61c72944f1233f6346f7491ba4a80ca802e8ade66dc2fd0400f719ad857c1eb8af82780d5ef5a02874ebe2f063fc8235572d592560b974 SHA512 4ab6a39047324d7d43edf523ccb1a2e4d86db8115a2284891ad1900184e83ddef7510930b579a2a7b83f1fb6c4f81bf43a2858d07fad21a566a152575ab04427
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild
index 60acc9e4dd18..35f793f00d2b 100644
--- a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild
+++ b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/c4dm/${PN}/archive/${PN}-v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc"
 
 RDEPEND="media-libs/libsndfile:0=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
index 8d48ee57d5df..68a67401607e 100644
--- a/media-libs/vidstab/Manifest
+++ b/media-libs/vidstab/Manifest
@@ -2,6 +2,6 @@ AUX vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch 804 BLA
 AUX vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch 903 BLAKE2B 5eb6f0970a6d3a3ead1f7efbd6746a5de1feb0db57cc03e62d7670633fb0ddf8d810b5913e5c819c6ba57204b566f5592c4d8b86368f7776d1d7bb4eac83d39b SHA512 c8f59b8c954f4207c1c946db88c1af2f1110ed37d68ad7cc1962be9d6b1659b4833ae4257b359b25d5f1ede65ff87447a94d2d39c0028f9a3bbd7cf4a69d5bd7
 AUX vidstab-1.1.0-tests-use-sse2-only-if-available.patch 1047 BLAKE2B 198d481a781186583b0f842f677e540e0f58fbf0f146d32ed1d5c47675f02ef3e7d7457674ef87104e28d0afd5931c9c082569fd86c0e594302e1513f9a9f281 SHA512 a09f845947bc9c22700a998e2fa985f735d42146745de0b6686d61b14ef7aecb4229842b35caab8a79f874c5875241a87e0a9556ca326d54358648b515be5e5d
 DIST vidstab-1.1.0.tar.gz 77736 BLAKE2B 382cec922e9e7d521f49b431a5ddb246e331e186bf11707221a6bae0ce6544278a4c855c35e0346a78e4be105057c01ad7d53671ea22cbd2500aba4640cc96c7 SHA512 e82a4b6dd854b8415952cc0a8bdea06c01ff40a497c8e98177831e29031ec535b9f47cc30d5444c47bfd91871615a1662e3991185e9eb179acf37ea601073cdf
-EBUILD vidstab-1.1.0-r2.ebuild 1725 BLAKE2B 42f08e1069bd7fb5ba23debdab5fc2a4dcf650007c270a131b3c6ec8f6d71c9718d1be48253732d7e8532818c1fdc6c1adbec59d546ecbc6a0cd81350ef41830 SHA512 efe8d6bf64c3f8633a8bb6056136fb1bd541ba4ca11fdb6206d6efd975535c044ea1d70192a495774d3f5b150fa4a18e198986f29904b6720b401fc36c3d4ae1
+EBUILD vidstab-1.1.0-r2.ebuild 1732 BLAKE2B d464058bd7678c19da8178af53658ac15eab6f7ee3252b761d49c9586cd25171216ed03cb3d63a1d4047fd744e6e857bf550c7a65a7d6d9647b0410cacdff8a0 SHA512 02f5db2360eb8b48c96f2fd9b5ad5280a117c613071fd8c94ac9ab5914f736df8928c3c24ea5dd258e3fcdf2d8c2c41039cc84ef9ff022957666d2ba1ada9d44
 EBUILD vidstab-9999.ebuild 1488 BLAKE2B b565db3fd850dc761e78713c5b04cfe9d762f81567f9026b4e6a91c695b007432c5a28c030eecbe0128a2924d28a69e059c36dce3daf83af2cc1ef27b5c51187 SHA512 8e4211783d88cbc004babce13cbd41e71ec1105b1151eff03189eab336a3f7406481d19540dee08bd71324adca1e84efbbc3f77591c22de3f2ed4000808119f7
 MISC metadata.xml 614 BLAKE2B 4bec3a88f5122421a26244cfe1cac3ffbdea562cc6cfff35caea9c494a291077b4ff95eb361693b10448a62c7ae7880c863cf5f9ba181b9c11c2a8a050ce32c5 SHA512 2d1be66c2d324ad1fff723bcb85388c3cd32d924df04bf41ccc50ef7fe1ed75d3937aa291fc90997275c231ad15ea242107ae031cefc6115d869c66da60206f7
diff --git a/media-libs/vidstab/vidstab-1.1.0-r2.ebuild b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
index a00c18ffe048..c4c32a5b0db5 100644
--- a/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
+++ b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 	S="${WORKDIR}/vid.stab-${PV}"
 fi
 
diff --git a/media-libs/vo-amrwbenc/Manifest b/media-libs/vo-amrwbenc/Manifest
index c94277f8296a..d368be6fbef9 100644
--- a/media-libs/vo-amrwbenc/Manifest
+++ b/media-libs/vo-amrwbenc/Manifest
@@ -1,4 +1,4 @@
 DIST vo-amrwbenc-0.1.3.tar.gz 608936 BLAKE2B 7283ef12c40e25d768d9d0be6cede6a514fc881cd67185700c0afe4e03c97c660d74f28fccbad436b4067ec07be574c10b73f00a162195697714ffe0c127b168 SHA512 5f132f798f00ec2c0619700ab1ce456897792b45631af4b538c866636af9c9de5600af5f79040c41c3dc69c17cf4be7032139a9518a46a4276431e091f3dd6a9
-EBUILD vo-amrwbenc-0.1.3.ebuild 875 BLAKE2B f4625cd2998a72c9ed2568ef08bf1d9ac67058fc5fbbb2780cd69c401c348b816f46f1ef5c79a92091450788d478c2eb25f7f5cd7c25d13b32f39d76f35419ca SHA512 8f420f0cd155f4fdc07b10cb18a38aa531dc9d20fa055eb711a5e3b11a6e9eef8e992d072c8c578b6a4d2c9b4cf21743bd5398e3c2b568214d20739d1829343e
+EBUILD vo-amrwbenc-0.1.3.ebuild 882 BLAKE2B 8c7beaa6cdd85418a866fc549d1ab2b249d3ad481eb59c4cb310d2f48720a394761d91a1b5f680be594a6ad6fb0a7693e98059f94a0acdf2dc351025049e469c SHA512 b10d16af7f05183cceaac55bc0d2d34127bb8eee63ccf683ec038046a63b06f5ffaede2bcf289901a1bf0f4c2627dd3b1893e7ac1ad4ed39bdc0f60e9bf3c7d7
 EBUILD vo-amrwbenc-9999.ebuild 882 BLAKE2B 3a780e442e889b3d613488a1b6ecd568d94d31fddc594fab3e6c6da4343c7d3375fa62c866774f9c1581d554f9fa95be29f30db5466d1972d1872ae337d52572 SHA512 33b53fa43a749f029547c309f46d96c5db2afdcd219ca2d13cbc17430c2f517ca8311cba43a59f5ab8d43caf62317d4baea59b930f4ef70fd26753bda0c595c9
 MISC metadata.xml 648 BLAKE2B e51d5f1ea7ae926d6e085eeebf7cf066dff76eba5e8ff611382093b25055f119f903eb7c8a91c28d04ecdb389a571072d8cfe6e2a456c243ec896c7bec877136 SHA512 db2c18bbf40481d5a3b2582ab07e0ace0538f629fabeff219f77a875a27ca6387884e5c3c8fc49916a11e53224b85f7fed28f4b8ec7921a0db15ee7cbd5ce951
diff --git a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
index 80547d38819f..ca88689655a2 100644
--- a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
+++ b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.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
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mstorsjo/vo-amrwbenc.git"
 else
 	SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="VisualOn AMR-WB encoder library"
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index faa3e1ef9479..c1ef1d94faf1 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,6 +1,6 @@
 DIST xine-lib-1.2.10.tar.xz 5226116 BLAKE2B e1bc088814c951ff56e55b626fe1f6f34c3da744e716de369a68e6c82a5adc414b452675ad19a5f82500bade6795b54efd503de8ffe4f1e65b534317ca0a26af SHA512 1cbe033da606d67a0a59f19968b2fe1cb46eaeb32c4b4aca7b91125b7230e15bd36d1e3e39e48e6eda56e556018f9f9bf84acb0012d3dd634306e7110fdc4c5f
 DIST xine-lib-1.2.11.tar.xz 5282204 BLAKE2B c61bec690f662e01372b1c068b0681ac4435925ca90a767c590d5d3b968163280c11210dc9e3aeb4cc6bb6b3520349ba22e18b17f34bd9139af02280d3a37ee3 SHA512 8208e4699819465ec9e820530f27b6129ee954ea17ab474eb9eda12137af1417ed5260830c1006ce32266a3913d22ba9957689bb5552464908038a1b8a8efbcf
 EBUILD xine-lib-1.2.10.ebuild 5196 BLAKE2B 3ab9183a937bf5e72058dc6309a1258e8177b2e1d2044e6b164e525be497688cdfcd12c176f9aa1fe809588c5511de060935ed29189886c4a24ba5f81991170e SHA512 569b9418b0671eba865429434ebdccb52b9a1d387027f70fb7484f4d32b99b9bda5658c1c6a9f58d43bf026e625cd0666ea0d8cb657952cb88e7460543914910
-EBUILD xine-lib-1.2.11.ebuild 5206 BLAKE2B b19a672d29763af7e3f5ea1a9effff5ed9d362d226f9d438defc67230c98b8d74851d4d9d399c29c8b4bb40aa8b8628d005aa846e1c6d6f3f1eec50a71f85e9a SHA512 f5f247b95cc880af7f2f10231637fff8a43b9d0c82f4645e8da214590ae5c903e439055ae352c0baf46facb0e2de0abebb9f62b7b76b4702b0947f90d5cf65fc
+EBUILD xine-lib-1.2.11.ebuild 5213 BLAKE2B fb1aa47ca34bdc267a2923d55ecfc1d642248e9bb072f782e9dbbcc66a926a1c4278037650d0ae3809ac2021a89e3504bf2586031883979ce5cc7faad1e62333 SHA512 bf042d0761c3320e5a94fd83d6aed7642bb1b3f982befaf05697c9139e1e062bf25624fd23090a656654b2c62d4ed2fa2b75c20ca04b6db11172a76d117bf5a3
 EBUILD xine-lib-1.2.9999.ebuild 5211 BLAKE2B f8c2ae627ba412ae2d0dc19a293787a1395e81729ca20a70170e5521744faa538de5b8e074208d2ede249dd5b85fbb507e324106df37662e0912fcd52df1795f SHA512 6c49006f8a5ee75073a0c28cfce7ffed01d93001cce4bf59fac1eb8efad132ebc982306f66a1495930f78d8b1b8aaf55a37351e51650bf3748cac9512fcf6d05
 MISC metadata.xml 2678 BLAKE2B 475baae30c66efa429a1bfb89590dde7f22a5774da81e7ac984fa4274668b892cdc30201d51c4fae9ef84da2ce02bac642a6084a45841f2a53d45815fdac924e SHA512 d57598b801107419ee3dc81e5b1ced81dad8296730967f9c58c94d4a1092eca53bbedf2e8ac654c6f0677ad32dbba32962787816ff201865fd1241cb363769b6
diff --git a/media-libs/xine-lib/xine-lib-1.2.11.ebuild b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
index 20e65d606921..24c2b15d14e6 100644
--- a/media-libs/xine-lib/xine-lib-1.2.11.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="amd64 arm64 ~hppa ppc ppc64 x86"
+	KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv x86"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index dd0fd952579e..cb7e4b1cbe25 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,3 +1,3 @@
 DIST xvidcore-1.3.7.tar.bz2 698615 BLAKE2B 19bea63226c2223e74e5202d3b671c5b292c03ce5de240df7d8ce34101de4036b28fad516b2a56712a099819b905e68922fa83a01fbe4f200dc880ca56c10a96 SHA512 e2b22e7a7e103af7adcc999d95484f991a0a33df02b912fe042b2e23d2af07381c737d23158dbf0fad770ee680572f86fbe04ab2ef33c81e2e0180ead2acc8ed
-EBUILD xvid-1.3.7.ebuild 1708 BLAKE2B 6b95f8745a9e11cf92b8277a9f5044642ce15628bb36cdb75ae4409d33e63182bdfb3fab566a07ffb44a9d5b734a930bb10aa1bdbabec81faa88fbcd33bb1619 SHA512 589de775c65d3e8448f77baff8dddb922580a2f7cf88419bd8590987b1670da5b4fbe899c228fdf8ac27220e100da3fa77742d461ebfe252387cc2866f668f89
+EBUILD xvid-1.3.7.ebuild 1715 BLAKE2B 9441a2a5524fe7ea264a9208723e33dbe7317210c3088458b2531c524bf6e690f9dd4e95303ea15d9073ee4f2cda408a5ff5819dfbab185f42945860eca14ed5 SHA512 6efe5deae196d287b0c3f2217b084e29e5c8d63d135ab297c74c67380235d8e243747bb049f70c0fa19a7078586a385f6be7748b97ebe6cf2514e5bd9f3c075e
 MISC metadata.xml 321 BLAKE2B cb6de1ddc565513350b010042d99dd2cb34c0cfa80d26d1324266b6621bea5fe50f4e9233348d0c5d9b9c214d48b9c94e8fc4b08f9c0b43c779b238a65559c03 SHA512 640a21ce70c9b74f86e27bca3153b920ad7ad8313f3f5d6032e41791ab99f7463718f99bfc7fd15613e682769be6fe322c15d3bc841f674bc0322afa130c8b98
diff --git a/media-libs/xvid/xvid-1.3.7.ebuild b/media-libs/xvid/xvid-1.3.7.ebuild
index ee6cc488d233..9ac9a9213f3b 100644
--- a/media-libs/xvid/xvid-1.3.7.ebuild
+++ b/media-libs/xvid/xvid-1.3.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xvid.com/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="elibc_FreeBSD examples pic +threads"
 
 NASM=">=dev-lang/nasm-2"
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index 345a42739ed2..8ca37d183bc6 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -4,6 +4,6 @@ DIST zimg-3.0.1.tar.gz 326304 BLAKE2B 353e623520df49122badd2d58400936fd25bf74fe3
 DIST zimg-3.0.2.tar.gz 326554 BLAKE2B 2ebea0060519a6912caf685ec551ed60f64f3e379629c607ad21d256daa549a2e85e2c8dbc0886846e9636508576680ed60353d569aef407879ba5fa7dd3001d SHA512 6aed45c19a07862d389dfc2903a7ed9c0c6b6faa23e1d5de5483f15f1c3fb44a31c954004b8b9f34def0d387a43590d9403d9e24a99a271bcadc373c6ce30d42
 EBUILD zimg-2.9.2.ebuild 888 BLAKE2B 434361e85ebb7e8c03baddc5e8d1a9b165f239fa7d613ee779ae72114bc95b9e53344c8b2e75c1865eb90ee8710ad8c01cffdbc28afef92032dfc4b4d6721bf5 SHA512 51fcd2adae236f6083ac1ec669b78c8c4e190081d16d6afa2616e47980c20e41423662c4845b4f174f730c669bd30428f4088cb1fbe5fdd74506c07e6989847c
 EBUILD zimg-3.0.1.ebuild 777 BLAKE2B 3ff6bb65c43a747b0fdd6638f4dbd847d805d3d1ced7f877205d88809b501d59c27c6427de3116e3bca4b80e82020d3b348479c768d4986eca56c4997a3207c8 SHA512 214b3ee47ab0cdf5dab93a94708e6fc49258e92338da2445b3889d65ef83709413d1af5cce9474df8874c7ab95f2654eb594bda3d546c9cc09cd753c0e698547
-EBUILD zimg-3.0.2.ebuild 783 BLAKE2B ebc86ac1594cb038175061fe8b500a70f1721b362d84461e7f1c6fd990a758088a128b502d32ccc284737a10df64e42b0f61c3cbeda68e4de47ec6b57d27581b SHA512 d506d5f3a93137bc855450f53f7437c6d8b423d570afefc70c2740ca71e4108283af325a734eb6e4f71bf55d7995d1053a2783e7bbac4a1ebf9ac05fa99145d6
+EBUILD zimg-3.0.2.ebuild 790 BLAKE2B 82bb65dae94ebcb7297fcf7cd7d008a422948f1a8d5fb823e2ebd8e0f208822d6047a93df42a7060af67dacdbcaa685cf19ef105e6248577a7cf0b6993e1c397 SHA512 f99abe15acd9d55ab345b73a6e2e6ba2b1ece7b3fbb2b293d0a249c371d3f6d8a4b85b18563a6ff07de155289507d613b01bed6b16d3fdbed7936f1d7e9d39d0
 EBUILD zimg-9999.ebuild 783 BLAKE2B 15ad8bd1c1fea38a7a367d497d6bcf04019dc53fdfc866ba779a59b59d7f59202544d9e68e2a110559819297e1684c56f8a716e1dfb55b38e576a694252a3af3 SHA512 0fd908ecd7e65b12d1012d3f1c1f4deff2c13d94a215a50dc756f9138f6402f3cc35d59bf785b0d851116868b40087941051e00201c3768f8dd074d70f0a1bf8
 MISC metadata.xml 311 BLAKE2B 35db707f7a5c1e20c662525b306a018a6cc2a5cfec6e6f316c5d532566e85710d8223f9a7478569e78c476dce30f357986a66ffde04112113c389b6198de59f3 SHA512 a46022cde358c89be1d423501630b15ea56d2012e022ba8e91800d834bae267bff5a79c115e0fcfd632da6b9031d3c68948f1cd83e3f27699895b7de548f95b2
diff --git a/media-libs/zimg/zimg-3.0.2.ebuild b/media-libs/zimg/zimg-3.0.2.ebuild
index c7a443af6834..8c2a9ace532d 100644
--- a/media-libs/zimg/zimg-3.0.2.ebuild
+++ b/media-libs/zimg/zimg-3.0.2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
 inherit autotools multilib-minimal
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index a490d9cc9eaf..d08624319273 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/frei0r-plugins/Manifest b/media-plugins/frei0r-plugins/Manifest
index 957c29f544a8..7a10053f662a 100644
--- a/media-plugins/frei0r-plugins/Manifest
+++ b/media-plugins/frei0r-plugins/Manifest
@@ -1,4 +1,4 @@
 AUX ocv4.patch 13850 BLAKE2B e385d97dea1e457642be0ee2bcce780b3fc62c06966ed2f88a9c081ea4d74a200a36d835b3a09809bf25d81a72126502fe3a99580fd6f420e22ec2dd23ca6b31 SHA512 b3c3817de2ff0d4738319ca47780d5e140d9e4d07e124b76ffc23133231ab9c7062fa786bc1f4b71d81c032044daae0e8845f4703720a6d4ec6c2f76bf68e8e6
 DIST frei0r-plugins-1.7.0.tar.gz 1214323 BLAKE2B 1b571361ced6dfc29c5b487ee78664995aab615b89ac9a0839254c5fc17ddc7147cf9eb7c2d6df33f518fa96b9761a185dba420037e6c9cdf7d0e70416aab76c SHA512 8c80e8e0ce8c302e633ea1f6ff4e2a141fd7a8bcb7fce25dc7f1f6521be11258a3efa1074c224c7323e6a17bc405413385be193a5c787e2f276252b50477ebce
-EBUILD frei0r-plugins-1.7.0.ebuild 1370 BLAKE2B 884b0152898c93d8bb5a4957966e3d96f551ad3cf935097de663b3b050be8f61717d111a9717162c8d8b563ddcc332bfdb1554122a3eb86793d7c8e2570cd42e SHA512 0d02099ff59166b2801ba3e94bc156d59975d99513749a5866a25a8c687282b76917a69538a82d5003cbe552cc803651c2f1b670d44eae67930fb0b13545b7ef
+EBUILD frei0r-plugins-1.7.0.ebuild 1377 BLAKE2B 80d6e0a93a72c889593bce4acb4910293b6a9cd8bfe0f76f033608ddaebca2bdc9019e0a7cdc565e8f7a21237fd14e48691fd561fb389db28f2efea3ed33a16f SHA512 49c838a169207fdfbbb18c37e462882253a002710f81ab418e00417c393a4d010b8ea9980ac113ab40e58ca95709113f02c78511a6db2b4ea66c729e96751e80
 MISC metadata.xml 638 BLAKE2B 2aed4206801c9876784219b8179bb533d1678f8818d75f8232a91f90a9481e8db40fdaa91a39158a334d68918702f458ca5ee86a5080d3bb55c8173614a3a202 SHA512 eceb3b15da2b79e9c243aed77d1f65ac63a8fdf010017f04cf9512c8c82770823e17f8eabd55c597fe10b7fd08605f2e398d1dc6634449c7e34ee19407a2d952
diff --git a/media-plugins/frei0r-plugins/frei0r-plugins-1.7.0.ebuild b/media-plugins/frei0r-plugins/frei0r-plugins-1.7.0.ebuild
index 3aa72934877e..20ad04e26c97 100644
--- a/media-plugins/frei0r-plugins/frei0r-plugins-1.7.0.ebuild
+++ b/media-plugins/frei0r-plugins/frei0r-plugins-1.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://files.dyne.org/frei0r/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 ~riscv x86"
 IUSE="doc +facedetect +scale0tilt"
 
 RDEPEND="x11-libs/cairo[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-chromaprint/Manifest b/media-plugins/gst-plugins-chromaprint/Manifest
index fd30a91307d6..5620e1300851 100644
--- a/media-plugins/gst-plugins-chromaprint/Manifest
+++ b/media-plugins/gst-plugins-chromaprint/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
 EBUILD gst-plugins-chromaprint-1.16.3.ebuild 380 BLAKE2B ded4b1e539d6696468c879db7c50e6f46ff71a1e98806e3ed3338d816695789001b5a18d0e9612bc0f69e27a498e874fc6677427ecf6d08c066560f80b3973c6 SHA512 c0d4810e614e28cea79a50a6b9d9f04e300ef79d68ed98fd50f4c82c6537a55fb595e03d1a98986363251fe73f0dc2c8f35c639e2e643dbb8d2115296af3fe72
-EBUILD gst-plugins-chromaprint-1.18.4.ebuild 389 BLAKE2B eac39ef9bffd448a07b6a376255d4a980211d9a8231017e61af82f1788b7299e1f46d8a2ae27c9b8c29f9bf90a2710eb009cec9eeaa72c723a8945f448e253ff SHA512 54d2c38c32aa4708fb533c0b003514dba5e7c9c2d82d903de5448e94955022f4125cf0d83cd585a1bb744e875cde7974d78bff35a7a83325907d6058ff2259d7
+EBUILD gst-plugins-chromaprint-1.18.4.ebuild 396 BLAKE2B 8560b3127f5ca65cc720498ab0bd7ae025dcf47f4c70900213d2cb5c9114650281d85fa7a9e6cb777888a009b79edbacb0a41bd51baac2a38b3c7efd7ab89386 SHA512 d14df6b99ba98f0518e69ad8bc7f0c514fb955e73c74c6f4c7430126aeca4797c1d1fe5da9679a8888649d5d1f962fe68da319c40a25285d4f1c6628d7153bdb
 MISC metadata.xml 493 BLAKE2B 2a86d0343178b353fec290f550a1442e2e1492e1e5bfb3bbbbc24a9f18cad04c12c582f5fb3deb5c845dd7633c2b6d0c30566ff86c68bd60635c49d0b46a8058 SHA512 2eba41dd2cd60d1101e79a68553188fd8d6a43711de3121e7ce230c1b09e598d3123aa2b1e65a415af80182848cc0ea17433a39b34d6d6cbeb8aa3f8644eee4c
diff --git a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.18.4.ebuild b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.18.4.ebuild
index 9bcfbfc4e54a..afcdccf51c4f 100644
--- a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.18.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="Calculate Chromaprint fingerprint from audio files for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="media-libs/chromaprint[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jpeg/Manifest b/media-plugins/gst-plugins-jpeg/Manifest
index 43f5e61a6aa1..9f9d3a7d7922 100644
--- a/media-plugins/gst-plugins-jpeg/Manifest
+++ b/media-plugins/gst-plugins-jpeg/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.16.3.tar.xz 3914676 BLAKE2B 52f18027f9d9a77e8b459a0a10fa7c1450dff2faf8a2a63134f833ad08b19985b7f0d3d2af4b766c9b8bf802d048fabd6f52ad5a7865eccd1fe0d26404b7b2de SHA512 3e0da4a4defc0ddea1c26dfc767fed732548654f4155452649777109a17d5b65b2fde895483a3e35dc1646de5a16e913cd2408f826251d46a99b7751b88dcb65
 DIST gst-plugins-good-1.18.4.tar.xz 3277572 BLAKE2B 8acfb975d19eabc681184d0096328051a9a02e5f849599dbad1233a0e9254e1a2d2bef75d8afdc779a7ca01a71b15d1e83a843749c0ef5f7ab2b5818067ab898 SHA512 764c66383c93e57f9c5e7742002013e07e7b25750d6974d6c07744433e8ceb7570e829e68278e2bc5214f77158311a6b3bfb013d615cf66205d8d7a9e2d54b86
 EBUILD gst-plugins-jpeg-1.16.3.ebuild 374 BLAKE2B 8952569f49957552269812901b8b749ae2c708ff33464c987aae356c805f521faa2c7c05ca076f735e00942c3906370a4a4e886a3b727d8aeb45619d7a68888c SHA512 9c0a769d8784289152a00a517039adfc9126edcb4ea37240620144d4dd35a99d3397e8cf8d13fbde7b2720440bb5bdcc679e491d58e8e24c3e5a1af88a86381e
-EBUILD gst-plugins-jpeg-1.18.4.ebuild 386 BLAKE2B b1ee8be66bd220ad7d1d32df46fa40cd04280e6e6a4bfd7001dabf44d1f1dad23db69a412eb972f4f80c42147af1be53075389cab0e1d8f4bcf224ed7889c9a7 SHA512 853b926bac67e7b7f85a65e5f1ebbefac911f6c10fd1d9ff1771b1057fc27de5350f75df07c947990ec665185ac0481fbb73daaef687dd667be89a61c58e124a
+EBUILD gst-plugins-jpeg-1.18.4.ebuild 393 BLAKE2B 6237d31ec06d615d0fc20fa9dde9805a6a41307885215b43c2167d745ef73b011603bc79d657233f2146f0d6420800aee46f31d2c71da99cb442494758274221 SHA512 79e9d5a8d78acf2206c1308e6b46ff9b7e6ed56e0cfac71bb45f53ac72b58b27f5e30610d41412000e7b506eefd5c8442f919467b24be9498585249cea98044b
 MISC metadata.xml 659 BLAKE2B 8da81502aaf3eecb4ef62469b494598b329cb7e134511df9bd4269807882564e052ec76ddb50640203d96c08fa80deb3cb96d2b2c3c8dfae21fe296b87351ff5 SHA512 c4d076bdd3a4cf70540a9cc56c91a8e805f0a809065b629970158ca002f3cc03f3b7b91615121813030f510eb2e9a912aa4ca79504a20e023cc36f1fa3acf329
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.18.4.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.18.4.ebuild
index 65384f6dd3ec..42aeaa57ecde 100644
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.18.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="JPEG image encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-webrtc/Manifest b/media-plugins/gst-plugins-webrtc/Manifest
index 7505f8aa847a..b3ae1765f8fd 100644
--- a/media-plugins/gst-plugins-webrtc/Manifest
+++ b/media-plugins/gst-plugins-webrtc/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
-EBUILD gst-plugins-webrtc-1.16.3.ebuild 821 BLAKE2B c031977268b36f8c584cb8ad82ae7acd7d3ca910b51dd81a1d5b1dbbd6459e208e4383282a8688049f924ef74bae0468cb364ed3fbbc872daf65b0cfad71a6e9 SHA512 765f9e6a5f38ea328f463d7e1035965889c037246231b5bd6b363afcfd7a5d19ebbf0f2bcef0fab2efd2852a7d6af578a6f407011f36bb959930cf2e12a51881
+EBUILD gst-plugins-webrtc-1.16.3.ebuild 820 BLAKE2B 3b7a3a1f50d93f3afa3823afc6f7da592bad975a21b42da54246dafd31ed1eb0c0b6178e7150257c1305ed32642275e9766651a05f6fdb87abb235ca84f86bd2 SHA512 fb3876bb941b499dfca187ffaa5f90bb1dace2c4634c241799fcca19f7567d0c926e4cd959d869e2811df8d5f26a3a2b409563e3bdd60eeaba469c9f98b767a1
 EBUILD gst-plugins-webrtc-1.18.4.ebuild 823 BLAKE2B e42e02867051767b8e890d150863ecb896fb0949127141f0c996e9f707904268ace3070916f3c7148d71dc01caec526fef2d01ff726c1061ea1a944b0dd9b789 SHA512 99b33ee397f2084fef4b1187d73a1ca0b6da065506151a5d299888bad5ca78a621c92321795eac37be473b21d31cbf1e62b2b99d2a600de6c0d037cb18c4e4fe
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.16.3.ebuild b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.16.3.ebuild
index 794b2b954bad..f1be0d13e344 100644
--- a/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.16.3.ebuild
+++ b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.16.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="WebRTC plugins for GStreamer"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/kodi-pvr-hts/Manifest b/media-plugins/kodi-pvr-hts/Manifest
index 48e3dd1e1d59..2c86881183dd 100644
--- a/media-plugins/kodi-pvr-hts/Manifest
+++ b/media-plugins/kodi-pvr-hts/Manifest
@@ -3,10 +3,12 @@ DIST kodi-pvr-hts-8.3.1.tar.gz 190434 BLAKE2B d1a2d17e94e02ec37d0598c5d550859db4
 DIST kodi-pvr-hts-8.3.2.tar.gz 190508 BLAKE2B b48ba46bc640d23ea7157c7a4c013879e201a30d8c45849cdbfa33e4d52bd9508761d241f67db980fb9c518aa9921781907329f3ef3f1388cd8321bd49eb0bf5 SHA512 5ff3791c0413cc6a3ddfece9da1296611dc2bd8fd726260ded391f04f2a259a7ead756f7a069c1a5d3e2d9249e03b767b0553a2a71d297adea8644ee27f1fa7e
 DIST kodi-pvr-hts-8.3.3.tar.gz 190712 BLAKE2B 3c3470eacda0df7f5dbb014597b9a492a1b926aeaaf48febb439cc253b096feec416e5ddd4c29b521c7e8389e80f274dc507912862563ed0254db03f121d50af SHA512 30d3baeb6c970a14b965f09f572d35f9d3a1339dfa624610045ad8d7dccb65d7eced665227fccda6c12801745e08ceb90ad73f2829540d49854af62757ecc5d1
 DIST kodi-pvr-hts-8.3.4.tar.gz 190740 BLAKE2B 10dd05d406b6e6b9a2608f0d9347997d9c939ba5ac937eb03d49ca8a9200dae6fee4f50c787a0004739218c35b95f14f2085a604183fd83869d886f5662f20ff SHA512 f7aadb37de471b57267984ca92484fab0736cf38db2f437dabad63ecbfd56b61f51fce077389d667eecab4f7445bfa458fe1ab8933607a81d1d69f3448810934
+DIST kodi-pvr-hts-8.4.0.tar.gz 214128 BLAKE2B b69589c2bb92cf5f77b6c5a35afa37b8995388179ab316c3c84baa20a79dc86cef89b99bf2afbc5e8f89f7f85e261c83eeca2b92e94b62a5f8de41da4bd64ea6 SHA512 929d32e0702b7199cf2e80a7bd7b0ec6654194fbd17f15defa11da7aa41e068bf999cad25ebb7dcb594e5895354824483b4a4e896cc97a7b06b9183d21c0fbff
 EBUILD kodi-pvr-hts-8.3.0.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
 EBUILD kodi-pvr-hts-8.3.1.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
 EBUILD kodi-pvr-hts-8.3.2.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
 EBUILD kodi-pvr-hts-8.3.3.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
 EBUILD kodi-pvr-hts-8.3.4.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
+EBUILD kodi-pvr-hts-8.4.0.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
 EBUILD kodi-pvr-hts-9999.ebuild 661 BLAKE2B 2e17ace5bb95016788db8c07b1d0aef10f72c5bf82f7c0321d27525550a382a565df112d4a5125233ae029dc294962da333d1f384a46bedd643d81e1c1a65fa0 SHA512 f6122a34e52426853d476eedfa33209d9435e02c79ae75520e6c64ae36a5cb663ee9140c96d53f2e7437c20135776ab8071c1a2de6cf73841c0cf3adc8bd10da
 MISC metadata.xml 439 BLAKE2B bc951f0eaf43cf751137213ab717ca84d60964687c640b778459afcc461700148ade8cf59afa7d0d0805fc53285db28de84950f38a0b9c3c7bb6c5a2c553214c SHA512 92746f7dacc9316b473e2e62ffaecedf88d760f91970cfd794d306e117ba45cdb509fc0cc7d868d55f70d8c567ffc34517c27c37dc51e0756758ce2860739a5f
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.4.0.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.4.0.ebuild
new file mode 100644
index 000000000000..2229139c850a
--- /dev/null
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
+SRC_URI=""
+
+if [[ ${PV} == 9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
+	inherit git-r3
+else
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index 86d213510806..e2acedff589c 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -2,5 +2,5 @@ AUX config.gentoo-so-r3 539 BLAKE2B e80c461f69a991641100d3966d1d100dc7fe8c15e3ed
 DIST live.2020.05.15.tar.gz 7229400 BLAKE2B 74532c178aa1044750110eb52561b99cd70874574ee84992201a145b18091d4f8475e2a299a83f0fe42c7e64483d46175fb76465a22509db3ba2633aff1327f6 SHA512 d53fb7e8c586f50e561aa361567ccd45babdbbcbe96a06d95e42a04a54b23ac3f474fefcacf94a49b604008623acf06789b92238364713853babbe356eeac4aa
 DIST live.2021.05.22.tar.gz 682749 BLAKE2B 38663f8c5dbd8cccf4e5cfe685b0eb393559195eba852fcdf6c38c7be936948d2727da91e829aedbde08eab6edb6082533d14061edfcf125d82c925bffdb9f90 SHA512 4021cbdaffb48b9b361e931fa71f89db1e116fe8c4e57df78d54493b111a8c6249431cc418a20352a45a75ef240712609eed3aa7468c6049996dd2451ae2941c
 EBUILD live-2020.05.15.ebuild 3102 BLAKE2B b1d44c9f667783a15b5263bf48a5e386b65359fc5cfc0accc02877e80e674e3ea6b3507ae090d2ac5597dbeaa0efcf84ddd4a3f26fc9967be76c77846b1dd6d7 SHA512 035327659e92059fd807bfb20d36dbe7c1126aa505f8581ec71e90319303cde3c6bf0547b78e7f4b39c5c5c40ab823719de550ac91f568de7280a7deae715f2c
-EBUILD live-2021.05.22.ebuild 3110 BLAKE2B 64d91277a17e228fdcb47f711b7535a5f9ecf1720d735e3301e312d2b816483bde1dac70f867b9553278838b2f770d9d6c066c6816d1743a594205260775a8e7 SHA512 54eb51c7c3426b3a55487825d5cfe0ef05a678341fd795fe19e99a041b17a8b88bc0644285d97c8a209ab97205cb38b15ad8340bf0bc8ce7d60812652b65fa12
+EBUILD live-2021.05.22.ebuild 3109 BLAKE2B af54967cdf34cfeb6b7f175902a69aac1d3b01dad02e3e90c7da47dd170a7c363270e1bdb90ee2d1d297726fcf4cbbc9e7e52c395c2a4d8b62af652f359525e1 SHA512 5ec35a0d90bec902ba75a4398189100b04b482c864707fa01be6259046a58eaa1d4055717080edcf109967dcd81dbba6a1f7ffeee138e158b23bb62e64b1a588
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-plugins/live/live-2021.05.22.ebuild b/media-plugins/live/live-2021.05.22.ebuild
index c9cd9b593616..951d89f4c0b2 100644
--- a/media-plugins/live/live-2021.05.22.ebuild
+++ b/media-plugins/live/live-2021.05.22.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.live555.com/"
 SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="ssl"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-plugins/vdr-fritzbox/Manifest b/media-plugins/vdr-fritzbox/Manifest
index e512f3c0cb24..7441574d0487 100644
--- a/media-plugins/vdr-fritzbox/Manifest
+++ b/media-plugins/vdr-fritzbox/Manifest
@@ -3,5 +3,5 @@ AUX vdr-fritzbox-1.5.3-gcc11-include.patch 411 BLAKE2B 91f3bebc1485485d1c8d5cdef
 AUX vdr-fritzbox-1.5.3_clang.patch 603 BLAKE2B 14b812d70d516ffde07219595d59f48829f69a20225288f9191a1bc18a8ca695e7ffc393be9f1e915c065ddafc30da36ea65fe4b06b0d54d22117ca57140a0e5 SHA512 65aa8324707debb96b42c4e93c210755113f1705c7840ab048465beff13002db880b65da84ee51caa974c4fb06356eee7c139465fd42faa503beda5d86f62f03
 DIST vdr-fritzbox-1.5.3.tgz 132207 BLAKE2B c9a93e922eeb2126279409e3948c44cb1fc3348d44fbcc2c1116038d66fc77a707d3885a6d587c8996138fcaff134bb78db4dab2d122caf0293d2d8d8770e985 SHA512 d396bb1386ffc4b53867c735d4ffc710c4266067e011e17f2d4aa597ecceeb502d2c6e23a1df69f929503b2cd5d07f4d57869c890040b1ae9af1742c044541be
 EBUILD vdr-fritzbox-1.5.3-r2.ebuild 1008 BLAKE2B 1b7836e2f0e674949e3bd7f1c0856baeb7081062f9970e93439ab792c2e2d237e4accfd327636708edbb64238cedb8b2f36b10c09209619fad4d311cc382ff18 SHA512 97f1d0d484779742408c40a6bae25608b32d8ae00250c41c04a00204dd2a68e3a1fa899365e9c6ab61cd2b42e68c691cdc2a39975e448461842094d3fd178ffd
-EBUILD vdr-fritzbox-1.5.3-r4.ebuild 1312 BLAKE2B 2cbc316952340cb378ae5d01c115685cece361518384efe114922da91eac9cd783b085ee9efa966c5a7598363dcc9749d51e5503cafc0ab917b360aba9d76837 SHA512 1303608fe8cab00193ebe7790cf8ffa85102b8319d3dc774f8b80eaf864649ed7c85891b2a3f075ad5ab6502043037d5ecd726259166c4422748a25b718d3d11
+EBUILD vdr-fritzbox-1.5.3-r4.ebuild 1311 BLAKE2B 692ce91b0629a0cdf11971e4bc5518f0286fcd14f075953bfa5a5a5441f1150e27a9e8310c731bc8d9ca467fd47cecc833678e1e5504a9c216d8f9b23a0b883e SHA512 7ee2a2aec280075971f8b987fcc967835f7677c19165956e12273704ac0863434f2373ef79305ce32e25c64fbf4aa48b7cca33fd7461d139f7b377f0efdf1dce
 MISC metadata.xml 330 BLAKE2B 5cd8d714a3b5682eb5488d30ee4e7ac0ffc32adf99df1b9e0779722fb4e85268e4a57d1cfac793117f93d76e42929ad9b22bfe352d55ed509946f51db9136148 SHA512 262ffcc4bc66991c986e3b89bdf7f5ce988e796248547fc8a6faa67b57c162bce8e3e7d59f548e953f65a3a889eacc4ab1a8e9fee74401604b7ddedb7416723b
diff --git a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r4.ebuild b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r4.ebuild
index aa779299b587..99bd94dcf3ca 100644
--- a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r4.ebuild
+++ b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jowi24/vdr-fritz/releases/download/${PV}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-plugins/zam-plugins/Manifest b/media-plugins/zam-plugins/Manifest
index afb35485c18e..8971851ef03b 100644
--- a/media-plugins/zam-plugins/Manifest
+++ b/media-plugins/zam-plugins/Manifest
@@ -1,4 +1,4 @@
 DIST DPF-9243625aacb9fb8dd9fe4bd479b227149eb37959.tar.gz 2114589 BLAKE2B c8f2cd92b47aa55a467ce14ef2adc8f776c6ce966df680b10c3efbd35ec45fd05ad3a7dee68788701a36a032d563ce2767236397daa0757095b653ecfefcb0fa SHA512 0eab116c5b57d44dc340400340d8fc8456045bdc7e8dbeaccb80f87c7c2e1784f2b24edb8e01e3b6e23807dec86f18caf7227db2c2fd491135b283e795701fb1
 DIST zam-plugins-3.14.tar.gz 23924833 BLAKE2B cdaa13d728cd7a9f7fa2ed53b04b76988bc88d0aa719c57913fd73be778186821d316add5eeea692dabfe1ca222c2f9aaf564abc1128f69da33b8aa592255eec SHA512 30c168ee855011b2f17fcc5e440039628399ab40b69bed9af284713df6155360b38d8249b3de1616e9a2f39885cff43c9e2505868aae891fd22bc92297c1962c
-EBUILD zam-plugins-3.14-r1.ebuild 1794 BLAKE2B ce8852d51993ce47dd911d496f7b9b103f020f1e1e5aeecd396cf461c479507a57c57ac37cec8dfacd846317d1fabc0363a2329c522d5fa95dae10dc67179e6c SHA512 72552a0195c80a1f27d4e71c71f5c3a2b340429a66f09b387fc5ffe3cd18f796c64fc999d87731b8724e80b0927d24f63d510daf552c9877474a511bfd69f846
+EBUILD zam-plugins-3.14-r1.ebuild 1793 BLAKE2B 450af2a3b74f14307242e39196b5114f7bc6f598500502e13637f6a71c42d79fe99422a6fbf9585bf283b5f39b8c75e804ac0cb1b6d87738e6374282e65080ce SHA512 269bdd7cb55e79766dd88f16217aeb07ec9135d996d4fb92d3367318724d372830a24328cb0931be38a911c1ae813035d38842cee0d3a1b3bcb52318435b3c16
 MISC metadata.xml 450 BLAKE2B 387157bf41d9b210ee034118359536b641f5f6ff78399f71dde8ba35deed919077491f7d63e836bddbbafcd70632a66d56ddfa02ab86929ef53177f250063068 SHA512 1ff12b862fa6f3a4d8f171466d8abaaedf24c717c5b563f94ded0e6575282d49a3b864b7a9e66d37dfee7b2a802d552a5f5ea1b796af5e8a87388620ab466233
diff --git a/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild b/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild
index 1c760fe76695..093b8a90f1aa 100644
--- a/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild
+++ b/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/zamaudio/${PN}/archive/refs/tags/3.14.tar.gz -> ${P}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="jack opengl"
 
 DEPEND="media-libs/ladspa-sdk
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 53fb5633c5b3..d0898d7e5e27 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index f32ea8478e60..375c7e486a52 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,7 +1,4 @@
-AUX jack2-1.9.14-fix-doc.patch 468 BLAKE2B 2062c7823ec928eec8374818409621991ef877123a57b717e3a1d91d7943b92dcc776f7e654b5c4fa85e7113c44bc232cf2a0d0ba413f6165e4a861c625ee267 SHA512 e1b65b55098534e3989c53470c3b690eba0bf2e087c1dd1f337332030e6fc8185fd1c2be590ad4b78df663d201a3e86f1b6e448619e93514c5e05311947862d4
-DIST jack2-1.9.18.tar.gz 987166 BLAKE2B e1684d50c26ce45b36133b5e9632e916cd5bdf2a2ffba9257d7d6018d9fab8ade87f2de4c837d3cc3cb37bdda296fbcd8c2da6468676a3a4c74563fb42397879 SHA512 7b9116b8002db88d9df746acf99e523cf9103c1a7955e8174912c8538b2c53bc8e7c34a64d0df4dc1f212e35035392814fdfcfe78597e26bd08ec028876bcb98
 DIST jack2-1.9.19.tar.gz 988780 BLAKE2B 37536e23f97ea8a3bf62fe77e35a4a40c5d88cea1197a2f72c4ab31cbbc689fcf99a1d51bb0ee96122c618464eefe1ca8479dc53ab7de9e6570cb4009cf2a7a1 SHA512 d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d
-EBUILD jack2-1.9.18.ebuild 2444 BLAKE2B 0428836a0c60aac26ec8196765fab80a69e80f1051c23204249dee7101b58eeafa89d9ad73930aa1421fa959a59669bee2263b975c3ec015258c301578091ce8 SHA512 22f7c1128b06286f167c2f13b17dcda6d58239d11e80d3e22d14e95f96bd66d470b266d0db7f5124fbc9df20a4598c6e138822d5c07e3867598db0d216fde6a2
-EBUILD jack2-1.9.19.ebuild 2400 BLAKE2B 98ae71d9869e315dd2db538d4845defb960cbbaf032bd4529a1c1a75c410aa03c9dceb836a1c4d71bd4ab2f1fe965f3e89073fb02c109d7362754273e840f42e SHA512 828e2226b2f3ac4d7063a0f878a10ca3b346899407ae6eae0ecb26d73942c360604fb8699862647cd547c28fdee2cecfe03e42fdda37240cd1d0b71e91a8f0d2
+EBUILD jack2-1.9.19.ebuild 2399 BLAKE2B 86e5f0ab5115cee946ce94003aaf90171b6867f91c4ee051fd57c8246e90e952450c20182ea871bea170fa01fbdc4cdcb5f2cf390adfdd2c01562092d3c1bae8 SHA512 ba5bb433a77a7fb0059b348cdb0a4519e98de0d88b7709ec8a8323f85f46f44796be264571f5c1f47800cf3747d44754cb396c4942ec7a6126b6c78803b43023
 EBUILD jack2-9999.ebuild 2395 BLAKE2B f663eee6c44cb65f76a12d5b599a887cb0d56be0644dedbfb8e06368510a7ae18522c80bd9c0ef290ceb1af3e1f06eb60b3e4fb18b0c229df83929b155647cec SHA512 bfcfa9479713d773706964daacb266168d7c019da1af2528ee6aa2d1c327443718086536cd28b2fb71cee9da1a66dcb768f798164c0cb551f4e1cd9d829f6aed
 MISC metadata.xml 557 BLAKE2B 76000f6e4bd787a3e2687f9bd3a71c0456cf4fbbd27e7bad1aaae7ee9e3e6832afd0cb44e07a4a23f13e01f7aa732be18e72e711f4148fc65b2b263c5190b49c SHA512 1a0a066f0829cd623672513b5c8950ffd6cb1a4d0921cd48174949af24070d1ef6c3bb0a850749c348d1afa2cdf56bcd94d6937b21163fd0a0667f7cdd1632e6
diff --git a/media-sound/jack2/files/jack2-1.9.14-fix-doc.patch b/media-sound/jack2/files/jack2-1.9.14-fix-doc.patch
deleted file mode 100644
index 10dd10afe565..000000000000
--- a/media-sound/jack2/files/jack2-1.9.14-fix-doc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/doxyfile.in b/doxyfile.in
-index f92e264..2335ada 100644
---- a/doxyfile.in
-+++ b/doxyfile.in
-@@ -792,7 +792,7 @@ HTML_HEADER            =
- # each generated HTML page. If it is left blank doxygen will generate a
- # standard footer.
- 
--HTML_FOOTER            = @SRCDIR@/no_date_footer.html
-+HTML_FOOTER            =
- 
- # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
- # style sheet that is used by each HTML page. It can be used to
diff --git a/media-sound/jack2/jack2-1.9.18.ebuild b/media-sound/jack2/jack2-1.9.18.ebuild
deleted file mode 100644
index a5ee5eea6fa7..000000000000
--- a/media-sound/jack2/jack2-1.9.18.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="threads(+)"
-inherit python-single-r1 waf-utils multilib-minimal
-
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="https://jackaudio.org/"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
-else
-	MY_PV="${PV/_rc/-RC}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( classic dbus )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-DEPEND="${PYTHON_DEPS}
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	sys-libs/readline:0=
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	dbus? (
-		dev-libs/expat[${MULTILIB_USEDEP}]
-		sys-apps/dbus[${MULTILIB_USEDEP}]
-	)
-	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
-	metadata? ( sys-libs/db:* )
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	dbus? (
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-		')
-	)
-	pam? ( sys-auth/realtime-base )
-	!media-sound/jack-audio-connection-kit:0"
-
-DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.9.14-fix-doc.patch"
-)
-
-src_prepare() {
-	default
-	python_fix_shebang waf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local mywafconfargs=(
-		--htmldir=/usr/share/doc/${PF}/html
-		$(usex dbus --dbus "")
-		$(usex classic --classic "")
-		--alsa=$(usex alsa yes no)
-		--celt=no
-		--db=$(usex metadata yes no)
-		--doxygen=$(multilib_native_usex doc yes no)
-		--firewire=$(usex ieee1394 yes no)
-		--iio=no
-		--opus=$(usex opus yes no)
-		--portaudio=no
-		--readline=$(multilib_native_usex readline yes no)
-		--samplerate=$(multilib_native_usex libsamplerate yes no)
-		--sndfile=$(multilib_native_usex sndfile yes no)
-		--winmme=no
-	)
-
-	waf-utils_src_configure ${mywafconfargs[@]}
-}
-
-multilib_src_compile() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
-}
-
-multilib_src_install() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-}
diff --git a/media-sound/jack2/jack2-1.9.19.ebuild b/media-sound/jack2/jack2-1.9.19.ebuild
index a3905070dc62..502d34d9af2b 100644
--- a/media-sound/jack2/jack2-1.9.19.ebuild
+++ b/media-sound/jack2/jack2-1.9.19.ebuild
@@ -18,7 +18,7 @@ else
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index d6e2f8d6db42..c39a5a64fa18 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,5 +1,4 @@
 AUX pulseeffects-4.8.5-meson_no_automagic.patch 1529 BLAKE2B d3ac44aed8a08ab62b932032b3c25e7e0019fbdc2c70e33114d4cca787e3f441ffe2bdc0c3c8c65a5f5a79b396c965b3f2c2fc4f1a9c392c1dc347c53f6460fa SHA512 508856da931ffeeab631ac684ba918e113144b345d95670bf0ac7c3cb1a4033745f2dfbfbf2cbb02a26a61c21146d74b0cbf22951386b3fc574f314d6318ae69
 DIST pulseeffects-4.8.5.tar.gz 2028531 BLAKE2B 0ba68c90d4eb25e3b22c4f39f989bef428c970f0dcfa0b301c500928f835d76c31cd1d7692d1a853b3121d4e8fbee8102c1f538b06cb15933509719a6da5d8a0 SHA512 b72f4d5356af1308d997f01ac2efc5eefb569e9a1253f0a19918aec5f9c2d386ab5c293a5aa6a28e8d15200289f32d34c8f3d524bc50874c750afdee61bc0820
-EBUILD pulseeffects-4.8.5-r1.ebuild 2224 BLAKE2B 558ade35e7e7f58891a1a2fb1814b052089a2b5c9c3bedf5c869ed6b0d45b29ad7f424053e20b855e87fa073aec96b9aca904b43e0a42512d2280c904745f8d6 SHA512 9de12241a62ce26c3e229b2b5f08171ae47a6b09a785f16fd4211e5ed1724148a515b74824ebe414159c0d7dc5c984bd0a0b268f4b33f00cc6faaf0b6b794e59
-EBUILD pulseeffects-4.8.5.ebuild 1824 BLAKE2B 1e68075519cb839026d230d2757fe7699b6cdc54f78e5c83222d2edf15dd64f0e50f32a4b73eedd5d57bb8773b920b01de058c8fc2ca85d15d98aab1bf794ced SHA512 46efcb59bba3e32bed6a8605b22021383be739351aeacc87fc7ff692d7f1d1bf8762187ca85064a32eedecd06b0cdc3793bb53e12bb9e729a67a2c88b72b7904
+EBUILD pulseeffects-4.8.5-r1.ebuild 2222 BLAKE2B 96e6a9145485a868f6d33d7db84ac1064f59312b32e72386b44e59616cf5bc2c70a1676c94ee9759d5c3804c4c29c930c5749a63134f704e6338b5b5f71d59ff SHA512 7876d3d1046cd485378498351c2e7affb4b12d2247ef1e5a97f0eaabc1677403d3439f7a9f116041e62e0788ec6f0303136527a4e268108aab0fb3f3cfda330d
 MISC metadata.xml 1263 BLAKE2B aba139ad030533b2d9c6fa8046ab69c2719a9aae6eacd7ead3761661332b6459fa8ebe591b338cd6048f244ed313a7c457043ab6f1f4f535142716dd8722a2cf SHA512 41cb031e5240fc6db96e04cfb16b303c1e63340fac00957056a360a890fae00fc59526056e8d13be8844d30ca2303c8e27ca5f6a3b43fc6a1a9dce82a35546ae
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
index 2e1e07edfc11..5a542f3586a9 100644
--- a/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="pulseaudio-legacy"
 else
 	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.5.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.5.ebuild
deleted file mode 100644
index 532f5ba39c14..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.8.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/easyeffects/tree/pulseaudio-legacy"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
-	EGIT_BRANCH="pulseaudio-legacy"
-else
-	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf rubberband"
-
-RDEPEND="!media-sound/easyeffects
-	>=dev-libs/boost-1.72:=
-	>=dev-cpp/glibmm-2.56.0:2
-	>=dev-cpp/gtkmm-3.24:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.20:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	>=media-libs/gstreamer-1.12.5:1.0
-	>=media-libs/gst-plugins-good-1.12.5:1.0
-	>=media-libs/gst-plugins-bad-1.12.5:1.0
-	>=media-plugins/gst-plugins-ladspa-1.12.5:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.5:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.5:1.0
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	media-sound/pulseaudio
-	sys-apps/dbus
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 )
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	rubberband? ( media-libs/rubberband )"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-BDEPEND="
-	>=sys-devel/gcc-7.3.0
-	dev-util/itstool
-	media-libs/libsamplerate
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 6ed6eb600074..8dc78a7185a0 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,5 +1,3 @@
 DIST rosegarden-21.06.1.tar.bz2 6479487 BLAKE2B c18e1b6d14c2caac1ac7a2ddba2d40fb5a19d8a6468b81c696267ac984875db58943ec0fd46afe4b5d511afa1f5cb1ada93205b6088effcaf75adf234beaa516 SHA512 a0214d95c26e01c5c0ce671bf23f4ebe7f63e54cecf6471226768aae5b4ce8dcf9f03a1970c26317d734a16a0d741d83ce684a53f115db656538522b373ef7a6
-DIST rosegarden-21.06.tar.bz2 6477323 BLAKE2B f5bb9a471122857666edf033d4e760cbf81b0bbcf255e1248a1f865825677c41fb1a55a64835a168174b420793367214e8dfcedea25dc857e1ec847fae87770d SHA512 9cadfed3caba203ea6db78c3600600b9c5ed0e2963228dd6e8129291618e3b7c617b0d6dfaccce0dd753ce229dfaa8c65d1354f591e2923185fb76dcbe48d840
-EBUILD rosegarden-21.06.1.ebuild 1134 BLAKE2B 4f42d5bfd9f1c2655db462d1e29d50bc25636ca185b3aa7e4801ab83efc7a39a00e459a713bf90d5183836cebeb7ebab3a061905f63e441ffeb49bbc72785df9 SHA512 7586f59b864f3dae5eefef483d9f4110a6dde6f50e06079471dca4b7c78eab37bb66b404431a6f3870ec99faee7715593ee79ff60a38581e4a5e15f77ebfb7e3
-EBUILD rosegarden-21.06.ebuild 1133 BLAKE2B 923da829748128bc080fad7299d0fca0549c8a265e966bb74daae240cccc057da58efbb7b3faaff769e7be7cef564dc46e79315237f1f372bff5c4710be5cd11 SHA512 3f9f4d9cd5754368ef5d1f09abea4c395ea05a48b8c8c695669d51acb823ebca074bfff81c0f37685f62c8c05406f27bfc878a733008fc9e910386b4d3de34a2
+EBUILD rosegarden-21.06.1.ebuild 1133 BLAKE2B 923da829748128bc080fad7299d0fca0549c8a265e966bb74daae240cccc057da58efbb7b3faaff769e7be7cef564dc46e79315237f1f372bff5c4710be5cd11 SHA512 3f9f4d9cd5754368ef5d1f09abea4c395ea05a48b8c8c695669d51acb823ebca074bfff81c0f37685f62c8c05406f27bfc878a733008fc9e910386b4d3de34a2
 MISC metadata.xml 349 BLAKE2B 0f31b6c7f0aef5e0b487ddcdf963c1701cc3429870464de30409dd788422964adbf05172089315a6543ac858f4d5ae64773c52728f24da4dc06dfe9b1dcabf9e SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee
diff --git a/media-sound/rosegarden/rosegarden-21.06.1.ebuild b/media-sound/rosegarden/rosegarden-21.06.1.ebuild
index 2b7ce2c22641..8df3e4a0dfb1 100644
--- a/media-sound/rosegarden/rosegarden-21.06.1.ebuild
+++ b/media-sound/rosegarden/rosegarden-21.06.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="lirc"
 
 BDEPEND="
diff --git a/media-sound/rosegarden/rosegarden-21.06.ebuild b/media-sound/rosegarden/rosegarden-21.06.ebuild
deleted file mode 100644
index 8df3e4a0dfb1..000000000000
--- a/media-sound/rosegarden/rosegarden-21.06.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg virtualx
-
-DESCRIPTION="MIDI and audio sequencer and notation editor"
-HOMEPAGE="https://www.rosegardenmusic.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="lirc"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/alsa-lib:=
-	>=media-libs/dssi-1.0.0:=
-	media-libs/ladspa-sdk:=
-	media-libs/liblo:=
-	media-libs/liblrdf:=
-	media-libs/libsamplerate:=
-	media-libs/libsndfile:=
-	sci-libs/fftw:3.0
-	sys-libs/zlib:=
-	virtual/jack
-	x11-libs/libSM:=
-	lirc? ( app-misc/lirc:= )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_LIRC=$(usex !lirc)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	# bug 701682, tries to open network socket and fails.
-	local myctestargs=(
-		-E "(test_notationview_selection)"
-	)
-	virtx cmake_src_test
-}
diff --git a/media-sound/tapestrea/Manifest b/media-sound/tapestrea/Manifest
deleted file mode 100644
index 9221ffbb6655..000000000000
--- a/media-sound/tapestrea/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX tapestrea-0.1.0.5-gcc44.patch 1301 BLAKE2B 09c05cdfef6860013d84a2833a77b3b693871770caad7e450191fd32c08039397a66b2e8891919d88fb57daa26e8413d47cd3d7145f49769a76c444450bf886a SHA512 d55c5fec518fc79686720a1c5b9fa01483aaaf22141e2a10de541a1cbf63daf37bebf8b653172990f34bc188f4064af9d3e266e0d103e0fef4fbd557c406b5a7
-AUX tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch 1280 BLAKE2B 3910c1de8ad0fe14c80b9e347350924e71d1f2c10068287474a0262060d26d5f24558c51483af912dbd8fef4c0436e84af7108379955458d5b50619a9a8a8616 SHA512 de4ff80ba5ca256d794ceff80fe956459e16261b1d786a87691d2736835839e177056ab9e4732c78ec0381c01324c483b27de310f8168269ebc04dd6e39af344
-DIST tapestrea-0.1.0.5.tgz 21987831 BLAKE2B 30ee2574acbb1a4577b0e952f9c474304ce6248bb6c4329c2788c0e640c6d82b35f3898e293a1e91ec38ca332bb4f910fd35278edf5c703dde456a6c006d14f4 SHA512 8df64cb31e85167afb78e4891192dde7d5476c637241e53f6218b013bb8c40e43a626cc2a2c1368498491f00451a719e1126a90ca2d67aa52137a9e1cd034656
-EBUILD tapestrea-0.1.0.5-r1.ebuild 2901 BLAKE2B 2b748a65148d384adee5448e710079547bfbafe025ad01206e4356ba8c9d979604901aaf520a0109518f033dccb32a022812d7c47ee1846e87eb2203d43febc2 SHA512 cb9f262737c20b8f390a628fa53509eba664426609937052f7b568458ec1266598c9467e328ae18084764a80ecbd43589cb13a46d9bc858d3b3e393122257c8b
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-sound/tapestrea/files/tapestrea-0.1.0.5-gcc44.patch b/media-sound/tapestrea/files/tapestrea-0.1.0.5-gcc44.patch
deleted file mode 100644
index ca6e0370c957..000000000000
--- a/media-sound/tapestrea/files/tapestrea-0.1.0.5-gcc44.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur tapestrea-0.1.0.5-orig/scripting/chuck-1.2.1.2/src/util_string.h tapestrea-0.1.0.5/scripting/chuck-1.2.1.2/src/util_string.h
---- tapestrea-0.1.0.5-orig/scripting/chuck-1.2.1.2/src/util_string.h	2009-06-27 19:06:03.000000000 -0400
-+++ tapestrea-0.1.0.5/scripting/chuck-1.2.1.2/src/util_string.h	2009-06-27 19:06:54.000000000 -0400
-@@ -36,6 +36,7 @@
- #include "chuck_def.h"
- #include <string>
- #include <vector>
-+#include <cstdio>
- 
- 
- // itoa
-diff -ur tapestrea-0.1.0.5-orig/src/taps_birdbrain.cpp tapestrea-0.1.0.5/src/taps_birdbrain.cpp
---- tapestrea-0.1.0.5-orig/src/taps_birdbrain.cpp	2009-06-27 19:06:18.000000000 -0400
-+++ tapestrea-0.1.0.5/src/taps_birdbrain.cpp	2009-06-27 17:49:18.000000000 -0400
-@@ -35,6 +35,7 @@
- #include "taps_birdbrain.h"
- #include "util_thread.h"
- #include <stdarg.h>
-+#include <cstdio>
- 
- // for getcwd and chdir
- #ifdef __PLATFORM_WIN32__
-diff -ur tapestrea-0.1.0.5-orig/src/ui_audiofx.cpp tapestrea-0.1.0.5/src/ui_audiofx.cpp
---- tapestrea-0.1.0.5-orig/src/ui_audiofx.cpp	2009-06-27 19:06:18.000000000 -0400
-+++ tapestrea-0.1.0.5/src/ui_audiofx.cpp	2009-06-27 17:49:18.000000000 -0400
-@@ -36,6 +36,7 @@
- #include "taps_birdbrain.h"
- #include "ui_audiofx.h"
- #include <iostream>
-+#include <cstdio>
- using namespace std;
- 
- // Start FxStk
diff --git a/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch b/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch
deleted file mode 100644
index 3f866d5c88e5..000000000000
--- a/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/src/makefile.alsa
-+++ b/src/makefile.alsa
-@@ -3,7 +3,7 @@
- CHUCK_DIR=../scripting/chuck-1.2.1.2/src
- INCLUDES=-I$(CHUCK_DIR)
- FLAGS=-D__LINUX_ALSA__ `pkg-config --cflags gtk+-2.0` $(CFLAGS) -c
--LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs gtk+-2.0`
-+LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs gtk+-2.0` -lpthread
- 
- TAPS_OBJS= taps_analysis.o taps_birdbrain.o taps_driver.o \
- 	taps_featurelibrary.o taps_pvc.o taps_regioncomparer.o \
---- a/scripting/chuck-1.2.1.2/src/makefile.alsa
-+++ b/scripting/chuck-1.2.1.2/src/makefile.alsa
-@@ -5,7 +5,7 @@
- INCLUDES=
- CFLAGS?= -O3
- FLAGS= -D__LINUX_ALSA__ -c $(CFLAGS)
--LIBS=-lasound -lstdc++ -ldl -lm
-+LIBS=-lasound -lstdc++ -lm -lpthread -ldl
- SF_OBJ=util_sndfile.o
- 
- ifneq ($(CHUCK_DEBUG),)
-diff -Naur a/src/makefile.alsa b/src/makefile.alsa
---- a/src/makefile.alsa	2014-01-30 02:21:02.173891275 +0100
-+++ b/src/makefile.alsa	2014-01-30 02:21:23.026891253 +0100
-@@ -48,7 +48,7 @@
- OBJS+=ui_scripting.o
- # scripting disable needs most of chuck anyway due to includes 
- # in latest rtaudio.cpp, so always keep this line:
--LIBS+=$(CHUCK_OBJS)
-+LIBS+=$(CHUCK_OBJS) -ldl
- 
- # uncomment to use preconfigured sndfile
- #FLAGS+=-D__USE_SNDFILE_PRECONF__
diff --git a/media-sound/tapestrea/metadata.xml b/media-sound/tapestrea/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/media-sound/tapestrea/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/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild b/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
deleted file mode 100644
index 89e4d50d770d..000000000000
--- a/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
+++ /dev/null
@@ -1,114 +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="Expressive Synthesis, Transformation, Rendering of Environmental Audio"
-HOMEPAGE="http://taps.cs.princeton.edu/"
-SRC_URI="http://taps.cs.princeton.edu/release/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa doc jack oss"
-
-RDEPEND="jack? ( media-sound/jack-audio-connection-kit:0 )
-	alsa? ( >=media-libs/alsa-lib-0.9:0 )
-	media-libs/libsndfile:0
-	media-libs/freeglut:0
-	virtual/opengl:0
-	virtual/glu:0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc44.patch
-	"${FILESDIR}"/${PF}-underlinking-alsa-pthread.patch
-)
-
-pkg_setup() {
-	if ! use alsa && ! use jack && ! use oss; then
-		eerror "One of the following USE flags is needed: jack, alsa or oss"
-		die "Please set at least one audio engine type"
-	fi
-}
-
-src_prepare() {
-	# Respect LDFLAGS/CC
-	for bend in alsa jack oss; do
-		sed -i -e "s:gcc -o:\$(CC) \$(LDFLAGS) -o :" \
-			-e "s:-O3 -c:\$(CFLAGS) -c:" \
-			-e "s:make -C:\$(MAKE) -C :" \
-			"${S}/src/makefile.${bend}" || die
-	done
-
-	# Avoid "make jobserver unavailable" warning
-	sed -i -e "s:-make:\$(MAKE):g" \
-		"${S}/src/makefile" || die
-
-	sed -i -e "s:-make:\$(MAKE):g" \
-		"${S}/scripting/chuck-1.2.1.2/src/makefile" || die
-
-	default
-}
-
-compile_backend() {
-	backend=${1}
-	einfo "Compiling against ${backend}"
-
-	cd "${S}/scripting/chuck-1.2.1.2/src" || die
-
-	emake -f "makefile.${backend}" \
-		PKG_CONFIG=$(tc-getPKG_CONFIG) CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-
-	cd "${S}/src"
-	emake -f "makefile.${backend}" \
-		PKG_CONFIG=$(tc-getPKG_CONFIG) CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-
-	mv taps{,-${backend}} || die
-	emake -f makefile clean
-	cd "${S}/scripting/chuck-1.2.1.2/src"
-	emake -f makefile clean
-}
-
-src_compile() {
-	# When compiled with athlon or athlon-xp flags
-	# chuck crashes on removing a shred with a double free or corruption,
-	# it happens in Chuck_VM_Stack::shutdown() on the line
-	#   SAFE_DELETE_ARRAY( stack );
-	replace-cpu-flags athlon athlon-xp i686
-
-	use jack && compile_backend jack
-	use alsa && compile_backend alsa
-	use oss && compile_backend oss
-}
-
-src_install() {
-	use jack && dobin src/taps-jack
-	use alsa && dobin src/taps-alsa
-	use oss && dobin src/taps-oss
-
-	dodoc AUTHORS BUGS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
-
-	if use doc ; then
-		local tapedir
-		for tapedir in $(find examples/* -type d -maxdepth 0); do
-			docinto ${tapedir}
-			dodoc $(find ${tapedir}/* -type f -maxdepth 0)
-
-			local tapedir2
-			for tapedir2 in $(find ${tapedir}/* -type d -maxdepth 0); do
-				docinto ${tapedir2}
-				dodoc $(find ${tapedir2}/* -type f -maxdepth 0)
-			done
-		done
-		docinto doc
-		dodoc doc/*
-	fi
-}
diff --git a/media-sound/wildmidi/Manifest b/media-sound/wildmidi/Manifest
index 379a2c020310..5f4bbc70a04e 100644
--- a/media-sound/wildmidi/Manifest
+++ b/media-sound/wildmidi/Manifest
@@ -1,5 +1,5 @@
 DIST wildmidi-0.4.3.tar.gz 196750 BLAKE2B 580903dd1e7dc61193b593f3706d5070ae5cf26394919f8d632098aa0dda14d8d65631c902a6a01d02d046e639df4d66727849954b5d6f76dba8d12235e20b8d SHA512 7e86e998ee97cdf57328e4cf5ef52a64926fd01999879c0eae5b6c823be4e6d116f7026230bd15d209e6616fbc7ba1c29ebd1f3be04735e341ce5c83298f956f
 DIST wildmidi-0.4.4.tar.gz 197597 BLAKE2B 5f5b11bec70b24b4798ac39d4d30420916609f3d65497ef88b48ef292f41d0cc81cc8d9c8c47ffc68705d6297a9ce55ef5d7ebdf63f8c18b8b0f7982c1f60bfc SHA512 5b74ee83f1d7ce3b45d2f996aaa30ec6e7d7808eab294a3eaf6fcef77443523df1f54bb0fb1b3105edd0d72d75885fda1a2e97c68defb5bbd687bda5077d3454
 EBUILD wildmidi-0.4.3.ebuild 1322 BLAKE2B e5e32633203e7bf0ee7f2bbc5d618e05132e91415a07a48cd01b4b5c0719172d313808abb318c68cd625124c4a79e5578e27abe9c887e9b054dee581b0f600cb SHA512 99a54c4d0124caef134e9c8fff60d563e974db43bba0ae74476e9bc5cd0a37ea5e8276e8c91b54c2ecaa89b2e7f17e41bf46c192dd0d8cf98ecb4572cb5c1f2c
-EBUILD wildmidi-0.4.4.ebuild 1327 BLAKE2B 0ff5beb04442aa8c17208c1252a894392506b7faa9b8b5414d707ebfbd94f2be9df1737b483303d6ae50c766199ed9edf11313f51e8753bb30ad09e8173597d7 SHA512 e8f96cf1ecb95bbea6683b4a7e8401d0b2c6bd5f4c3c3cdf7dd854fdd4f6e3d10001388f7d9760a3fe3fded7e7f7943c038331d3aecd5a0c600ab96b6b662a73
+EBUILD wildmidi-0.4.4.ebuild 1322 BLAKE2B 4f7bf5fbf72101d06075a7ab5d223a1170cf6a1f72c49950145fb6850e3dd1c479fad88b62dbc75785fe8bd213a54b09cd17a13a43ebbe11b877af743b45dd72 SHA512 4c2c32b1f25ba8e9e9f0a7b36f773f42e01162d7b29494d617cb9a8919d3f01ec73dacded05daa946e9799405757178e4bc9877b8167f229533c4bb1ef1a280f
 MISC metadata.xml 614 BLAKE2B ff532f36af5f957e1acc46d35a7931984ad70f82d3557b5f516ee8a16ed8d5a7fb2f202243c437aed84cb951275c76d32a75107ba838969a96213f2be584ac26 SHA512 bc3725016c1386bfc5c1c1c8d3df9e17f92a16cde8603e88c0166dd6d802b82004a3545645f874092f5f1e045f8519c780d76e733af0c4484d93a118a25b5db7
diff --git a/media-sound/wildmidi/wildmidi-0.4.4.ebuild b/media-sound/wildmidi/wildmidi-0.4.4.ebuild
index f6f59cf6d838..0756e6b11904 100644
--- a/media-sound/wildmidi/wildmidi-0.4.4.ebuild
+++ b/media-sound/wildmidi/wildmidi-0.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
 IUSE="+alsa openal oss +player"
 
 DEPEND="
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 75ae4333596f..26b91e034a14 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,3 +1,5 @@
 DIST yoshimi-2.0.2.tar.gz 7017339 BLAKE2B a0e129b3f667dff28e043ab69416992556f4e737e786baa79c361cff9411b849acf815e9d37f1a0338ce81f3014c3f44f0a27c3287cdd9c29d6c453a44c49cc2 SHA512 f83eed05dbe63e1966086ac0d19d02fafabce7ce10c6579ab8a95fd5fec7c040d516a4d979f38181f31c9f7720e92fac3c99c3737ddc4b0d4005bcdc45dea40f
+DIST yoshimi-2.1.0.tar.gz 7471945 BLAKE2B f95fb49ec901e5a513960bfc4c1d27ce1979f3cd664d7ca7ddb723ad41fb06153749db0560a32f41c44c7fb433fde09ee49e898cb8bf55e232536b163d616992 SHA512 d90666ca2599d057d5c22abfc5e64f9a31eb323d13c50f771b92c5f94f7da9049b79dc8a478b3832142a97f8c2f5ea384a26e1543fdd6c063930989e34b146eb
 EBUILD yoshimi-2.0.2.ebuild 1003 BLAKE2B 91bfecb1c3e29de09bebf9f193a34a1a0da8d9b75b8bdb44c0f6da0f9d6e73352a175781e8497c18589a5995567027363ed4173864cb9821b35aa54ca840e807 SHA512 4a888ff968ba8473d2bae1dcc2a26b233a19d38a75be15f94e0bc48863853cdf2932ecd9d7064461a46d999b60d1865d91f64564639627ddc42cb17e7c3aba48
+EBUILD yoshimi-2.1.0.ebuild 1005 BLAKE2B 187ff9d4a64f3f3ceb58b3ea288aa0aa1c58ce72d71a729906060183b22bfac3e6fa60d04d22a3e8542c53657d6c9ca4416476ec2769e60406b375b599d6a18b SHA512 948a96b1b44ef68d759a64114648cf86ad07579d7d4d47cd0e5d3b55379049f7500ece2a347c3bbc72969a4eb15505d1d5bdf567476f0bcddf33037a7622f092
 MISC metadata.xml 1413 BLAKE2B c294d4bd44ddd5a51ae0294e12e053633da91e3ee4f6e71786e68d3ea674ff3966cd5992b5d9e7c43c677d64e3771662c23760b8e74a9382bd9118ca5e779a8c SHA512 d35e3df2eae6868adf65f4cb5f9e9306c9e72f930c427a01816f2dfe7b32e07641ea91c6829e7ef6c099cb3d7136541b2deedbfe926d50be66d364042c054ba4
diff --git a/media-sound/yoshimi/yoshimi-2.1.0.ebuild b/media-sound/yoshimi/yoshimi-2.1.0.ebuild
new file mode 100644
index 000000000000..ae3192e6c50e
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-2.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Software synthesizer based on ZynAddSubFX"
+HOMEPAGE="https://yoshimi.github.io/"
+SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lv2"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	dev-libs/mxml
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/libsndfile
+	sci-libs/fftw:3.0=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/jack
+	x11-libs/cairo[X]
+	x11-libs/fltk:1[opengl]
+	lv2? ( media-libs/lv2 )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+DOCS=( ../Changelog ../README.txt )
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die
+	append-cxxflags -lpthread
+	append-cppflags -lpthread
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLV2Plugin=$(usex lv2)
+	)
+	cmake_src_configure
+}
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index a84ed2c9b0d3..f21c3aa112f9 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index 1db4afddad21..c215ebdf4697 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -4,10 +4,10 @@ AUX plex-media-server.conf.d 216 BLAKE2B 094d0f6f7cdfa696ae47d7879c7459be5755dfe
 AUX plex-media-server.init.d 380 BLAKE2B 03d5737128390c13d914a94e8d861cf24abed92b2a5c672e72cd7dad8ed9a71ba7bccc28f06acaf5920be7d0b809746b6a8f4daffef4594830cf8ad5f071a2f5 SHA512 44ddd5a046851f77f550ff9f0bf158a3bce465101b5fdbd31b68ed64dc6c8e823f70c05b833f97101b4608256422ff4aa026114fac17f9e6e3670602ed9ef816
 AUX plexmediaserver 89 BLAKE2B c7866fce849e6ce2a15ec5a1550146072aa62d278ee47bf2ca70327babf5877750c0749d879e51bacc05ddd242d8a46c808665b9f299cee999dfa2d243ced073 SHA512 798a1736133339865aa1ffc6074720e84b28f3e3298c044019ec4959ba724f7a96dcbfcac29f1f39252cadb2a863a500423027970e5f2699e806bc4d532d9974
 AUX start_pms 1768 BLAKE2B c111f268535f03f1763c9a2f16ccc4a317f9540721a1c89e33306d6ad6d6ee34673d6a13326923c2fa399d1a3f7ad3e26c89d097de8f977a9ad7973c99dff811 SHA512 8c672a9de6f20c968869fb2bd643bdfe6d3e7ca6d89dfddfd5d7a4bc425a34e1b30ba711a0f0afd79df428df4151a59f18880cff7e0ef12df146421f299858c5
-DIST plexmediaserver_1.23.6.4881-e2e58f321_amd64.deb 81538488 BLAKE2B 4ef972686fcce2e69728f7b19b3b40354808862efde93b7c247828671518ed420981222dce002f8477e84afe460a78f41287a9d31c525289c73a395ac475efc3 SHA512 da9a487b28b6fa341da6652c77018cde3446375a7344222c9c617e0b4f4686915f3f8044d38d80247b0ef9d2875f875ba81064edf7429deaa4be32c3d06d4971
-DIST plexmediaserver_1.23.6.4881-e2e58f321_i386.deb 74534752 BLAKE2B b9b29f4397bae7de86a6f8a09fe32bd751ec0df8f37335fd451b304c3e3a938fe37208613861a1b349b2e9ef7c531e57e6f9987852123614b19df917b3abdfea SHA512 8441ca480073b3378ddb5f9c96a7866e9a46151365c2d956924398fb33ecbc3eb92bdf883a9f59a34d4d3a142314c86046a549e10baae5571cb0bdf38b126078
 DIST plexmediaserver_1.24.0.4930-ab6e1a058_amd64.deb 86981424 BLAKE2B b8859db43688f80074529ddb9acf38c47c869bf9c1ed180e6e8bae0f1772002d5cfff8b19c4000726a547361447ff3a4deac135ea90635a6577e05cf2fc74f21 SHA512 2e923dae4c6d5de7a1ecf253bd075b86a28fea1110b90163685fc72751e6547406f870f2b336ad377db95f87e8375dd8004f6e6ae3a64a314e08aa25a6a1fb84
 DIST plexmediaserver_1.24.0.4930-ab6e1a058_i386.deb 79401568 BLAKE2B a5c89f7c030d94f03c2736b6c15ea926eca3a8dd21d565e90aa9a0d70c37d98ffce007c065e00d58dec7600f1bf4928e6f195290c9668f31fa62a3520d2a2e44 SHA512 1b5cbea1c20eb4e703011a30bc9d4515223143cf5d415cab828fb09224c7dbab02ee4a0d160643c361d9c7728659fc40e3f87c583646f487b46221d248e2188b
-EBUILD plex-media-server-1.23.6.4881.ebuild 1897 BLAKE2B 692cd2798f2cfe529b7ade4823a7333bba308b4b6a08af0be9685962269024a8595a9c6b6e8d5f1e83501751cf2027efdc42fb169d2a6870d1fa6a1f044a7d9f SHA512 9a813c77a7929ebbae25e9bb0d200c0437c2c539049a6727d5f40ed75d167486795a8db1cb7b31adeb79cdf9490cc490fab2d07b6801771198e7cdb0d4a6883a
+DIST plexmediaserver_1.24.1.4931-1a38e63c6_amd64.deb 87347750 BLAKE2B 4cfe52f29257401fc333960c0de85065d9977a5cc5a49488bca904aef9d0778fce7b2a5dea753ebf394f3dd98a4bff52f7ee3db3c938f6272f210ac1b3766256 SHA512 d2d4631e951b130c39cf49741f7cc145482ed4d03f823441bc9564354836b10fd3eb441bc053f5447679646d659d8bf7ace3ff15bd06dbbab4a218a931b51769
+DIST plexmediaserver_1.24.1.4931-1a38e63c6_i386.deb 79765562 BLAKE2B 3752fda531e5c2139240c0af1927c2ba55abde4ecb6f71d244bf37f5d8ef47a2fdff51ea76c7fbe0878ed6c9292e5b0b98f1f9934a8aa71fc9991c265c3f11fe SHA512 7d87fc54c5536b3cc1d221d0bca0f6a63c282ff26fc2cb5b63595633553821dac344f508e7c39f17db91414a1d424428896c09b3c1806a841014fe68afdc111e
 EBUILD plex-media-server-1.24.0.4930.ebuild 1897 BLAKE2B 700eaa534e676ae4bd40baae879d4dec03d212c39158fc49b0b8b53c7142e40680fe7836297c4cd68659a58b72f5576816fd577a190325d98d118438596969fe SHA512 30be7b6b38b476a733bb65175e0b35f8e7eebe338d57c3d54016002ffbc9c0c692c7ddf64239eab7479ca3e49958c8733b7f7c373179b50c98ede3cb1788bbbb
+EBUILD plex-media-server-1.24.1.4931.ebuild 1897 BLAKE2B 0715aaf1a8bbb2613099747c25211d8c52d3d6e83baa5f00f9f1010c37e6ccfd7b3835216c4ae9b380eef6dcc56c977ec63b1a3fcda306a0392014e10cefb9e9 SHA512 a976cc9a85525c96b143e3302c127aa4fb30bcd8bb805120b4e4347f171e2154cd6f7f88181d4d145b2996f76c608e1b2a0ad4d395af1746f0359cd0d8f24059
 MISC metadata.xml 597 BLAKE2B ccb49cc2f1115157ace237440b8c59e4466eb96a4f3c274c13e275fa6564b5bb0506bc3e3d9bdee4d2385d151e1f1bf9e3e3b70c7e0400d884aa1fcb3f0a1522 SHA512 d33bfd6ff84128622666b9452b975879840b3b6d24e555536cb8daf98f41411000ea26754df7fb31a639749c9f9b4aca64ed7524fb48d918a74d30a003a19d04
diff --git a/media-tv/plex-media-server/plex-media-server-1.23.6.4881.ebuild b/media-tv/plex-media-server/plex-media-server-1.23.6.4881.ebuild
deleted file mode 100644
index 332463574089..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.23.6.4881.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 systemd unpacker
-
-MY_PV="${PV}-e2e58f321"
-MY_URI="https://downloads.plex.tv/plex-media-server-new"
-
-DESCRIPTION="Free media library that is intended for use with a plex client"
-HOMEPAGE="https://www.plex.tv/"
-SRC_URI="
-	amd64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_amd64.deb )
-	x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb )"
-S="${WORKDIR}"
-
-LICENSE="Plex"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="mirror bindist"
-
-DEPEND="
-	acct-group/plex
-	acct-user/plex"
-RDEPEND="${DEPEND}"
-
-QA_PREBUILT="*"
-QA_MULTILIB_PATHS=(
-	"usr/lib/plexmediaserver/lib/.*"
-	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/.*"
-	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so"
-)
-
-src_install() {
-	# Remove Debian specific files
-	rm -r "usr/share/doc" || die
-
-	# Add startup wrapper
-	dosbin "${FILESDIR}/start_pms"
-
-	# Add user config file
-	mkdir -p "${ED}/etc/default" || die
-	cp "${FILESDIR}/plexmediaserver" "${ED}/etc/default/" || die
-
-	# Copy main files over to image and preserve permissions so it is portable
-	cp -rp usr/ "${ED}" || die
-
-	# Make sure the logging directory is created
-	keepdir /var/log/pms
-	fowners plex:plex /var/log/pms
-
-	keepdir /var/lib/plexmediaserver
-	fowners plex:plex /var/lib/plexmediaserver
-
-	newinitd "${FILESDIR}/${PN}.init.d" ${PN}
-	newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
-
-	systemd_dounit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service
-	keepdir /var/lib/plexmediaserver
-
-	# Adds the precompiled plex libraries to the revdep-rebuild's mask list
-	# so it doesn't try to rebuild libraries that can't be rebuilt.
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/80plexmediaserver
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-tv/plex-media-server/plex-media-server-1.24.1.4931.ebuild b/media-tv/plex-media-server/plex-media-server-1.24.1.4931.ebuild
new file mode 100644
index 000000000000..0c8867ffe82b
--- /dev/null
+++ b/media-tv/plex-media-server/plex-media-server-1.24.1.4931.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1 systemd unpacker
+
+MY_PV="${PV}-1a38e63c6"
+MY_URI="https://downloads.plex.tv/plex-media-server-new"
+
+DESCRIPTION="Free media library that is intended for use with a plex client"
+HOMEPAGE="https://www.plex.tv/"
+SRC_URI="
+	amd64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_amd64.deb )
+	x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb )"
+S="${WORKDIR}"
+
+LICENSE="Plex"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="mirror bindist"
+
+DEPEND="
+	acct-group/plex
+	acct-user/plex"
+RDEPEND="${DEPEND}"
+
+QA_PREBUILT="*"
+QA_MULTILIB_PATHS=(
+	"usr/lib/plexmediaserver/lib/.*"
+	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/.*"
+	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so"
+)
+
+src_install() {
+	# Remove Debian specific files
+	rm -r "usr/share/doc" || die
+
+	# Add startup wrapper
+	dosbin "${FILESDIR}/start_pms"
+
+	# Add user config file
+	mkdir -p "${ED}/etc/default" || die
+	cp "${FILESDIR}/plexmediaserver" "${ED}/etc/default/" || die
+
+	# Copy main files over to image and preserve permissions so it is portable
+	cp -rp usr/ "${ED}" || die
+
+	# Make sure the logging directory is created
+	keepdir /var/log/pms
+	fowners plex:plex /var/log/pms
+
+	keepdir /var/lib/plexmediaserver
+	fowners plex:plex /var/lib/plexmediaserver
+
+	newinitd "${FILESDIR}/${PN}.init.d" ${PN}
+	newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
+
+	systemd_dounit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service
+	keepdir /var/lib/plexmediaserver
+
+	# Adds the precompiled plex libraries to the revdep-rebuild's mask list
+	# so it doesn't try to rebuild libraries that can't be rebuilt.
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/80plexmediaserver
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 8033c284e218..0649dc4343f0 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index c530a68133d7..7ee047e4dd08 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,4 +1,7 @@
+AUX cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch 4008 BLAKE2B 6a8fe1f1514b5e033319a21c2cf3e6d57affc78cf0e46a2d5d34e062a6991fd3a12893f8d0ad9f1c55d56e3e7103cc81f00f97d8e633a4649b3ba0e3d03fb2a8 SHA512 57fc9fada8da49de8e8e23f5211a9a90621b9452104322fe8cc7fbf26f7efcd65a78e324a6b5fc560920d09c865b65268df2ec71e74395cd4a10365b8be5f239
 AUX cheese-3.38.0-buildfix.patch 736 BLAKE2B 3118378b5b125ae6fe223d3b114e07805eb2b5d300bb78ec6b8ff3888f19a0b68af0091aa33918c885991a86293c5cc530d65a75d433cd7c5d343889e5740fbe SHA512 6633f5ebdb2662d199d3f44f49754c8e2c9cd2d864084bff079f4f4de9f20d15489f84ca3acba46df0c9af36920c57b1eca94748c097cb744f71669a69fada47
+AUX cheese-3.38.0-vala-genericarray.patch 6731 BLAKE2B 83f283e629106eba1174197f4b0afc9929fcaaaaa6d29ecaa59cbee97a373589638c2aa0da122db0bd11142ef2790e08b8e3a97e757837f4ce420c0f588609a7 SHA512 de93e2664331a792205c29cf893317719b182bece4185452e705cc349d48dbe46d7320a337e16d923dee4da693c07ba0542b4bc4367162212c7df549313849c2
 DIST cheese-3.38.0.tar.xz 1086428 BLAKE2B b26a19a019de0385bdd7adbc55c873ebceca90a8f477d2041ef4a5045654f46ee8f7fdfc64f5fd34e059116528cc790610353791a7cbd13d7927a8c3abf38132 SHA512 210b50fc79a7b3a72c94163fe0dd76f7f29f576c1085c671c2c6c3b7f59ee362aec288f885a590ebfd9530534b6a6bad569c6df57874b9fcecf7e9f1ba9531ae
+EBUILD cheese-3.38.0-r1.ebuild 2215 BLAKE2B 8556a48fb5703373ec99ec1100dd2573748f1cbdd83489f0d2896c34202e411462b41eeac8cbcffb3634ba5868ef466bf46c015294e34942ad2628b26f02fb29 SHA512 98ea52ee01d3b26e1f82cc18d020a391052405c0fd743a0733104ec1ab7f2dbb9bcb9b0fd43ae366b4d3bdb16d99c3544e2cb68793ddf517e1ae98c8a7041eed
 EBUILD cheese-3.38.0.ebuild 2120 BLAKE2B c28699d5912d6bcf91c9c95b02f00bb1e2c5c88964b67dd46681549eccc0570fe1cd55a3d21bacf5b557ba0bb4c4cd9ac1e4ecea4d13cd067577bca19abda7fa SHA512 5af98575aafab5be072e221cc54d4f317cca56fd1bb60a17c80b5811760d2f63c4140ffeecaa350677491737c2bc4bd66ffc2ca7d7d6be835b978246aad62b4b
 MISC metadata.xml 428 BLAKE2B 3a6b33697b144cba857668b55e04897b8b6c6c4323f09be85ce827843ef50c9c6d988a4e60ffde4ecf1e66a73d70f0e71f2f05371f33f3853429107684abbc9a SHA512 cbe065cc8fe75a86d8f16788dc2ddeafda2b1c27858427f6c9ec83841730e3d9c1c9f7815718c86e19626098b96782a1017b614bac5a0121c92af04b11a30a22
diff --git a/media-video/cheese/cheese-3.38.0-r1.ebuild b/media-video/cheese/cheese-3.38.0-r1.ebuild
new file mode 100644
index 000000000000..9b233fac2198
--- /dev/null
+++ b/media-video/cheese/cheese-3.38.0-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson vala virtualx xdg
+
+DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
+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"
+IUSE="gtk-doc +introspection test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=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?]
+
+"
+RDEPEND="${DEPEND}
+	>=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
+"
+
+BDEPEND="
+	gtk-doc? ( dev-util/gtk-doc )
+	dev-libs/libxslt
+	app-text/docbook-xml-dtd:4.3
+	dev-util/itstool
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	test? ( x11-libs/libXtst )
+	$(vala_depend)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-buildfix.patch
+	"${FILESDIR}"/${P}-Fix-infinite-loop-if-thumbnailer-is-not-available.patch
+	"${FILESDIR}"/${P}-vala-genericarray.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use test tests)
+		-Dman=true
+	)
+
+	meson_src_configure
+
+	# Hack: version.xml is not generated if gtk-doc is not enabled
+	echo ${PV} > docs/reference/version.xml
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-video/cheese/files/cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch b/media-video/cheese/files/cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch
new file mode 100644
index 000000000000..5a27eb6e7844
--- /dev/null
+++ b/media-video/cheese/files/cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch
@@ -0,0 +1,88 @@
+From e7046d564a6f76c1af8f5640ac9c569e07284ec0 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 18 Sep 2020 12:06:45 +0200
+Subject: [PATCH] Fix infinite loop if thumbnailer is not available
+
+The code in cheese_thumb_view_idle_append_item() in
+src/thumbview/cheese-thumb-view.c didn't pop the list of items to
+thumbnail if thumbnailing failed.
+
+ #0  0x00007f4a60e55314 in open64 () at /lib64/libc.so.6
+ #1  0x00007f4a60de6386 in _IO_file_open () at /lib64/libc.so.6
+ #2  0x00007f4a60de655a in __GI__IO_file_fopen () at /lib64/libc.so.6
+ #3  0x00007f4a60dd9aad in __fopen_internal () at /lib64/libc.so.6
+ #4  0x00007f4a6157a43f in gdk_pixbuf_new_from_file () at /lib64/libgdk_pixbuf-2.0.so.0
+ #5  0x00007f4a61e84b3a in gnome_desktop_thumbnail_factory_lookup () at /lib64/libgnome-desktop-3.so.19
+ #6  0x000055cef476046f in cheese_thumb_view_idle_append_item ()
+ #7  0x00007f4a6124f47b in g_idle_dispatch () at /lib64/libglib-2.0.so.0
+ #8  0x00007f4a612537af in g_main_context_dispatch () at /lib64/libglib-2.0.so.0
+ #9  0x00007f4a61253b38 in g_main_context_iterate.constprop () at /lib64/libglib-2.0.so.0
+ #10 0x00007f4a61253c03 in g_main_context_iteration () at /lib64/libglib-2.0.so.0
+ #11 0x00007f4a6146a7ca in g_application_run () at /lib64/libgio-2.0.so.0
+ #12 0x000055cef4758547 in _vala_main ()
+ #13 0x00007f4a60d8a042 in __libc_start_main () at /lib64/libc.so.6
+ #14 0x000055cef47554be in _start ()
+
+ #0  0x00007f4a60ec562d in __strlen_avx2 () at /lib64/libc.so.6
+ #1  0x00007f4a61275de8 in g_str_has_suffix () at /lib64/libglib-2.0.so.0
+ #2  0x00007f4a618c0072 in icon_name_is_symbolic () at /lib64/libgtk-3.so.0
+ #3  0x00007f4a618c00b1 in theme_dir_get_icon_suffix () at /lib64/libgtk-3.so.0
+ #4  0x00007f4a618c32ed in theme_lookup_icon () at /lib64/libgtk-3.so.0
+ #5  0x00007f4a618c3adf in real_choose_icon () at /lib64/libgtk-3.so.0
+ #6  0x00007f4a618c4762 in gtk_icon_theme_lookup_icon_for_scale () at /lib64/libgtk-3.so.0
+ #7  0x00007f4a618c5105 in gtk_icon_theme_load_icon_for_scale () at /lib64/libgtk-3.so.0
+ #8  0x000055cef47605c9 in cheese_thumb_view_idle_append_item ()
+ #9  0x00007f4a6124f47b in g_idle_dispatch () at /lib64/libglib-2.0.so.0
+ #10 0x00007f4a612537af in g_main_context_dispatch () at /lib64/libglib-2.0.so.0
+ #11 0x00007f4a61253b38 in g_main_context_iterate.constprop () at /lib64/libglib-2.0.so.0
+ #12 0x00007f4a61253c03 in g_main_context_iteration () at /lib64/libglib-2.0.so.0
+ #13 0x00007f4a6146a7d8 in g_application_run () at /lib64/libgio-2.0.so.0
+ #14 0x000055cef4758547 in _vala_main ()
+ #15 0x00007f4a60d8a042 in __libc_start_main () at /lib64/libc.so.6
+ #16 0x000055cef47554be in _start ()
+
+Closes: #81
+---
+ src/thumbview/cheese-thumb-view.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/thumbview/cheese-thumb-view.c b/src/thumbview/cheese-thumb-view.c
+index 1d2d88f5..232fd4b6 100644
+--- a/src/thumbview/cheese-thumb-view.c
++++ b/src/thumbview/cheese-thumb-view.c
+@@ -92,7 +92,7 @@ GtkWidget * cheese_thumb_view_new (void);
+ static gboolean
+ cheese_thumb_view_idle_append_item (gpointer data)
+ {
+-  CheeseThumbViewIdleData *item = g_queue_peek_head (data);
++  CheeseThumbViewIdleData *item = g_queue_pop_head (data);
+   CheeseThumbView         *thumb_view;
+   CheeseThumbViewPrivate  *priv;
+ 
+@@ -119,6 +119,7 @@ cheese_thumb_view_idle_append_item (gpointer data)
+   if (!info)
+   {
+     g_warning ("Invalid filename\n");
++    g_slice_free (CheeseThumbViewIdleData, item);
+     return TRUE;
+   }
+   g_file_info_get_modification_time (info, &mtime);
+@@ -167,6 +168,7 @@ cheese_thumb_view_idle_append_item (gpointer data)
+     if (error)
+     {
+       g_warning ("%s", error->message);
++      g_slice_free (CheeseThumbViewIdleData, item);
+       return TRUE;
+     }
+   }
+@@ -183,7 +185,6 @@ cheese_thumb_view_idle_append_item (gpointer data)
+   g_object_unref (pixbuf);
+   g_object_unref (file);
+   g_slice_free (CheeseThumbViewIdleData, item);
+-  g_queue_pop_head (data);
+ 
+   return TRUE;
+ }
+-- 
+2.28.0
+
diff --git a/media-video/cheese/files/cheese-3.38.0-vala-genericarray.patch b/media-video/cheese/files/cheese-3.38.0-vala-genericarray.patch
new file mode 100644
index 000000000000..dcbd1c1b2c5c
--- /dev/null
+++ b/media-video/cheese/files/cheese-3.38.0-vala-genericarray.patch
@@ -0,0 +1,177 @@
+From 7cf6268e54620bbbe5e6e61800c50fb0cb4bea57 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin@elementary.io>
+Date: Fri, 16 Oct 2020 19:56:26 +0200
+Subject: [PATCH] Change GLib.PtrArray into GLib.GenericArray
+
+This is the vala-friendly way of handling GPtrArray.
+Fix several memory leaks on the go and unnecessary reference increase.
+---
+ src/cheese-preferences.vala | 26 ++++++++++++--------------
+ src/cheese-window.vala      | 22 +++++++++++-----------
+ src/vapi/cheese-common.vapi |  2 +-
+ 3 files changed, 24 insertions(+), 26 deletions(-)
+
+diff --git a/src/cheese-preferences.vala b/src/cheese-preferences.vala
+index f56af7e0..80a92431 100644
+--- a/src/cheese-preferences.vala
++++ b/src/cheese-preferences.vala
+@@ -100,7 +100,7 @@ public PreferencesDialog (Cheese.Camera camera)
+    */
+   private void initialize_camera_devices ()
+   {
+-    unowned GLib.PtrArray devices = camera.get_camera_devices ();
++    GLib.GenericArray<unowned Cheese.CameraDevice> devices = camera.get_camera_devices ();
+     camera_model = new Gtk.ListStore (2, typeof (string), typeof (Cheese.CameraDevice));
+ 
+     source_combo.model = camera_model;
+@@ -357,13 +357,13 @@ public PreferencesDialog (Cheese.Camera camera)
+    */
+   private void on_camera_update_num_camera_devices ()
+   {
+-    unowned GLib.PtrArray devices = camera.get_camera_devices ();
+-    Cheese.CameraDevice   dev;
++    GLib.GenericArray<unowned Cheese.CameraDevice> devices = camera.get_camera_devices ();
++    unowned Cheese.CameraDevice   dev;
+ 
+     // Add (if) / Remove (else) a camera device.
+-    if (devices.len > camera_model.iter_n_children (null))
++    if (devices.length > camera_model.iter_n_children (null))
+     {
+-      dev = (Cheese.CameraDevice) devices.index (devices.len - 1);
++      dev = devices.get (devices.length - 1);
+       add_camera_device(dev);
+     }
+     else
+@@ -382,12 +382,11 @@ public PreferencesDialog (Cheese.Camera camera)
+       bool device_removed = false;
+       devices.foreach ((device) =>
+       {
+-        var old_device = (Cheese.CameraDevice) device;
+         Cheese.CameraDevice new_device;
+         camera_model.get (iter, 1, out new_device, -1);
+ 
+         // Found the device that was removed.
+-        if (old_device != new_device)
++        if (device != new_device)
+         {
+             remove_camera_device (iter, new_device, active_device);
+             device_removed = true;
+@@ -418,17 +417,16 @@ public PreferencesDialog (Cheese.Camera camera)
+    *
+    * @param device a Cheese.CameraDevice to add to the device combo box model
+    */
+-  private void add_camera_device (void *device)
++  private void add_camera_device (Cheese.CameraDevice device)
+   {
+     TreeIter iter;
+-    Cheese.CameraDevice dev = (Cheese.CameraDevice) device;
+ 
+     camera_model.append (out iter);
+     camera_model.set (iter,
+-                      0, dev.get_name (),
+-                      1, dev);
++                      0, device.get_name (),
++                      1, device);
+ 
+-    if (camera.get_selected_device () == dev)
++    if (camera.get_selected_device () == device)
+         source_combo.set_active_iter (iter);
+ 
+     if (camera_model.iter_n_children (null) > 1)
+@@ -445,12 +443,12 @@ public PreferencesDialog (Cheese.Camera camera)
+   private void remove_camera_device (TreeIter iter, Cheese.CameraDevice device_node,
+                              Cheese.CameraDevice active_device_node)
+   {
+-      unowned GLib.PtrArray devices = camera.get_camera_devices ();
++      GLib.GenericArray<unowned Cheese.CameraDevice> devices = camera.get_camera_devices ();
+ 
+       // Check if the camera that we want to remove, is the active one
+       if (device_node == active_device_node)
+       {
+-        if (devices.len > 0)
++        if (devices.length > 0)
+           set_new_available_camera_device (iter);
+         else
+           this.hide ();
+diff --git a/src/cheese-window.vala b/src/cheese-window.vala
+index ff069808..cc119b68 100644
+--- a/src/cheese-window.vala
++++ b/src/cheese-window.vala
+@@ -1216,9 +1216,9 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
+    */
+   public void on_switch_camera_clicked ()
+   {
+-      Cheese.CameraDevice selected;
+-      Cheese.CameraDevice next = null;
+-      GLib.PtrArray cameras;
++      unowned Cheese.CameraDevice selected;
++      unowned Cheese.CameraDevice next = null;
++      GLib.GenericArray<unowned Cheese.CameraDevice> cameras;
+       uint i;
+ 
+       if (camera == null)
+@@ -1235,9 +1235,9 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
+ 
+       cameras = camera.get_camera_devices ();
+ 
+-      for (i = 0; i < cameras.len; i++)
++      for (i = 0; i < cameras.length; i++)
+       {
+-          next = (Cheese.CameraDevice )cameras.index (i);
++          next = cameras.get (i);
+ 
+           if (next == selected)
+           {
+@@ -1245,13 +1245,13 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
+           }
+       }
+ 
+-      if (i + 1 < cameras.len)
++      if (i + 1 < cameras.length)
+       {
+-          next = (Cheese.CameraDevice )cameras.index (i + 1);
++          next = cameras.get (i + 1);
+       }
+       else
+       {
+-          next = (Cheese.CameraDevice )cameras.index (0);
++          next = cameras.get (0);
+       }
+ 
+       if (next == selected)
+@@ -1269,8 +1269,8 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
+    */
+   public void set_switch_camera_button_state ()
+   {
+-      Cheese.CameraDevice selected;
+-      GLib.PtrArray cameras;
++      unowned Cheese.CameraDevice selected;
++      GLib.GenericArray<unowned Cheese.CameraDevice> cameras;
+ 
+       if (camera == null)
+       {
+@@ -1288,7 +1288,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
+ 
+       cameras = camera.get_camera_devices ();
+ 
+-      if (cameras.len > 1)
++      if (cameras.length > 1)
+       {
+          switch_camera_button.set_visible (true);
+          return;
+diff --git a/src/vapi/cheese-common.vapi b/src/vapi/cheese-common.vapi
+index 6517cdfc..e4ae7ad3 100644
+--- a/src/vapi/cheese-common.vapi
++++ b/src/vapi/cheese-common.vapi
+@@ -35,7 +35,7 @@ namespace Cheese
+     [CCode (has_construct_function = false)]
+     public Camera (Clutter.Actor video_texture, string camera_device_node, int x_resolution, int y_resolution);
+     public bool                        get_balance_property_range (string property, double min, double max, double def);
+-    public unowned GLib.PtrArray       get_camera_devices ();
++    public GLib.GenericArray<unowned Cheese.CameraDevice> get_camera_devices ();
+     public unowned Cheese.VideoFormat  get_current_video_format ();
+     public int                         get_num_camera_devices ();
+     public unowned Cheese.CameraDevice get_selected_device ();
+-- 
+GitLab
+
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index 1605fc3ad66f..7e55744461d6 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -2,5 +2,5 @@ AUX ffmpegthumbnailer-2.2.0-pkgconfig-libdir.patch 675 BLAKE2B b6b00228900e3fb18
 DIST ffmpegthumbnailer-2.2.0.tar.bz2 1223895 BLAKE2B 1babd01672f927a9ae043488e67225490f732b26544ad92e4c55ae683eb7d852cb90233e76a52cbda2f6aec26654b57907d7706e3ad4ae6d76ca3bca163c78eb SHA512 526d15b2c754fcb1415e69fb54cb6e7d0102b6d73a32a7e8528df81e32633dfe3786898984fdb988c93daee7218956c75c096ef657c9b3a42399d2d1d27c7bbf
 DIST ffmpegthumbnailer-2.2.2.tar.bz2 1201838 BLAKE2B 449a876eaf56feb41c06dc5f3d123b138d66dfe8b6e1bc2e53f1742ef6fbd4ec5d14d77402e13cf8c369ee0cf0707ae5b100ac1d9fb02435b3c3a776cc9dc5f4 SHA512 52760dcf59430e5e85024c9f19dc1fac1d5f0edb4f937b33feac2b3ca8f12bbf549b5f658fc16fc07bf773717b9e10048aa3eb24bf52811c5c88c995ef492612
 EBUILD ffmpegthumbnailer-2.2.0-r1.ebuild 1085 BLAKE2B d89bcbeed12ca0aea9c931461dbdecce973d44e8ecd0d8d777abfa6f0128f491f36771a1a4d7adddac49b8228458cb81821b7b85d78d85b1bccdfb907c871dc5 SHA512 aa950d982ac2529cbaef04af04582cb8023e2165e3905d20c6f72411fe59bd5e1e1c71e2fa8891958ef44f943406dbcfc366588c445e3105fc02ce2992233348
-EBUILD ffmpegthumbnailer-2.2.2.ebuild 1037 BLAKE2B 74df41ed7ffba61c688cf9fc4dbe9b1257322bc25591aaeb194cc9a507b9103b8d8490b01770f6e40958187ae58bee0bdee1c7ab98fb56a41a531b8de603c9fc SHA512 f7c957535d396c18a1348af47d7d9350701be4da6bed54f7fa3eae8ce2412b86dcac702454bda5df241bc1a879790389a37cfdb6400b851639273530bf68c0c8
+EBUILD ffmpegthumbnailer-2.2.2.ebuild 1044 BLAKE2B 27b7e93e7ea961d77ae53efb351090f0ba7247439abb38263ec38e595f7d62d251341e0b96f91ad6068cd30e5540a95d15fbb5dd8d770b094c90288c5f4afb44 SHA512 b43e9bbcb4361ee80fa3a7bab8bab442670b4c9603e638e6edb3c67cc1134e2a95c2513af16b38952741de0aadb3ce1a50b9abcc22d071bd48675c9f50dc7f75
 MISC metadata.xml 375 BLAKE2B 95c0757230dcb40e028a904cfeb17bc44d651e2c5840fb9bd45222f56217ab72cee863157c014fa301a69611eee2e5b574fe9351f066bba1a846ad2b458ae52e SHA512 a3b8d0dc66f4660489b8e084a310da37b5379843b5e4a661a7c1150a4c2a7c4924f6d92366edefa6e57ed77016577d86c4aef084238df06925395f21c3078ab0
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2.ebuild
index 2ac9daa50b69..1db8f1d925cb 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dirkvdb/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="gnome gtk jpeg png test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 8ef2a75f498d..92970d8b393c 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -5,7 +5,7 @@ DIST mkvtoolnix-51.0.0.tar.xz 7569264 BLAKE2B c2af73c278e794739ccb7a8eb560c23e0f
 DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18 SHA512 583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99
 DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 094c13ac7e73e79f3cc7eae0768625482c4808a4323239a93de34d1406583bfe676d71855dd1f7eae9a8a0ff0a7badf50c04c71f9d2fbb4afd9ff5f05b9353ea SHA512 90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3
 EBUILD mkvtoolnix-51.0.0.ebuild 2921 BLAKE2B e71d3e988f14a21595f8666f57d5eee063088dc708d787c707bef93e2fe8d8c86614e8c81f2542eb7b8b91203927b04ae44b5d8c95f8710884acde992f0da6bd SHA512 76409b23ca27bd4c9528c153d016c72bb39778c80ee3c487dd6d9f23c228b475df80fbc10b2b37ce10e0f131d4d6a33e6af77117f25488218bf5a3c0057a8e2b
-EBUILD mkvtoolnix-57.0.0.ebuild 2973 BLAKE2B d2c5a209bf16fac4b98a093e3cc5ac7b11f12707e648d5cabed8d90ea6431020cdbeac918a2b3c7d61ddebe6eca42499c038e3c6abfea2332cd4e952c1948370 SHA512 e64b0c432ebf47a4b40d201ff83ebec6723214d44d72d9ac8757ef176319579bfcbc841ba2e595bb8870735e8ef4f846fea8670e59498fc737dacdb0f362bd20
+EBUILD mkvtoolnix-57.0.0.ebuild 2969 BLAKE2B 402ed70eb494854ce19cebf3e78809b8f96df652dcdaa385210eb0b7417a342aed1065245ffc06a76b62c05a5be009ff38f562049fc07ad2f7100f32e4fbc8d9 SHA512 2f6ee7dbfb8702dcd1cb9c358906e0fc850f8cd3d209ae21144311f0cef58f5a037cb3d748390206ec65b026ac22797636f1d11b81afc4c7ba75ed4a0fbf4d37
 EBUILD mkvtoolnix-60.0.0.ebuild 2687 BLAKE2B 97fdbe6d11985f608d996dc43954480ea3a007ad753a610836ad62d04977c319a2ebee16af88d4b1072032a54356088705cac8a4acabad1a7a94045710b6b7c3 SHA512 7e80c992f5bab78ba16a4a8540d5f3a54883d3a9ee58d4690964f2d07cf829d4762cc21941bde4ead37528d81c45f73d72996235bc7137bd7f39493be897818f
 EBUILD mkvtoolnix-9999.ebuild 2687 BLAKE2B 97fdbe6d11985f608d996dc43954480ea3a007ad753a610836ad62d04977c319a2ebee16af88d4b1072032a54356088705cac8a4acabad1a7a94045710b6b7c3 SHA512 7e80c992f5bab78ba16a4a8540d5f3a54883d3a9ee58d4690964f2d07cf829d4762cc21941bde4ead37528d81c45f73d72996235bc7137bd7f39493be897818f
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
index dbc45d73af89..33522f391c02 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
diff --git a/media-video/oxine/Manifest b/media-video/oxine/Manifest
index e9c9e1379a93..fc107ff6f776 100644
--- a/media-video/oxine/Manifest
+++ b/media-video/oxine/Manifest
@@ -1,3 +1,3 @@
 DIST oxine-0.7.1.tar.gz 3653511 BLAKE2B 33f9e213d1bd379b3faca0d8bba01c656838109a1b47c4dde87aa385c5ecf478e3655b3fd4fffecf6d01d0f95a138d926d55124846f581450c5635eadd9722a9 SHA512 96f6851f6277d97530b1f4d95d0f0843c9c3262d1a97ccc431e8a674441e06ca8fc24a65f83be5735f54e089d636e60fb297fa7958279b24004eecbc1711a257
-EBUILD oxine-0.7.1-r3.ebuild 1768 BLAKE2B bd0fbecb5dd49ed8fa1518a16a51145b42a7f605d3c2af1e55e9bda28e19c7a7d8b38d79d869d8be9071856aeff62fd87a11e23f3ed7675af8b76ffe480b2eec SHA512 bba030378ab3f5099c60f03fd6bbc74b4f2462c5d1f2e7d9e0b59ecf88c2de9620d33af8d2b3569cc69a3f3f3af22bb5e6745f705ecaa07c81171046ed63d377
+EBUILD oxine-0.7.1-r4.ebuild 1789 BLAKE2B f8f3a6a2798f7a061a5e95a4b38dd47587bb1a442161ddc1051fabe46905e31df6d1c9e6a02e44ca2cf0b94a6e5aa22e448f40ae6a02e7cd3ace64f0585b3eb8 SHA512 5ac31a27297e0ffe83ab53015ed6e6658eb97247da8fb97175d303f9a85ae9ef029e90b1143e0f126e48c36edb520494ed7944f4953834d9ff944e4bd7d62fad
 MISC metadata.xml 306 BLAKE2B 349811aa4e6ca674625faf2c41eac9be13c232c356b289f1c56d53e63a041d06e675e26c366aa724729565baed0facdbf9e5926187cdff6f5e036a66920d1643 SHA512 eac1b6e169636bff97d29cf4de2b7c47d25f7ccdffc31807bd0d8b4e0c6ac9314e7f1de8759f8506a4c49aba696ae4dc8d5995806a1f3f4dfcbcc9dfef7bebd5
diff --git a/media-video/oxine/oxine-0.7.1-r3.ebuild b/media-video/oxine/oxine-0.7.1-r3.ebuild
deleted file mode 100644
index 877be6611ffe..000000000000
--- a/media-video/oxine/oxine-0.7.1-r3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="OSD frontend for Xine"
-HOMEPAGE="http://oxine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE="curl debug dvb exif joystick jpeg lirc nls png v4l X"
-
-COMMON_DEPEND="
-	dev-libs/libcdio
-	media-libs/xine-lib[v4l?,X,imagemagick]
-	curl? ( net-misc/curl )
-	dvb? ( media-libs/xine-lib[v4l] )
-	joystick? ( media-libs/libjsw )
-	jpeg? (
-		media-gfx/imagemagick
-		media-libs/netpbm[jpeg,zlib]
-		media-video/mjpegtools
-	)
-	lirc? ( app-misc/lirc )
-	nls? (
-		virtual/libintl
-		sys-devel/gettext
-	)
-	png? (
-		media-gfx/imagemagick
-		media-libs/netpbm[png,zlib]
-		media-video/mjpegtools
-	)
-	X? (
-		x11-libs/libXext
-		x11-libs/libX11
-	)"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/util-linux"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-HTML_DOCS=( doc/README.html )
-
-src_configure() {
-	# Fix underlinking by falling back to
-	# GNU89 inline semantics, bug 590946
-	append-cflags -std=gnu89
-
-	# Note on images: Image support will be automatically disabled if
-	# netpbm, imagemagick or mjpegtools is not installed, regardless
-	# of what the USE flags are set to.
-	# If one of the image USE flags is unset, disable image support
-	local myconf=()
-	if use !png || use !jpeg; then
-		myconf+=( --disable-images )
-	fi
-
-	econf \
-		--disable-hal \
-		--disable-rpath \
-		--disable-extractor \
-		$(use_with curl) \
-		$(use_enable debug) \
-		$(use_enable dvb) \
-		$(use_enable exif) \
-		$(use_enable joystick) \
-		$(use_enable lirc) \
-		$(use_enable nls) \
-		$(use_enable v4l) \
-		$(use_with X x) \
-		"${myconf[@]}"
-}
-
-src_install() {
-	default
-	dodoc doc/keymapping.pdf
-}
diff --git a/media-video/oxine/oxine-0.7.1-r4.ebuild b/media-video/oxine/oxine-0.7.1-r4.ebuild
new file mode 100644
index 000000000000..c827c4ee2203
--- /dev/null
+++ b/media-video/oxine/oxine-0.7.1-r4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="OSD frontend for Xine"
+HOMEPAGE="http://oxine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="curl debug dvb exif joystick jpeg lirc nls png v4l X"
+
+COMMON_DEPEND="
+	dev-libs/libcdio
+	media-libs/xine-lib[v4l?,X,imagemagick]
+	virtual/libcrypt:=
+	curl? ( net-misc/curl )
+	dvb? ( media-libs/xine-lib[v4l] )
+	joystick? ( media-libs/libjsw )
+	jpeg? (
+		media-gfx/imagemagick
+		media-libs/netpbm[jpeg,zlib]
+		media-video/mjpegtools
+	)
+	lirc? ( app-misc/lirc )
+	nls? (
+		virtual/libintl
+		sys-devel/gettext
+	)
+	png? (
+		media-gfx/imagemagick
+		media-libs/netpbm[png,zlib]
+		media-video/mjpegtools
+	)
+	X? (
+		x11-libs/libXext
+		x11-libs/libX11
+	)"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/util-linux"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+HTML_DOCS=( doc/README.html )
+
+src_configure() {
+	# Fix underlinking by falling back to
+	# GNU89 inline semantics, bug 590946
+	append-cflags -std=gnu89
+
+	# Note on images: Image support will be automatically disabled if
+	# netpbm, imagemagick or mjpegtools is not installed, regardless
+	# of what the USE flags are set to.
+	# If one of the image USE flags is unset, disable image support
+	local myconf=()
+	if use !png || use !jpeg; then
+		myconf+=( --disable-images )
+	fi
+
+	econf \
+		--disable-hal \
+		--disable-rpath \
+		--disable-extractor \
+		$(use_with curl) \
+		$(use_enable debug) \
+		$(use_enable dvb) \
+		$(use_enable exif) \
+		$(use_enable joystick) \
+		$(use_enable lirc) \
+		$(use_enable nls) \
+		$(use_enable v4l) \
+		$(use_with X x) \
+		"${myconf[@]}"
+}
+
+src_install() {
+	default
+	dodoc doc/keymapping.pdf
+}
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 475854c2fbb9..0579da13729f 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -5,6 +5,7 @@ AUX pipewire-0.3.28-revert-openaptx-restriction.patch 955 BLAKE2B 17b6adc21205fd
 AUX pipewire-0.3.29-revert-openaptx-restriction.patch 1228 BLAKE2B a282cd6f678ecd5fd27076cd945b86a8139caf644fae5f6420f45e47cfa1f1ef7edacb6e5c6c0ae860bfaa016de902accb916159f90a85bddb0b26b73658e3ff SHA512 cadfe7c54eec23d2619faf274d2c5c95b4f430525c7fc0b84e667e3f90775d27dbb6682d200d3af5d48475a2b37ab0ff2dd6e8be4f2d69bead68f6f1efb7a7ad
 AUX pipewire-0.3.31-non-systemd-integration.patch 854 BLAKE2B 361b01278d2525768edd33881ebfa78e15006d346612422cc11817df6cc6c5079d166f3185b8d48312294a6a225ecdb607f180339f416131c7acd638b6efe3fb SHA512 495a7568a1c19e0a24edab7d0572032234efd2380fc9c0fe282a891ff316a235cdb97d5df4524233ed6d8ebfc7724ba9870393b8a5c2a192974865aa706760ab
 AUX pipewire-0.3.31-revert-openaptx-restriction.patch 1368 BLAKE2B 7f995c53ea843282ea802304365833c1464393f7e3e4edeb93cb400c1ed85d2cb7e9f3aa47565139e80ee0fae33e83f5306062e4d26c43d5d544a7f9ca4a4e17 SHA512 0ef4262d5d7c95061dbb68c998539c5a3f70084b6ecbed4b237f699df4f1fdb95539ab35fe0295acf46e729065295cb75750bd99eaa1ff565a26369116b52855
+AUX pipewire-0.3.33-revert-libfreeaptx-switch.patch 1709 BLAKE2B e66bd84b0e297899dfa5167179394b2e5b0d7e98da35171cd9f37c0c100fb593d21955e44643ac7df00d4aa087d7e4e7d26017fc8d2b60477adb7c619978c874 SHA512 d91a7985d32e33d24e05145c567483b50d2a0049f0641a06abc295be776c1eb1a8c2935aa96118d1d71dce2e0538837bf4a18e3c235a2bdab6f9188f012da41b
 AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
 DIST pipewire-0.3.22.tar.gz 1263844 BLAKE2B 3fb90c0b1c17ed108e8c390873f5c4527e1ff9241d1c5964ad5b7c01fbfefda901ef1228f178cf3c9899e6e8e75969a470f8fba63473ff203cba612c6c0553ca SHA512 a6587e0afd5c90be1733ecf62c6fc68e735ab3b84f2cbbf844bbe1be93e7a23dee07b041ed6b273cab6ab207d2388ae6f2027d0380928555a0155a7cc9ca4a7e
@@ -16,6 +17,7 @@ DIST pipewire-0.3.29.tar.gz 1504935 BLAKE2B fe3984ec4b02fe91683d382e3891e174748b
 DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
 DIST pipewire-0.3.31.tar.gz 1594284 BLAKE2B 0ff358c53ea4357a72ac58ee45ccac792161d3ddd7a9dbcd6933be88e0ddc5d9c49468a3b1eb0cdf9ea81ec4272ad53078f6cae1fd20358bbeed108139e217ce SHA512 ff21e281bb3e5f6da1001e0c64b33368e96d31f0ec2d395cdfcfac105b0442d8fedd2225e6e5d1c93fdbd5e0108accecebbb7c294c55803a4ea853f1efa0c069
 DIST pipewire-0.3.32.tar.gz 1604622 BLAKE2B cab83a17a2b27f710e1377a2ad2ad7003053ef3e8b55423362f0b428e22d52c2ce564da00aab71cc93262d4cb21f239fffea195d05937fdf3489dc540b77d58d SHA512 8a7fe26a78071fdd8d4c9e2d9bf3791af8e0cb53b976b45d39dcab4ad08196808f416911fb1b366cc85e3fa80592ec79c4e4556bb3a390f4a10229b4bf9893f7
+DIST pipewire-0.3.33.tar.gz 1629559 BLAKE2B de48956ac87ed6d63a08dd354b1e4abf81b9db99825ca65cbb5b522e71eb6920b35173e1c3abd9a710c28709e2b0a459db67654cfeac42149cdfa91c84833a8b SHA512 bc3d5658d6fda11dd55f22ba5293b4ff6c3e9a8d083b0cf7b3356bc18f4f65967557602a0d6603a2a2a548ecb42c6b7fbb9d315ed0fce435f4bb884ab4dd263b
 EBUILD pipewire-0.3.22.ebuild 3177 BLAKE2B 712e773c42b0a89d482a1c38f1d5b2ad73bd9790173093813f257378e5bcda3aaaeedb2d215812637d14dccc4c57cb25ba3d4574d579821f7c09f8a110cac8ac SHA512 89583f0495c8a12598c829de80d2b515a1a37aecf51b4cb54c4988f0fc3aff2f5d9b7f4d23621678d5f1b2e67f145d941eacc0d9eca0281d9cf202ff109a7195
 EBUILD pipewire-0.3.25-r1.ebuild 8591 BLAKE2B 4ed730cd42404fc94e7665c6ee07e9548e1d5e363f74af0a52ff488e005d6f582081f6ceef383f84e8c378c833f2406646c7b3b84e50074a9519ffeb49912b8a SHA512 5541d51a4888f753f0c463fb54009b5aabe45047df2b7b53c6016abc2481be589067bb0ecf4ee79c64a1ae2d4b06254e6b61f210a9737ee57a159da332bc3820
 EBUILD pipewire-0.3.26-r1.ebuild 8742 BLAKE2B 112df615c5e4549c2d3d44e19f45d48eb1787d4570c6e4ec5041775b3e67c2c010586ffdcccd29a8a8fd521a1b73303ab3086aaa3c5d7b6a11b4db67063fba71 SHA512 20d607009548c323e704cd33b07e0437b9ad9d1ec8a7eff895b558d1825b596550c78a956dbf7ddb9bd7e8aa312271f04c7969577180151d00e27b5128f62317
@@ -25,5 +27,6 @@ EBUILD pipewire-0.3.29-r1.ebuild 9394 BLAKE2B f14cffd0a50e2405795c56ad277c53e52e
 EBUILD pipewire-0.3.30-r2.ebuild 9676 BLAKE2B 0a830a07130fbbd97fb0e34ed02acb848e9dd1c6edb7f5e90f3b0f67a6fa9cf270ba914cb1b3db2439519f22b71ff63d78293589a68437610bf70855ada8ba25 SHA512 c5bab51ec5659176738b79ff2299794f84010cedfb6280198ee4c709f76d9cf8dc1b91bec70a132cfcbe074967b254098418b27e2dd9228445cf33b9e507140a
 EBUILD pipewire-0.3.31-r1.ebuild 9681 BLAKE2B 539e8528f06605c1874194f9e01d92e6a1e35550c9f177964010a5b39a80ffb027adba89b2aa6ca8a2f59c419e0ed383c96102e62368fa1a9402dfa55a70dabf SHA512 595f83d2f06fc36d5fe83cbc054da9c20f555a28eb443ae40d0b49ba07ad73b0608abfa638285b015117c09d0024760b6493a6c7b2dc435e17412d8326dfbdd8
 EBUILD pipewire-0.3.32.ebuild 9601 BLAKE2B 6e23d8b5fbc3f3a2a0369153cc59723f48755cbabfed1a7972de1b49b8a2b9493263d6a05e50868516232141f5e762be49faeb1487c2f0e887fa1f6ade9bf86b SHA512 700e6a4ac979a7fe90dcf8f14afc8a5fa5257ff0ae29797a5570f0df172c583b5d57883e94304bdcf7d1b1f0336a579e88d4dd5b45c04694641b585c754ae477
-EBUILD pipewire-9999.ebuild 9594 BLAKE2B 3e0195e9aeb8e4c2d8c9258d3597c575eb4e7d4a6812fc5479ffd8007bf3eaf8faccd58013fa3e59ba23d7843094e2ab72feb89ce2c4ced6f24ac8e1b887ab2d SHA512 829cbdde885e5d0a72f2a30f2d69058308bdee8ac79c0b001775d36efcbf616c347c0c7b555c5966883fd5fdc4a60303d0ff6ba42f0026eaeabde509a4fc6ba7
+EBUILD pipewire-0.3.33.ebuild 9661 BLAKE2B 0932ab7f735303fced337c19380cca28994352d0e3b4e0cad463682718893a2cf99572de12860e22a7fb7ffc37a2a48e3bacbd5ab13ee75f7c72c1353ae8bffb SHA512 8e978f61127ebff2b07c99e487ed3b3eda164a3500309c7e02ae15058cf3c10286504de13292eb05e59874b6410b7433b825c71c9a95125225f3ba588135f0e3
+EBUILD pipewire-9999.ebuild 9654 BLAKE2B b77973f14d900e1fc3de6c0685fd425bddc1abc31008400a65e519e2ac2b5a3701876b61a9c17fd3ccb07505378b9e02c02fa4cc3ff33585db7a55e213f798aa SHA512 e38a75cb814be7c120f9b90c7a97f1fbb1f4fe2406eb084cad1c435487c3e07d531bd2c1287b70a1a641975d8844c90fd8ce27c3847570d2949c1d467d8d39dc
 MISC metadata.xml 1600 BLAKE2B 1138c789841fae8ea509ba2becdfef8376b87525b5b1822854ca083ab49e63124cbde6d8064849e0114a0e39269f63cf76d63f49396d709f6b3da865cf539487 SHA512 5ca5105edecf2515049b61e71327236c3e0fd949a25e91a9ed9dc0a9ad5d9d66f0b99329276c824e8840352b699bb9995b9ae073b43f30f87f4a8cc4bc4237a5
diff --git a/media-video/pipewire/files/pipewire-0.3.33-revert-libfreeaptx-switch.patch b/media-video/pipewire/files/pipewire-0.3.33-revert-libfreeaptx-switch.patch
new file mode 100644
index 000000000000..94d4b7dcb0c3
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.33-revert-libfreeaptx-switch.patch
@@ -0,0 +1,38 @@
+commit f405a4e6069725934f9ae0f1b978497a34197d8d
+Author:     Thomas Deutschmann <whissi@gentoo.org>
+AuthorDate: Tue Aug 24 14:22:36 2021 +0200
+Commit:     Thomas Deutschmann <whissi@gentoo.org>
+CommitDate: Tue Aug 24 14:22:43 2021 +0200
+
+    Revert "bluez5: Use libfreeaptx instead of libopenaptx"
+    
+    This reverts commit 1216371f8c06f548f8ade6468b66612f43df1436.
+    
+    Delay decision for now since both aptx libs haven't diverged yet.
+
+diff --git a/spa/meson.build b/spa/meson.build
+index 483536b54..e13802e94 100644
+--- a/spa/meson.build
++++ b/spa/meson.build
+@@ -28,7 +28,7 @@ if not get_option('spa-plugins').disabled()
+     summary({'LDAC': ldac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+     ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac'))
+     summary({'LDAC ABR': ldac_abr_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+-    aptx_dep = dependency('libfreeaptx', required : get_option('bluez5-codec-aptx'))
++    aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : get_option('bluez5-codec-aptx'))
+     summary({'aptX': aptx_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+     fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac'))
+     summary({'AAC': fdk_aac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+diff --git a/spa/plugins/bluez5/a2dp-codec-aptx.c b/spa/plugins/bluez5/a2dp-codec-aptx.c
+index f8d7d6dd8..62ecde348 100644
+--- a/spa/plugins/bluez5/a2dp-codec-aptx.c
++++ b/spa/plugins/bluez5/a2dp-codec-aptx.c
+@@ -32,7 +32,7 @@
+ 
+ #include <sbc/sbc.h>
+ 
+-#include <freeaptx.h>
++#include <openaptx.h>
+ 
+ #include "defs.h"
+ #include "rtp.h"
diff --git a/media-video/pipewire/pipewire-0.3.33.ebuild b/media-video/pipewire/pipewire-0.3.33.ebuild
new file mode 100644
index 000000000000..6668891d3bb9
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.33.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit meson-multilib optfeature python-any-r1 udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+SLOT="0/0.3"
+IUSE="bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="jack-sdk? ( !jack-client )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-doc/xmltoman
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
+	bluetooth? (
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libopenaptx
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+	)
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+		|| (
+			media-plugins/alsa-plugins[-pulseaudio]
+			!media-plugins/alsa-plugins
+		)
+	)
+	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+	systemd? ( sys-apps/systemd )
+	v4l? ( media-libs/libv4l )
+"
+
+DEPEND="${RDEPEND}"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	"${FILESDIR}"/${PN}-0.3.33-revert-libfreeaptx-switch.patch
+	"${FILESDIR}"/${PN}-0.3.31-revert-openaptx-restriction.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		# This can be applied non-conditionally but would make for a
+		# significantly worse user experience on systemd then.
+		eapply "${FILESDIR}"/${PN}-0.3.31-non-systemd-integration.patch
+	fi
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
+		$(meson_native_enabled media-session)
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
+		-Dsystemd-system-service=disabled # Matches upstream
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_feature jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our customs DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
+
+		exeinto /usr/libexec
+		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
+	fi
+}
+
+pkg_postinst() {
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "To use PipeWire for audio, the user units must be manually enabled:"
+		elog
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
+		elog
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
+		elog
+		elog "  systemctl --user enable pipewire-media-session.service"
+		elog
+	else
+		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
+		elog "autospawn'ing of the original daemon by setting:"
+		elog
+		elog "  autospawn = no"
+		elog
+		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+		elog
+		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
+		elog "command near the end of the file:"
+		elog
+		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
+		elog
+		elog "NOTE:"
+		elog "Starting with PipeWire-0.3.30, package is no longer installing config"
+		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
+		elog "config, please start by copying default config from ${EROOT}/usr/share/pipewire"
+		elog "and just override sections you want to change."
+	fi
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
+	if use bluetooth; then
+		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
+		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
+	fi
+}
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index ca8a33f0f304..af7dc100dd1d 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -96,6 +96,7 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	"${FILESDIR}"/${PN}-0.3.33-revert-libfreeaptx-switch.patch
 	"${FILESDIR}"/${PN}-0.3.31-revert-openaptx-restriction.patch
 )
 
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index 89f25700d71c..e230dc3884d8 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,6 +1,8 @@
 DIST QMPlay2-src-20.07.04.tar.xz 1552680 BLAKE2B cc53ef842f91312f72e8d347a2d6d2e4239fe9435d0b7ac39e47e9f1f48a9a570ce614dd496512079d3701e1823ab75123b40ad752fdd2348cdb7bc8de425225 SHA512 4a6316f03d1b77bcd6c08de0daefc3f29b4c8c575eae9f901951e2b43f2739904136b9455f567b66fc9a4e4c64fe92584608f1878dd8c30c0352ea9ee1e2e314
 DIST QMPlay2-src-21.03.09.tar.xz 1568600 BLAKE2B da3a185ae2e372b0bad697e4ad7d836647c5b4bb376f0ee3f7e85e387c10b86f1a3fdaf8eb13a2c9a8d3b7d56105e282cc82f22d31043e9e418ee907776f1db2 SHA512 311fe45a9ee237556faeee29633be6161407a31b19fd3bceca5a164e92ff1757824094d20f6b556c0a4beaac07a14179e812faafc5e41ee904cf1ce1827fb138
+DIST QMPlay2-src-21.06.07.tar.xz 1579640 BLAKE2B f687cf19ce8d4a606b5271c2e5789d5194233bd300f29d165354cc8784808a148e02536ea8a593c036cd75d1e40a335177f1b9db33016008bbb2f9516daf7e61 SHA512 41558e2df09a188cef05c2a24393e67ce4d1ef1268ff1bdd1ac97ec666d9f8f849817b0c64e384624403a8f6f60cb985dde188cb3c75afd731e42f776076d282
 EBUILD qmplay2-20.07.04.ebuild 3577 BLAKE2B 01d9a11780e3ef63e9c5e60cd65cd2649090f1e9cd8f4928b8f00296fa99c602458622dab63f282d3e5ab143d0f2e7b422be783d16bc75c37603e97c05633454 SHA512 3e60673d0c778b37ecb80390b2dc7d21b3e6997b7593cefd8730244b17220ba9b87d0ef03b050b2ec8c41968a97ed856f617791e677cedbedcfbddfd273b4c85
 EBUILD qmplay2-21.03.09.ebuild 3457 BLAKE2B 33657ed63ead83ea84d42a5a5afa6756733d496c7429fb80d7150326f463ed4e0f470b67a38814f16144053eaf2727a2586e21b2c809fc858554d47a47b8568f SHA512 af380f84264bbb4de17f1a7bdaf0fb1c338ce2b404e9accfed9d95cdab8601c67e2a1a4429b6fe664a9d30234a5da715ba2ea117aaf5f7ac26363c7082025427
-EBUILD qmplay2-9999.ebuild 3457 BLAKE2B 33657ed63ead83ea84d42a5a5afa6756733d496c7429fb80d7150326f463ed4e0f470b67a38814f16144053eaf2727a2586e21b2c809fc858554d47a47b8568f SHA512 af380f84264bbb4de17f1a7bdaf0fb1c338ce2b404e9accfed9d95cdab8601c67e2a1a4429b6fe664a9d30234a5da715ba2ea117aaf5f7ac26363c7082025427
-MISC metadata.xml 1487 BLAKE2B f91021bb5b7db3b6cb98516ab8c31120bbe0706cc22d0d847a28be8d4c803c2336eba9c7188c5d7c3f91f1a3ba29ee9e0f9bace18410f2b36227d8b940d5c05d SHA512 3a7cdadcacea59a411e3169995a688339c779b74d81a92d7cd386fcdb0ef9a66e969a72bce68914bd156741b0bd2657eb5bfe94644e094f96001363a8adbeb47
+EBUILD qmplay2-21.06.07-r2.ebuild 3332 BLAKE2B 28e7d5b00a174fe3bd56e9e36376ff2ed57c271c9e182bfbce2994f33eaa4277d837ba64dbfe37851b320cab5cc1ac8ab1598e78a08a9d533ada64d4065ba448 SHA512 08ea23ec11101dee122d4ea0b7c541c322bc4b037a232dd37270381ba2221f6354005ebf5c9457af8aaf316fbf8963af1d47f1cbadb68e22d66f369295d64aff
+EBUILD qmplay2-9999.ebuild 3351 BLAKE2B 102feaa9743194172b1006cf402caa3fb2acba7e8e7b90fd3bdc7377b2a4a313621b718e3f46596a7e5c46c8405cb4bef75b184db13a437d0e203ccef366d3e5 SHA512 84fa72ce81bbc824fbbde3f1f14423aa4161db358400aff2eca141549e36dc35202d872fa9fd74dffa43fc04305960af17400329667053977c59b73e4b76513b
+MISC metadata.xml 1341 BLAKE2B 8fd25066219905c325120f63102759195e04aeb8fc7dda0d089acfc52e5e0dcd7dead7983567cb388f4c82a954313d09c65437a545f8149848e9288e348950ec SHA512 e27d42deedfb419419a78a414cdece25c63d84a0929a5aa8ffa35283cb245148702135cfe2fe8d727e0845028d555418a60e518f6291951dd861212f9c3f3ed2
diff --git a/media-video/qmplay2/metadata.xml b/media-video/qmplay2/metadata.xml
index 4d4923eee8d1..7445c76d7461 100644
--- a/media-video/qmplay2/metadata.xml
+++ b/media-video/qmplay2/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>reagentoo@gmail.com</email>
-		<name>Dmitry Baranov</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>arthurzam@gentoo.org</email>
+		<name>Arthur Zamarin</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">zaps166/QMPlay2</remote-id>
diff --git a/media-video/qmplay2/qmplay2-21.06.07-r2.ebuild b/media-video/qmplay2/qmplay2-21.06.07-r2.ebuild
new file mode 100644
index 000000000000..7af2e7f0fd0a
--- /dev/null
+++ b/media-video/qmplay2/qmplay2-21.06.07-r2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
+HOMEPAGE="https://github.com/zaps166/QMPlay2"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
+else
+	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/QMPlay2-src-${PV}"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+
+IUSE="avdevice +audiofilters +alsa cdio cuvid dbus extensions
+	gme inputs libass modplug notifications opengl pipewire portaudio
+	pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv"
+
+REQUIRED_USE="
+	audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
+	shaders? ( vulkan )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-video/ffmpeg
+	|| (
+		dev-qt/qtgui:5[X(-)]
+		dev-qt/qtgui:5[xcb(-)]
+	)
+	alsa? ( media-libs/alsa-lib )
+	cdio? ( dev-libs/libcdio[cddb] )
+	extensions? (
+		dev-qt/qtdeclarative:5
+		media-libs/taglib
+	)
+	gme? ( media-libs/game-music-emu )
+	libass? ( media-libs/libass )
+	opengl? ( virtual/opengl )
+	pipewire? ( media-video/pipewire )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sid? ( media-libs/libsidplayfp )
+	shaders? ( >=media-libs/shaderc-2020.1 )
+	vaapi? (
+		>=media-video/ffmpeg-4.1.3[vaapi]
+		x11-libs/libva[drm,opengl]
+	)
+	vdpau? ( media-video/ffmpeg[vdpau] )
+	videofilters? ( dev-qt/qtconcurrent:5 )
+	vulkan? (
+		>=dev-qt/qtgui-5.14.1:5[vulkan]
+		>=media-libs/vulkan-loader-1.2.133
+	)
+	xv? ( x11-libs/libXv )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+src_prepare() {
+	# disable compress man pages
+	sed -r \
+		-e 's/if\(GZIP\)/if\(TRUE\)/' \
+		-e 's/(install.+QMPlay2\.1)\.gz/\1/' \
+		-i src/gui/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# core
+		-DUSE_LINK_TIME_OPTIMIZATION=false
+		-DUSE_ALSA=$(usex alsa)
+		-DUSE_AUDIOCD=$(usex cdio)
+		-DUSE_DBUS_SUSPEND=$(usex dbus)
+		-DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) # https://github.com/zaps166/QMPlay2/issues/134
+		-DUSE_LIBASS=$(usex libass)
+		-DUSE_NOTIFY=$(usex notifications)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_VULKAN=$(usex vulkan)
+		-DUSE_GLSLC=$(usex shaders)
+		-DUSE_XVIDEO=$(usex xv)
+
+		# ffmpeg
+		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
+		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
+		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
+
+		# chiptune
+		-DUSE_CHIPTUNE_GME=$(usex gme)
+		-DUSE_CHIPTUNE_SID=$(usex sid)
+
+		# modules
+		-DUSE_AUDIOFILTERS=$(usex audiofilters)
+		-DUSE_CUVID=$(usex cuvid)
+		-DUSE_INPUTS=$(usex inputs)
+		-DUSE_MODPLUG=$(usex modplug)
+		-DUSE_PIPEWIRE=$(usex pipewire)
+		-DUSE_PORTAUDIO=$(usex portaudio)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+		-DUSE_VIDEOFILTERS=$(usex videofilters)
+		-DUSE_VISUALIZATIONS=$(usex visualizations)
+
+		# extensions
+		-DUSE_EXTENSIONS=$(usex extensions)
+		-DUSE_TAGLIB=$(usex extensions)
+		-DUSE_LASTFM=$(usex extensions)
+		-DUSE_LYRICS=$(usex extensions)
+		-DUSE_MEDIABROWSER=$(usex extensions)
+		-DUSE_MPRIS2=$(usex extensions)
+	)
+
+	if [[ ${PV} == *9999 ]]; then
+		mycmakeargs+=( -DUSE_GIT_VERSION=true )
+	else
+		mycmakeargs+=( -DUSE_GIT_VERSION=false )
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild
index b626780caa01..d6a9054ddf1c 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -124,15 +124,10 @@ src_configure() {
 		-DUSE_MPRIS2=$(usex extensions)
 	)
 
-	# find and link vulkan libs permanently
-	if use vulkan; then
-		mycmakeargs+=( -DQMVK_FIND_VULKAN=true )
-	fi
-
 	if [[ ${PV} == *9999 ]]; then
-		mycmakeargs+=( USE_GIT_VERSION=true )
+		mycmakeargs+=( -DUSE_GIT_VERSION=true )
 	else
-		mycmakeargs+=( USE_GIT_VERSION=false )
+		mycmakeargs+=( -DUSE_GIT_VERSION=false )
 	fi
 
 	cmake_src_configure
diff --git a/media-video/vcdimager/Manifest b/media-video/vcdimager/Manifest
index 5a4ef8842cd1..181c5cd5c5fc 100644
--- a/media-video/vcdimager/Manifest
+++ b/media-video/vcdimager/Manifest
@@ -1,4 +1,4 @@
 AUX vcdimager-2.0.1-pkg-config.patch 347 BLAKE2B 082ac47630ce7289967a3dfb17c601ba90c01d15e87bedb61a78a44573a38ac0c0d8790bf2acca540c2dbe91f6a099b57032644dbb32d202c05709dddc17ffbe SHA512 e43827527b656e8813c41266e30a9f9e86a3a7dd67ff01de08088d78a775481914d7a6f1d472b80d53e93f09573e0b922006652626415fd5d7f6a9c3ca534468
 DIST vcdimager-2.0.1.tar.gz 1115207 BLAKE2B edf70212e81a89924e64115cae9eab77619f7e639e5529b85cc6a80c6ef4f4028c8a207bec86c41283b9768f6a0f56ef56adfad18c7bba20c315b1e5554a83a9 SHA512 55a9d235149a35fe26576703c623a2c9a3f7deedd2e42e01271fdf1e1fdf14c51ee040ee3b5d15fe1b5860fbd4cbeb437362b1a1f40187c8d4d691b6b89a2230
-EBUILD vcdimager-2.0.1.ebuild 1351 BLAKE2B 9e7a998c4370c9ac8954456792655bf6d76c222dc4e0ce2ac649fbb8e0fbc2c81d5d4ab1f3fedd41d49319f1a987a211a76fcf45439d6b12ce246e92c55346d4 SHA512 761fa1739c002042bf8ef774784375b4497e56d27810c76a380295e6ae1159a7bee6e1cc272ac1b28f0c3d4f519c2587939bcfbb60e07cd0fdc63a6e54b7b494
+EBUILD vcdimager-2.0.1.ebuild 1358 BLAKE2B 475abb923285ac1b5a834a967d102485ebd48fe2620bd3079c5b4d0c0c83c5e93e7b730348196c742d3735853401da2d5ed550b4c229ac7a9e3c6adf2dc9da84 SHA512 6ffe7d5908ae54e927b91c6003361f09535858cd70d21d8370e460296eb1727d9f620a80964a51901497007d05648bf4064fa0a232e725610f6953d979484bf6
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-video/vcdimager/vcdimager-2.0.1.ebuild b/media-video/vcdimager/vcdimager-2.0.1.ebuild
index df38adb84279..065c2eb6c8ae 100644
--- a/media-video/vcdimager/vcdimager-2.0.1.ebuild
+++ b/media-video/vcdimager/vcdimager-2.0.1.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="static-libs +xml"
 
 RDEPEND="
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 43c650d81557..ec81d34c10d8 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -14,7 +14,7 @@ DIST vlc-3.0-3.0.14.tar.gz 34355555 BLAKE2B e8182229da1fe4f73b640fad8005ec3fc49d
 DIST vlc-3.0.16.tar.xz 26439328 BLAKE2B 1971b88f3faf6d3b019c3fcb83108242bb218f1472dc3c1763a8eaa996befcb36a685a75beb8c2513e3365e77a9df6623d194ef511b5271e3114f2f46588e1ff SHA512 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298
 EBUILD vlc-3.0.12.1-r102.ebuild 13761 BLAKE2B f374707de28935c411e9b02e99073eac296216dc471da4fc74669fc3a81df15165df3d4766a971f3a13c83b99578980db12404ec436ceefa5e2ce7ab547994b3 SHA512 4c7c532455c0e505befc37a411b9e09020ee2c7f8f7f6a58208ac74544510b33a10200a3f1d64b8a2d7ecb691738991527122b77df4292a68eff761adf1b4d58
 EBUILD vlc-3.0.14-r5.ebuild 13742 BLAKE2B 4eb92ef7de92aeeac6ebb217d221a49479ee7457f9497ae66dd8c8740c6474753c553f9c50562750cc925ebdfa5642e22aef080ac5960a4f37ddd13af41cbdc4 SHA512 cebbb15a7d7b9af8ccebad3bae87c1809136a4d4f8f6ee879a3d51822122ac47b92fbd8f07d8b0370179a1584ce150186f40fbe103aa39db8d39a2ea0f50a846
-EBUILD vlc-3.0.14-r6.ebuild 13812 BLAKE2B a54502501de617cf3a541fbd9de0543cc50afe2413fcdba84eb22a6602d9229f95ca50692c978c3d13f9755e087cb0eb1dc68e85f50274119e5014de2799365b SHA512 23d8b5b057b1991680f8e5786ca07fea20fba9f4de40ea79a8827fdd9eae74f3380df3c445c8f1fc8ab63b4fdfa78bc8437cd5ad60b974503a45e43d53d0d211
+EBUILD vlc-3.0.14-r6.ebuild 13811 BLAKE2B c7bfa970ce2ed6474b08486cc80d781b71a8149184fe3a61a655417440f530198d2eedceb0f022b54b25f720453925a34fabb41cf539dafb532162614311596e SHA512 e838d26950efa98ba4b39c171c5246beb61d57a25005ed6d04899ccff8c37c0f37081e9545b8ff6d70bbe2b7ab3dff804f4c49fc762178ff05352b66a3a98fe9
 EBUILD vlc-3.0.16-r5.ebuild 13807 BLAKE2B c5330aa94a746437244da0b97eab00ae356d54d42997c80ea7e4dd5498ff7f82b737013a9fd72fa42b87df2306dab3f8889f10bd7dca6ebefd00f2034a83cf61 SHA512 d64e09323facd3c670d7a04bd307996056af8ae260e73d3ac3cad7fe1910077cc71d309c82bbc16731b37ac2f3439bf77d1d2b3f9971005442c06b77412a1683
 EBUILD vlc-3.0.16-r6.ebuild 13947 BLAKE2B 9159aee81de28beb081bd2522e26fa311b7ac372518c0726c1e029b2b1422718e0e203521d05465c2691a22d3bee4cc8fab63c664d497ecf632bb48c34ba4c0c SHA512 4d80bfd4c2f8e69f71b460383e8fb702b4aff07fbbfe58020e27fac6a57e4161e61e7303c81d65f5485b66134ac541cc99832b99f132020a783e192078434ba6
 EBUILD vlc-3.0.9999.ebuild 13484 BLAKE2B 4af596070d8b9a4f4c22d14540863221725a591d34d26979b1b60c06d24923963dd3f1279c8de4f9adefc90b87bf08a88267d1a42324988099c4d656f2a3f843 SHA512 f5cf094b7eb9ce67b10a71719b476f9a960086587dfdb469d09c58e5c449fc1a06aea8532f479d51478d095dd0b92cb04e015d036752c56ad7e188e1ec8b2ade
diff --git a/media-video/vlc/vlc-3.0.14-r6.ebuild b/media-video/vlc/vlc-3.0.14-r6.ebuild
index 91613345913f..8cc409ebdb5d 100644
--- a/media-video/vlc/vlc-3.0.14-r6.ebuild
+++ b/media-video/vlc/vlc-3.0.14-r6.ebuild
@@ -23,7 +23,7 @@ else
 	#else
 	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	#fi
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86"
 fi
 
 inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 901ea3b00dca..49af3e5d01f1 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 9ee6d7482628..b04e403eceb1 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 21 Aug 2021 21:39:06 +0000
+Wed, 25 Aug 2021 22:39:09 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index e04559d97acf..89b0ea376870 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 517807 BLAKE2B 2ecdb63e9cfe1a1b71d23ab4fe58b057928be5a410ab9012b87ec1e7c917af227099229248e5b2c7dc5b25edb96e4adad920259d956349d0ecbb204178f8da2c SHA512 4ca9cc06a8ae7d4eefdd8a435b92f1f4e675295b618afdb11cf1d7f45b49f0fd5137f7f0c81b60933a8b942fe25de9928a9f4ffe0d5968bae8eae39c95a7da50
-TIMESTAMP 2021-08-21T21:39:12Z
+TIMESTAMP 2021-08-25T22:39:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmEhcoBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmEmxpBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klABBw//aWGI8xyNrO+A7dledXnWq5LhVffxY7K7WGjt+g2HCboBaPBYfxTvsPyj
-NLMjpx/msKy3+ZDrT08oQM5VY1HDNK/FQs3uypjysLz3yqgZsCjy8wrG6Dw1Zp+W
-gGw423oU/HLf+yldDtdnxSuuRozMjPFM2cfk8ALzkRFLa3wiRD/VVIw9etuJYinu
-S0Z7yNBzrYG846vnIiMYIjhDKmv5CUFep7KZ3yTtbSPYGz/KruSqgZSk1nQJq9nH
-CJvD3DuftqswJOdazR6dFiSOeOw0f8Abtu5tzHMFLvTvVVUM/8Sam89oQE4UXxpO
-yquyP/uSjGoDIW6vGkfp6+6sGv1kjdHSd2lML1oW5FUXS3AwVsOqmFisb0GVlQUc
-2q+jsKH7hK2rJgl56S50BFX6PHzUMaFx/NZWmLLnaXt1JnebuVODiuPlt482QuH1
-+abjZ+uLWx7orEmBDl+Kjx6OjBDiYheSntxxQIr9breV6QfLZkGlKE9Ltjn5iXy3
-+e2+uGYxe1fwpfyn7qdXO/RXRLITKY+zEhyohkVt3BtRcftOf0dPK0F9/GiBs7qW
-3MRMVECGyZjhuF9zXhaP4+hYVdz80VxXGWBt/49cMiHIgVUxEVu1Atch5RAFYGIS
-qQlvkhfNHcfLt+Htc9aKT7kIznTGXeqe8eNVxIdn0ywcKJOyR+E=
-=3zUq
+klCJnA//WGcX+hnVV9tXXuX7VEna7qHkJ8h4xqnPuhBiCSnbq1s1BTSuqEEEbv4n
+CziQsOamcCXYMSWlfEkmU7rhA/Jl3ThYOZ+wljGORHgiIlITeb6ZPo0uP+1EoPi9
+x3NRrsrT/bhDhgYF4gAFsfUuv/+lfDH4rzx0EHe1SKorOVxU8mXebFIg3FIhm3Kv
+DlNvpWsUO1koJ8quABewaUJs3w8z3MmsX1XuGnScCF4JvkVG6LS9RJcDw6w/9RMO
+uJ/yTuX7isG4ZP7LYrn+bEjaReNuR2SbXLXEyCHBKws0bAT7I+2XAsqpnj5VmDwj
+2WvVepA2Wo5jHl66EeCB0CE5DSfIxkQWJhUZJJVYQe3R560nbkyVLz/5UxqTF+Rm
+HsoSFYpjit9ipmnOYV+odXvNuX20IkLxu63rX84y9TxmGNPwKE2nUHGcBWBCCE4k
+8tF2chkNJ+dZGe995NidYEr0XBTfxB2AM4v3Ei5bN1H3XBjFP2E7zS760dFOVmQ6
+Nlu/TsKMqNkOVpfCz1iHifWtQSKbF7ldokVFR1QK91KKAA6Zytg80upRnpOISopL
+Gj/NT3HfrX/Id7z/OK9Xnp9C0y5Iznb24giQFQ3e3LqWzicwkiQFuA+cZ3xnYUQu
+PwcurUNGRYw5oQwOJuYi4KQDPM9MtOFOZVHGm8AAh8HftZJmpN8=
+=4pTL
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 9ee6d7482628..b04e403eceb1 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 21 Aug 2021 21:39:06 +0000
+Wed, 25 Aug 2021 22:39:09 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index dd8092b59807..ab522107d3de 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 11aec9f20760..6eaaca0d1aab 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/caribou-0.4.21-r4 b/metadata/md5-cache/app-accessibility/caribou-0.4.21-r4
new file mode 100644
index 000000000000..a50ec6484eb6
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/caribou-0.4.21-r4
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) >=dev-util/intltool-0.35.5 virtual/pkgconfig 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 app-arch/xz-utils
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=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-accessibility/at-spi2-core python_single_target_python3_8? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_9(-)] ) >=dev-libs/gobject-introspection-0.10.7:= dev-libs/libgee:0.8 dev-libs/libxml2 >=media-libs/clutter-1.5.11:1.0[introspection] >=x11-libs/gtk+-3:3[introspection] x11-libs/libX11 x11-libs/libxklavier x11-libs/libXtst dev-libs/libxslt
+DESCRIPTION=Input assistive technology intended for switch and pointer users
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Caribou
+IUSE=python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=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-accessibility/at-spi2-core python_single_target_python3_8? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_9(-)] ) >=dev-libs/gobject-introspection-0.10.7:= dev-libs/libgee:0.8 dev-libs/libxml2 >=media-libs/clutter-1.5.11:1.0[introspection] >=x11-libs/gtk+-3:3[introspection] x11-libs/libX11 x11-libs/libxklavier x11-libs/libXtst dev-libs/glib[dbus] python_single_target_python3_8? ( >=dev-python/pyatspi-2.1.90[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pyatspi-2.1.90[python_targets_python3_9(-)] ) >=gnome-base/gsettings-desktop-schemas-3 gnome-base/librsvg:2 sys-apps/dbus !<x11-base/xorg-server-1.20.10
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/caribou/0.4/caribou-0.4.21.tar.xz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=45fdebbbcfdc4981b946a390d64aa9cd
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 212ba642bcfe..b8c74f3b13dc 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/ansible-4.3.0 b/metadata/md5-cache/app-admin/ansible-4.3.0
index e3c2bcee5051..29a3d4c1676d 100644
--- a/metadata/md5-cache/app-admin/ansible-4.3.0
+++ b/metadata/md5-cache/app-admin/ansible-4.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=Model-driven deployment, config management, and command execution fr
 EAPI=7
 HOMEPAGE=https://www.ansible.com/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=>=app-admin/ansible-base-2.11.1 <app-admin/ansible-base-2.12 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(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-4.3.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aec7f52840eacde43b68f8f2aedbe407
+_md5_=c3dc763e38e154f18a2d47e8ea2daedc
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.11.2 b/metadata/md5-cache/app-admin/ansible-base-2.11.2
deleted file mode 100644
index 221808b5df16..000000000000
--- a/metadata/md5-cache/app-admin/ansible-base-2.11.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git )
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=7
-HOMEPAGE=https://www.ansible.com/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.11.2.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d9ea692625ff5ec7d07e257a34f0f32d
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.11.3 b/metadata/md5-cache/app-admin/ansible-base-2.11.3
index af82f7ecb1cf..a516025df990 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.11.3
+++ b/metadata/md5-cache/app-admin/ansible-base-2.11.3
@@ -5,7 +5,7 @@ DESCRIPTION=Model-driven deployment, config management, and command execution fr
 EAPI=7
 HOMEPAGE=https://www.ansible.com/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh 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(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.11.3.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=638dff5cc980e0d7f39906f2249b45d4
+_md5_=d9ea692625ff5ec7d07e257a34f0f32d
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.27 b/metadata/md5-cache/app-admin/awscli-1.20.27
new file mode 100644
index 000000000000..2db43fa25a4b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.27
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.21.27[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=7
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.27[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.20.27.tar.gz -> awscli-1.20.27.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.28 b/metadata/md5-cache/app-admin/awscli-1.20.28
new file mode 100644
index 000000000000..e81f7070062d
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.28
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.21.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=7
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.20.28.tar.gz -> awscli-1.20.28.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/calamares-3.2.32.1 b/metadata/md5-cache/app-admin/calamares-3.2.32.1
deleted file mode 100644
index 0f0a4ee2dc99..000000000000
--- a/metadata/md5-cache/app-admin/calamares-3.2.32.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=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-cpp/yaml-cpp:= python_single_target_python3_8? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_8(-)] dev-libs/libpwquality[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_9(-)] dev-libs/libpwquality[python_targets_python3_9(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kpackage:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt >=sys-libs/kpmcore-4.0.0:5= test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Distribution-independent installer framework
-EAPI=7
-HOMEPAGE=https://calamares.io
-IUSE=+networkmanager +upower debug test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=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-cpp/yaml-cpp:= python_single_target_python3_8? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_8(-)] dev-libs/libpwquality[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_9(-)] dev-libs/libpwquality[python_targets_python3_9(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kpackage:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt >=sys-libs/kpmcore-4.0.0:5= app-admin/sudo dev-libs/libatasmart net-misc/rsync || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools sys-libs/timezone-data virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=https://github.com/calamares/calamares/releases/download/v3.2.32.1/calamares-3.2.32.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e82b7f1f31085f87c5e50c9c1c11b4f6
diff --git a/metadata/md5-cache/app-admin/calamares-3.2.32.1-r1 b/metadata/md5-cache/app-admin/calamares-3.2.32.1-r1
new file mode 100644
index 000000000000..c0aa0d99545e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/calamares-3.2.32.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=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-cpp/yaml-cpp:= python_single_target_python3_8? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_8(-)] dev-libs/libpwquality[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_9(-)] dev-libs/libpwquality[python_targets_python3_9(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kpackage:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt >=sys-libs/kpmcore-4.0.0:5= virtual/libcrypt:= test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Distribution-independent installer framework
+EAPI=7
+HOMEPAGE=https://calamares.io
+IUSE=+networkmanager +upower debug test python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=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-cpp/yaml-cpp:= python_single_target_python3_8? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_8(-)] dev-libs/libpwquality[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_9(-)] dev-libs/libpwquality[python_targets_python3_9(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kpackage:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt >=sys-libs/kpmcore-4.0.0:5= virtual/libcrypt:= app-admin/sudo dev-libs/libatasmart net-misc/rsync || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools sys-libs/timezone-data virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=https://github.com/calamares/calamares/releases/download/v3.2.32.1/calamares-3.2.32.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c772e68fc8f56d0af8289885c4200bbc
diff --git a/metadata/md5-cache/app-admin/exo-1.40.3 b/metadata/md5-cache/app-admin/exo-1.40.3
deleted file mode 100644
index 34518fec4a1b..000000000000
--- a/metadata/md5-cache/app-admin/exo-1.40.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/go:=
-DESCRIPTION=Command-line tool for everything at Exoscale: compute, storage, dns.
-EAPI=7
-HOMEPAGE=https://github.com/exoscale/cli
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/exoscale/cli/archive/v1.40.3.tar.gz -> exo-1.40.3.tar.gz
-_md5_=a638813d2b712f85d21a976d47d1d5b9
diff --git a/metadata/md5-cache/app-admin/exo-1.40.5 b/metadata/md5-cache/app-admin/exo-1.40.5
new file mode 100644
index 000000000000..f806d49e4677
--- /dev/null
+++ b/metadata/md5-cache/app-admin/exo-1.40.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-lang/go:=
+DESCRIPTION=Command-line tool for everything at Exoscale: compute, storage, dns.
+EAPI=7
+HOMEPAGE=https://github.com/exoscale/cli
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/exoscale/cli/archive/v1.40.5.tar.gz -> exo-1.40.5.tar.gz
+_md5_=a638813d2b712f85d21a976d47d1d5b9
diff --git a/metadata/md5-cache/app-admin/monit-5.28.0-r1 b/metadata/md5-cache/app-admin/monit-5.28.0-r1
deleted file mode 100644
index 038a90dd0b16..000000000000
--- a/metadata/md5-cache/app-admin/monit-5.28.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-libs/zlib:= virtual/libcrypt:= pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=Monitoring and managing daemons or similar programs running on a Unix system
-EAPI=7
-HOMEPAGE=http://mmonit.com/monit/
-IUSE=ipv6 pam ssl
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=AGPL-3
-RDEPEND=sys-libs/zlib:= virtual/libcrypt:= pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=http://mmonit.com/monit/dist/monit-5.28.0.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0606104f45028e049ae16f3d60f409b3
diff --git a/metadata/md5-cache/app-admin/monit-5.29.0 b/metadata/md5-cache/app-admin/monit-5.29.0
new file mode 100644
index 000000000000..27a6f4e949df
--- /dev/null
+++ b/metadata/md5-cache/app-admin/monit-5.29.0
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=sys-libs/zlib:= virtual/libcrypt:= pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=Monitoring and managing daemons or similar programs running on a Unix system
+EAPI=7
+HOMEPAGE=http://mmonit.com/monit/
+IUSE=ipv6 pam ssl
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=AGPL-3
+RDEPEND=sys-libs/zlib:= virtual/libcrypt:= pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=http://mmonit.com/monit/dist/monit-5.29.0.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=cef8c4d5812d0ad9477541b47c7f9530
diff --git a/metadata/md5-cache/app-admin/puppet-7.9.0-r1 b/metadata/md5-cache/app-admin/puppet-7.9.0-r1
index 9b3a880807f5..221dac5735bf 100644
--- a/metadata/md5-cache/app-admin/puppet-7.9.0-r1
+++ b/metadata/md5-cache/app-admin/puppet-7.9.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A system automation and configuration management software.
 EAPI=6
 HOMEPAGE=https://puppet.com/
 IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=Apache-2.0 GPL-2
 PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet 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(-)] ) virtual/tmpfiles
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.9.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e8b5af1178ffbe13dc522fbce0c631ec
+_md5_=83919d8bfc870bcf5e6a57ed5a30d47b
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.9.0-r3 b/metadata/md5-cache/app-admin/puppet-agent-7.9.0-r3
index 73e4805574b7..be7709784724 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-7.9.0-r3
+++ b/metadata/md5-cache/app-admin/puppet-agent-7.9.0-r3
@@ -5,11 +5,11 @@ DESCRIPTION=general puppet client utils along with hiera and facter
 EAPI=7
 HOMEPAGE=https://puppetlabs.com/
 IUSE=puppetdb selinux
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet app-portage/eix sys-apps/dmidecode sys-libs/libselinux sys-libs/glibc sys-libs/readline:0/8 sys-libs/libxcrypt[compat] sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 ) virtual/tmpfiles
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.9.0-1focal_amd64.deb
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=34350fbf6223d9870033c8049249ad75
+_md5_=ddb938da7f861b21a21937d6f72a3a44
diff --git a/metadata/md5-cache/app-admin/puppetdb-7.5.0 b/metadata/md5-cache/app-admin/puppetdb-7.5.0
deleted file mode 100644
index dc6f0cfea7a3..000000000000
--- a/metadata/md5-cache/app-admin/puppetdb-7.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=acct-user/puppetdb acct-group/puppetdb
-DESCRIPTION=PuppetDB collects data generated by Puppet.
-EAPI=7
-HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8.0 virtual/tmpfiles
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-7.5.0.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cf9044901dc441e6db55e7b3248c1a59
diff --git a/metadata/md5-cache/app-admin/puppetdb-7.5.0-r1 b/metadata/md5-cache/app-admin/puppetdb-7.5.0-r1
new file mode 100644
index 000000000000..480ab15ce155
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppetdb-7.5.0-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=acct-user/puppetdb acct-group/puppetdb
+DESCRIPTION=PuppetDB collects data generated by Puppet.
+EAPI=7
+HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
+KEYWORDS=amd64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8.0 virtual/tmpfiles
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-7.5.0.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=72c593d312a2056fd7a85171d781fc70
diff --git a/metadata/md5-cache/app-admin/puppetserver-7.2.1-r1 b/metadata/md5-cache/app-admin/puppetserver-7.2.1-r1
index 1f92a8292729..23e056380105 100644
--- a/metadata/md5-cache/app-admin/puppetserver-7.2.1-r1
+++ b/metadata/md5-cache/app-admin/puppetserver-7.2.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Puppet Server is the next-generation application for managing Puppet
 EAPI=7
 HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
 IUSE=puppetdb
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?] virtual/tmpfiles
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-7.2.1.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=80166a866915209d71d346457d919bef
+_md5_=44a5418969ad8f63ba51a9b78d6e3aa7
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2108.0 b/metadata/md5-cache/app-admin/rsyslog-8.2108.0
new file mode 100644
index 000000000000..ce80c730b707
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2108.0
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) ) 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=compile config configure install postinst prepare setup test unpack
+DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( www-servers/civetweb ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] )
+DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
+EAPI=7
+HOMEPAGE=https://www.rsyslog.com/
+IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+LICENSE=GPL-3 LGPL-3 Apache-2.0
+RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( www-servers/civetweb ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
+REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2108.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2108.0.tar.gz )
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=500944735bddca0e91b8515b5f7b8224
diff --git a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2 b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2
index 79c4ef8bf5d8..bb008e423501 100644
--- a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2
+++ b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/leogx9r/ryzen_smu/archive/v0.1.2.tar.gz -> ryzen_smu-0.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9ee7a9a54882c0756a86572f4fcabba0
diff --git a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627 b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627
index 6a5c482f331e..7625b524d75c 100644
--- a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627
+++ b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slashbeast/distfiles/ryzen_smu/ryzen_smu-0.1.2_p20210627.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=98d57297c7863e3c6b0b08b0fda2ff7d
diff --git a/metadata/md5-cache/app-admin/vault-1.8.1 b/metadata/md5-cache/app-admin/vault-1.8.1
new file mode 100644
index 000000000000..038e7e1f09bb
--- /dev/null
+++ b/metadata/md5-cache/app-admin/vault-1.8.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.15.3 filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=acct-group/vault acct-user/vault
+DESCRIPTION=A tool for managing secrets
+EAPI=7
+HOMEPAGE=https://vaultproject.io/
+IUSE=+webui +filecaps
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
+RDEPEND=acct-group/vault acct-user/vault filecaps? ( sys-libs/libcap )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vault/archive/v1.8.1.tar.gz -> vault-1.8.1.tar.gz webui? ( https://dev.gentoo.org/~zmedico/dist/vault-1.8.1-webui.tar.xz ) 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//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.39.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.39.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.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.zip 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/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.6.0.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.6.0.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.6.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.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.zip 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.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.zip 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/spanner/@v/v1.5.1.zip -> cloud.google.com%2Fgo%2Fspanner%2F@v%2Fv1.5.1.zip mirror://goproxy//cloud.google.com/go/spanner/@v/v1.5.1.mod -> cloud.google.com%2Fgo%2Fspanner%2F@v%2Fv1.5.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.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.zip 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//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.zip -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.zip mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.mod -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.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//git.apache.org/thrift.git/@v/v0.12.0.mod -> git.apache.org%2Fthrift.git%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.3.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.3.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v36.2.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv36.2.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v44.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv44.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v51.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v51.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.11.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.11.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.11.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.11.0.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/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.17.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.17.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.17.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.17.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.7.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.11.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.11.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.11.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.11.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.5.7.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.7.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.5.7.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.zip -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.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/!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/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!jeffail/gabs/@v/v1.1.1.zip -> github.com%2F!jeffail%2Fgabs%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!jeffail/gabs/@v/v1.1.1.mod -> github.com%2F!jeffail%2Fgabs%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!knetic/govaluate/@v/v3.0.1-0.20171022003610-9aa49832a739+incompatible.mod -> github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.zip -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.zip -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.zip mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.mod -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.13.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.13.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.16-0.20201130162521-d1ffc52c7331.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16-0.20201130162521-d1ffc52c7331.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16-0.20201130162521-d1ffc52c7331.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16-0.20201130162521-d1ffc52c7331.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.14.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.14.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!nvveen/!gotty/@v/v0.0.0-20120604004816-cd527374f1e5.zip -> github.com%2F!nvveen%2F!gotty%2F@v%2Fv0.0.0-20120604004816-cd527374f1e5.zip 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/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!s!a!p/go-hdb/@v/v0.14.1.zip -> github.com%2F!s!a!p%2Fgo-hdb%2F@v%2Fv0.14.1.zip mirror://goproxy//github.com/!s!a!p/go-hdb/@v/v0.14.1.mod -> github.com%2F!s!a!p%2Fgo-hdb%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/!sectorbob/mlab-ns2/@v/v0.0.0-20171030222938-d3aa0c295a8a.zip -> github.com%2F!sectorbob%2Fmlab-ns2%2F@v%2Fv0.0.0-20171030222938-d3aa0c295a8a.zip mirror://goproxy//github.com/!sectorbob/mlab-ns2/@v/v0.0.0-20171030222938-d3aa0c295a8a.mod -> github.com%2F!sectorbob%2Fmlab-ns2%2F@v%2Fv0.0.0-20171030222938-d3aa0c295a8a.mod mirror://goproxy//github.com/!shopify/sarama/@v/v1.19.0.mod -> github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/!vivid!cortex/gohistogram/@v/v1.0.0.mod -> github.com%2F!vivid!cortex%2Fgohistogram%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v3.1.1+incompatible.zip -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv3.1.1+incompatible.zip mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v3.1.1+incompatible.mod -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/afex/hystrix-go/@v/v0.0.0-20180502004556-fa1af6a1f4f5.mod -> github.com%2Fafex%2Fhystrix-go%2F@v%2Fv0.0.0-20180502004556-fa1af6a1f4f5.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190412020505-60e2075261b6.mod -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190412020505-60e2075261b6.mod mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190620160927-9418d7b0cd0f.zip -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190620160927-9418d7b0cd0f.zip mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190620160927-9418d7b0cd0f.mod -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190620160927-9418d7b0cd0f.mod mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190307165228-86c17b95fcd5.zip -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190307165228-86c17b95fcd5.zip mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190307165228-86c17b95fcd5.mod -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190307165228-86c17b95fcd5.mod mirror://goproxy//github.com/apache/arrow/go/arrow/@v/v0.0.0-20200601151325-b2287a20f230.zip -> github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20200601151325-b2287a20f230.zip mirror://goproxy//github.com/apache/arrow/go/arrow/@v/v0.0.0-20200601151325-b2287a20f230.mod -> github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20200601151325-b2287a20f230.mod mirror://goproxy//github.com/apache/thrift/@v/v0.12.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/apache/thrift/@v/v0.13.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.0.mod mirror://goproxy//github.com/apple/foundationdb/bindings/go/@v/v0.0.0-20190411004307-cd5c9d91fad2.zip -> github.com%2Fapple%2Ffoundationdb%2Fbindings%2Fgo%2F@v%2Fv0.0.0-20190411004307-cd5c9d91fad2.zip mirror://goproxy//github.com/apple/foundationdb/bindings/go/@v/v0.0.0-20190411004307-cd5c9d91fad2.mod -> github.com%2Fapple%2Ffoundationdb%2Fbindings%2Fgo%2F@v%2Fv0.0.0-20190411004307-cd5c9d91fad2.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.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/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.3.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.7.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.7.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.7.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.7.mod mirror://goproxy//github.com/armon/go-proxyproto/@v/v0.0.0-20210323213023-7e956b284f0a.zip -> github.com%2Farmon%2Fgo-proxyproto%2F@v%2Fv0.0.0-20210323213023-7e956b284f0a.zip mirror://goproxy//github.com/armon/go-proxyproto/@v/v0.0.0-20210323213023-7e956b284f0a.mod -> github.com%2Farmon%2Fgo-proxyproto%2F@v%2Fv0.0.0-20210323213023-7e956b284f0a.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aryann/difflib/@v/v0.0.0-20170710044230-e206f873d14a.mod -> github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.13.3.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.13.3.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.0.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.30.27.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.27.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.28.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.28.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.37.19.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.19.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.37.19.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.19.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.18.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.zip -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.zip mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.mod -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod 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/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bitly/go-hostpool/@v/v0.0.0-20171023180738-a3a6125de932.mod -> github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.0.0-20171023180738-a3a6125de932.mod mirror://goproxy//github.com/bitly/go-hostpool/@v/v0.1.0.zip -> github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bitly/go-hostpool/@v/v0.1.0.mod -> github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.zip -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.zip 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/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/boombuler/barcode/@v/v1.0.1-0.20190219062509-6c824513bacc.zip -> github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.1-0.20190219062509-6c824513bacc.zip mirror://goproxy//github.com/boombuler/barcode/@v/v1.0.1-0.20190219062509-6c824513bacc.mod -> github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.1-0.20190219062509-6c824513bacc.mod mirror://goproxy//github.com/briankassouf/jose/@v/v0.9.2-0.20180619214549-d2569464773f.zip -> github.com%2Fbriankassouf%2Fjose%2F@v%2Fv0.9.2-0.20180619214549-d2569464773f.zip mirror://goproxy//github.com/briankassouf/jose/@v/v0.9.2-0.20180619214549-d2569464773f.mod -> github.com%2Fbriankassouf%2Fjose%2F@v%2Fv0.9.2-0.20180619214549-d2569464773f.mod mirror://goproxy//github.com/c2h5oh/datasize/@v/v0.0.0-20200112174442-28bbd4740fee.mod -> github.com%2Fc2h5oh%2Fdatasize%2F@v%2Fv0.0.0-20200112174442-28bbd4740fee.mod mirror://goproxy//github.com/casbin/casbin/v2/@v/v2.1.2.mod -> github.com%2Fcasbin%2Fcasbin%2Fv2%2F@v%2Fv2.1.2.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/cenkalti/backoff/v3/@v/v3.0.0.zip -> github.com%2Fcenkalti%2Fbackoff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/cenkalti/backoff/v3/@v/v3.0.0.mod -> github.com%2Fcenkalti%2Fbackoff%2Fv3%2F@v%2Fv3.0.0.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/centrify/cloud-golang-sdk/@v/v0.0.0-20190214225812-119110094d0f.zip -> github.com%2Fcentrify%2Fcloud-golang-sdk%2F@v%2Fv0.0.0-20190214225812-119110094d0f.zip mirror://goproxy//github.com/centrify/cloud-golang-sdk/@v/v0.0.0-20190214225812-119110094d0f.mod -> github.com%2Fcentrify%2Fcloud-golang-sdk%2F@v%2Fv0.0.0-20190214225812-119110094d0f.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chrismalek/oktasdk-go/@v/v0.0.0-20181212195951-3430665dfaa0.zip -> github.com%2Fchrismalek%2Foktasdk-go%2F@v%2Fv0.0.0-20181212195951-3430665dfaa0.zip mirror://goproxy//github.com/chrismalek/oktasdk-go/@v/v0.0.0-20181212195951-3430665dfaa0.mod -> github.com%2Fchrismalek%2Foktasdk-go%2F@v%2Fv0.0.0-20181212195951-3430665dfaa0.mod 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.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.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 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/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/clbanning/x2j/@v/v0.0.0-20191024224557-825249438eec.mod -> github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.zip -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.zip 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/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190201205600-f136f9222381.zip -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190201205600-f136f9222381.zip mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190201205600-f136f9222381.mod -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190201205600-f136f9222381.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/cockroachdb/apd/@v/v1.1.0.zip -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cockroachdb/cockroach-go/@v/v0.0.0-20181001143604-e0a95dfd547c.zip -> github.com%2Fcockroachdb%2Fcockroach-go%2F@v%2Fv0.0.0-20181001143604-e0a95dfd547c.zip mirror://goproxy//github.com/cockroachdb/cockroach-go/@v/v0.0.0-20181001143604-e0a95dfd547c.mod -> github.com%2Fcockroachdb%2Fcockroach-go%2F@v%2Fv0.0.0-20181001143604-e0a95dfd547c.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/codahale/hdrhistogram/@v/v0.0.0-20161010025455-3a0bb77429bd.mod -> github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.zip -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.zip mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.mod -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200531161412-0dbf7f05ba59.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.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/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod 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-20190827140505-75bee3e2ccb6.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190827140505-75bee3e2ccb6.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/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/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/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.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-oidc/@v/v2.2.1+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/v3/@v/v3.0.0.zip -> github.com%2Fcoreos%2Fgo-oidc%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/coreos/go-oidc/v3/@v/v3.0.0.mod -> github.com%2Fcoreos%2Fgo-oidc%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip 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-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod 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/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.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/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/couchbase/gocb/v2/@v/v2.1.4.zip -> github.com%2Fcouchbase%2Fgocb%2Fv2%2F@v%2Fv2.1.4.zip mirror://goproxy//github.com/couchbase/gocb/v2/@v/v2.1.4.mod -> github.com%2Fcouchbase%2Fgocb%2Fv2%2F@v%2Fv2.1.4.mod mirror://goproxy//github.com/couchbase/gocbcore/v9/@v/v9.0.4.zip -> github.com%2Fcouchbase%2Fgocbcore%2Fv9%2F@v%2Fv9.0.4.zip mirror://goproxy//github.com/couchbase/gocbcore/v9/@v/v9.0.4.mod -> github.com%2Fcouchbase%2Fgocbcore%2Fv9%2F@v%2Fv9.0.4.mod 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.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.zip 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.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/denisenkom/go-mssqldb/@v/v0.0.0-20200428022330-06a60b6afbbc.zip -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200428022330-06a60b6afbbc.zip mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200428022330-06a60b6afbbc.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200428022330-06a60b6afbbc.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgrijalva/jwt-go/v4/@v/v4.0.0-preview1.zip -> github.com%2Fdgrijalva%2Fjwt-go%2Fv4%2F@v%2Fv4.0.0-preview1.zip mirror://goproxy//github.com/dgrijalva/jwt-go/v4/@v/v4.0.0-preview1.mod -> github.com%2Fdgrijalva%2Fjwt-go%2Fv4%2F@v%2Fv4.0.0-preview1.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.7.5.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.7.5.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.7.5.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.7.5.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.1.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.1.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip 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/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20200319182547-c7ad2b866182.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200319182547-c7ad2b866182.mod mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.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-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/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dsnet/compress/@v/v0.0.1.zip -> github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/dsnet/compress/@v/v0.0.1.mod -> github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/dsnet/golib/@v/v0.0.0-20171103203638-1ea166775780.mod -> github.com%2Fdsnet%2Fgolib%2F@v%2Fv0.0.0-20171103203638-1ea166775780.mod mirror://goproxy//github.com/duosecurity/duo_api_golang/@v/v0.0.0-20190308151101-6c680f768e74.zip -> github.com%2Fduosecurity%2Fduo_api_golang%2F@v%2Fv0.0.0-20190308151101-6c680f768e74.zip mirror://goproxy//github.com/duosecurity/duo_api_golang/@v/v0.0.0-20190308151101-6c680f768e74.mod -> github.com%2Fduosecurity%2Fduo_api_golang%2F@v%2Fv0.0.0-20190308151101-6c680f768e74.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/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.1.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/edsrzf/mmap-go/@v/v1.0.0.mod -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v1.0.1-0.20200509193318-234c15e7648f.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv1.0.1-0.20200509193318-234c15e7648f.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v1.0.1-0.20200509193318-234c15e7648f.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv1.0.1-0.20200509193318-234c15e7648f.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.6.9.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.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/evanphx/json-patch/@v/v0.0.0-20190203023257-5858425f7550.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20190203023257-5858425f7550.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.11.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.11.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.zip -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/franela/goblin/@v/v0.0.0-20200105215937-c9ffbefa60db.mod -> github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod mirror://goproxy//github.com/franela/goreq/@v/v0.0.0-20171204163338-bcd34c9993f8.mod -> github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.10.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.13.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.13.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.13.0.mod 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/fullsailor/pkcs7/@v/v0.0.0-20190404230743-d7302db945fa.zip -> github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.zip mirror://goproxy//github.com/fullsailor/pkcs7/@v/v0.0.0-20190404230743-d7302db945fa.mod -> github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.mod mirror://goproxy//github.com/gammazero/deque/@v/v0.0.0-20190130191400-2afb3858e9c7.zip -> github.com%2Fgammazero%2Fdeque%2F@v%2Fv0.0.0-20190130191400-2afb3858e9c7.zip mirror://goproxy//github.com/gammazero/deque/@v/v0.0.0-20190130191400-2afb3858e9c7.mod -> github.com%2Fgammazero%2Fdeque%2F@v%2Fv0.0.0-20190130191400-2afb3858e9c7.mod mirror://goproxy//github.com/gammazero/workerpool/@v/v0.0.0-20190406235159-88d534f22b56.zip -> github.com%2Fgammazero%2Fworkerpool%2F@v%2Fv0.0.0-20190406235159-88d534f22b56.zip mirror://goproxy//github.com/gammazero/workerpool/@v/v0.0.0-20190406235159-88d534f22b56.mod -> github.com%2Fgammazero%2Fworkerpool%2F@v%2Fv0.0.0-20190406235159-88d534f22b56.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.1-0.20190212211648-25d852aebe32.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.1-0.20190212211648-25d852aebe32.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.1-0.20190212211648-25d852aebe32.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.1-0.20190212211648-25d852aebe32.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.4.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.1.zip -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.zip -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.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/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.10.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.7.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.7.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.10.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.10.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.2.4.zip -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.4.zip mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.2.4.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.4.mod mirror://goproxy//github.com/go-ldap/ldif/@v/v0.0.0-20200320164324-fd88d9b715b3.zip -> github.com%2Fgo-ldap%2Fldif%2F@v%2Fv0.0.0-20200320164324-fd88d9b715b3.zip mirror://goproxy//github.com/go-ldap/ldif/@v/v0.0.0-20200320164324-fd88d9b715b3.mod -> github.com%2Fgo-ldap%2Fldif%2F@v%2Fv0.0.0-20200320164324-fd88d9b715b3.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.zip -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.zip mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.mod -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.1.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.7.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.7.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.7.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.7.mod mirror://goproxy//github.com/go-yaml/yaml/@v/v2.1.0+incompatible.zip -> github.com%2Fgo-yaml%2Fyaml%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/go-yaml/yaml/@v/v2.1.0+incompatible.mod -> github.com%2Fgo-yaml%2Fyaml%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/gobuffalo/attrs/@v/v0.0.0-20190224210810-a9411de4debd.mod -> github.com%2Fgobuffalo%2Fattrs%2F@v%2Fv0.0.0-20190224210810-a9411de4debd.mod mirror://goproxy//github.com/gobuffalo/depgen/@v/v0.0.0-20190329151759-d478694a28d3.mod -> github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.0.0-20190329151759-d478694a28d3.mod mirror://goproxy//github.com/gobuffalo/depgen/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/envy/@v/v1.6.15.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.6.15.mod mirror://goproxy//github.com/gobuffalo/envy/@v/v1.7.0.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.3.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.0.0-20190329151137-27723ad26ef9.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190329151137-27723ad26ef9.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.0.0-20190403191548-3ca520ef0d9e.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190403191548-3ca520ef0d9e.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/gitgen/@v/v0.0.0-20190315122116-cc086187d211.mod -> github.com%2Fgobuffalo%2Fgitgen%2F@v%2Fv0.0.0-20190315122116-cc086187d211.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.0.0-20190315121717-8f38393713f5.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.0.0-20190315121717-8f38393713f5.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/logger/@v/v0.0.0-20190315122211-86e12af44bc2.mod -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv0.0.0-20190315122211-86e12af44bc2.mod mirror://goproxy//github.com/gobuffalo/mapi/@v/v1.0.1.mod -> github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/gobuffalo/mapi/@v/v1.0.2.mod -> github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v0.0.0-20190315124812-a385830c7fc0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.0.0-20190315124812-a385830c7fc0.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.0.9.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.0.9.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.2.0.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/gobuffalo/syncx/@v/v0.0.0-20190224160051-33c29581e754.mod -> github.com%2Fgobuffalo%2Fsyncx%2F@v%2Fv0.0.0-20190224160051-33c29581e754.mod mirror://goproxy//github.com/gocql/gocql/@v/v0.0.0-20210401103645-80ab1e13e309.zip -> github.com%2Fgocql%2Fgocql%2F@v%2Fv0.0.0-20210401103645-80ab1e13e309.zip mirror://goproxy//github.com/gocql/gocql/@v/v0.0.0-20210401103645-80ab1e13e309.mod -> github.com%2Fgocql%2Fgocql%2F@v%2Fv0.0.0-20210401103645-80ab1e13e309.mod 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/gogo/googleapis/@v/v1.1.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.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.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.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.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/goji/httpauth/@v/v0.0.0-20160601135302-2da839ab0f4d.mod -> github.com%2Fgoji%2Fhttpauth%2F@v%2Fv0.0.0-20160601135302-2da839ab0f4d.mod mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.zip -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.zip mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.mod -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.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-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.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.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip 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/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/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.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.zip 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/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.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/golang/snappy/@v/v0.0.0-20170215233205-553a64147049.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20170215233205-553a64147049.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.2.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.2.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.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.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip 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/flatbuffers/@v/v1.11.0.zip -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/google/flatbuffers/@v/v1.11.0.mod -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.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.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.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.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.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-metrics-stackdriver/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-metrics-stackdriver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-metrics-stackdriver/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-metrics-stackdriver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip 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/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip 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/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/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod 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/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.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.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 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/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180628210949-0892b62f0d9f.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180628210949-0892b62f0d9f.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 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/gorhill/cronexpr/@v/v0.0.0-20180427100037-88b0669f7d75.zip -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20180427100037-88b0669f7d75.zip mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20180427100037-88b0669f7d75.mod -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20180427100037-88b0669f7d75.mod 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/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.3.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.zip -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/sessions/@v/v1.2.0.zip -> github.com%2Fgorilla%2Fsessions%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/gorilla/sessions/@v/v1.2.0.mod -> github.com%2Fgorilla%2Fsessions%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gotestyourself/gotestyourself/@v/v2.2.0+incompatible.zip -> github.com%2Fgotestyourself%2Fgotestyourself%2F@v%2Fv2.2.0+incompatible.zip 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/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.6.2.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hailocab/go-hostpool/@v/v0.0.0-20160125115350-e80d13ce29ed.zip -> github.com%2Fhailocab%2Fgo-hostpool%2F@v%2Fv0.0.0-20160125115350-e80d13ce29ed.zip mirror://goproxy//github.com/hailocab/go-hostpool/@v/v0.0.0-20160125115350-e80d13ce29ed.mod -> github.com%2Fhailocab%2Fgo-hostpool%2F@v%2Fv0.0.0-20160125115350-e80d13ce29ed.mod mirror://goproxy//github.com/hashicorp/cap/@v/v0.1.0.zip -> github.com%2Fhashicorp%2Fcap%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/hashicorp/cap/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fcap%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/consul-template/@v/v0.26.0.zip -> github.com%2Fhashicorp%2Fconsul-template%2F@v%2Fv0.26.0.zip mirror://goproxy//github.com/hashicorp/consul-template/@v/v0.26.0.mod -> github.com%2Fhashicorp%2Fconsul-template%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.4.0.zip -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.4.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.1-0.20200910203702-bb2b5dd871ca.zip -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.1-0.20200910203702-bb2b5dd871ca.zip mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.1-0.20200910203702-bb2b5dd871ca.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.1-0.20200910203702-bb2b5dd871ca.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-bindata/@v/v3.0.8-0.20180209072458-bf7910af8997+incompatible.zip -> github.com%2Fhashicorp%2Fgo-bindata%2F@v%2Fv3.0.8-0.20180209072458-bf7910af8997+incompatible.zip mirror://goproxy//github.com/hashicorp/go-bindata/@v/v3.0.8-0.20180209072458-bf7910af8997+incompatible.mod -> github.com%2Fhashicorp%2Fgo-bindata%2F@v%2Fv3.0.8-0.20180209072458-bf7910af8997+incompatible.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.2.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.2.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20201029210230-738cb3105cd0.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20201029210230-738cb3105cd0.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20201029210230-738cb3105cd0.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20201029210230-738cb3105cd0.mod mirror://goproxy//github.com/hashicorp/go-gatedio/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-gatedio%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-gatedio/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-gatedio%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-gcp-common/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-gcp-common%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-gcp-common/@v/v0.7.0.zip -> github.com%2Fhashicorp%2Fgo-gcp-common%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/hashicorp/go-gcp-common/@v/v0.7.0.mod -> github.com%2Fhashicorp%2Fgo-gcp-common%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.15.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.15.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.16.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.16.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.16.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.16.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/@v/v0.5.16.zip -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2F@v%2Fv0.5.16.zip mirror://goproxy//github.com/hashicorp/go-kms-wrapping/@v/v0.5.16.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2F@v%2Fv0.5.16.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.zip -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v1.1.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v1.1.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%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/go-plugin/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.3-0.20191002164813-7e9e8525653a.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.3-0.20191002164813-7e9e8525653a.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.3-0.20191002164813-7e9e8525653a.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.3-0.20191002164813-7e9e8525653a.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.2.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.zip -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.mod -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.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.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.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/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.1-vault-3.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.1-vault-3.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.1-vault-3.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.1-vault-3.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/nomad/api/@v/v0.0.0-20191220223628-edc62acd919d.zip -> github.com%2Fhashicorp%2Fnomad%2Fapi%2F@v%2Fv0.0.0-20191220223628-edc62acd919d.zip mirror://goproxy//github.com/hashicorp/nomad/api/@v/v0.0.0-20191220223628-edc62acd919d.mod -> github.com%2Fhashicorp%2Fnomad%2Fapi%2F@v%2Fv0.0.0-20191220223628-edc62acd919d.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2-0.20191002163536-9c6bd3e3eb17.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2-0.20191002163536-9c6bd3e3eb17.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.3.zip -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/v2/@v/v2.0.0-20210421194847-a7e34179d62c.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2Fv2%2F@v%2Fv2.0.0-20210421194847-a7e34179d62c.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/v2/@v/v2.0.0-20210421194847-a7e34179d62c.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2Fv2%2F@v%2Fv2.0.0-20210421194847-a7e34179d62c.mod mirror://goproxy//github.com/hashicorp/raft-snapshot/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fraft-snapshot%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/raft-snapshot/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fraft-snapshot%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.4.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-alicloud/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-alicloud%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-alicloud/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-alicloud%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-azure/@v/v0.8.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-azure%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-azure/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-azure%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-centrify/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-centrify%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-centrify/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-centrify%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-cf/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-cf%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-cf/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-cf%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-gcp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-gcp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-gcp/@v/v0.10.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-gcp%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-gcp/@v/v0.10.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-gcp%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-jwt/@v/v0.10.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-jwt%2F@v%2Fv0.10.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-jwt/@v/v0.10.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-jwt%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kerberos/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-kerberos%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kerberos/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-kerberos%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kubernetes/@v/v0.10.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-kubernetes%2F@v%2Fv0.10.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kubernetes/@v/v0.10.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-kubernetes%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-oci/@v/v0.8.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-oci%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-oci/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-oci%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-couchbase/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-couchbase%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-couchbase/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-couchbase%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-elasticsearch/@v/v0.8.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-elasticsearch%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-elasticsearch/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-elasticsearch%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-mongodbatlas/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-mongodbatlas%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-mongodbatlas/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-mongodbatlas%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-snowflake/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-snowflake%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-snowflake/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-snowflake%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-mock/@v/v0.16.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-mock%2F@v%2Fv0.16.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-mock/@v/v0.16.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-mock%2F@v%2Fv0.16.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-ad/@v/v0.10.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-ad%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-ad/@v/v0.10.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-ad%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-alicloud/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-alicloud%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-alicloud/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-alicloud%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-azure/@v/v0.10.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-azure%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-azure/@v/v0.10.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-azure%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcp/@v/v0.10.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcp%2F@v%2Fv0.10.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcp/@v/v0.10.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcp%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcpkms/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcpkms%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcpkms/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcpkms%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-kv/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-kv%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-kv/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-kv%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-mongodbatlas/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-mongodbatlas%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-mongodbatlas/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-mongodbatlas%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-openldap/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-openldap/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-terraform/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-terraform%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-terraform/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-terraform%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.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/huandu/xstrings/@v/v1.3.2.zip -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/huaweicloud/golangsdk/@v/v0.0.0-20200304081349-45ec0797f2a4.mod -> github.com%2Fhuaweicloud%2Fgolangsdk%2F@v%2Fv0.0.0-20200304081349-45ec0797f2a4.mod mirror://goproxy//github.com/hudl/fargo/@v/v1.3.0.mod -> github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.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/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod 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/influxdata/influxdb/@v/v0.0.0-20190411212539-d24b7ba8c4c4.zip -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv0.0.0-20190411212539-d24b7ba8c4c4.zip mirror://goproxy//github.com/influxdata/influxdb/@v/v0.0.0-20190411212539-d24b7ba8c4c4.mod -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv0.0.0-20190411212539-d24b7ba8c4c4.mod mirror://goproxy//github.com/influxdata/influxdb1-client/@v/v0.0.0-20191209144304-8bf82d3c094d.mod -> github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.zip -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.zip mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.zip -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.zip mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.4.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.5.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.5.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/jcmturner/aescts/@v/v1.0.1.zip -> github.com%2Fjcmturner%2Faescts%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/jcmturner/aescts/@v/v1.0.1.mod -> github.com%2Fjcmturner%2Faescts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/jcmturner/dnsutils/@v/v1.0.1.zip -> github.com%2Fjcmturner%2Fdnsutils%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/jcmturner/dnsutils/@v/v1.0.1.mod -> github.com%2Fjcmturner%2Fdnsutils%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.zip -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.mod -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jcmturner/goidentity/v6/@v/v6.0.1.zip -> github.com%2Fjcmturner%2Fgoidentity%2Fv6%2F@v%2Fv6.0.1.zip mirror://goproxy//github.com/jcmturner/goidentity/v6/@v/v6.0.1.mod -> github.com%2Fjcmturner%2Fgoidentity%2Fv6%2F@v%2Fv6.0.1.mod mirror://goproxy//github.com/jcmturner/gokrb5/v8/@v/v8.0.0.zip -> github.com%2Fjcmturner%2Fgokrb5%2Fv8%2F@v%2Fv8.0.0.zip mirror://goproxy//github.com/jcmturner/gokrb5/v8/@v/v8.0.0.mod -> github.com%2Fjcmturner%2Fgokrb5%2Fv8%2F@v%2Fv8.0.0.mod mirror://goproxy//github.com/jcmturner/rpc/v2/@v/v2.0.2.zip -> github.com%2Fjcmturner%2Frpc%2Fv2%2F@v%2Fv2.0.2.zip mirror://goproxy//github.com/jcmturner/rpc/v2/@v/v2.0.2.mod -> github.com%2Fjcmturner%2Frpc%2Fv2%2F@v%2Fv2.0.2.mod mirror://goproxy//github.com/jeffchao/backoff/@v/v0.0.0-20140404060208-9d7fd7aa17f2.zip -> github.com%2Fjeffchao%2Fbackoff%2F@v%2Fv0.0.0-20140404060208-9d7fd7aa17f2.zip mirror://goproxy//github.com/jeffchao/backoff/@v/v0.0.0-20140404060208-9d7fd7aa17f2.mod -> github.com%2Fjeffchao%2Fbackoff%2F@v%2Fv0.0.0-20140404060208-9d7fd7aa17f2.mod mirror://goproxy//github.com/jefferai/isbadcipher/@v/v0.0.0-20190226160619-51d2077c035f.zip -> github.com%2Fjefferai%2Fisbadcipher%2F@v%2Fv0.0.0-20190226160619-51d2077c035f.zip mirror://goproxy//github.com/jefferai/isbadcipher/@v/v0.0.0-20190226160619-51d2077c035f.mod -> github.com%2Fjefferai%2Fisbadcipher%2F@v%2Fv0.0.0-20190226160619-51d2077c035f.mod mirror://goproxy//github.com/jefferai/jsonx/@v/v1.0.0.zip -> github.com%2Fjefferai%2Fjsonx%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jefferai/jsonx/@v/v1.0.0.mod -> github.com%2Fjefferai%2Fjsonx%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180701071628-ab8a2e0c74be.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180701071628-ab8a2e0c74be.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.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.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip 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/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 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/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.8.0.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.10.3.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/kelseyhightower/envconfig/@v/v1.3.0.mod -> github.com%2Fkelseyhightower%2Fenvconfig%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/kelseyhightower/envconfig/@v/v1.4.0.zip -> github.com%2Fkelseyhightower%2Fenvconfig%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/kelseyhightower/envconfig/@v/v1.4.0.mod -> github.com%2Fkelseyhightower%2Fenvconfig%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/keybase/go-crypto/@v/v0.0.0-20190403132359-d65b6b94177f.zip -> github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20190403132359-d65b6b94177f.zip mirror://goproxy//github.com/keybase/go-crypto/@v/v0.0.0-20190403132359-d65b6b94177f.mod -> github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20190403132359-d65b6b94177f.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/klauspost/compress/@v/v1.4.1.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.5.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.9.5.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod 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.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/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.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/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.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/lestrrat-go/jwx/@v/v0.9.0.mod -> github.com%2Flestrrat-go%2Fjwx%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/lib/pq/@v/v0.0.0-20180327071824-d34b9ff171c2.mod -> github.com%2Flib%2Fpq%2F@v%2Fv0.0.0-20180327071824-d34b9ff171c2.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.8.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.8.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-common/golang/gogo/@v/v0.0.0-20190605223551-bc2310a04743.mod -> github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-go/@v/v0.18.1.mod -> github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/lyft/protoc-gen-validate/@v/v0.0.13.mod -> github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.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/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/markbates/oncer/@v/v0.0.0-20181203154359-bf2de49a0be2.mod -> github.com%2Fmarkbates%2Foncer%2F@v%2Fv0.0.0-20181203154359-bf2de49a0be2.mod mirror://goproxy//github.com/markbates/safe/@v/v1.0.1.mod -> github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.zip -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.zip mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.mod -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.7.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.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-ieproxy/@v/v0.0.1.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.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/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.12.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.12.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.12.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.12.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/mholt/archiver/@v/v3.1.1+incompatible.zip -> github.com%2Fmholt%2Farchiver%2F@v%2Fv3.1.1+incompatible.zip mirror://goproxy//github.com/mholt/archiver/@v/v3.1.1+incompatible.mod -> github.com%2Fmholt%2Farchiver%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/michaelklishin/rabbit-hole/@v/v0.0.0-20191008194146-93d9988f0cd5.zip -> github.com%2Fmichaelklishin%2Frabbit-hole%2F@v%2Fv0.0.0-20191008194146-93d9988f0cd5.zip mirror://goproxy//github.com/michaelklishin/rabbit-hole/@v/v0.0.0-20191008194146-93d9988f0cd5.mod -> github.com%2Fmichaelklishin%2Frabbit-hole%2F@v%2Fv0.0.0-20191008194146-93d9988f0cd5.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.40.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.40.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.40.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.40.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.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-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip 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/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.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/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.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/mapstructure/@v/v1.2.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200915141129-7f0af18e79f2.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200915141129-7f0af18e79f2.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200915141129-7f0af18e79f2.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200915141129-7f0af18e79f2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mongodb/go-client-mongodb-atlas/@v/v0.1.2.zip -> github.com%2Fmongodb%2Fgo-client-mongodb-atlas%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/mongodb/go-client-mongodb-atlas/@v/v0.1.2.mod -> github.com%2Fmongodb%2Fgo-client-mongodb-atlas%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/montanaflynn/stats/@v/v0.0.0-20171201202039-1bf9dbcd8cbe.mod -> github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.0.0-20171201202039-1bf9dbcd8cbe.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwielbut/pointy/@v/v1.1.0.zip -> github.com%2Fmwielbut%2Fpointy%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mwielbut/pointy/@v/v1.1.0.mod -> github.com%2Fmwielbut%2Fpointy%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/natefinch/atomic/@v/v0.0.0-20150920032501-a62ce929ffcc.zip -> github.com%2Fnatefinch%2Fatomic%2F@v%2Fv0.0.0-20150920032501-a62ce929ffcc.zip mirror://goproxy//github.com/natefinch/atomic/@v/v0.0.0-20150920032501-a62ce929ffcc.mod -> github.com%2Fnatefinch%2Fatomic%2F@v%2Fv0.0.0-20150920032501-a62ce929ffcc.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.0.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.2.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/nats-io/nats-server/v2/@v/v2.1.2.mod -> github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/nats-io/nats.go/@v/v1.9.1.mod -> github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.0.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.3.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/nats-io/nuid/@v/v1.0.1.mod -> github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.zip -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.zip 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/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.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/nwaples/rardecode/@v/v1.1.0.zip -> github.com%2Fnwaples%2Frardecode%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/nwaples/rardecode/@v/v1.1.0.mod -> github.com%2Fnwaples%2Frardecode%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/oklog/oklog/@v/v0.3.2.mod -> github.com%2Foklog%2Foklog%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.zip -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/okta/okta-sdk-golang/@v/v1.1.0.zip -> github.com%2Fokta%2Fokta-sdk-golang%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/okta/okta-sdk-golang/@v/v1.1.0.mod -> github.com%2Fokta%2Fokta-sdk-golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/okta/okta-sdk-golang/v2/@v/v2.0.0.zip -> github.com%2Fokta%2Fokta-sdk-golang%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/okta/okta-sdk-golang/v2/@v/v2.0.0.mod -> github.com%2Fokta%2Fokta-sdk-golang%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.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.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.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.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20190113212917-5533ce8a0da3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20190113212917-5533ce8a0da3.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.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip 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/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.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/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-rc9.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/openlyinc/pointy/@v/v1.1.2.zip -> github.com%2Fopenlyinc%2Fpointy%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/openlyinc/pointy/@v/v1.1.2.mod -> github.com%2Fopenlyinc%2Fpointy%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/opentracing-contrib/go-observer/@v/v0.0.0-20170622124052-a52f23424492.mod -> github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod mirror://goproxy//github.com/opentracing/basictracer-go/@v/v1.0.0.mod -> github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod 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/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/openzipkin-contrib/zipkin-go-opentracing/@v/v0.4.5.mod -> github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.3.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.6.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.2.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/oracle/oci-go-sdk/@v/v7.0.0+incompatible.mod -> github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv7.0.0+incompatible.mod mirror://goproxy//github.com/oracle/oci-go-sdk/@v/v12.5.0+incompatible.zip -> github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv12.5.0+incompatible.zip mirror://goproxy//github.com/oracle/oci-go-sdk/@v/v12.5.0+incompatible.mod -> github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv12.5.0+incompatible.mod mirror://goproxy//github.com/ory/dockertest/@v/v3.3.4+incompatible.mod -> github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.4+incompatible.mod mirror://goproxy//github.com/ory/dockertest/@v/v3.3.5+incompatible.zip -> github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.5+incompatible.zip mirror://goproxy//github.com/ory/dockertest/@v/v3.3.5+incompatible.mod -> github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.5+incompatible.mod mirror://goproxy//github.com/ory/dockertest/v3/@v/v3.6.2.zip -> github.com%2Fory%2Fdockertest%2Fv3%2F@v%2Fv3.6.2.zip mirror://goproxy//github.com/ory/dockertest/v3/@v/v3.6.2.mod -> github.com%2Fory%2Fdockertest%2Fv3%2F@v%2Fv3.6.2.mod mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.zip -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.mod -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pact-foundation/pact-go/@v/v1.0.4.mod -> github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v0.0.0-20180815053127-5633e0862627.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv0.0.0-20180815053127-5633e0862627.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.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/pelletier/go-toml/@v/v1.7.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/performancecopilot/speed/@v/v3.0.0+incompatible.mod -> github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/petermattis/goid/@v/v0.0.0-20180202154549-b0b1615b78e5.zip -> github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.zip mirror://goproxy//github.com/petermattis/goid/@v/v0.0.0-20180202154549-b0b1615b78e5.mod -> github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.mod mirror://goproxy//github.com/pierrec/lz4/@v/v1.0.2-0.20190131084431-473cd7ce01a1.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.2.6+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.zip -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.zip mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.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.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/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20201205024021-ac21108117ac.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20201205024021-ac21108117ac.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20201205024021-ac21108117ac.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20201205024021-ac21108117ac.mod mirror://goproxy//github.com/pquerna/otp/@v/v1.2.1-0.20191009055518-468c2dd2b58d.zip -> github.com%2Fpquerna%2Fotp%2F@v%2Fv1.2.1-0.20191009055518-468c2dd2b58d.zip mirror://goproxy//github.com/pquerna/otp/@v/v1.2.1-0.20191009055518-468c2dd2b58d.mod -> github.com%2Fpquerna%2Fotp%2F@v%2Fv1.2.1-0.20191009055518-468c2dd2b58d.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3-0.20190127221311-3c4408c8b829.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.3.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod 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-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.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/prometheus/client_model/@v/v0.1.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.11.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.11.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.11.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.11.1.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-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190117184657-bf6a532e95b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20181016184325-3113b8401b8a.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.2.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.2.2.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/rogpeppe/go-internal/@v/v1.6.2.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.6.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod 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.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/samuel/go-zookeeper/@v/v0.0.0-20190923202752-2cc03de413da.zip -> github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.zip mirror://goproxy//github.com/samuel/go-zookeeper/@v/v0.0.0-20190923202752-2cc03de413da.mod -> github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod mirror://goproxy//github.com/sasha-s/go-deadlock/@v/v0.2.0.zip -> github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/sasha-s/go-deadlock/@v/v0.2.0.mod -> github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip 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/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sethvargo/go-limiter/@v/v0.3.0.zip -> github.com%2Fsethvargo%2Fgo-limiter%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/sethvargo/go-limiter/@v/v0.3.0.mod -> github.com%2Fsethvargo%2Fgo-limiter%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v3.21.5+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.21.5+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v3.21.5+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.21.5+incompatible.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.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/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.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.0.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.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-20180725160413-e900ae048470.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180725160413-e900ae048470.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 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-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.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/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/snowflakedb/glog/@v/v0.0.0-20180824191149-f5055e6f21ce.zip -> github.com%2Fsnowflakedb%2Fglog%2F@v%2Fv0.0.0-20180824191149-f5055e6f21ce.zip mirror://goproxy//github.com/snowflakedb/glog/@v/v0.0.0-20180824191149-f5055e6f21ce.mod -> github.com%2Fsnowflakedb%2Fglog%2F@v%2Fv0.0.0-20180824191149-f5055e6f21ce.mod mirror://goproxy//github.com/snowflakedb/gosnowflake/@v/v1.3.11.zip -> github.com%2Fsnowflakedb%2Fgosnowflake%2F@v%2Fv1.3.11.zip mirror://goproxy//github.com/snowflakedb/gosnowflake/@v/v1.3.11.mod -> github.com%2Fsnowflakedb%2Fgosnowflake%2F@v%2Fv1.3.11.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/sony/gobreaker/@v/v0.4.1.mod -> github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.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/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.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.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/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.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.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.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/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.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/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/square/go-jose/@v/v2.4.1+incompatible.mod -> github.com%2Fsquare%2Fgo-jose%2F@v%2Fv2.4.1+incompatible.mod mirror://goproxy//github.com/square/go-jose/v3/@v/v3.0.0-20200225220504-708a9fe87ddc.mod -> github.com%2Fsquare%2Fgo-jose%2Fv3%2F@v%2Fv3.0.0-20200225220504-708a9fe87ddc.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190404075320-75d898a42a94.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190827072141-edfb9018d271.zip -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.zip mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190827072141-edfb9018d271.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod mirror://goproxy//github.com/streadway/handy/@v/v0.0.0-20190108123426-d5acb3125c2a.mod -> github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.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.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.0.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.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.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.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.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/svanharmelen/jsonapi/@v/v0.0.0-20180618144545-0c0828c3f16d.zip -> github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.zip mirror://goproxy//github.com/svanharmelen/jsonapi/@v/v0.0.0-20180618144545-0c0828c3f16d.mod -> github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.171+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.171+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.171+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.171+incompatible.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.1.zip -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.1.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.6.zip -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.6.mod -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/tklauser/numcpus/@v/v0.2.2.zip -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/tklauser/numcpus/@v/v0.2.2.mod -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.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/ulikunitz/xz/@v/v0.5.6.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.7.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.7.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod 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/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.zip -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v0.0.0-20180714160509-73f8eece6fdc.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv0.0.0-20180714160509-73f8eece6fdc.mod mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.zip -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.zip -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.zip mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.mod -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.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/yandex-cloud/go-genproto/@v/v0.0.0-20200722140432-762fe965ce77.mod -> github.com%2Fyandex-cloud%2Fgo-genproto%2F@v%2Fv0.0.0-20200722140432-762fe965ce77.mod mirror://goproxy//github.com/yandex-cloud/go-sdk/@v/v0.0.0-20200722140627-2194e5077f13.mod -> github.com%2Fyandex-cloud%2Fgo-sdk%2F@v%2Fv0.0.0-20200722140627-2194e5077f13.mod mirror://goproxy//github.com/yhat/scrape/@v/v0.0.0-20161128144610-24b7890b0945.mod -> github.com%2Fyhat%2Fscrape%2F@v%2Fv0.0.0-20161128144610-24b7890b0945.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.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20200816102855-ee81675732da.zip -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20200816102855-ee81675732da.zip mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20200816102855-ee81675732da.mod -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20200816102855-ee81675732da.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 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.4.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.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.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200425165423-262c93980547.zip -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200425165423-262c93980547.zip mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200425165423-262c93980547.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200425165423-262c93980547.mod mirror://goproxy//go.mongodb.org/atlas/@v/v0.7.1.zip -> go.mongodb.org%2Fatlas%2F@v%2Fv0.7.1.zip mirror://goproxy//go.mongodb.org/atlas/@v/v0.7.1.mod -> go.mongodb.org%2Fatlas%2F@v%2Fv0.7.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.2.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.6.zip -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.6.zip mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.6.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.6.mod mirror://goproxy//go.opencensus.io/@v/v0.19.1.mod -> go.opencensus.io%2F@v%2Fv0.19.1.mod mirror://goproxy//go.opencensus.io/@v/v0.19.2.mod -> go.opencensus.io%2F@v%2Fv0.19.2.mod mirror://goproxy//go.opencensus.io/@v/v0.20.1.mod -> go.opencensus.io%2F@v%2Fv0.20.1.mod mirror://goproxy//go.opencensus.io/@v/v0.20.2.mod -> go.opencensus.io%2F@v%2Fv0.20.2.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.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opentelemetry.io/otel/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.13.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.1.zip -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.zip mirror://goproxy//go.uber.org/zap/@v/v1.14.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.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-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.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-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.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-20190325154230-a5d413f7728c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190422162423-af44ce270edf.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190422162423-af44ce270edf.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-20190513172903-22d7a77e9e5f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.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-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.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-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200117160349-530e935923ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200117160349-530e935923ad.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod 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/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200604202706-70a84ac30bf9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.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-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.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-20210513164829-c07d793c2f9a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.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-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-20181217174547-8f45f776aaf1.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181217174547-8f45f776aaf1.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.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip 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/mod/@v/v0.4.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.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-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181106065722-10aee1819953.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.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-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190206173232-65e2d4e15006.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190206173232-65e2d4e15006.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-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.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-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.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-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191003171128-d98b1b443823.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191003171128-d98b1b443823.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-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.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-20200320220750-118fecf932d8.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200320220750-118fecf932d8.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-20200505041828-1ed23360d12c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200505041828-1ed23360d12c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.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-20201002202402-0a1ea396d57c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201002202402-0a1ea396d57c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.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-20210510120150-4163338589ed.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210510120150-4163338589ed.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.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-20181203162652-d668ce993890.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190130055435-99b60b757ec1.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190130055435-99b60b757ec1.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-20190319182350-c85d3e98c914.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190319182350-c85d3e98c914.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.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.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip 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/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-20190412183630-56d357773e84.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190412183630-56d357773e84.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-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.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-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181122145206-62eef0e2fa9b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.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-20181218192612-074acd46bca6.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181218192612-074acd46bca6.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190204203706-41f3e6584952.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190204203706-41f3e6584952.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.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-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.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-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.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-20190419153524-e8e3143a4f4a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190419153524-e8e3143a4f4a.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-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190531175056-4c3a928424d2.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190531175056-4c3a928424d2.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-20190712062909-fae7ac547cb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190712062909-fae7ac547cb7.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-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.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-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.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-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.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-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-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.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-20191220142924-d4481acd189f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.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-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.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-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-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-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.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-20200409092240-59c9f1ba88fa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200409092240-59c9f1ba88fa.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200828194041-157a740278f4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200828194041-157a740278f4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200831180312-196b9ba8737a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200831180312-196b9ba8737a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.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-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210316164454-77fc1eacc6aa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210316164454-77fc1eacc6aa.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210514084401-e8d321eab015.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210514084401-e8d321eab015.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.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.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip 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/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.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.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.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/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 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-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/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.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-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.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-20181219222714-6e267b5cc78e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181219222714-6e267b5cc78e.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-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-20190329151228-23e29df326fe.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190329151228-23e29df326fe.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190416151739-9c9e1878f421.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190416151739-9c9e1878f421.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190420181800-aa740d480789.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190420181800-aa740d480789.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190424220101-1e8e1cfdf96b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190424220101-1e8e1cfdf96b.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-20190531172133-b3315ee88b7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190531172133-b3315ee88b7d.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-20190718200317-82a3ea8a504c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190718200317-82a3ea8a504c.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-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.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-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.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-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.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-20200103221440-774c71fcf114.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.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-20200409170454-77362c5149f0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200409170454-77362c5149f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200416214402-fc959738d646.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200416214402-fc959738d646.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200521155704-91d71f6c2f04.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200521155704-91d71f6c2f04.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210101214203-2dba1e4ea05c.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210101214203-2dba1e4ea05c.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210101214203-2dba1e4ea05c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210101214203-2dba1e4ea05c.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.0.0-20181220000619-583d854617af.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181220000619-583d854617af.mod mirror://goproxy//google.golang.org/api/@v/v0.2.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.2.0.mod mirror://goproxy//google.golang.org/api/@v/v0.3.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.0.mod mirror://goproxy//google.golang.org/api/@v/v0.3.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod mirror://goproxy//google.golang.org/api/@v/v0.3.2.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.2.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.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.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.21.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.21.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.29.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.zip 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/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.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.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.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.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip 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/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-20181219182458-5a97ab628bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181219182458-5a97ab628bfb.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-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.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-20190508193815-b515fa19cec8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190513181449-d00d292a067c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190513181449-d00d292a067c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190530194941-fb225487d101.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.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-20200323114720-3f67cca34472.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200323114720-3f67cca34472.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-20200409111301-baae70f3302d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200409111301-baae70f3302d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200416231807-8751e049a2a0.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200416231807-8751e049a2a0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.zip 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/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.16.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.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.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.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.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.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.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.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.28.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.zip 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/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/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.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-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.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/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.zip -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.zip 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/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/gcfg.v1/@v/v1.2.3.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.3.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/inf.v0/@v/v0.9.0.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.zip -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.mod -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20180705113604-9856a29383ce.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20180705113604-9856a29383ce.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.mod mirror://goproxy//gopkg.in/ory-am/dockertest.v3/@v/v3.3.4.zip -> gopkg.in%2Fory-am%2Fdockertest.v3%2F@v%2Fv3.3.4.zip mirror://goproxy//gopkg.in/ory-am/dockertest.v3/@v/v3.3.4.mod -> gopkg.in%2Fory-am%2Fdockertest.v3%2F@v%2Fv3.3.4.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.0.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.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/warnings.v0/@v/v0.1.2.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.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.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.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-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-20180920025451-e3ad64cb4ed3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180920025451-e3ad64cb4ed3.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.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.zip 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//k8s.io/api/@v/v0.0.0-20190409092523-d687e77c8ae9.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190409092523-d687e77c8ae9.mod mirror://goproxy//k8s.io/api/@v/v0.18.2.zip -> k8s.io%2Fapi%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/api/@v/v0.18.2.mod -> k8s.io%2Fapi%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190409092423-760d1845f48b.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190409092423-760d1845f48b.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.2.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.2.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/client-go/@v/v0.18.2.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/client-go/@v/v0.18.2.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20190306015804-8e90cee79f82.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20190306015804-8e90cee79f82.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190228160746-b3a7cee44a30.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190228160746-b3a7cee44a30.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200121204235-bf4fb3bd569c.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//layeh.com/radius/@v/v0.0.0-20190322222518-890bc1058917.zip -> layeh.com%2Fradius%2F@v%2Fv0.0.0-20190322222518-890bc1058917.zip mirror://goproxy//layeh.com/radius/@v/v0.0.0-20190322222518-890bc1058917.mod -> layeh.com%2Fradius%2F@v%2Fv0.0.0-20190322222518-890bc1058917.mod mirror://goproxy//mvdan.cc/gofumpt/@v/v0.1.1.zip -> mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.1.zip mirror://goproxy//mvdan.cc/gofumpt/@v/v0.1.1.mod -> mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.1.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%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 mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/appdash/@v/v0.0.0-20190731080439-ebfcffb1b5c0.mod -> sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod
+_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=37e7b127412ff9e33de9f9cd6212d67c
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 985c53ab4710..a23ed23bf7f4 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.9-r2 b/metadata/md5-cache/app-arch/brotli-1.0.9-r2
index 6b70d3b51600..5a6ab90d28d5 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.9-r2
+++ b/metadata/md5-cache/app-arch/brotli-1.0.9-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Generic-purpose lossless compression algorithm
 EAPI=7
 HOMEPAGE=https://github.com/google/brotli
 IUSE=python static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=MIT python? ( Apache-2.0 )
 RDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/1
 SRC_URI=https://github.com/google/brotli/archive/v1.0.9.tar.gz -> brotli-1.0.9.tar.gz
 _eclasses_=cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	cmake-utils	12008d68ebfd61f49a377c49f83558a8	distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=12a194159e8e8f12bf7550f11d3768af
+_md5_=56de6ee6b194d7d32734ccb70b22e637
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.9-r3 b/metadata/md5-cache/app-arch/brotli-1.0.9-r3
index 02fff20b2f12..caf8f998b60e 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.9-r3
+++ b/metadata/md5-cache/app-arch/brotli-1.0.9-r3
@@ -5,7 +5,7 @@ DESCRIPTION=Generic-purpose lossless compression algorithm
 EAPI=7
 HOMEPAGE=https://github.com/google/brotli
 IUSE=python static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=MIT python? ( Apache-2.0 )
 RDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/1
 SRC_URI=https://github.com/google/brotli/archive/v1.0.9.tar.gz -> brotli-1.0.9.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b4d707214e413f1feefbbb774908f790
+_md5_=4d8a63320c1ac80efb1f77d97f93599e
diff --git a/metadata/md5-cache/app-arch/libarchive-3.5.2 b/metadata/md5-cache/app-arch/libarchive-3.5.2
new file mode 100644
index 000000000000..101c71fbf481
--- /dev/null
+++ b/metadata/md5-cache/app-arch/libarchive-3.5.2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.2.5-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(-)?] ) lzo? ( >=dev-libs/lzo-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(-)?] ) nettle? ( dev-libs/nettle: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(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs ) )
+DESCRIPTION=Multi-format archive and compression library
+EAPI=7
+HOMEPAGE=https://www.libarchive.org/
+IUSE=acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux lz4 +lzma lzo nettle static-libs xattr +zlib zstd 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD BSD-2 BSD-4 public-domain
+RDEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.2.5-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(-)?] ) lzo? ( >=dev-libs/lzo-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(-)?] ) nettle? ( dev-libs/nettle: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(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[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/13
+SRC_URI=https://www.libarchive.org/downloads/libarchive-3.5.2.tar.gz
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=79f68dbd2b89915686c6f93b0af69446
diff --git a/metadata/md5-cache/app-arch/makeself-2.4.5 b/metadata/md5-cache/app-arch/makeself-2.4.5
index 810af35905fb..c386a8bb53d8 100644
--- a/metadata/md5-cache/app-arch/makeself-2.4.5
+++ b/metadata/md5-cache/app-arch/makeself-2.4.5
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst
 DESCRIPTION=Shell script that generates a self-extractible tar.gz
 EAPI=7
 HOMEPAGE=https://makeself.io/
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/megastep/makeself/archive/refs/tags/release-2.4.5.tar.gz -> makeself-2.4.5.tar.gz
 _eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
-_md5_=7d9e0383d20c17c8ad70089a4a3e3451
+_md5_=a06781255c73f34c881f847e8be85a2c
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.8 b/metadata/md5-cache/app-arch/snappy-1.1.8
index fa259bfb4798..a942048ced48 100644
--- a/metadata/md5-cache/app-arch/snappy-1.1.8
+++ b/metadata/md5-cache/app-arch/snappy-1.1.8
@@ -5,10 +5,10 @@ DESCRIPTION=A high-speed compression/decompression library by Google
 EAPI=7
 HOMEPAGE=https://github.com/google/snappy
 IUSE=test 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 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/snappy/archive/1.1.8.tar.gz -> snappy-1.1.8.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a7429e91fdc90ecc9fec32b0696846d5
+_md5_=d5b950140c3664a7a68727e50a7173e3
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index e7c4350bf150..2fe5d46dce3d 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.3.1 b/metadata/md5-cache/app-crypt/gnupg-2.3.1
deleted file mode 100644
index 5f733bac07f2..000000000000
--- a/metadata/md5-cache/app-crypt/gnupg-2.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) 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=compile configure install prepare test
-DEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.9.1 >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) sqlite? ( >=dev-db/sqlite-3.27 ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib
-DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
-EAPI=7
-HOMEPAGE=https://gnupg.org/
-IUSE=bzip2 doc ldap nls readline selinux +smartcard sqlite ssl tofu tools usb user-socket wks-server
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.9.1 >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) sqlite? ( >=dev-db/sqlite-3.27 ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
-REQUIRED_USE=tofu? ( sqlite )
-SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-2.3.1.tar.bz2
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cdcbe8946c03fc97b8b5b6948297104b
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.3.2 b/metadata/md5-cache/app-crypt/gnupg-2.3.2
new file mode 100644
index 000000000000..b8e825e92150
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/gnupg-2.3.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) 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=compile configure install prepare test
+DEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.9.1 >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) sqlite? ( >=dev-db/sqlite-3.27 ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib
+DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
+EAPI=8
+HOMEPAGE=https://gnupg.org/
+IUSE=bzip2 doc ldap nls readline selinux +smartcard sqlite ssl tofu tools usb user-socket wks-server
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.9.1 >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) sqlite? ( >=dev-db/sqlite-3.27 ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
+REQUIRED_USE=tofu? ( sqlite )
+SLOT=0
+SRC_URI=mirror://gnupg/gnupg/gnupg-2.3.2.tar.bz2
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6c6a70091c4e93ddf6fb6019f5b25f24
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.16.0 b/metadata/md5-cache/app-crypt/gpgme-1.16.0
index a8863d1a3b2f..4c70bac960c9 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.16.0
+++ b/metadata/md5-cache/app-crypt/gpgme-1.16.0
@@ -5,11 +5,11 @@ DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
 EAPI=7
 HOMEPAGE=http://www.gnupg.org/related_software/gpgme
 IUSE=common-lisp static-libs +cxx python qt5 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.36:= python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) qt5? ( dev-qt/qtcore:5 )
 REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.16.0.tar.bz2
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c7797b9e07f7662e417538f4b6f86b33
+_md5_=23f1c6551a3050cb756825a0198fb5aa
diff --git a/metadata/md5-cache/app-crypt/libmd-1.0.3 b/metadata/md5-cache/app-crypt/libmd-1.0.3
deleted file mode 100644
index b3ef7026ec67..000000000000
--- a/metadata/md5-cache/app-crypt/libmd-1.0.3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Message Digest functions from BSD systems
-EAPI=7
-HOMEPAGE=https://www.hadrons.org/software/libmd/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
-SLOT=0
-SRC_URI=https://archive.hadrons.org/software/libmd/libmd-1.0.3.tar.xz
-_md5_=1d2405586c1ea98268c9de3de7f1d07a
diff --git a/metadata/md5-cache/app-crypt/libmd-1.0.3-r2 b/metadata/md5-cache/app-crypt/libmd-1.0.3-r2
index a3aa57ff0099..fb45431d18de 100644
--- a/metadata/md5-cache/app-crypt/libmd-1.0.3-r2
+++ b/metadata/md5-cache/app-crypt/libmd-1.0.3-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Message Digest functions from BSD systems
 EAPI=8
 HOMEPAGE=https://www.hadrons.org/software/libmd/
 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 ~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=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
 SLOT=0
 SRC_URI=https://archive.hadrons.org/software/libmd/libmd-1.0.3.tar.xz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8bbb0a379c0ca312fed4c7e04a7a9f1b
+_md5_=6f1d13b7097664dfd93f383acc6a14a3
diff --git a/metadata/md5-cache/app-crypt/pinentry-1.1.1-r1 b/metadata/md5-cache/app-crypt/pinentry-1.1.1-r1
index 4858d07938e1..41ced620673f 100644
--- a/metadata/md5-cache/app-crypt/pinentry-1.1.1-r1
+++ b/metadata/md5-cache/app-crypt/pinentry-1.1.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol
 EAPI=7
 HOMEPAGE=https://gnupg.org/aegypten2
 IUSE=caps efl emacs gnome-keyring gtk ncurses qt5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-pinentry-0.7.2 >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 caps? ( sys-libs/libcap ) efl? ( dev-libs/efl[X] ) gnome-keyring? ( app-crypt/libsecret ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) gtk? ( app-crypt/gcr )
 SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-1.1.1.tar.bz2
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=02e59364b9484ea6982122d1a621425d
+_md5_=5a10cedf05a5a565d1c3cb798c74e363
diff --git a/metadata/md5-cache/app-crypt/qca-2.3.3 b/metadata/md5-cache/app-crypt/qca-2.3.3
index f180619c9e3d..fb841bfdb609 100644
--- a/metadata/md5-cache/app-crypt/qca-2.3.3
+++ b/metadata/md5-cache/app-crypt/qca-2.3.3
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=dev-qt/qtcore:5 botan? ( dev-libs/botan:= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( >=dev-libs/openssl-1.1 dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( >=dev-libs/openssl-1.1:0= ) test? ( dev-qt/qtnetwork:5 dev-qt/qttest:5 )
+DEPEND=>=dev-qt/qtcore-5.14:5 botan? ( dev-libs/botan:= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( >=dev-libs/openssl-1.1 dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( >=dev-libs/openssl-1.1:0= ) test? ( dev-qt/qtnetwork:5 dev-qt/qttest:5 )
 DESCRIPTION=Qt Cryptographic Architecture (QCA)
 EAPI=7
 HOMEPAGE=https://userbase.kde.org/QCA
 IUSE=botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=LGPL-2.1
-RDEPEND=dev-qt/qtcore:5 botan? ( dev-libs/botan:= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( >=dev-libs/openssl-1.1 dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( >=dev-libs/openssl-1.1:0= )
+RDEPEND=>=dev-qt/qtcore-5.14:5 botan? ( dev-libs/botan:= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( >=dev-libs/openssl-1.1 dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( >=dev-libs/openssl-1.1:0= )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://kde/stable/qca/2.3.3/qca-2.3.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a85de9c5556665457b7e97b060765986
+_md5_=d2c81385d5ac6c22e87f05840bb3fba2
diff --git a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r3 b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r3
index 0e1ee2eef82d..f72e381d77f5 100644
--- a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r3
+++ b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/tpm acct-user/tpm dev-libs/gmp:= modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://github.com/PeterHuewe/tpm-emulator/archive/v0.7.5.tar.gz -> tpm-emulator-0.7.5.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0d5c45b47554a87aea509b8b54475e01
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 3c7ff477e88c..74c948dceae5 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r11 b/metadata/md5-cache/app-editors/emacs-25.3-r11
index f6db90ec1d77..63a9fce391b7 100644
--- a/metadata/md5-cache/app-editors/emacs-25.3-r11
+++ b/metadata/md5-cache/app-editors/emacs-25.3-r11
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=25
 SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-3.tar.xz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d7f55ce231f8c36005528a9702ef3c3d
+_md5_=6a21e6e4e678e4639ed78df0777ee724
diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r6 b/metadata/md5-cache/app-editors/emacs-26.3-r6
index 33bc665a0a94..b06f023ca9a4 100644
--- a/metadata/md5-cache/app-editors/emacs-26.3-r6
+++ b/metadata/md5-cache/app-editors/emacs-26.3-r6
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=26
 SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-26.3-patches-1.tar.xz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cd6c2e5e668ff0aebf03794323909115
+_md5_=cb971e59c261259cc88d4c0d90117572
diff --git a/metadata/md5-cache/app-editors/emacs-27.2-r4 b/metadata/md5-cache/app-editors/emacs-27.2-r4
index c0c870d2e5a9..043f32534c0c 100644
--- a/metadata/md5-cache/app-editors/emacs-27.2-r4
+++ b/metadata/md5-cache/app-editors/emacs-27.2-r4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs !app-editors/emacs-vcs:27
 RESTRICT=test
 SLOT=27
 SRC_URI=mirror://gnu/emacs/emacs-27.2.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-27.2-patches-3.tar.xz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a8bdb0b2838e44fd63c6285724d48a23
+_md5_=2fd26b3dd5b8efb04a1a16c51005a95d
diff --git a/metadata/md5-cache/app-editors/kakoune-2020.01.16_p20200601-r1 b/metadata/md5-cache/app-editors/kakoune-2020.01.16_p20200601-r1
deleted file mode 100644
index 430b370b442e..000000000000
--- a/metadata/md5-cache/app-editors/kakoune-2020.01.16_p20200601-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:=[unicode(+)]
-DESCRIPTION=Modal editor inspired by vim
-EAPI=7
-HOMEPAGE=http://kakoune.org/ https://github.com/mawww/kakoune
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=Unlicense
-RDEPEND=sys-libs/ncurses:=[unicode(+)]
-SLOT=0
-SRC_URI=https://github.com/mawww/kakoune/archive/6fa26b8dd2ac0931fe688370728c47086277d883.tar.gz -> kakoune-2020.01.16_p20200601.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=011171b5fba48aa686a4107059d6f1b3
diff --git a/metadata/md5-cache/app-editors/kakoune-2020.09.01 b/metadata/md5-cache/app-editors/kakoune-2020.09.01
new file mode 100644
index 000000000000..271931fd90eb
--- /dev/null
+++ b/metadata/md5-cache/app-editors/kakoune-2020.09.01
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:=[unicode(+)]
+DESCRIPTION=Modal editor inspired by vim
+EAPI=8
+HOMEPAGE=http://kakoune.org/ https://github.com/mawww/kakoune
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Unlicense
+RDEPEND=sys-libs/ncurses:=[unicode(+)]
+SLOT=0
+SRC_URI=https://github.com/mawww/kakoune/archive/v2020.09.01.tar.gz -> kakoune-2020.09.01.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5273a61bb3a7b385598ab8b82f5aa943
diff --git a/metadata/md5-cache/app-editors/mg-20200723 b/metadata/md5-cache/app-editors/mg-20200723
deleted file mode 100644
index a1f772487e7b..000000000000
--- a/metadata/md5-cache/app-editors/mg-20200723
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 ) virtual/pkgconfig
-DESCRIPTION=MicroGnuEmacs, a port from the BSDs
-EAPI=7
-HOMEPAGE=https://homepage.boetes.org/software/mg/
-IUSE=livecd
-KEYWORDS=~alpha amd64 arm ~hppa ppc ~ppc64 sparc x86
-LICENSE=public-domain
-RDEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
-SLOT=0
-SRC_URI=https://github.com/hboetes/mg/archive/20200723.tar.gz -> mg-20200723.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4ebcddfb08deb5c16fbe8d426a496469
diff --git a/metadata/md5-cache/app-editors/mg-20210314 b/metadata/md5-cache/app-editors/mg-20210314
deleted file mode 100644
index 61953625abc7..000000000000
--- a/metadata/md5-cache/app-editors/mg-20210314
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 ) virtual/pkgconfig
-DESCRIPTION=MicroGnuEmacs, a port from the BSDs
-EAPI=7
-HOMEPAGE=https://homepage.boetes.org/software/mg/
-IUSE=livecd
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 sparc x86
-LICENSE=public-domain
-RDEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
-SLOT=0
-SRC_URI=https://github.com/hboetes/mg/archive/20210314.tar.gz -> mg-20210314.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4c5c7843bcdedd9afbdddc5a67556ae6
diff --git a/metadata/md5-cache/app-editors/mg-20210314-r1 b/metadata/md5-cache/app-editors/mg-20210314-r1
new file mode 100644
index 000000000000..d9b4acb4f246
--- /dev/null
+++ b/metadata/md5-cache/app-editors/mg-20210314-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=sys-libs/ncurses:0= !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 ) virtual/pkgconfig
+DESCRIPTION=MicroGnuEmacs, a port from the BSDs
+EAPI=7
+HOMEPAGE=https://homepage.boetes.org/software/mg/
+IUSE=livecd
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 sparc x86
+LICENSE=public-domain
+RDEPEND=sys-libs/ncurses:0= !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
+SLOT=0
+SRC_URI=https://github.com/hboetes/mg/archive/20210314.tar.gz -> mg-20210314.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=abc8ec39317bc5e6e1762f7b0f301c62
diff --git a/metadata/md5-cache/app-editors/mg-20210609-r1 b/metadata/md5-cache/app-editors/mg-20210609-r1
new file mode 100644
index 000000000000..e08178c805d2
--- /dev/null
+++ b/metadata/md5-cache/app-editors/mg-20210609-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=sys-libs/ncurses:0= !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
+DESCRIPTION=MicroGnuEmacs, a port from the BSDs
+EAPI=8
+HOMEPAGE=https://homepage.boetes.org/software/mg/ https://github.com/hboetes/mg
+IUSE=livecd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=public-domain
+RDEPEND=sys-libs/ncurses:0= !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
+SLOT=0
+SRC_URI=https://github.com/hboetes/mg/archive/20210609.tar.gz -> mg-20210609.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5de61c05682ed19edd13430f5d3f53d3
diff --git a/metadata/md5-cache/app-editors/xemacs-21.5.34-r6 b/metadata/md5-cache/app-editors/xemacs-21.5.34-r6
index d9c79220019f..4e920f487b0e 100644
--- a/metadata/md5-cache/app-editors/xemacs-21.5.34-r6
+++ b/metadata/md5-cache/app-editors/xemacs-21.5.34-r6
@@ -5,11 +5,11 @@ DESCRIPTION=highly customizable open source text editor and application developm
 EAPI=7
 HOMEPAGE=http://www.xemacs.org/
 IUSE=alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 -riscv ~sparc ~x86
 LICENSE=GPL-3+
 PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
 RDEPEND=berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0[xft=] ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.34.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=67fda8d3a77bc32866b81d2b87cfef08
+_md5_=ebe944754262c4836d2ba28634a2ef14
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index b24c30b11b32..3242af7b01c0 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/apel-10.8_p20201106 b/metadata/md5-cache/app-emacs/apel-10.8_p20201106
index 032b9ad45d8c..1ec9722c6469 100644
--- a/metadata/md5-cache/app-emacs/apel-10.8_p20201106
+++ b/metadata/md5-cache/app-emacs/apel-10.8_p20201106
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A Portable Emacs Library is a library for making portable Emacs Lisp programs
 EAPI=8
 HOMEPAGE=https://github.com/wanderlust/apel
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-24.5:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/apel/archive/4e3269b6e702db2dba48cf560563ac883e81e3bf.tar.gz -> apel-10.8_p20201106.tar.gz
 _eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=9295542c92af73815614f84e1d36c8fe
+_md5_=3de0f0267c2fc036e1f272e29196cb5b
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.53 b/metadata/md5-cache/app-emacs/ebuild-mode-1.53
index 5d32addbc649..d7ab657e9315 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.53
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.53
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.53.tar.xz
 _eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=4ec37b8ef84ed182d55adac315a735d5
+_md5_=0a4e2b770fc3c8a40d2a8fb6927dc709
diff --git a/metadata/md5-cache/app-emacs/flim-1.14.9_p20210529 b/metadata/md5-cache/app-emacs/flim-1.14.9_p20210529
index 3859f1cdf75f..7c481e918639 100644
--- a/metadata/md5-cache/app-emacs/flim-1.14.9_p20210529
+++ b/metadata/md5-cache/app-emacs/flim-1.14.9_p20210529
@@ -4,10 +4,10 @@ DEPEND=>=app-emacs/apel-10.8
 DESCRIPTION=A library to provide basic features about message representation or encoding
 EAPI=8
 HOMEPAGE=https://github.com/wanderlust/flim
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 >=app-editors/emacs-24.5:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/flim/archive/02735dede6603987e8309a76d0bc7a9ff9a5a227.tar.gz -> flim-1.14.9_p20210529.tar.gz
 _eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=458f7f0be03bc4c3e153153415ad0f99
+_md5_=fac35bb10b671c92e596783847e7f3e7
diff --git a/metadata/md5-cache/app-emacs/semi-1.14.7_p20210613 b/metadata/md5-cache/app-emacs/semi-1.14.7_p20210613
index d500e2163ee2..7ea0bc0a6868 100644
--- a/metadata/md5-cache/app-emacs/semi-1.14.7_p20210613
+++ b/metadata/md5-cache/app-emacs/semi-1.14.7_p20210613
@@ -5,10 +5,10 @@ DESCRIPTION=A library to provide MIME feature for GNU Emacs
 EAPI=8
 HOMEPAGE=https://github.com/wanderlust/semi
 IUSE=l10n_ja
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-editors/emacs-24.5:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/semi/archive/509f6f0bc2f5d020c63e47d9ad89410dc20bcb6f.tar.gz -> semi-1.14.7_p20210613.tar.gz
 _eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=ecfd53265c8f733a781321d090b8db8b
+_md5_=df45b860c618af5b17b3c04641775cd1
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 49f74e277662..c0afa96f336b 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-3.13.0 b/metadata/md5-cache/app-emulation/diskimage-builder-3.13.0
index 9342e8180c39..7e0c547a8b9e 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-3.13.0
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-3.13.0
@@ -5,11 +5,11 @@ DESCRIPTION=Golden Disk Image builder.
 EAPI=7
 HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/Babel-2.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !~dev-python/Babel-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/networkx-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-3.13.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f3cec61237aad6cb3d0bccb039ed949e
+_md5_=3ec39e4f0200ff1a26b3d8024a18e251
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.29.2 b/metadata/md5-cache/app-emulation/docker-compose-1.29.2
index 40c01f5fd67d..055912eeeb06 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.29.2
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.29.2
@@ -1,16 +1,16 @@
-BDEPEND=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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/cached-property-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distro-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dockerpty-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docopt-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dotenv-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PySocks-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/texttable-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/websocket-client-0.32.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cached-property-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/distro-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dockerpty-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docopt-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dotenv-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/PySocks-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/texttable-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/websocket-client-0.32.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/pytest-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ddt-1.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DEPEND=>=dev-python/cached-property-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distro-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dockerpty-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docopt-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dotenv-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PySocks-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/texttable-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/websocket-client-0.32.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/pytest-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ddt-1.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 DESCRIPTION=Multi-container orchestration for Docker
 EAPI=7
 HOMEPAGE=https://github.com/docker/compose
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cached-property-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/distro-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dockerpty-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docopt-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dotenv-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/PySocks-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/texttable-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/websocket-client-0.32.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/cached-property-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distro-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dockerpty-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docopt-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dotenv-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PySocks-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/texttable-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/websocket-client-0.32.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.29.2.tar.gz -> docker-compose-1.29.2.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c0a15eff619d94763be1db0c4b948d0f
+_md5_=6b15930b151a7fe7f8976d1e46f8b3ec
diff --git a/metadata/md5-cache/app-emulation/lxd-4.0.6-r1 b/metadata/md5-cache/app-emulation/lxd-4.0.6-r1
deleted file mode 100644
index 5408be815b68..000000000000
--- a/metadata/md5-cache/app-emulation/lxd-4.0.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-lang/go nls? ( sys-devel/gettext ) verify-sig? ( app-crypt/openpgp-keys-linuxcontainers ) 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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft >=dev-util/xdelta-3.0[lzma(+)] net-dns/dnsmasq[dhcp,ipv6?]
-DESCRIPTION=Fast, dense and secure container management
-EAPI=7
-HOMEPAGE=https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd
-IUSE=apparmor ipv6 nls verify-sig kernel_linux verify-sig
-KEYWORDS=amd64
-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 >=dev-util/xdelta-3.0[lzma(+)] 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.6.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-4.0.6.tar.gz.asc )
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=fc76da6c338016edac3ce2e147bbd6a7
diff --git a/metadata/md5-cache/app-emulation/vendor-reset-0.1.0 b/metadata/md5-cache/app-emulation/vendor-reset-0.1.0
index 00455a11e970..9a660d3dcc8b 100644
--- a/metadata/md5-cache/app-emulation/vendor-reset-0.1.0
+++ b/metadata/md5-cache/app-emulation/vendor-reset-0.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/gnif/vendor-reset/archive/v0.1.0.tar.gz -> vendor-reset-0.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f319c1fb4982e782f2c0193dbcfd08a7
diff --git a/metadata/md5-cache/app-emulation/vendor-reset-9999 b/metadata/md5-cache/app-emulation/vendor-reset-9999
index 83e5fa9596fb..6cf409086e04 100644
--- a/metadata/md5-cache/app-emulation/vendor-reset-9999
+++ b/metadata/md5-cache/app-emulation/vendor-reset-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3ee76dedcf3e53c3270523edfc243244
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.24 b/metadata/md5-cache/app-emulation/virtualbox-6.1.24
index af66b5656641..6a880f61df46 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.24
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.24
@@ -5,11 +5,11 @@ DESCRIPTION=Family of powerful x86 virtualization products for enterprise and ho
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2 dtrace? ( CDDL )
 RDEPEND=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] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.24 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.24/VirtualBox-6.1.24.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	ac9fb9efa5413c5fb85a4203fe930e88	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=da05a1c67362d3f3783ded98b392fe82
+_md5_=2f965c66df97e97a4681e33897d2bc40
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.24 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.24
index 4d299e6bb927..1ff990b7ce1b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.24
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.24
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=CD image containing guest additions for VirtualBox
 EAPI=8
 HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
 RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
 RESTRICT=mirror
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.24/VBoxGuestAdditions_6.1.24.iso
-_md5_=b37f764c5c2bf5615fd5e21626dab41e
+_md5_=994c780f547c4d72a219b3e82229ff66
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.24 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.24
index 377a9c4f841e..a629cf535acc 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.24
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.24
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=PUEL extensions for VirtualBox
 EAPI=8
 HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=PUEL
 RDEPEND==app-emulation/virtualbox-6.1.24*
 RESTRICT=bindist mirror strip
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.24/Oracle_VM_VirtualBox_Extension_Pack-6.1.24.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.24.tar.gz
-_md5_=b6de3102051de498175db036d04dc144
+_md5_=8c592bf69b244626edaa09e03fcf74eb
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.20 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.20
index ae81c0be94a4..e790a4e1ddf5 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.20
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.20
@@ -11,5 +11,5 @@ PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.20/VirtualBox-6.1.20.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=59f67126f18426448eecd22e0f29c948
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.22 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.22
index bc429ae25f7e..27afa5dea081 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.22
@@ -11,5 +11,5 @@ PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.22/VirtualBox-6.1.22.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=85b58b1b74775adf82cf2f925dcfce04
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.24 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.24
index 307b6da43540..5637a82577ba 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.24
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.24
@@ -5,11 +5,11 @@ DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=X kernel_linux kernel_linux dist-kernel
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.24/VirtualBox-6.1.24.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4af7f23882b9afb0120a85ef749bd51b
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=59f67126f18426448eecd22e0f29c948
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.26 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.26
index f567b48861c8..773ada11489b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.26
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.26
@@ -11,5 +11,5 @@ PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.26/VirtualBox-6.1.26.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=461efe0d1f7e7c52d3b739d39e645ef7
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.22 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.22
index 3c1cb114380b..edd558f47038 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.1.22.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c930b4d02e135f2c37ba6d30444b9c2b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.24 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.24
index af7a19773d3c..e8b802a86cd4 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.24
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.24
@@ -4,10 +4,10 @@ DESCRIPTION=Kernel Modules for Virtualbox
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=pax-kernel kernel_linux kernel_linux dist-kernel
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.1.24.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=70dced3490aa85e1aff06e9590f7e46f
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c930b4d02e135f2c37ba6d30444b9c2b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.26 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.26
index 235c1c62c906..aefe366ed583 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.26
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.26
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.1.26.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ddbe0a12f0704314ed8f71d00594f8fc
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 89a169af2f85..e76351c93460 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/aflplusplus-3.14c-r1 b/metadata/md5-cache/app-forensics/aflplusplus-3.14c-r1
index 891c0e66bc40..d5fd03e99d9a 100644
--- a/metadata/md5-cache/app-forensics/aflplusplus-3.14c-r1
+++ b/metadata/md5-cache/app-forensics/aflplusplus-3.14c-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A fork of AFL, the popular compile-time instrumentation fuzzer
 EAPI=7
 HOMEPAGE=https://github.com/AFLplusplus/AFLplusplus
 IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0
 RDEPEND=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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=sys-devel/llvm-10:= || ( sys-devel/clang:10 sys-devel/clang:11 sys-devel/clang:12 sys-devel/clang:13 ) !app-forensics/afl
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AFLplusplus/AFLplusplus/archive/3.14c.tar.gz -> aflplusplus-3.14c.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2c3fdb0fbbce3de4a90f2c767d0389f3
+_md5_=5ae7940a7a8f3d52434ff38cf61e2ed5
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index cd3e7a25831b..3dfed440251c 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/anthy-9100h-r3 b/metadata/md5-cache/app-i18n/anthy-9100h-r3
index 93b6c9f92a20..e80e70557c45 100644
--- a/metadata/md5-cache/app-i18n/anthy-9100h-r3
+++ b/metadata/md5-cache/app-i18n/anthy-9100h-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Anthy -- free and secure Japanese input system
 EAPI=7
 HOMEPAGE=http://anthy.osdn.jp/
 IUSE=emacs static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/anthy/37536/anthy-9100h.tar.gz
 _eclasses_=elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=8b3a56f6bacf42ac132f36aba1147192
+_md5_=cf19a355d47b7b2f26c95494a383ea96
diff --git a/metadata/md5-cache/app-i18n/nkf-2.1.5 b/metadata/md5-cache/app-i18n/nkf-2.1.5
index cc067272210c..246e5a2a8195 100644
--- a/metadata/md5-cache/app-i18n/nkf-2.1.5
+++ b/metadata/md5-cache/app-i18n/nkf-2.1.5
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/perl
+BDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-lang/perl
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)?] ) ) dev-lang/perl
+DEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-lang/perl
 DESCRIPTION=Network Kanji code conversion Filter with UTF-8/16 support
 EAPI=7
 HOMEPAGE=https://osdn.net/projects/nkf/
-IUSE=perl python l10n_ja python_targets_python3_8
+IUSE=perl python l10n_ja python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=ZLIB python? ( BSD )
-RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)?] ) ) dev-lang/perl:=
-REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
+RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-lang/perl:=
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/nkf/70406/nkf-2.1.5.tar.gz python? ( https://github.com/fumiyas/python-nkf/archive/c2c6724714b66f295137c8818dae4c09fc09e0a3.tar.gz -> python-nkf-0.2.0_p20191121.tar.gz )
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=3f0dab4b88ee6f40cf7fac5bf8d9361e
+_md5_=4a335cf759f0f129c41e1ef2b1d829ae
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index e7aa1d5ca84c..ce78711a1aed 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/tp_smapi-0.43-r1 b/metadata/md5-cache/app-laptop/tp_smapi-0.43-r1
index f7f142668136..bed967609537 100644
--- a/metadata/md5-cache/app-laptop/tp_smapi-0.43-r1
+++ b/metadata/md5-cache/app-laptop/tp_smapi-0.43-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/dmidecode kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/evgeni/tp_smapi/releases/download/tp-smapi/0.43/tp_smapi-0.43.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=df35c217300f0cd1d55d7725b57933aa
diff --git a/metadata/md5-cache/app-laptop/tuxedo-keyboard-2.0.5-r1 b/metadata/md5-cache/app-laptop/tuxedo-keyboard-2.0.5-r1
index a95700cd0690..37e9cc509e9b 100644
--- a/metadata/md5-cache/app-laptop/tuxedo-keyboard-2.0.5-r1
+++ b/metadata/md5-cache/app-laptop/tuxedo-keyboard-2.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/tuxedocomputers/tuxedo-keyboard/archive/v2.0.5.tar.gz -> tuxedo-keyboard-2.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=979a365d9093e7136d6f90201f57d358
diff --git a/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.3 b/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.3
index e600d600e1bb..8cf88efa65b6 100644
--- a/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.3
+++ b/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/tuxedocomputers/tuxedo-keyboard/archive/v3.0.3.tar.gz -> tuxedo-keyboard-3.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=10db22c86bdb1afadccc50ffc6429212
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index b6dc243d3f15..5e3051aca16a 100644
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
diff --git a/metadata/md5-cache/app-metrics/node_exporter-1.1.2-r1 b/metadata/md5-cache/app-metrics/node_exporter-1.1.2-r1
index bdcb4e32b401..41b4a6286922 100644
--- a/metadata/md5-cache/app-metrics/node_exporter-1.1.2-r1
+++ b/metadata/md5-cache/app-metrics/node_exporter-1.1.2-r1
@@ -4,11 +4,11 @@ DEPEND=>=dev-util/promu-0.3.0 acct-group/node_exporter acct-user/node_exporter
 DESCRIPTION=Prometheus exporter for machine metrics
 EAPI=7
 HOMEPAGE=https://github.com/prometheus/node_exporter
-KEYWORDS=amd64
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0 BSD BSD-2 MIT
 RDEPEND=acct-group/node_exporter acct-user/node_exporter
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/node_exporter/archive/v1.1.2.tar.gz -> node_exporter-1.1.2.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//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/!knetic/govaluate/@v/v3.0.1-0.20171022003610-9aa49832a739+incompatible.mod -> github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod mirror://goproxy//github.com/!shopify/sarama/@v/v1.19.0.mod -> github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!vivid!cortex/gohistogram/@v/v1.0.0.mod -> github.com%2F!vivid!cortex%2Fgohistogram%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/afex/hystrix-go/@v/v0.0.0-20180502004556-fa1af6a1f4f5.mod -> github.com%2Fafex%2Fhystrix-go%2F@v%2Fv0.0.0-20180502004556-fa1af6a1f4f5.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/apache/thrift/@v/v0.12.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/apache/thrift/@v/v0.13.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.0.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/aryann/difflib/@v/v0.0.0-20170710044230-e206f873d14a.mod -> github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.13.3.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.13.3.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.0.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.18.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/beevik/ntp/@v/v0.3.0.zip -> github.com%2Fbeevik%2Fntp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/beevik/ntp/@v/v0.3.0.mod -> github.com%2Fbeevik%2Fntp%2F@v%2Fv0.3.0.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/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/casbin/casbin/v2/@v/v2.1.2.mod -> github.com%2Fcasbin%2Fcasbin%2Fv2%2F@v%2Fv2.1.2.mod 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/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/clbanning/x2j/@v/v0.0.0-20191024224557-825249438eec.mod -> github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.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/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/codahale/hdrhistogram/@v/v0.0.0-20161010025455-3a0bb77429bd.mod -> github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.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-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.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/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.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/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.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/eapache/go-resiliency/@v/v1.1.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/edsrzf/mmap-go/@v/v1.0.0.mod -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ema/qdisc/@v/v0.0.0-20200603082823-62d0308e3e00.zip -> github.com%2Fema%2Fqdisc%2F@v%2Fv0.0.0-20200603082823-62d0308e3e00.zip mirror://goproxy//github.com/ema/qdisc/@v/v0.0.0-20200603082823-62d0308e3e00.mod -> github.com%2Fema%2Fqdisc%2F@v%2Fv0.0.0-20200603082823-62d0308e3e00.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.6.9.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.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/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/franela/goblin/@v/v0.0.0-20200105215937-c9ffbefa60db.mod -> github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod mirror://goproxy//github.com/franela/goreq/@v/v0.0.0-20171204163338-bcd34c9993f8.mod -> github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod 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/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.10.0.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.10.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190402143921-271e53dc4968.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190402143921-271e53dc4968.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190402143921-271e53dc4968.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190402143921-271e53dc4968.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.1.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip 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.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.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/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-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.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/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.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip 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.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 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.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.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/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.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.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/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 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.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.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/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.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.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod 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.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.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/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.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/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hodgesds/perf-utils/@v/v0.2.5.zip -> github.com%2Fhodgesds%2Fperf-utils%2F@v%2Fv0.2.5.zip mirror://goproxy//github.com/hodgesds/perf-utils/@v/v0.2.5.mod -> github.com%2Fhodgesds%2Fperf-utils%2F@v%2Fv0.2.5.mod 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/hudl/fargo/@v/v1.3.0.mod -> github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod 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/influxdata/influxdb1-client/@v/v0.0.0-20191209144304-8bf82d3c094d.mod -> github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/josharian/native/@v/v0.0.0-20200817173448-b6b71def0850.zip -> github.com%2Fjosharian%2Fnative%2F@v%2Fv0.0.0-20200817173448-b6b71def0850.zip mirror://goproxy//github.com/josharian/native/@v/v0.0.0-20200817173448-b6b71def0850.mod -> github.com%2Fjosharian%2Fnative%2F@v%2Fv0.0.0-20200817173448-b6b71def0850.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.zip -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190606172950-9527aa82566a.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190830100107-3784a6c7c552.zip -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190830100107-3784a6c7c552.zip mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190830100107-3784a6c7c552.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190830100107-3784a6c7c552.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.zip -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.zip mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201009170750-9c6f07d100c1.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201009170750-9c6f07d100c1.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201216134343-bde56ed16391.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201216134343-bde56ed16391.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201220180245-69540ac93943.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201220180245-69540ac93943.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210122163228-8d122574c736.zip -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210122163228-8d122574c736.zip mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210122163228-8d122574c736.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210122163228-8d122574c736.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.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/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.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/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.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.zip -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.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/lightstep/lightstep-tracer-common/golang/gogo/@v/v0.0.0-20190605223551-bc2310a04743.mod -> github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-go/@v/v0.18.1.mod -> github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod mirror://goproxy//github.com/lufia/iostat/@v/v1.1.0.zip -> github.com%2Flufia%2Fiostat%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/lufia/iostat/@v/v1.1.0.mod -> github.com%2Flufia%2Fiostat%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lyft/protoc-gen-validate/@v/v0.0.13.mod -> github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-xmlrpc/@v/v0.0.3.zip -> github.com%2Fmattn%2Fgo-xmlrpc%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/mattn/go-xmlrpc/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-xmlrpc%2F@v%2Fv0.0.3.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/mdlayher/genetlink/@v/v1.0.0.zip -> github.com%2Fmdlayher%2Fgenetlink%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mdlayher/genetlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fgenetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190409211403-11939a169225.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190828143259-340058475d09.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190828143259-340058475d09.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190828143259-340058475d09.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190828143259-340058475d09.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.0.0.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.1.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.1.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/mdlayher/wifi/@v/v0.0.0-20200527114002-84f0b9457fdd.zip -> github.com%2Fmdlayher%2Fwifi%2F@v%2Fv0.0.0-20200527114002-84f0b9457fdd.zip mirror://goproxy//github.com/mdlayher/wifi/@v/v0.0.0-20200527114002-84f0b9457fdd.mod -> github.com%2Fmdlayher%2Fwifi%2F@v%2Fv0.0.0-20200527114002-84f0b9457fdd.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.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/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.zip -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.zip mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.zip -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.zip mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.0.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.2.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/nats-io/nats-server/v2/@v/v2.1.2.mod -> github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/nats-io/nats.go/@v/v1.9.1.mod -> github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.0.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.3.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/nats-io/nuid/@v/v1.0.1.mod -> github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/oklog/oklog/@v/v0.3.2.mod -> github.com%2Foklog%2Foklog%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.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/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/opentracing-contrib/go-observer/@v/v0.0.0-20170622124052-a52f23424492.mod -> github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod mirror://goproxy//github.com/opentracing/basictracer-go/@v/v1.0.0.mod -> github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod 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/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/openzipkin-contrib/zipkin-go-opentracing/@v/v0.4.5.mod -> github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.6.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.2.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/pact-foundation/pact-go/@v/v1.0.4.mod -> github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/performancecopilot/speed/@v/v3.0.0+incompatible.mod -> github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v1.0.2-0.20190131084431-473cd7ce01a1.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.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.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/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3-0.20190127221311-3c4408c8b829.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.3.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.9.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.9.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.9.0.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-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.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/prometheus/client_model/@v/v0.1.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.15.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.15.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.15.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.15.0.mod mirror://goproxy//github.com/prometheus/exporter-toolkit/@v/v0.5.1.zip -> github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/prometheus/exporter-toolkit/@v/v0.5.1.mod -> github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190117184657-bf6a532e95b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20181016184325-3113b8401b8a.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.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/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/samuel/go-zookeeper/@v/v0.0.0-20190923202752-2cc03de413da.mod -> github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.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/siebenmann/go-kstat/@v/v0.0.0-20200303194639-4e8294f9e9d5.zip -> github.com%2Fsiebenmann%2Fgo-kstat%2F@v%2Fv0.0.0-20200303194639-4e8294f9e9d5.zip mirror://goproxy//github.com/siebenmann/go-kstat/@v/v0.0.0-20200303194639-4e8294f9e9d5.mod -> github.com%2Fsiebenmann%2Fgo-kstat%2F@v%2Fv0.0.0-20200303194639-4e8294f9e9d5.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.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.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/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/sony/gobreaker/@v/v0.4.1.mod -> github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/soundcloud/go-runit/@v/v0.0.0-20150630195641-06ad41a06c4a.zip -> github.com%2Fsoundcloud%2Fgo-runit%2F@v%2Fv0.0.0-20150630195641-06ad41a06c4a.zip mirror://goproxy//github.com/soundcloud/go-runit/@v/v0.0.0-20150630195641-06ad41a06c4a.mod -> github.com%2Fsoundcloud%2Fgo-runit%2F@v%2Fv0.0.0-20150630195641-06ad41a06c4a.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/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190404075320-75d898a42a94.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190827072141-edfb9018d271.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod mirror://goproxy//github.com/streadway/handy/@v/v0.0.0-20190108123426-d5acb3125c2a.mod -> github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.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.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip 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/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 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/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.opencensus.io/@v/v0.20.1.mod -> go.opencensus.io%2F@v%2Fv0.20.1.mod mirror://goproxy//go.opencensus.io/@v/v0.20.2.mod -> go.opencensus.io%2F@v%2Fv0.20.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.13.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.13.0.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-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.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-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.zip 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-20201208171446-5f87f3452ae9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201208171446-5f87f3452ae9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201208171446-5f87f3452ae9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201208171446-5f87f3452ae9.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-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-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip 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/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.1-0.20191105210325-c90efee705ee.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.zip 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/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-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.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-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.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-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-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.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-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191007182048-72f939374954.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191007182048-72f939374954.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip 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-20200625001655-4c5254603344.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.zip 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-20201010224723-4f7140c49acb.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201010224723-4f7140c49acb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201216054612-986b41b23924.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201216054612-986b41b23924.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.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/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.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.zip 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.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.zip 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/sync/@v/v0.0.0-20201207232520-09787c993a3a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.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-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181122145206-62eef0e2fa9b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.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-20190219203350-90b0e4468f99.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190219203350-90b0e4468f99.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-20190411185658-b44545bcd369.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190411185658-b44545bcd369.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-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-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190902133755-9109b7679e13.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190902133755-9109b7679e13.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190902133755-9109b7679e13.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190902133755-9109b7679e13.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.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-20191220142924-d4481acd189f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.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-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-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201009025420-dfb3f7c4e634.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201009025420-dfb3f7c4e634.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201118182958-a01c418693c7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201118182958-a01c418693c7.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-20201214210602-f9fddec55a1e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201214210602-f9fddec55a1e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201218084310-7d0127a74742.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201218084310-7d0127a74742.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210110051926-789bb1bd4061.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210110051926-789bb1bd4061.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210110051926-789bb1bd4061.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210110051926-789bb1bd4061.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.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/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/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 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-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.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-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-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-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-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-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200103221440-774c71fcf114.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.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.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 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//google.golang.org/api/@v/v0.3.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.1.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.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.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/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-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-20190530194941-fb225487d101.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.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/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.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.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.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.22.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.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.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.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/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.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 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-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.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/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.3.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.3.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 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/warnings.v0/@v/v0.1.2.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.zip 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.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 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.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.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//honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip 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//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/appdash/@v/v0.0.0-20190731080439-ebfcffb1b5c0.mod -> sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7500e89a62d0a62501fb2c9f8f2e1f79
+_md5_=f46dedbf98453f28815a501db13cb30e
diff --git a/metadata/md5-cache/app-metrics/node_exporter-1.2.0 b/metadata/md5-cache/app-metrics/node_exporter-1.2.0
index 2952ebd46ab5..1869b113f5cd 100644
--- a/metadata/md5-cache/app-metrics/node_exporter-1.2.0
+++ b/metadata/md5-cache/app-metrics/node_exporter-1.2.0
@@ -4,11 +4,11 @@ DEPEND=>=dev-util/promu-0.3.0 acct-group/node_exporter acct-user/node_exporter
 DESCRIPTION=Prometheus exporter for machine metrics
 EAPI=7
 HOMEPAGE=https://github.com/prometheus/node_exporter
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 BSD BSD-2 MIT
 RDEPEND=acct-group/node_exporter acct-user/node_exporter
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/node_exporter/archive/v1.2.0.tar.gz -> node_exporter-1.2.0.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//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/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/beevik/ntp/@v/v0.3.0.zip -> github.com%2Fbeevik%2Fntp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/beevik/ntp/@v/v0.3.0.mod -> github.com%2Fbeevik%2Fntp%2F@v%2Fv0.3.0.mod 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/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.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/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 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.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.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.5.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.6.2.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.6.2.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.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/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.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/ema/qdisc/@v/v0.0.0-20200603082823-62d0308e3e00.zip -> github.com%2Fema%2Fqdisc%2F@v%2Fv0.0.0-20200603082823-62d0308e3e00.zip mirror://goproxy//github.com/ema/qdisc/@v/v0.0.0-20200603082823-62d0308e3e00.mod -> github.com%2Fema%2Fqdisc%2F@v%2Fv0.0.0-20200603082823-62d0308e3e00.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/frankban/quicktest/@v/v1.11.3.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.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/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/log/@v/v0.1.0.zip -> github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/go-kit/log/@v/v0.1.0.mod -> github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190402143921-271e53dc4968.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190402143921-271e53dc4968.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190402143921-271e53dc4968.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190402143921-271e53dc4968.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/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.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.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.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod 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-cmp/@v/v0.5.6.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.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/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/hodgesds/perf-utils/@v/v0.2.5.zip -> github.com%2Fhodgesds%2Fperf-utils%2F@v%2Fv0.2.5.zip mirror://goproxy//github.com/hodgesds/perf-utils/@v/v0.2.5.mod -> github.com%2Fhodgesds%2Fperf-utils%2F@v%2Fv0.2.5.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/illumos/go-kstat/@v/v0.0.0-20210513183136-173c9b0a9973.zip -> github.com%2Fillumos%2Fgo-kstat%2F@v%2Fv0.0.0-20210513183136-173c9b0a9973.zip mirror://goproxy//github.com/illumos/go-kstat/@v/v0.0.0-20210513183136-173c9b0a9973.mod -> github.com%2Fillumos%2Fgo-kstat%2F@v%2Fv0.0.0-20210513183136-173c9b0a9973.mod mirror://goproxy//github.com/josharian/native/@v/v0.0.0-20200817173448-b6b71def0850.zip -> github.com%2Fjosharian%2Fnative%2F@v%2Fv0.0.0-20200817173448-b6b71def0850.zip mirror://goproxy//github.com/josharian/native/@v/v0.0.0-20200817173448-b6b71def0850.mod -> github.com%2Fjosharian%2Fnative%2F@v%2Fv0.0.0-20200817173448-b6b71def0850.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.zip -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190606172950-9527aa82566a.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190830100107-3784a6c7c552.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190830100107-3784a6c7c552.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201009170750-9c6f07d100c1.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201009170750-9c6f07d100c1.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201216134343-bde56ed16391.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201216134343-bde56ed16391.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201220180245-69540ac93943.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201220180245-69540ac93943.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210122163228-8d122574c736.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210122163228-8d122574c736.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210212075122-66c871082f2b.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210212075122-66c871082f2b.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210525051524-4cc836578190.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210525051524-4cc836578190.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210713125558-2bfdf1dbdbd6.zip -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210713125558-2bfdf1dbdbd6.zip mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210713125558-2bfdf1dbdbd6.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210713125558-2bfdf1dbdbd6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.11.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.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/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.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.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.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.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/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.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/lufia/iostat/@v/v1.1.0.zip -> github.com%2Flufia%2Fiostat%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/lufia/iostat/@v/v1.1.0.mod -> github.com%2Flufia%2Fiostat%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mattn/go-xmlrpc/@v/v0.0.3.zip -> github.com%2Fmattn%2Fgo-xmlrpc%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/mattn/go-xmlrpc/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-xmlrpc%2F@v%2Fv0.0.3.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/mdlayher/ethtool/@v/v0.0.0-20210210192532-2b88debcdd43.zip -> github.com%2Fmdlayher%2Fethtool%2F@v%2Fv0.0.0-20210210192532-2b88debcdd43.zip mirror://goproxy//github.com/mdlayher/ethtool/@v/v0.0.0-20210210192532-2b88debcdd43.mod -> github.com%2Fmdlayher%2Fethtool%2F@v%2Fv0.0.0-20210210192532-2b88debcdd43.mod mirror://goproxy//github.com/mdlayher/genetlink/@v/v1.0.0.zip -> github.com%2Fmdlayher%2Fgenetlink%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mdlayher/genetlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fgenetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190409211403-11939a169225.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190828143259-340058475d09.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190828143259-340058475d09.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.2-0.20210123213345-5cc92139ae3e.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.2-0.20210123213345-5cc92139ae3e.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.3.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.4.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.4.1.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v1.4.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/mdlayher/socket/@v/v0.0.0-20210307095302-262dc9984e00.zip -> github.com%2Fmdlayher%2Fsocket%2F@v%2Fv0.0.0-20210307095302-262dc9984e00.zip mirror://goproxy//github.com/mdlayher/socket/@v/v0.0.0-20210307095302-262dc9984e00.mod -> github.com%2Fmdlayher%2Fsocket%2F@v%2Fv0.0.0-20210307095302-262dc9984e00.mod mirror://goproxy//github.com/mdlayher/wifi/@v/v0.0.0-20200527114002-84f0b9457fdd.zip -> github.com%2Fmdlayher%2Fwifi%2F@v%2Fv0.0.0-20200527114002-84f0b9457fdd.zip mirror://goproxy//github.com/mdlayher/wifi/@v/v0.0.0-20200527114002-84f0b9457fdd.mod -> github.com%2Fmdlayher%2Fwifi%2F@v%2Fv0.0.0-20200527114002-84f0b9457fdd.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.zip -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.zip mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.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.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_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod 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-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.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/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.26.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.29.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.29.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.29.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.29.0.mod mirror://goproxy//github.com/prometheus/exporter-toolkit/@v/v0.6.0.zip -> github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/exporter-toolkit/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.7.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.7.0.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/safchain/ethtool/@v/v0.0.0-20201023143004-874930cb3ce0.zip -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20201023143004-874930cb3ce0.zip mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20201023143004-874930cb3ce0.mod -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20201023143004-874930cb3ce0.mod mirror://goproxy//github.com/siebenmann/go-kstat/@v/v0.0.0-20210513183136-173c9b0a9973.zip -> github.com%2Fsiebenmann%2Fgo-kstat%2F@v%2Fv0.0.0-20210513183136-173c9b0a9973.zip mirror://goproxy//github.com/siebenmann/go-kstat/@v/v0.0.0-20210513183136-173c9b0a9973.mod -> github.com%2Fsiebenmann%2Fgo-kstat%2F@v%2Fv0.0.0-20210513183136-173c9b0a9973.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 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.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/soundcloud/go-runit/@v/v0.0.0-20150630195641-06ad41a06c4a.zip -> github.com%2Fsoundcloud%2Fgo-runit%2F@v%2Fv0.0.0-20150630195641-06ad41a06c4a.zip mirror://goproxy//github.com/soundcloud/go-runit/@v/v0.0.0-20150630195641-06ad41a06c4a.mod -> github.com%2Fsoundcloud%2Fgo-runit%2F@v%2Fv0.0.0-20150630195641-06ad41a06c4a.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.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.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.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/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//go.uber.org/atomic/@v/v1.7.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.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-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-20210616213533-5ff15b29337e.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210616213533-5ff15b29337e.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.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-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.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-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.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-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191007182048-72f939374954.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.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-20201010224723-4f7140c49acb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201216054612-986b41b23924.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201216054612-986b41b23924.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.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-20210525063256-abc453219eb5.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210525063256-abc453219eb5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.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-20210514164344-f6687ab2804c.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210514164344-f6687ab2804c.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.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/sync/@v/v0.0.0-20201207232520-09787c993a3a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.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-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.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-20190219203350-90b0e4468f99.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190219203350-90b0e4468f99.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-20190411185658-b44545bcd369.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190411185658-b44545bcd369.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-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-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190902133755-9109b7679e13.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190902133755-9109b7679e13.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-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.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-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.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-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-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.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-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201009025420-dfb3f7c4e634.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201009025420-dfb3f7c4e634.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201118182958-a01c418693c7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201118182958-a01c418693c7.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-20201218084310-7d0127a74742.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201218084310-7d0127a74742.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210110051926-789bb1bd4061.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210110051926-789bb1bd4061.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210123111255-9b0068b26619.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210123111255-9b0068b26619.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210216163648-f7da38b97c65.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210216163648-f7da38b97c65.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210525143221-35b2ab0089ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210525143221-35b2ab0089ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210603081109-ebe580a85c40.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.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/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/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.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-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.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.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-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.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.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.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.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/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	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fbd81601adf9a5917c8060b93939dc34
+_md5_=25a1092e329a9431066c0b2c91e1f235
diff --git a/metadata/md5-cache/app-metrics/node_exporter-1.2.2 b/metadata/md5-cache/app-metrics/node_exporter-1.2.2
index 383b550124a9..32586cd8f76e 100644
--- a/metadata/md5-cache/app-metrics/node_exporter-1.2.2
+++ b/metadata/md5-cache/app-metrics/node_exporter-1.2.2
@@ -4,11 +4,11 @@ DEPEND=>=dev-util/promu-0.3.0 acct-group/node_exporter acct-user/node_exporter
 DESCRIPTION=Prometheus exporter for machine metrics
 EAPI=7
 HOMEPAGE=https://github.com/prometheus/node_exporter
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 BSD BSD-2 MIT
 RDEPEND=acct-group/node_exporter acct-user/node_exporter
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/node_exporter/archive/v1.2.2.tar.gz -> node_exporter-1.2.2.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//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/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/beevik/ntp/@v/v0.3.0.zip -> github.com%2Fbeevik%2Fntp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/beevik/ntp/@v/v0.3.0.mod -> github.com%2Fbeevik%2Fntp%2F@v%2Fv0.3.0.mod 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/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.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/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 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.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.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.5.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.6.2.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.6.2.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.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/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.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/ema/qdisc/@v/v0.0.0-20200603082823-62d0308e3e00.zip -> github.com%2Fema%2Fqdisc%2F@v%2Fv0.0.0-20200603082823-62d0308e3e00.zip mirror://goproxy//github.com/ema/qdisc/@v/v0.0.0-20200603082823-62d0308e3e00.mod -> github.com%2Fema%2Fqdisc%2F@v%2Fv0.0.0-20200603082823-62d0308e3e00.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/frankban/quicktest/@v/v1.11.3.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.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/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/log/@v/v0.1.0.zip -> github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/go-kit/log/@v/v0.1.0.mod -> github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190402143921-271e53dc4968.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190402143921-271e53dc4968.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190402143921-271e53dc4968.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190402143921-271e53dc4968.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/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.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.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.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod 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-cmp/@v/v0.5.6.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.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/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/hodgesds/perf-utils/@v/v0.2.5.zip -> github.com%2Fhodgesds%2Fperf-utils%2F@v%2Fv0.2.5.zip mirror://goproxy//github.com/hodgesds/perf-utils/@v/v0.2.5.mod -> github.com%2Fhodgesds%2Fperf-utils%2F@v%2Fv0.2.5.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/illumos/go-kstat/@v/v0.0.0-20210513183136-173c9b0a9973.zip -> github.com%2Fillumos%2Fgo-kstat%2F@v%2Fv0.0.0-20210513183136-173c9b0a9973.zip mirror://goproxy//github.com/illumos/go-kstat/@v/v0.0.0-20210513183136-173c9b0a9973.mod -> github.com%2Fillumos%2Fgo-kstat%2F@v%2Fv0.0.0-20210513183136-173c9b0a9973.mod mirror://goproxy//github.com/josharian/native/@v/v0.0.0-20200817173448-b6b71def0850.zip -> github.com%2Fjosharian%2Fnative%2F@v%2Fv0.0.0-20200817173448-b6b71def0850.zip mirror://goproxy//github.com/josharian/native/@v/v0.0.0-20200817173448-b6b71def0850.mod -> github.com%2Fjosharian%2Fnative%2F@v%2Fv0.0.0-20200817173448-b6b71def0850.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.zip -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190606172950-9527aa82566a.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190830100107-3784a6c7c552.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190830100107-3784a6c7c552.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201009170750-9c6f07d100c1.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201009170750-9c6f07d100c1.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201216134343-bde56ed16391.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201216134343-bde56ed16391.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201220180245-69540ac93943.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201220180245-69540ac93943.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210122163228-8d122574c736.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210122163228-8d122574c736.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210212075122-66c871082f2b.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210212075122-66c871082f2b.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210525051524-4cc836578190.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210525051524-4cc836578190.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210713125558-2bfdf1dbdbd6.zip -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210713125558-2bfdf1dbdbd6.zip mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210713125558-2bfdf1dbdbd6.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210713125558-2bfdf1dbdbd6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.11.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.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/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.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.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.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.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/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.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/lufia/iostat/@v/v1.1.0.zip -> github.com%2Flufia%2Fiostat%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/lufia/iostat/@v/v1.1.0.mod -> github.com%2Flufia%2Fiostat%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mattn/go-xmlrpc/@v/v0.0.3.zip -> github.com%2Fmattn%2Fgo-xmlrpc%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/mattn/go-xmlrpc/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-xmlrpc%2F@v%2Fv0.0.3.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/mdlayher/ethtool/@v/v0.0.0-20210210192532-2b88debcdd43.zip -> github.com%2Fmdlayher%2Fethtool%2F@v%2Fv0.0.0-20210210192532-2b88debcdd43.zip mirror://goproxy//github.com/mdlayher/ethtool/@v/v0.0.0-20210210192532-2b88debcdd43.mod -> github.com%2Fmdlayher%2Fethtool%2F@v%2Fv0.0.0-20210210192532-2b88debcdd43.mod mirror://goproxy//github.com/mdlayher/genetlink/@v/v1.0.0.zip -> github.com%2Fmdlayher%2Fgenetlink%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mdlayher/genetlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fgenetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190409211403-11939a169225.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190828143259-340058475d09.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190828143259-340058475d09.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.2-0.20210123213345-5cc92139ae3e.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.2-0.20210123213345-5cc92139ae3e.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.3.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.4.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.4.1.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v1.4.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/mdlayher/socket/@v/v0.0.0-20210307095302-262dc9984e00.zip -> github.com%2Fmdlayher%2Fsocket%2F@v%2Fv0.0.0-20210307095302-262dc9984e00.zip mirror://goproxy//github.com/mdlayher/socket/@v/v0.0.0-20210307095302-262dc9984e00.mod -> github.com%2Fmdlayher%2Fsocket%2F@v%2Fv0.0.0-20210307095302-262dc9984e00.mod mirror://goproxy//github.com/mdlayher/wifi/@v/v0.0.0-20200527114002-84f0b9457fdd.zip -> github.com%2Fmdlayher%2Fwifi%2F@v%2Fv0.0.0-20200527114002-84f0b9457fdd.zip mirror://goproxy//github.com/mdlayher/wifi/@v/v0.0.0-20200527114002-84f0b9457fdd.mod -> github.com%2Fmdlayher%2Fwifi%2F@v%2Fv0.0.0-20200527114002-84f0b9457fdd.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.zip -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.zip mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.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.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_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod 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-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.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/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.26.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.29.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.29.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.29.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.29.0.mod mirror://goproxy//github.com/prometheus/exporter-toolkit/@v/v0.6.0.zip -> github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/exporter-toolkit/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.7.2.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.7.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.7.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.7.2.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/safchain/ethtool/@v/v0.0.0-20201023143004-874930cb3ce0.zip -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20201023143004-874930cb3ce0.zip mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20201023143004-874930cb3ce0.mod -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20201023143004-874930cb3ce0.mod mirror://goproxy//github.com/siebenmann/go-kstat/@v/v0.0.0-20210513183136-173c9b0a9973.zip -> github.com%2Fsiebenmann%2Fgo-kstat%2F@v%2Fv0.0.0-20210513183136-173c9b0a9973.zip mirror://goproxy//github.com/siebenmann/go-kstat/@v/v0.0.0-20210513183136-173c9b0a9973.mod -> github.com%2Fsiebenmann%2Fgo-kstat%2F@v%2Fv0.0.0-20210513183136-173c9b0a9973.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 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.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/soundcloud/go-runit/@v/v0.0.0-20150630195641-06ad41a06c4a.zip -> github.com%2Fsoundcloud%2Fgo-runit%2F@v%2Fv0.0.0-20150630195641-06ad41a06c4a.zip mirror://goproxy//github.com/soundcloud/go-runit/@v/v0.0.0-20150630195641-06ad41a06c4a.mod -> github.com%2Fsoundcloud%2Fgo-runit%2F@v%2Fv0.0.0-20150630195641-06ad41a06c4a.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.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.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.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/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//go.uber.org/atomic/@v/v1.7.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.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-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-20210616213533-5ff15b29337e.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210616213533-5ff15b29337e.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.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-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.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-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.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-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191007182048-72f939374954.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.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-20201010224723-4f7140c49acb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201216054612-986b41b23924.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201216054612-986b41b23924.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.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-20210525063256-abc453219eb5.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210525063256-abc453219eb5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.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-20210514164344-f6687ab2804c.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210514164344-f6687ab2804c.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.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/sync/@v/v0.0.0-20201207232520-09787c993a3a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.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-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.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-20190219203350-90b0e4468f99.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190219203350-90b0e4468f99.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-20190411185658-b44545bcd369.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190411185658-b44545bcd369.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-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-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190902133755-9109b7679e13.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190902133755-9109b7679e13.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-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.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-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.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-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-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.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-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201009025420-dfb3f7c4e634.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201009025420-dfb3f7c4e634.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201118182958-a01c418693c7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201118182958-a01c418693c7.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-20201218084310-7d0127a74742.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201218084310-7d0127a74742.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210110051926-789bb1bd4061.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210110051926-789bb1bd4061.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210123111255-9b0068b26619.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210123111255-9b0068b26619.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210216163648-f7da38b97c65.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210216163648-f7da38b97c65.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210525143221-35b2ab0089ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210525143221-35b2ab0089ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210603081109-ebe580a85c40.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.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/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/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.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-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.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.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-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.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.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.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.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/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	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=36f27e374b091f2148389f640d93b883
+_md5_=c58989f9ffd4f19e0365151d08a9f0bd
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index bdeaf5770e33..bf7d1a6d0564 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2 b/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
index e53bf020370e..9c7a55ff5fd2 100644
--- a/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
+++ b/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Inputlirc daemon to utilize /dev/input/event*
 EAPI=6
 HOMEPAGE=https://github.com/ferdinandhuebner/inputlirc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://gentooexperimental.org/~genstef/dist/inputlircd-0.0.1_pre15.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=d82bf4d240f1e3312099333f5459f241
+_md5_=dfb58400dcb1a33f65864193c06dcbd0
diff --git a/metadata/md5-cache/app-misc/jq-1.7_pre20201109 b/metadata/md5-cache/app-misc/jq-1.7_pre20201109
index 358a0c80d67a..9a23a4f56a5a 100644
--- a/metadata/md5-cache/app-misc/jq-1.7_pre20201109
+++ b/metadata/md5-cache/app-misc/jq-1.7_pre20201109
@@ -5,7 +5,7 @@ DESCRIPTION=A lightweight and flexible command-line JSON processor
 EAPI=7
 HOMEPAGE=https://stedolan.github.io/jq/
 IUSE=+oniguruma static-libs test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x64-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos
 LICENSE=MIT CC-BY-3.0
 RDEPEND=!static-libs? ( oniguruma? ( >=dev-libs/oniguruma-6.1.3[static-libs?] ) )
 REQUIRED_USE=test? ( oniguruma )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stedolan/jq/archive/a17dd3248a666d01be75f6b16be37e80e20b0954.tar.gz -> jq-1.7_pre20201109.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dc1d6e08349840e0f0f94a935172b52e
+_md5_=ec6a9eaabb4e6fcc6ed4cbba355f9bd1
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index cd90bebb3bab..c561139a9485 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/scribus-9999 b/metadata/md5-cache/app-office/scribus-9999
index c65330fab21f..400641f42313 100644
--- a/metadata/md5-cache/app-office/scribus-9999
+++ b/metadata/md5-cache/app-office/scribus-9999
@@ -11,4 +11,4 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/py
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) tk? ( scripts )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	subversion	c500a1b7795f44153bd96fc2597e3c05	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8c4bd0c944199aaaa499901dd8e49633
+_md5_=9789ff883c32c703f14f62642a27f747
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index 692ccb0103fc..e901db3b49c8 100644
--- a/metadata/md5-cache/app-pda/Manifest.gz
+++ b/metadata/md5-cache/app-pda/Manifest.gz
diff --git a/metadata/md5-cache/app-pda/libimobiledevice-1.3.0-r1 b/metadata/md5-cache/app-pda/libimobiledevice-1.3.0-r1
index 24ad080c1761..25f8b7521f57 100644
--- a/metadata/md5-cache/app-pda/libimobiledevice-1.3.0-r1
+++ b/metadata/md5-cache/app-pda/libimobiledevice-1.3.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Support library to communicate with Apple iPhone/iPod Touch devices
 EAPI=7
 HOMEPAGE=https://www.libimobiledevice.org/
 IUSE=doc gnutls python static-libs python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=app-pda/libplist-2.2.0:= >=app-pda/libusbmuxd-2.0.2:= gnutls? ( dev-libs/libgcrypt:0 >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( dev-libs/openssl:0= ) python? ( 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(-)?] app-pda/libplist[python(-),python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0/1.0-6
 SRC_URI=https://github.com/libimobiledevice/libimobiledevice/releases/download/1.3.0/libimobiledevice-1.3.0.tar.bz2
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9759d5200f15ebe5456dda76c9213878
+_md5_=02f9cf51b12fad7460480bd223cdb657
diff --git a/metadata/md5-cache/app-pda/libplist-2.2.0-r3 b/metadata/md5-cache/app-pda/libplist-2.2.0-r3
index e756b716d8f4..e1464cb36657 100644
--- a/metadata/md5-cache/app-pda/libplist-2.2.0-r3
+++ b/metadata/md5-cache/app-pda/libplist-2.2.0-r3
@@ -5,11 +5,11 @@ DESCRIPTION=Support library to deal with Apple Property Lists (Binary & XML)
 EAPI=7
 HOMEPAGE=https://www.libimobiledevice.org/
 IUSE=python python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=python? ( 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(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0/2.0-3
 SRC_URI=https://cgit.libimobiledevice.org/libplist.git/snapshot/libplist-2.2.0.tar.bz2
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7bfe147bd820804c21912e512c059833
+_md5_=0e4e6644c3a74a4efb620bb86620236a
diff --git a/metadata/md5-cache/app-pda/libusbmuxd-2.0.2-r1 b/metadata/md5-cache/app-pda/libusbmuxd-2.0.2-r1
index dc5ea2be149c..59d980dd0613 100644
--- a/metadata/md5-cache/app-pda/libusbmuxd-2.0.2-r1
+++ b/metadata/md5-cache/app-pda/libusbmuxd-2.0.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=USB multiplex daemon for use with Apple iPhone/iPod Touch devices
 EAPI=7
 HOMEPAGE=https://www.libimobiledevice.org/
 IUSE=static-libs
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=app-pda/libplist-2.2.0:=
 SLOT=0/2.0-6
 SRC_URI=https://cgit.libimobiledevice.org/libusbmuxd.git/snapshot/libusbmuxd-2.0.2.tar.bz2
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5db5ab023ec444b140f04fc7e3102fd5
+_md5_=b27eacb118324fdc31a254f0d7baa6f7
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index b93a74b77931..f2416052b2c6 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/deltup-0.4.6-r1 b/metadata/md5-cache/app-portage/deltup-0.4.6-r1
deleted file mode 100644
index ef5ed6a8ff6f..000000000000
--- a/metadata/md5-cache/app-portage/deltup-0.4.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-libs/zlib app-arch/bzip2 dev-libs/openssl:0=
-DESCRIPTION=Delta-Update - patch system for updating source-archives.
-EAPI=6
-HOMEPAGE=http://deltup.sourceforge.net
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib app-arch/bzip2 dev-libs/openssl:0= || ( dev-util/bdelta =dev-util/xdelta-1* )
-SLOT=0
-SRC_URI=https://github.com/jjwhitney/Deltup/archive/v0.4.6.tar.gz -> deltup-0.4.6.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d1e3653c63ddff395285d38e52a38a07
diff --git a/metadata/md5-cache/app-portage/getdelta-0.7.9-r2 b/metadata/md5-cache/app-portage/getdelta-0.7.9-r2
deleted file mode 100644
index 661872abd6ab..000000000000
--- a/metadata/md5-cache/app-portage/getdelta-0.7.9-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=dynamic deltup client
-EAPI=5
-HOMEPAGE=http://linux01.gwdg.de/~nlissne/
-KEYWORDS=~alpha ~amd64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=app-portage/deltup dev-util/bdelta
-SLOT=0
-SRC_URI=http://linux01.gwdg.de/~nlissne/getdelta-0.7.8.tar.bz2
-_eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56
-_md5_=99b49220d90f9e8146b75b6afc543621
diff --git a/metadata/md5-cache/app-portage/iwdevtools-0.2.0 b/metadata/md5-cache/app-portage/iwdevtools-0.2.0
new file mode 100644
index 000000000000..c808696cf566
--- /dev/null
+++ b/metadata/md5-cache/app-portage/iwdevtools-0.2.0
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst test
+DESCRIPTION=Small tools to aid with Gentoo development, primarily intended for QA
+EAPI=8
+HOMEPAGE=https://github.com/ionenwks/iwdevtools
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=app-misc/pax-utils app-portage/portage-utils sys-apps/diffutils sys-apps/file sys-apps/portage sys-apps/util-linux
+SLOT=0
+SRC_URI=https://github.com/ionenwks/iwdevtools/archive/refs/tags/v0.2.0.tar.gz -> iwdevtools-0.2.0.tar.gz
+_eclasses_=meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7ab946958a9beb872ee19e9bcdc53d3f
diff --git a/metadata/md5-cache/app-portage/iwdevtools-0.3.1 b/metadata/md5-cache/app-portage/iwdevtools-0.3.1
new file mode 100644
index 000000000000..0eecc54cfeae
--- /dev/null
+++ b/metadata/md5-cache/app-portage/iwdevtools-0.3.1
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst test
+DESCRIPTION=Small tools to aid with Gentoo development, primarily intended for QA
+EAPI=8
+HOMEPAGE=https://github.com/ionenwks/iwdevtools
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=app-misc/pax-utils app-portage/portage-utils sys-apps/diffutils sys-apps/file sys-apps/portage sys-apps/util-linux
+SLOT=0
+SRC_URI=https://github.com/ionenwks/iwdevtools/archive/refs/tags/v0.3.1.tar.gz -> iwdevtools-0.3.1.tar.gz
+_eclasses_=meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7ab946958a9beb872ee19e9bcdc53d3f
diff --git a/metadata/md5-cache/app-portage/iwdevtools-9999 b/metadata/md5-cache/app-portage/iwdevtools-9999
index 36633cfb5470..79f5f6515d2d 100644
--- a/metadata/md5-cache/app-portage/iwdevtools-9999
+++ b/metadata/md5-cache/app-portage/iwdevtools-9999
@@ -7,5 +7,5 @@ LICENSE=BSD-2
 PROPERTIES=live
 RDEPEND=app-misc/pax-utils app-portage/portage-utils sys-apps/diffutils sys-apps/file sys-apps/portage sys-apps/util-linux
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7643ddd50c2b9329441aef2deecba4eb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4154f43f42ac945622cde785c3d66834
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index edfe8a0cc6f6..0d5c494603e8 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/bibutils-6.10 b/metadata/md5-cache/app-text/bibutils-6.10
index fe0b29f164cb..1c0bcf03fcba 100644
--- a/metadata/md5-cache/app-text/bibutils-6.10
+++ b/metadata/md5-cache/app-text/bibutils-6.10
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Interconverts between various bibliography formats using common XML intermediate
 EAPI=7
 HOMEPAGE=https://sourceforge.net/p/bibutils/home/Bibutils/
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/bibutils/bibutils_6.10_src.tgz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8e5d37832b460d1e47dcdc2d4440d9be
+_md5_=5ec48b7d3debb66c2f91b1b11dc19ca3
diff --git a/metadata/md5-cache/app-text/catdoc-0.95-r1 b/metadata/md5-cache/app-text/catdoc-0.95-r1
index b38a154b4435..ab0803e33714 100644
--- a/metadata/md5-cache/app-text/catdoc-0.95-r1
+++ b/metadata/md5-cache/app-text/catdoc-0.95-r1
@@ -8,4 +8,4 @@ KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://ftp.wagner.pp.ru/pub/catdoc/catdoc-0.95.tar.gz
-_md5_=18989dbaba713bf157db872cd5a6829b
+_md5_=321f2652aa821d534b25ab61489b046c
diff --git a/metadata/md5-cache/app-text/dblatex-0.3.12 b/metadata/md5-cache/app-text/dblatex-0.3.12
index add08249d223..e2511e1573f5 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.12
+++ b/metadata/md5-cache/app-text/dblatex-0.3.12
@@ -5,11 +5,11 @@ DESCRIPTION=Transform DocBook using TeX macros
 EAPI=7
 HOMEPAGE=http://dblatex.sourceforge.net/
 IUSE=inkscape python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs/libxslt dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-xetex gnome-base/librsvg media-gfx/imagemagick media-gfx/transfig inkscape? ( media-gfx/inkscape ) 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(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/dblatex/dblatex/dblatex-0.3.12/dblatex3-0.3.12.tar.bz2
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=73a8d931a70cebce25903a912cdbd83d
+_md5_=a563165cd41fcf27506e02e1cd293a19
diff --git a/metadata/md5-cache/app-text/lout-3.40 b/metadata/md5-cache/app-text/lout-3.40
deleted file mode 100644
index 92b1a611268a..000000000000
--- a/metadata/md5-cache/app-text/lout-3.40
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=zlib? ( >=sys-libs/zlib-1.1.4 )
-DESCRIPTION=High-level language for document formatting
-EAPI=6
-HOMEPAGE=http://savannah.nongnu.org/projects/lout
-IUSE=zlib doc
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3+
-RDEPEND=zlib? ( >=sys-libs/zlib-1.1.4 )
-SLOT=0
-SRC_URI=mirror://nongnu/lout/lout-3.40.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6c3fccf23539419d0446f52ff2935a8f
diff --git a/metadata/md5-cache/app-text/pinfo-0.6.13 b/metadata/md5-cache/app-text/pinfo-0.6.13
index 839ada9ea797..47d05fd88b3f 100644
--- a/metadata/md5-cache/app-text/pinfo-0.6.13
+++ b/metadata/md5-cache/app-text/pinfo-0.6.13
@@ -5,10 +5,10 @@ DESCRIPTION=Hypertext info and man viewer based on (n)curses
 EAPI=7
 HOMEPAGE=https://github.com/baszoetekouw/pinfo
 IUSE=nls readline
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://github.com/baszoetekouw/pinfo/archive/v0.6.13.tar.gz -> pinfo-0.6.13.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9180cbc717aced305ef05a9127c743b2
+_md5_=3e096e2d304721e437c1f95ab08a533b
diff --git a/metadata/md5-cache/app-text/tessdata_best-4.1.0 b/metadata/md5-cache/app-text/tessdata_best-4.1.0
index efd517b357e5..299ad206b84a 100644
--- a/metadata/md5-cache/app-text/tessdata_best-4.1.0
+++ b/metadata/md5-cache/app-text/tessdata_best-4.1.0
@@ -4,9 +4,9 @@ DESCRIPTION=Most accurate trained models for app-text/tesseract
 EAPI=7
 HOMEPAGE=https://github.com/tesseract-ocr/tessdata_best
 IUSE=+osd l10n_af l10n_am l10n_ar l10n_as l10n_az l10n_be l10n_bg l10n_bn l10n_bo l10n_br l10n_bs l10n_ca l10n_ceb l10n_chr l10n_co l10n_cs l10n_cy l10n_da l10n_de l10n_dv l10n_dz l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fil l10n_fo l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_ht l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_iu l10n_ja l10n_jv l10n_ka l10n_kk l10n_km l10n_kmr-Latn l10n_kn l10n_ko l10n_ky l10n_la l10n_lb l10n_lo l10n_lt l10n_lv l10n_mi l10n_mk l10n_ml l10n_mn l10n_mr l10n_ms l10n_mt l10n_my l10n_ne l10n_nl l10n_no l10n_oc l10n_or l10n_pa l10n_pl l10n_ps l10n_pt l10n_qu l10n_ro l10n_ru l10n_sa l10n_sd l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_su l10n_sv l10n_sw l10n_syc l10n_ta l10n_te l10n_tg l10n_th l10n_ti l10n_to l10n_tr l10n_tt l10n_ug l10n_uk l10n_ur l10n_uz l10n_vi l10n_yi l10n_yo l10n_zh
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=!app-text/tessdata_fast !app-text/tessdata_legacy !<app-text/tesseract-4.1.0
 SLOT=0
 SRC_URI=https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/eng.traineddata -> eng.traineddata-tessdata_best-4.1.0 osd? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/osd.traineddata -> osd.traineddata-tessdata_best-4.1.0 ) l10n_af? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/afr.traineddata -> afr.traineddata-tessdata_best-4.1.0 ) l10n_am? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/amh.traineddata -> amh.traineddata-tessdata_best-4.1.0 ) l10n_ar? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/ara.traineddata -> ara.traineddata-tessdata_best-4.1.0 ) l10n_as? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/asm.traineddata -> asm.traineddata-tessdata_best-4.1.0 ) l10n_az? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/aze.traineddata -> aze.traineddata-tessdata_best-4.1.0 ) l10n_az? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/aze_cyrl.traineddata -> aze_cyrl.traineddata-tessdata_best-4.1.0 ) l10n_be? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/bel.traineddata -> bel.traineddata-tessdata_best-4.1.0 ) l10n_bg? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/bul.traineddata -> bul.traineddata-tessdata_best-4.1.0 ) l10n_bn? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/ben.traineddata -> ben.traineddata-tessdata_best-4.1.0 ) l10n_bo? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/bod.traineddata -> bod.traineddata-tessdata_best-4.1.0 ) l10n_br? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/bre.traineddata -> bre.traineddata-tessdata_best-4.1.0 ) l10n_bs? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/bos.traineddata -> bos.traineddata-tessdata_best-4.1.0 ) l10n_ca? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/cat.traineddata -> cat.traineddata-tessdata_best-4.1.0 ) l10n_ceb? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/ceb.traineddata -> ceb.traineddata-tessdata_best-4.1.0 ) l10n_chr? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/chr.traineddata -> chr.traineddata-tessdata_best-4.1.0 ) l10n_co? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/cos.traineddata -> cos.traineddata-tessdata_best-4.1.0 ) l10n_cs? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/ces.traineddata -> ces.traineddata-tessdata_best-4.1.0 ) l10n_cy? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/cym.traineddata -> cym.traineddata-tessdata_best-4.1.0 ) l10n_da? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/dan.traineddata -> dan.traineddata-tessdata_best-4.1.0 ) l10n_de? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/deu.traineddata -> deu.traineddata-tessdata_best-4.1.0 ) l10n_de? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/frk.traineddata -> frk.traineddata-tessdata_best-4.1.0 ) l10n_dv? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/div.traineddata -> div.traineddata-tessdata_best-4.1.0 ) l10n_dz? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/dzo.traineddata -> dzo.traineddata-tessdata_best-4.1.0 ) l10n_el? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/ell.traineddata -> ell.traineddata-tessdata_best-4.1.0 ) l10n_el? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/grc.traineddata -> grc.traineddata-tessdata_best-4.1.0 ) l10n_en? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/enm.traineddata -> enm.traineddata-tessdata_best-4.1.0 ) l10n_eo? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/epo.traineddata -> epo.traineddata-tessdata_best-4.1.0 ) l10n_es? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/spa.traineddata -> spa.traineddata-tessdata_best-4.1.0 ) l10n_es? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/spa_old.traineddata -> spa_old.traineddata-tessdata_best-4.1.0 ) l10n_et? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/est.traineddata -> est.traineddata-tessdata_best-4.1.0 ) l10n_eu? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/eus.traineddata -> eus.traineddata-tessdata_best-4.1.0 ) l10n_fa? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/fas.traineddata -> fas.traineddata-tessdata_best-4.1.0 ) l10n_fi? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/fin.traineddata -> fin.traineddata-tessdata_best-4.1.0 ) l10n_fil? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/fil.traineddata -> fil.traineddata-tessdata_best-4.1.0 ) l10n_fo? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/fao.traineddata -> fao.traineddata-tessdata_best-4.1.0 ) l10n_fr? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/fra.traineddata -> fra.traineddata-tessdata_best-4.1.0 ) l10n_fr? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/frm.traineddata -> frm.traineddata-tessdata_best-4.1.0 ) l10n_fy? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/fry.traineddata -> fry.traineddata-tessdata_best-4.1.0 ) l10n_ga? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/gle.traineddata -> gle.traineddata-tessdata_best-4.1.0 ) l10n_gd? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/gla.traineddata -> gla.traineddata-tessdata_best-4.1.0 ) l10n_gl? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/glg.traineddata -> glg.traineddata-tessdata_best-4.1.0 ) l10n_gu? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/guj.traineddata -> guj.traineddata-tessdata_best-4.1.0 ) l10n_he? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/heb.traineddata -> heb.traineddata-tessdata_best-4.1.0 ) l10n_hi? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/hin.traineddata -> hin.traineddata-tessdata_best-4.1.0 ) l10n_hr? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/hrv.traineddata -> hrv.traineddata-tessdata_best-4.1.0 ) l10n_ht? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/hat.traineddata -> hat.traineddata-tessdata_best-4.1.0 ) l10n_hu? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/hun.traineddata -> hun.traineddata-tessdata_best-4.1.0 ) l10n_hy? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/hye.traineddata -> hye.traineddata-tessdata_best-4.1.0 ) l10n_id? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/ind.traineddata -> ind.traineddata-tessdata_best-4.1.0 ) l10n_is? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/isl.traineddata -> isl.traineddata-tessdata_best-4.1.0 ) l10n_it? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/ita.traineddata -> ita.traineddata-tessdata_best-4.1.0 ) l10n_it? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/ita_old.traineddata -> ita_old.traineddata-tessdata_best-4.1.0 ) l10n_iu? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/iku.traineddata -> iku.traineddata-tessdata_best-4.1.0 ) l10n_ja? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/jpn.traineddata -> jpn.traineddata-tessdata_best-4.1.0 ) l10n_ja? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/jpn_vert.traineddata -> jpn_vert.traineddata-tessdata_best-4.1.0 ) l10n_jv? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/jav.traineddata -> jav.traineddata-tessdata_best-4.1.0 ) l10n_ka? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/kat.traineddata -> kat.traineddata-tessdata_best-4.1.0 ) l10n_ka? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/kat_old.traineddata -> kat_old.traineddata-tessdata_best-4.1.0 ) l10n_kk? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/kaz.traineddata -> kaz.traineddata-tessdata_best-4.1.0 ) l10n_km? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/khm.traineddata -> khm.traineddata-tessdata_best-4.1.0 ) l10n_kmr-Latn? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/kmr.traineddata -> kmr.traineddata-tessdata_best-4.1.0 ) l10n_kn? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/kan.traineddata -> kan.traineddata-tessdata_best-4.1.0 ) l10n_ko? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/kor.traineddata -> kor.traineddata-tessdata_best-4.1.0 ) l10n_ko? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/kor_vert.traineddata -> kor_vert.traineddata-tessdata_best-4.1.0 ) l10n_ky? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/kir.traineddata -> kir.traineddata-tessdata_best-4.1.0 ) l10n_la? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/lat.traineddata -> lat.traineddata-tessdata_best-4.1.0 ) l10n_lb? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/ltz.traineddata -> ltz.traineddata-tessdata_best-4.1.0 ) l10n_lo? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/lao.traineddata -> lao.traineddata-tessdata_best-4.1.0 ) l10n_lt? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/lit.traineddata -> lit.traineddata-tessdata_best-4.1.0 ) l10n_lv? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/lav.traineddata -> lav.traineddata-tessdata_best-4.1.0 ) l10n_mi? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/mri.traineddata -> mri.traineddata-tessdata_best-4.1.0 ) l10n_mk? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/mkd.traineddata -> mkd.traineddata-tessdata_best-4.1.0 ) l10n_ml? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/mal.traineddata -> mal.traineddata-tessdata_best-4.1.0 ) l10n_mn? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/mon.traineddata -> mon.traineddata-tessdata_best-4.1.0 ) l10n_mr? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/mar.traineddata -> mar.traineddata-tessdata_best-4.1.0 ) l10n_ms? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/msa.traineddata -> msa.traineddata-tessdata_best-4.1.0 ) l10n_mt? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/mlt.traineddata -> mlt.traineddata-tessdata_best-4.1.0 ) l10n_my? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/mya.traineddata -> mya.traineddata-tessdata_best-4.1.0 ) l10n_ne? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/nep.traineddata -> nep.traineddata-tessdata_best-4.1.0 ) l10n_nl? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/nld.traineddata -> nld.traineddata-tessdata_best-4.1.0 ) l10n_no? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/nor.traineddata -> nor.traineddata-tessdata_best-4.1.0 ) l10n_oc? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/oci.traineddata -> oci.traineddata-tessdata_best-4.1.0 ) l10n_or? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/ori.traineddata -> ori.traineddata-tessdata_best-4.1.0 ) l10n_pa? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/pan.traineddata -> pan.traineddata-tessdata_best-4.1.0 ) l10n_pl? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/pol.traineddata -> pol.traineddata-tessdata_best-4.1.0 ) l10n_ps? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/pus.traineddata -> pus.traineddata-tessdata_best-4.1.0 ) l10n_pt? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/por.traineddata -> por.traineddata-tessdata_best-4.1.0 ) l10n_qu? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/que.traineddata -> que.traineddata-tessdata_best-4.1.0 ) l10n_ro? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/ron.traineddata -> ron.traineddata-tessdata_best-4.1.0 ) l10n_ru? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/rus.traineddata -> rus.traineddata-tessdata_best-4.1.0 ) l10n_sa? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/san.traineddata -> san.traineddata-tessdata_best-4.1.0 ) l10n_sd? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/snd.traineddata -> snd.traineddata-tessdata_best-4.1.0 ) l10n_si? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/sin.traineddata -> sin.traineddata-tessdata_best-4.1.0 ) l10n_sk? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/slk.traineddata -> slk.traineddata-tessdata_best-4.1.0 ) l10n_sl? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/slv.traineddata -> slv.traineddata-tessdata_best-4.1.0 ) l10n_sq? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/sqi.traineddata -> sqi.traineddata-tessdata_best-4.1.0 ) l10n_sr? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/srp.traineddata -> srp.traineddata-tessdata_best-4.1.0 ) l10n_sr? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/srp_latn.traineddata -> srp_latn.traineddata-tessdata_best-4.1.0 ) l10n_su? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/sun.traineddata -> sun.traineddata-tessdata_best-4.1.0 ) l10n_sv? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/swe.traineddata -> swe.traineddata-tessdata_best-4.1.0 ) l10n_sw? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/swa.traineddata -> swa.traineddata-tessdata_best-4.1.0 ) l10n_syc? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/syr.traineddata -> syr.traineddata-tessdata_best-4.1.0 ) l10n_ta? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/tam.traineddata -> tam.traineddata-tessdata_best-4.1.0 ) l10n_te? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/tel.traineddata -> tel.traineddata-tessdata_best-4.1.0 ) l10n_tg? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/tgk.traineddata -> tgk.traineddata-tessdata_best-4.1.0 ) l10n_th? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/tha.traineddata -> tha.traineddata-tessdata_best-4.1.0 ) l10n_ti? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/tir.traineddata -> tir.traineddata-tessdata_best-4.1.0 ) l10n_to? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/ton.traineddata -> ton.traineddata-tessdata_best-4.1.0 ) l10n_tr? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/tur.traineddata -> tur.traineddata-tessdata_best-4.1.0 ) l10n_tt? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/tat.traineddata -> tat.traineddata-tessdata_best-4.1.0 ) l10n_ug? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/uig.traineddata -> uig.traineddata-tessdata_best-4.1.0 ) l10n_uk? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/ukr.traineddata -> ukr.traineddata-tessdata_best-4.1.0 ) l10n_ur? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/urd.traineddata -> urd.traineddata-tessdata_best-4.1.0 ) l10n_uz? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/uzb.traineddata -> uzb.traineddata-tessdata_best-4.1.0 ) l10n_uz? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/uzb_cyrl.traineddata -> uzb_cyrl.traineddata-tessdata_best-4.1.0 ) l10n_vi? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/vie.traineddata -> vie.traineddata-tessdata_best-4.1.0 ) l10n_yi? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/yid.traineddata -> yid.traineddata-tessdata_best-4.1.0 ) l10n_yo? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/yor.traineddata -> yor.traineddata-tessdata_best-4.1.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/chi_sim.traineddata -> chi_sim.traineddata-tessdata_best-4.1.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/chi_sim_vert.traineddata -> chi_sim_vert.traineddata-tessdata_best-4.1.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/chi_tra.traineddata -> chi_tra.traineddata-tessdata_best-4.1.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.1.0/chi_tra_vert.traineddata -> chi_tra_vert.traineddata-tessdata_best-4.1.0 )
-_md5_=12e44fa21cf3c5faa0db7f204fb1a8b1
+_md5_=82ad35638d4fd86531e6edc628339090
diff --git a/metadata/md5-cache/app-text/tessdata_fast-4.1.0 b/metadata/md5-cache/app-text/tessdata_fast-4.1.0
index 194d6adf65dc..ddb35f4c6ab3 100644
--- a/metadata/md5-cache/app-text/tessdata_fast-4.1.0
+++ b/metadata/md5-cache/app-text/tessdata_fast-4.1.0
@@ -4,9 +4,9 @@ DESCRIPTION=Fast integer versions of trained models for app-text/tesseract
 EAPI=7
 HOMEPAGE=https://github.com/tesseract-ocr/tessdata_fast
 IUSE=+osd l10n_af l10n_am l10n_ar l10n_as l10n_az l10n_be l10n_bg l10n_bn l10n_bo l10n_br l10n_bs l10n_ca l10n_ceb l10n_chr l10n_co l10n_cs l10n_cy l10n_da l10n_de l10n_dv l10n_dz l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fil l10n_fo l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_ht l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_iu l10n_ja l10n_jv l10n_ka l10n_kk l10n_km l10n_kmr-Latn l10n_kn l10n_ko l10n_ky l10n_la l10n_lb l10n_lo l10n_lt l10n_lv l10n_mi l10n_mk l10n_ml l10n_mn l10n_mr l10n_ms l10n_mt l10n_my l10n_ne l10n_nl l10n_no l10n_oc l10n_or l10n_pa l10n_pl l10n_ps l10n_pt l10n_qu l10n_ro l10n_ru l10n_sa l10n_sd l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_su l10n_sv l10n_sw l10n_syc l10n_ta l10n_te l10n_tg l10n_th l10n_ti l10n_to l10n_tr l10n_tt l10n_ug l10n_uk l10n_ur l10n_uz l10n_vi l10n_yi l10n_yo l10n_zh
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=!app-text/tessdata_best !app-text/tessdata_legacy !<app-text/tesseract-4.1.0
 SLOT=0
 SRC_URI=https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/eng.traineddata -> eng.traineddata-tessdata_fast-4.1.0 osd? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/osd.traineddata -> osd.traineddata-tessdata_fast-4.1.0 ) l10n_af? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/afr.traineddata -> afr.traineddata-tessdata_fast-4.1.0 ) l10n_am? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/amh.traineddata -> amh.traineddata-tessdata_fast-4.1.0 ) l10n_ar? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/ara.traineddata -> ara.traineddata-tessdata_fast-4.1.0 ) l10n_as? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/asm.traineddata -> asm.traineddata-tessdata_fast-4.1.0 ) l10n_az? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/aze.traineddata -> aze.traineddata-tessdata_fast-4.1.0 ) l10n_az? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/aze_cyrl.traineddata -> aze_cyrl.traineddata-tessdata_fast-4.1.0 ) l10n_be? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/bel.traineddata -> bel.traineddata-tessdata_fast-4.1.0 ) l10n_bg? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/bul.traineddata -> bul.traineddata-tessdata_fast-4.1.0 ) l10n_bn? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/ben.traineddata -> ben.traineddata-tessdata_fast-4.1.0 ) l10n_bo? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/bod.traineddata -> bod.traineddata-tessdata_fast-4.1.0 ) l10n_br? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/bre.traineddata -> bre.traineddata-tessdata_fast-4.1.0 ) l10n_bs? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/bos.traineddata -> bos.traineddata-tessdata_fast-4.1.0 ) l10n_ca? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/cat.traineddata -> cat.traineddata-tessdata_fast-4.1.0 ) l10n_ceb? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/ceb.traineddata -> ceb.traineddata-tessdata_fast-4.1.0 ) l10n_chr? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/chr.traineddata -> chr.traineddata-tessdata_fast-4.1.0 ) l10n_co? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/cos.traineddata -> cos.traineddata-tessdata_fast-4.1.0 ) l10n_cs? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/ces.traineddata -> ces.traineddata-tessdata_fast-4.1.0 ) l10n_cy? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/cym.traineddata -> cym.traineddata-tessdata_fast-4.1.0 ) l10n_da? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/dan.traineddata -> dan.traineddata-tessdata_fast-4.1.0 ) l10n_de? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/deu.traineddata -> deu.traineddata-tessdata_fast-4.1.0 ) l10n_de? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/frk.traineddata -> frk.traineddata-tessdata_fast-4.1.0 ) l10n_dv? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/div.traineddata -> div.traineddata-tessdata_fast-4.1.0 ) l10n_dz? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/dzo.traineddata -> dzo.traineddata-tessdata_fast-4.1.0 ) l10n_el? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/ell.traineddata -> ell.traineddata-tessdata_fast-4.1.0 ) l10n_el? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/grc.traineddata -> grc.traineddata-tessdata_fast-4.1.0 ) l10n_en? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/enm.traineddata -> enm.traineddata-tessdata_fast-4.1.0 ) l10n_eo? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/epo.traineddata -> epo.traineddata-tessdata_fast-4.1.0 ) l10n_es? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/spa.traineddata -> spa.traineddata-tessdata_fast-4.1.0 ) l10n_es? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/spa_old.traineddata -> spa_old.traineddata-tessdata_fast-4.1.0 ) l10n_et? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/est.traineddata -> est.traineddata-tessdata_fast-4.1.0 ) l10n_eu? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/eus.traineddata -> eus.traineddata-tessdata_fast-4.1.0 ) l10n_fa? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/fas.traineddata -> fas.traineddata-tessdata_fast-4.1.0 ) l10n_fi? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/fin.traineddata -> fin.traineddata-tessdata_fast-4.1.0 ) l10n_fil? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/fil.traineddata -> fil.traineddata-tessdata_fast-4.1.0 ) l10n_fo? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/fao.traineddata -> fao.traineddata-tessdata_fast-4.1.0 ) l10n_fr? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/fra.traineddata -> fra.traineddata-tessdata_fast-4.1.0 ) l10n_fr? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/frm.traineddata -> frm.traineddata-tessdata_fast-4.1.0 ) l10n_fy? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/fry.traineddata -> fry.traineddata-tessdata_fast-4.1.0 ) l10n_ga? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/gle.traineddata -> gle.traineddata-tessdata_fast-4.1.0 ) l10n_gd? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/gla.traineddata -> gla.traineddata-tessdata_fast-4.1.0 ) l10n_gl? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/glg.traineddata -> glg.traineddata-tessdata_fast-4.1.0 ) l10n_gu? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/guj.traineddata -> guj.traineddata-tessdata_fast-4.1.0 ) l10n_he? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/heb.traineddata -> heb.traineddata-tessdata_fast-4.1.0 ) l10n_hi? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/hin.traineddata -> hin.traineddata-tessdata_fast-4.1.0 ) l10n_hr? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/hrv.traineddata -> hrv.traineddata-tessdata_fast-4.1.0 ) l10n_ht? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/hat.traineddata -> hat.traineddata-tessdata_fast-4.1.0 ) l10n_hu? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/hun.traineddata -> hun.traineddata-tessdata_fast-4.1.0 ) l10n_hy? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/hye.traineddata -> hye.traineddata-tessdata_fast-4.1.0 ) l10n_id? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/ind.traineddata -> ind.traineddata-tessdata_fast-4.1.0 ) l10n_is? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/isl.traineddata -> isl.traineddata-tessdata_fast-4.1.0 ) l10n_it? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/ita.traineddata -> ita.traineddata-tessdata_fast-4.1.0 ) l10n_it? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/ita_old.traineddata -> ita_old.traineddata-tessdata_fast-4.1.0 ) l10n_iu? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/iku.traineddata -> iku.traineddata-tessdata_fast-4.1.0 ) l10n_ja? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/jpn.traineddata -> jpn.traineddata-tessdata_fast-4.1.0 ) l10n_ja? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/jpn_vert.traineddata -> jpn_vert.traineddata-tessdata_fast-4.1.0 ) l10n_jv? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/jav.traineddata -> jav.traineddata-tessdata_fast-4.1.0 ) l10n_ka? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/kat.traineddata -> kat.traineddata-tessdata_fast-4.1.0 ) l10n_ka? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/kat_old.traineddata -> kat_old.traineddata-tessdata_fast-4.1.0 ) l10n_kk? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/kaz.traineddata -> kaz.traineddata-tessdata_fast-4.1.0 ) l10n_km? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/khm.traineddata -> khm.traineddata-tessdata_fast-4.1.0 ) l10n_kmr-Latn? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/kmr.traineddata -> kmr.traineddata-tessdata_fast-4.1.0 ) l10n_kn? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/kan.traineddata -> kan.traineddata-tessdata_fast-4.1.0 ) l10n_ko? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/kor.traineddata -> kor.traineddata-tessdata_fast-4.1.0 ) l10n_ko? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/kor_vert.traineddata -> kor_vert.traineddata-tessdata_fast-4.1.0 ) l10n_ky? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/kir.traineddata -> kir.traineddata-tessdata_fast-4.1.0 ) l10n_la? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/lat.traineddata -> lat.traineddata-tessdata_fast-4.1.0 ) l10n_lb? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/ltz.traineddata -> ltz.traineddata-tessdata_fast-4.1.0 ) l10n_lo? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/lao.traineddata -> lao.traineddata-tessdata_fast-4.1.0 ) l10n_lt? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/lit.traineddata -> lit.traineddata-tessdata_fast-4.1.0 ) l10n_lv? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/lav.traineddata -> lav.traineddata-tessdata_fast-4.1.0 ) l10n_mi? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/mri.traineddata -> mri.traineddata-tessdata_fast-4.1.0 ) l10n_mk? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/mkd.traineddata -> mkd.traineddata-tessdata_fast-4.1.0 ) l10n_ml? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/mal.traineddata -> mal.traineddata-tessdata_fast-4.1.0 ) l10n_mn? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/mon.traineddata -> mon.traineddata-tessdata_fast-4.1.0 ) l10n_mr? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/mar.traineddata -> mar.traineddata-tessdata_fast-4.1.0 ) l10n_ms? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/msa.traineddata -> msa.traineddata-tessdata_fast-4.1.0 ) l10n_mt? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/mlt.traineddata -> mlt.traineddata-tessdata_fast-4.1.0 ) l10n_my? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/mya.traineddata -> mya.traineddata-tessdata_fast-4.1.0 ) l10n_ne? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/nep.traineddata -> nep.traineddata-tessdata_fast-4.1.0 ) l10n_nl? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/nld.traineddata -> nld.traineddata-tessdata_fast-4.1.0 ) l10n_no? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/nor.traineddata -> nor.traineddata-tessdata_fast-4.1.0 ) l10n_oc? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/oci.traineddata -> oci.traineddata-tessdata_fast-4.1.0 ) l10n_or? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/ori.traineddata -> ori.traineddata-tessdata_fast-4.1.0 ) l10n_pa? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/pan.traineddata -> pan.traineddata-tessdata_fast-4.1.0 ) l10n_pl? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/pol.traineddata -> pol.traineddata-tessdata_fast-4.1.0 ) l10n_ps? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/pus.traineddata -> pus.traineddata-tessdata_fast-4.1.0 ) l10n_pt? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/por.traineddata -> por.traineddata-tessdata_fast-4.1.0 ) l10n_qu? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/que.traineddata -> que.traineddata-tessdata_fast-4.1.0 ) l10n_ro? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/ron.traineddata -> ron.traineddata-tessdata_fast-4.1.0 ) l10n_ru? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/rus.traineddata -> rus.traineddata-tessdata_fast-4.1.0 ) l10n_sa? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/san.traineddata -> san.traineddata-tessdata_fast-4.1.0 ) l10n_sd? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/snd.traineddata -> snd.traineddata-tessdata_fast-4.1.0 ) l10n_si? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/sin.traineddata -> sin.traineddata-tessdata_fast-4.1.0 ) l10n_sk? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/slk.traineddata -> slk.traineddata-tessdata_fast-4.1.0 ) l10n_sl? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/slv.traineddata -> slv.traineddata-tessdata_fast-4.1.0 ) l10n_sq? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/sqi.traineddata -> sqi.traineddata-tessdata_fast-4.1.0 ) l10n_sr? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/srp.traineddata -> srp.traineddata-tessdata_fast-4.1.0 ) l10n_sr? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/srp_latn.traineddata -> srp_latn.traineddata-tessdata_fast-4.1.0 ) l10n_su? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/sun.traineddata -> sun.traineddata-tessdata_fast-4.1.0 ) l10n_sv? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/swe.traineddata -> swe.traineddata-tessdata_fast-4.1.0 ) l10n_sw? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/swa.traineddata -> swa.traineddata-tessdata_fast-4.1.0 ) l10n_syc? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/syr.traineddata -> syr.traineddata-tessdata_fast-4.1.0 ) l10n_ta? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/tam.traineddata -> tam.traineddata-tessdata_fast-4.1.0 ) l10n_te? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/tel.traineddata -> tel.traineddata-tessdata_fast-4.1.0 ) l10n_tg? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/tgk.traineddata -> tgk.traineddata-tessdata_fast-4.1.0 ) l10n_th? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/tha.traineddata -> tha.traineddata-tessdata_fast-4.1.0 ) l10n_ti? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/tir.traineddata -> tir.traineddata-tessdata_fast-4.1.0 ) l10n_to? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/ton.traineddata -> ton.traineddata-tessdata_fast-4.1.0 ) l10n_tr? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/tur.traineddata -> tur.traineddata-tessdata_fast-4.1.0 ) l10n_tt? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/tat.traineddata -> tat.traineddata-tessdata_fast-4.1.0 ) l10n_ug? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/uig.traineddata -> uig.traineddata-tessdata_fast-4.1.0 ) l10n_uk? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/ukr.traineddata -> ukr.traineddata-tessdata_fast-4.1.0 ) l10n_ur? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/urd.traineddata -> urd.traineddata-tessdata_fast-4.1.0 ) l10n_uz? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/uzb.traineddata -> uzb.traineddata-tessdata_fast-4.1.0 ) l10n_uz? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/uzb_cyrl.traineddata -> uzb_cyrl.traineddata-tessdata_fast-4.1.0 ) l10n_vi? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/vie.traineddata -> vie.traineddata-tessdata_fast-4.1.0 ) l10n_yi? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/yid.traineddata -> yid.traineddata-tessdata_fast-4.1.0 ) l10n_yo? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/yor.traineddata -> yor.traineddata-tessdata_fast-4.1.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/chi_sim.traineddata -> chi_sim.traineddata-tessdata_fast-4.1.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/chi_sim_vert.traineddata -> chi_sim_vert.traineddata-tessdata_fast-4.1.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/chi_tra.traineddata -> chi_tra.traineddata-tessdata_fast-4.1.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.1.0/chi_tra_vert.traineddata -> chi_tra_vert.traineddata-tessdata_fast-4.1.0 )
-_md5_=ebc77084dc6b9993119bfa9dc5cc5fca
+_md5_=c8cfbf605d4472c4b84f02bb0b446b6e
diff --git a/metadata/md5-cache/app-text/tessdata_legacy-4.1.0 b/metadata/md5-cache/app-text/tessdata_legacy-4.1.0
index 135b44c638e4..068f1c417c3d 100644
--- a/metadata/md5-cache/app-text/tessdata_legacy-4.1.0
+++ b/metadata/md5-cache/app-text/tessdata_legacy-4.1.0
@@ -4,9 +4,9 @@ DESCRIPTION=Trained models for app-text/tesseract compatible with the legacy eng
 EAPI=7
 HOMEPAGE=https://github.com/tesseract-ocr/tessdata
 IUSE=math osd l10n_af l10n_am l10n_ar l10n_as l10n_az l10n_be l10n_bg l10n_bn l10n_bo l10n_br l10n_bs l10n_ca l10n_ceb l10n_chr l10n_co l10n_cs l10n_cy l10n_da l10n_de l10n_dv l10n_dz l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fil l10n_fo l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_ht l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_iu l10n_ja l10n_jv l10n_ka l10n_kk l10n_km l10n_kn l10n_ko l10n_ku l10n_ky l10n_la l10n_lb l10n_lo l10n_lt l10n_lv l10n_mi l10n_mk l10n_ml l10n_mn l10n_mr l10n_ms l10n_mt l10n_my l10n_ne l10n_nl l10n_no l10n_oc l10n_or l10n_pa l10n_pl l10n_ps l10n_pt l10n_qu l10n_ro l10n_ru l10n_sa l10n_sd l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_su l10n_sv l10n_sw l10n_syc l10n_ta l10n_te l10n_tg l10n_th l10n_ti l10n_tl l10n_to l10n_tr l10n_tt l10n_ug l10n_uk l10n_ur l10n_uz l10n_vi l10n_yi l10n_yo l10n_zh
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=!app-text/tessdata_best !app-text/tessdata_fast !<app-text/tesseract-4.1.0
 SLOT=0
 SRC_URI=https://github.com/tesseract-ocr/tessdata/raw/4.1.0/eng.traineddata -> eng.traineddata-tessdata_legacy-4.1.0 math? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/equ.traineddata -> equ.traineddata-tessdata_legacy-4.1.0 ) osd? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/osd.traineddata -> osd.traineddata-tessdata_legacy-4.1.0 ) l10n_af? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/afr.traineddata -> afr.traineddata-tessdata_legacy-4.1.0 ) l10n_am? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/amh.traineddata -> amh.traineddata-tessdata_legacy-4.1.0 ) l10n_ar? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/ara.traineddata -> ara.traineddata-tessdata_legacy-4.1.0 ) l10n_as? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/asm.traineddata -> asm.traineddata-tessdata_legacy-4.1.0 ) l10n_az? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/aze.traineddata -> aze.traineddata-tessdata_legacy-4.1.0 ) l10n_az? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/aze_cyrl.traineddata -> aze_cyrl.traineddata-tessdata_legacy-4.1.0 ) l10n_be? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/bel.traineddata -> bel.traineddata-tessdata_legacy-4.1.0 ) l10n_bg? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/bul.traineddata -> bul.traineddata-tessdata_legacy-4.1.0 ) l10n_bn? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/ben.traineddata -> ben.traineddata-tessdata_legacy-4.1.0 ) l10n_bo? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/bod.traineddata -> bod.traineddata-tessdata_legacy-4.1.0 ) l10n_br? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/bre.traineddata -> bre.traineddata-tessdata_legacy-4.1.0 ) l10n_bs? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/bos.traineddata -> bos.traineddata-tessdata_legacy-4.1.0 ) l10n_ca? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/cat.traineddata -> cat.traineddata-tessdata_legacy-4.1.0 ) l10n_ceb? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/ceb.traineddata -> ceb.traineddata-tessdata_legacy-4.1.0 ) l10n_chr? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/chr.traineddata -> chr.traineddata-tessdata_legacy-4.1.0 ) l10n_co? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/cos.traineddata -> cos.traineddata-tessdata_legacy-4.1.0 ) l10n_cs? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/ces.traineddata -> ces.traineddata-tessdata_legacy-4.1.0 ) l10n_cy? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/cym.traineddata -> cym.traineddata-tessdata_legacy-4.1.0 ) l10n_da? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/dan.traineddata -> dan.traineddata-tessdata_legacy-4.1.0 ) l10n_de? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/deu.traineddata -> deu.traineddata-tessdata_legacy-4.1.0 ) l10n_de? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/frk.traineddata -> frk.traineddata-tessdata_legacy-4.1.0 ) l10n_dv? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/div.traineddata -> div.traineddata-tessdata_legacy-4.1.0 ) l10n_dz? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/dzo.traineddata -> dzo.traineddata-tessdata_legacy-4.1.0 ) l10n_el? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/ell.traineddata -> ell.traineddata-tessdata_legacy-4.1.0 ) l10n_el? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/grc.traineddata -> grc.traineddata-tessdata_legacy-4.1.0 ) l10n_en? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/enm.traineddata -> enm.traineddata-tessdata_legacy-4.1.0 ) l10n_eo? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/epo.traineddata -> epo.traineddata-tessdata_legacy-4.1.0 ) l10n_es? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/spa.traineddata -> spa.traineddata-tessdata_legacy-4.1.0 ) l10n_es? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/spa_old.traineddata -> spa_old.traineddata-tessdata_legacy-4.1.0 ) l10n_et? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/est.traineddata -> est.traineddata-tessdata_legacy-4.1.0 ) l10n_eu? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/eus.traineddata -> eus.traineddata-tessdata_legacy-4.1.0 ) l10n_fa? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/fas.traineddata -> fas.traineddata-tessdata_legacy-4.1.0 ) l10n_fi? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/fin.traineddata -> fin.traineddata-tessdata_legacy-4.1.0 ) l10n_fil? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/fil.traineddata -> fil.traineddata-tessdata_legacy-4.1.0 ) l10n_fo? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/fao.traineddata -> fao.traineddata-tessdata_legacy-4.1.0 ) l10n_fr? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/fra.traineddata -> fra.traineddata-tessdata_legacy-4.1.0 ) l10n_fr? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/frm.traineddata -> frm.traineddata-tessdata_legacy-4.1.0 ) l10n_fy? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/fry.traineddata -> fry.traineddata-tessdata_legacy-4.1.0 ) l10n_ga? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/gle.traineddata -> gle.traineddata-tessdata_legacy-4.1.0 ) l10n_gd? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/gla.traineddata -> gla.traineddata-tessdata_legacy-4.1.0 ) l10n_gl? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/glg.traineddata -> glg.traineddata-tessdata_legacy-4.1.0 ) l10n_gu? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/guj.traineddata -> guj.traineddata-tessdata_legacy-4.1.0 ) l10n_he? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/heb.traineddata -> heb.traineddata-tessdata_legacy-4.1.0 ) l10n_hi? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/hin.traineddata -> hin.traineddata-tessdata_legacy-4.1.0 ) l10n_hr? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/hrv.traineddata -> hrv.traineddata-tessdata_legacy-4.1.0 ) l10n_ht? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/hat.traineddata -> hat.traineddata-tessdata_legacy-4.1.0 ) l10n_hu? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/hun.traineddata -> hun.traineddata-tessdata_legacy-4.1.0 ) l10n_hy? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/hye.traineddata -> hye.traineddata-tessdata_legacy-4.1.0 ) l10n_id? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/ind.traineddata -> ind.traineddata-tessdata_legacy-4.1.0 ) l10n_is? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/isl.traineddata -> isl.traineddata-tessdata_legacy-4.1.0 ) l10n_it? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/ita.traineddata -> ita.traineddata-tessdata_legacy-4.1.0 ) l10n_it? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/ita_old.traineddata -> ita_old.traineddata-tessdata_legacy-4.1.0 ) l10n_iu? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/iku.traineddata -> iku.traineddata-tessdata_legacy-4.1.0 ) l10n_ja? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/jpn.traineddata -> jpn.traineddata-tessdata_legacy-4.1.0 ) l10n_ja? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/jpn_vert.traineddata -> jpn_vert.traineddata-tessdata_legacy-4.1.0 ) l10n_jv? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/jav.traineddata -> jav.traineddata-tessdata_legacy-4.1.0 ) l10n_ka? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/kat.traineddata -> kat.traineddata-tessdata_legacy-4.1.0 ) l10n_ka? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/kat_old.traineddata -> kat_old.traineddata-tessdata_legacy-4.1.0 ) l10n_kk? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/kaz.traineddata -> kaz.traineddata-tessdata_legacy-4.1.0 ) l10n_km? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/khm.traineddata -> khm.traineddata-tessdata_legacy-4.1.0 ) l10n_kn? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/kan.traineddata -> kan.traineddata-tessdata_legacy-4.1.0 ) l10n_ko? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/kor.traineddata -> kor.traineddata-tessdata_legacy-4.1.0 ) l10n_ko? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/kor_vert.traineddata -> kor_vert.traineddata-tessdata_legacy-4.1.0 ) l10n_ku? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/kmr.traineddata -> kmr.traineddata-tessdata_legacy-4.1.0 ) l10n_ky? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/kir.traineddata -> kir.traineddata-tessdata_legacy-4.1.0 ) l10n_la? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/lat.traineddata -> lat.traineddata-tessdata_legacy-4.1.0 ) l10n_lb? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/ltz.traineddata -> ltz.traineddata-tessdata_legacy-4.1.0 ) l10n_lo? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/lao.traineddata -> lao.traineddata-tessdata_legacy-4.1.0 ) l10n_lt? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/lit.traineddata -> lit.traineddata-tessdata_legacy-4.1.0 ) l10n_lv? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/lav.traineddata -> lav.traineddata-tessdata_legacy-4.1.0 ) l10n_mi? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/mri.traineddata -> mri.traineddata-tessdata_legacy-4.1.0 ) l10n_mk? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/mkd.traineddata -> mkd.traineddata-tessdata_legacy-4.1.0 ) l10n_ml? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/mal.traineddata -> mal.traineddata-tessdata_legacy-4.1.0 ) l10n_mn? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/mon.traineddata -> mon.traineddata-tessdata_legacy-4.1.0 ) l10n_mr? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/mar.traineddata -> mar.traineddata-tessdata_legacy-4.1.0 ) l10n_ms? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/msa.traineddata -> msa.traineddata-tessdata_legacy-4.1.0 ) l10n_mt? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/mlt.traineddata -> mlt.traineddata-tessdata_legacy-4.1.0 ) l10n_my? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/mya.traineddata -> mya.traineddata-tessdata_legacy-4.1.0 ) l10n_ne? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/nep.traineddata -> nep.traineddata-tessdata_legacy-4.1.0 ) l10n_nl? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/nld.traineddata -> nld.traineddata-tessdata_legacy-4.1.0 ) l10n_no? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/nor.traineddata -> nor.traineddata-tessdata_legacy-4.1.0 ) l10n_oc? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/oci.traineddata -> oci.traineddata-tessdata_legacy-4.1.0 ) l10n_or? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/ori.traineddata -> ori.traineddata-tessdata_legacy-4.1.0 ) l10n_pa? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/pan.traineddata -> pan.traineddata-tessdata_legacy-4.1.0 ) l10n_pl? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/pol.traineddata -> pol.traineddata-tessdata_legacy-4.1.0 ) l10n_ps? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/pus.traineddata -> pus.traineddata-tessdata_legacy-4.1.0 ) l10n_pt? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/por.traineddata -> por.traineddata-tessdata_legacy-4.1.0 ) l10n_qu? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/que.traineddata -> que.traineddata-tessdata_legacy-4.1.0 ) l10n_ro? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/ron.traineddata -> ron.traineddata-tessdata_legacy-4.1.0 ) l10n_ru? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/rus.traineddata -> rus.traineddata-tessdata_legacy-4.1.0 ) l10n_sa? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/san.traineddata -> san.traineddata-tessdata_legacy-4.1.0 ) l10n_sd? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/snd.traineddata -> snd.traineddata-tessdata_legacy-4.1.0 ) l10n_si? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/sin.traineddata -> sin.traineddata-tessdata_legacy-4.1.0 ) l10n_sk? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/slk.traineddata -> slk.traineddata-tessdata_legacy-4.1.0 ) l10n_sl? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/slv.traineddata -> slv.traineddata-tessdata_legacy-4.1.0 ) l10n_sq? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/sqi.traineddata -> sqi.traineddata-tessdata_legacy-4.1.0 ) l10n_sr? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/srp.traineddata -> srp.traineddata-tessdata_legacy-4.1.0 ) l10n_sr? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/srp_latn.traineddata -> srp_latn.traineddata-tessdata_legacy-4.1.0 ) l10n_su? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/sun.traineddata -> sun.traineddata-tessdata_legacy-4.1.0 ) l10n_sv? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/swe.traineddata -> swe.traineddata-tessdata_legacy-4.1.0 ) l10n_sw? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/swa.traineddata -> swa.traineddata-tessdata_legacy-4.1.0 ) l10n_syc? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/syr.traineddata -> syr.traineddata-tessdata_legacy-4.1.0 ) l10n_ta? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/tam.traineddata -> tam.traineddata-tessdata_legacy-4.1.0 ) l10n_te? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/tel.traineddata -> tel.traineddata-tessdata_legacy-4.1.0 ) l10n_tg? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/tgk.traineddata -> tgk.traineddata-tessdata_legacy-4.1.0 ) l10n_th? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/tha.traineddata -> tha.traineddata-tessdata_legacy-4.1.0 ) l10n_ti? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/tir.traineddata -> tir.traineddata-tessdata_legacy-4.1.0 ) l10n_tl? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/tgl.traineddata -> tgl.traineddata-tessdata_legacy-4.1.0 ) l10n_to? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/ton.traineddata -> ton.traineddata-tessdata_legacy-4.1.0 ) l10n_tr? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/tur.traineddata -> tur.traineddata-tessdata_legacy-4.1.0 ) l10n_tt? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/tat.traineddata -> tat.traineddata-tessdata_legacy-4.1.0 ) l10n_ug? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/uig.traineddata -> uig.traineddata-tessdata_legacy-4.1.0 ) l10n_uk? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/ukr.traineddata -> ukr.traineddata-tessdata_legacy-4.1.0 ) l10n_ur? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/urd.traineddata -> urd.traineddata-tessdata_legacy-4.1.0 ) l10n_uz? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/uzb.traineddata -> uzb.traineddata-tessdata_legacy-4.1.0 ) l10n_uz? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/uzb_cyrl.traineddata -> uzb_cyrl.traineddata-tessdata_legacy-4.1.0 ) l10n_vi? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/vie.traineddata -> vie.traineddata-tessdata_legacy-4.1.0 ) l10n_yi? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/yid.traineddata -> yid.traineddata-tessdata_legacy-4.1.0 ) l10n_yo? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/yor.traineddata -> yor.traineddata-tessdata_legacy-4.1.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/chi_sim.traineddata -> chi_sim.traineddata-tessdata_legacy-4.1.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/chi_sim_vert.traineddata -> chi_sim_vert.traineddata-tessdata_legacy-4.1.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/chi_tra.traineddata -> chi_tra.traineddata-tessdata_legacy-4.1.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata/raw/4.1.0/chi_tra_vert.traineddata -> chi_tra_vert.traineddata-tessdata_legacy-4.1.0 )
-_md5_=2e1601ad0f961d21fc28d444481e3dbd
+_md5_=f8fad455b726b9464a50a93fe8a668a4
diff --git a/metadata/md5-cache/app-text/tesseract-4.1.1 b/metadata/md5-cache/app-text/tesseract-4.1.1
index af3564cbf0cd..003179af3e45 100644
--- a/metadata/md5-cache/app-text/tesseract-4.1.1
+++ b/metadata/md5-cache/app-text/tesseract-4.1.1
@@ -5,10 +5,10 @@ DESCRIPTION=An OCR Engine, originally developed at HP, now open source.
 EAPI=7
 HOMEPAGE=https://github.com/tesseract-ocr
 IUSE=doc jpeg opencl openmp png static-libs tiff training webp 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 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=media-libs/leptonica-1.74:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl[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-libs/tiff: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(-)?] media-libs/leptonica:=[tiff] ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) || ( >=app-text/tessdata_fast-4.0.0 >=app-text/tessdata_best-4.0.0 >=app-text/tessdata_legacy-4.0.0 )
 SLOT=0
 SRC_URI=https://github.com/tesseract-ocr/tesseract/archive/4.1.1.tar.gz -> tesseract-4.1.1.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b357c12ec3a7ebe3e96506889d219f69
+_md5_=5ed6e034f277c94593a3fbef54b455f7
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index a2d45a1f1782..9466ba64a26f 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/libcutl-1.10.0 b/metadata/md5-cache/dev-cpp/libcutl-1.10.0
deleted file mode 100644
index 420614de2a47..000000000000
--- a/metadata/md5-cache/dev-cpp/libcutl-1.10.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/expat dev-libs/boost:= 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=A collection of C++ libraries (successor of libcult)
-EAPI=6
-HOMEPAGE=https://www.codesynthesis.com/projects/libcutl/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/expat dev-libs/boost:=
-SLOT=0
-SRC_URI=https://www.codesynthesis.com/download/libcutl/1.10/libcutl-1.10.0.tar.bz2
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7d347224dd2d6cd959bc4f470c0518e1
diff --git a/metadata/md5-cache/dev-cpp/libxsd-frontend-2.0.0-r1 b/metadata/md5-cache/dev-cpp/libxsd-frontend-2.0.0-r1
deleted file mode 100644
index 1fb4ad1bc4a2..000000000000
--- a/metadata/md5-cache/dev-cpp/libxsd-frontend-2.0.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/xerces-c-3.0.0 dev-libs/boost:=[threads(+)] dev-cpp/libcutl >=dev-util/build-0.3.10
-DESCRIPTION=A compiler frontend for the W3C XML Schema definition language
-EAPI=6
-HOMEPAGE=https://www.codesynthesis.com/projects/libxsd-frontend/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/xerces-c-3.0.0 dev-libs/boost:=[threads(+)] dev-cpp/libcutl
-SLOT=0
-SRC_URI=https://www.codesynthesis.com/download/libxsd-frontend/2.0/libxsd-frontend-2.0.0.tar.bz2
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=9ed4c8fc370d8b4f23e57c2975c64cbd
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 8e086698e091..f027907ec24e 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/m17n-db-1.8.0 b/metadata/md5-cache/dev-db/m17n-db-1.8.0
index c3f31e500a10..8a9210ea0084 100644
--- a/metadata/md5-cache/dev-db/m17n-db-1.8.0
+++ b/metadata/md5-cache/dev-db/m17n-db-1.8.0
@@ -3,9 +3,9 @@ DEPEND=sys-devel/gettext
 DESCRIPTION=Database for the m17n library
 EAPI=6
 HOMEPAGE=https://savannah.nongnu.org/projects/m17n https://git.savannah.nongnu.org/cgit/m17n/m17n-db.git
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=virtual/libintl
 SLOT=0
 SRC_URI=mirror://nongnu/m17n/m17n-db-1.8.0.tar.gz
-_md5_=8e7d8250ff6ce7a024b9729aceb77ce1
+_md5_=8232ff73b8d6c96f0bfc649745740dd1
diff --git a/metadata/md5-cache/dev-db/mongodb-5.0.2 b/metadata/md5-cache/dev-db/mongodb-5.0.2
index 3ab58a3a4a50..746c7d83482e 100644
--- a/metadata/md5-cache/dev-db/mongodb-5.0.2
+++ b/metadata/md5-cache/dev-db/mongodb-5.0.2
@@ -4,7 +4,7 @@ DEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/ya
 DESCRIPTION=A high-performance, open source, schema-free document-oriented database
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
-IUSE=debug kerberos lto mongosh ssl +tools
+IUSE=debug kerberos lto mongosh ssl +tools cpu_flags_x86_avx
 KEYWORDS=~amd64 ~arm64 -riscv
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=mongosh? ( app-admin/mongosh-bin ) tools? ( >=app-admin/mongo-tools-100 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r5.0.2.tar.gz
 _eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=13e8128d52a433d0bc654cbd5cc44384
+_md5_=aa7a070bb75a197c4a8621ca3aa2d1b5
diff --git a/metadata/md5-cache/dev-db/pgmodeler-0.9.2 b/metadata/md5-cache/dev-db/pgmodeler-0.9.2
index cac50946c591..901526d54f3e 100644
--- a/metadata/md5-cache/dev-db/pgmodeler-0.9.2
+++ b/metadata/md5-cache/dev-db/pgmodeler-0.9.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install setup test
-DEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) dev-libs/icu:= dev-libs/libxml2:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
+DEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) dev-libs/icu:= dev-libs/libxml2:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 DESCRIPTION=PostgreSQL Database Modeler
 EAPI=7
 HOMEPAGE=https://pgmodeler.io
-IUSE=postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+IUSE=postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) dev-libs/icu:= dev-libs/libxml2:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
+RDEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) dev-libs/icu:= dev-libs/libxml2:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/pgmodeler/pgmodeler/archive/v0.9.2.tar.gz -> pgmodeler-0.9.2.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	postgres	c90f34fec636bb31d36838ad7e11b37b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=281e41a70652455948ff9f1432ffd5c7
+_md5_=d096763961d17379262d560c1010c664
diff --git a/metadata/md5-cache/dev-db/pgpool2-4.2.1-r1 b/metadata/md5-cache/dev-db/pgpool2-4.2.1-r1
index a699291c6f46..d1fc8046d5d3 100644
--- a/metadata/md5-cache/dev-db/pgpool2-4.2.1-r1
+++ b/metadata/md5-cache/dev-db/pgpool2-4.2.1-r1
@@ -1,14 +1,14 @@
 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
 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= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= ) sys-devel/bison virtual/pkgconfig
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= ) sys-devel/bison virtual/pkgconfig
 DESCRIPTION=Connection pool server for PostgreSQL
 EAPI=7
 HOMEPAGE=https://www.pgpool.net/
-IUSE=doc memcached pam ssl static-libs postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+IUSE=doc memcached pam ssl static-libs postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= )
+RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-4.2.1.tar.gz -> pgpool-II-4.2.1.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	45f967e4809b0f1162e4e2c726308439	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=ef7e17c592263074121f45513330e230
+_md5_=82b7e92439d6ca645d50efc88bdc8748
diff --git a/metadata/md5-cache/dev-db/pgpool2-4.2.2-r1 b/metadata/md5-cache/dev-db/pgpool2-4.2.2-r1
index b3ec6705013e..c10aaaed0522 100644
--- a/metadata/md5-cache/dev-db/pgpool2-4.2.2-r1
+++ b/metadata/md5-cache/dev-db/pgpool2-4.2.2-r1
@@ -1,14 +1,14 @@
 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
 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= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= ) sys-devel/bison virtual/pkgconfig
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= ) sys-devel/bison virtual/pkgconfig
 DESCRIPTION=Connection pool server for PostgreSQL
 EAPI=7
 HOMEPAGE=https://www.pgpool.net/
-IUSE=doc memcached pam ssl static-libs postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+IUSE=doc memcached pam ssl static-libs postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= )
+RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-4.2.2.tar.gz -> pgpool-II-4.2.2.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	45f967e4809b0f1162e4e2c726308439	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=d9dd141aff0859d7bd8adae2c5b977aa
+_md5_=218906f2e0dba94453c129e5b7fd9127
diff --git a/metadata/md5-cache/dev-db/pgpool2-9999 b/metadata/md5-cache/dev-db/pgpool2-9999
index dcd8671d024a..e6db82faacae 100644
--- a/metadata/md5-cache/dev-db/pgpool2-9999
+++ b/metadata/md5-cache/dev-db/pgpool2-9999
@@ -1,13 +1,13 @@
 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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= ) sys-devel/bison virtual/pkgconfig doc? ( app-text/openjade dev-libs/libxml2 dev-libs/libxslt )
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= ) sys-devel/bison virtual/pkgconfig doc? ( app-text/openjade dev-libs/libxml2 dev-libs/libxslt )
 DESCRIPTION=Connection pool server for PostgreSQL
 EAPI=7
 HOMEPAGE=https://www.pgpool.net/
-IUSE=doc memcached pam ssl static-libs postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+IUSE=doc memcached pam ssl static-libs postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= )
+RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= )
 SLOT=0
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	45f967e4809b0f1162e4e2c726308439	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=493aa3ae06eabf80c248ce0c0b7d6537
+_md5_=c7946bdaa214c9080cdbf76fa9c3f2a8
diff --git a/metadata/md5-cache/dev-db/pgrouting-3.1.1 b/metadata/md5-cache/dev-db/pgrouting-3.1.1
index 5c21ca73087d..348e8329f64d 100644
--- a/metadata/md5-cache/dev-db/pgrouting-3.1.1
+++ b/metadata/md5-cache/dev-db/pgrouting-3.1.1
@@ -1,15 +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=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
 DESCRIPTION=pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality.
 EAPI=7
 HOMEPAGE=https://pgrouting.org/
-IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 MIT Boost-1.0
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
+RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pgRouting/pgrouting/archive/v3.1.1.tar.gz -> pgrouting-3.1.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	45f967e4809b0f1162e4e2c726308439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ff98b753eda4210b28ac02645c38c818
+_md5_=e6f9060986af5fc4c21c7f8dacfc1f4c
diff --git a/metadata/md5-cache/dev-db/pgrouting-3.1.2 b/metadata/md5-cache/dev-db/pgrouting-3.1.2
index 474e5ca27134..6ef80ae4beca 100644
--- a/metadata/md5-cache/dev-db/pgrouting-3.1.2
+++ b/metadata/md5-cache/dev-db/pgrouting-3.1.2
@@ -1,15 +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=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
 DESCRIPTION=pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality.
 EAPI=7
 HOMEPAGE=https://pgrouting.org/
-IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 MIT Boost-1.0
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
+RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pgRouting/pgrouting/archive/v3.1.2.tar.gz -> pgrouting-3.1.2.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	45f967e4809b0f1162e4e2c726308439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=142f24f30d6f01091687143a52b9df88
+_md5_=a9c48c0908c3d36bb0811c7633729ce4
diff --git a/metadata/md5-cache/dev-db/pgrouting-3.1.3 b/metadata/md5-cache/dev-db/pgrouting-3.1.3
index b072ed9dda06..1475772670d1 100644
--- a/metadata/md5-cache/dev-db/pgrouting-3.1.3
+++ b/metadata/md5-cache/dev-db/pgrouting-3.1.3
@@ -1,15 +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=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
 DESCRIPTION=pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality.
 EAPI=7
 HOMEPAGE=https://pgrouting.org/
-IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 MIT Boost-1.0
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
+RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pgRouting/pgrouting/archive/v3.1.3.tar.gz -> pgrouting-3.1.3.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	45f967e4809b0f1162e4e2c726308439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e82312e36727f370172c7c9de34f7fec
+_md5_=203298af9c819b08122974c68a03a459
diff --git a/metadata/md5-cache/dev-db/pgtap-0.99.0 b/metadata/md5-cache/dev-db/pgtap-0.99.0
index 789472868131..34d76e6b82c4 100644
--- a/metadata/md5-cache/dev-db/pgtap-0.99.0
+++ b/metadata/md5-cache/dev-db/pgtap-0.99.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) app-arch/unzip dev-perl/TAP-Parser-SourceHandler-pgTAP
+DEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) app-arch/unzip dev-perl/TAP-Parser-SourceHandler-pgTAP
 DESCRIPTION=Unit testing for PostgreSQL
 EAPI=6
 HOMEPAGE=https://pgtap.org/
-IUSE=postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+IUSE=postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6
 KEYWORDS=amd64
 LICENSE=POSTGRESQL
-RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) app-arch/unzip dev-perl/TAP-Parser-SourceHandler-pgTAP
+RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) app-arch/unzip dev-perl/TAP-Parser-SourceHandler-pgTAP
 RESTRICT=test
 SLOT=0
 SRC_URI=https://api.pgxn.org/dist/pgtap/0.99.0/pgtap-0.99.0.zip
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	45f967e4809b0f1162e4e2c726308439	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=d37721186722d9848ecdce8e78f5de59
+_md5_=80792af4c3106cb10d4beae0a16c8e1e
diff --git a/metadata/md5-cache/dev-db/pgtap-1.1.0 b/metadata/md5-cache/dev-db/pgtap-1.1.0
index ddf04f679483..ac0dc0092f2e 100644
--- a/metadata/md5-cache/dev-db/pgtap-1.1.0
+++ b/metadata/md5-cache/dev-db/pgtap-1.1.0
@@ -1,14 +1,14 @@
 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= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) app-arch/unzip dev-perl/TAP-Parser-SourceHandler-pgTAP
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) app-arch/unzip dev-perl/TAP-Parser-SourceHandler-pgTAP
 DESCRIPTION=Unit testing for PostgreSQL
 EAPI=7
 HOMEPAGE=https://pgtap.org/
-IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6
 KEYWORDS=~amd64
 LICENSE=POSTGRESQL
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) app-arch/unzip dev-perl/TAP-Parser-SourceHandler-pgTAP
+RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) app-arch/unzip dev-perl/TAP-Parser-SourceHandler-pgTAP
 RESTRICT=test
 SLOT=0
 SRC_URI=https://api.pgxn.org/dist/pgtap/1.1.0/pgtap-1.1.0.zip
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	45f967e4809b0f1162e4e2c726308439	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=57ebab1e552aaa1af9864a13d76cf10b
+_md5_=4709d1a2b0e0f35737b4794a414c95be
diff --git a/metadata/md5-cache/dev-db/plr-8.3.0.17 b/metadata/md5-cache/dev-db/plr-8.3.0.17
index 496f23838ca9..e77afbe86744 100644
--- a/metadata/md5-cache/dev-db/plr-8.3.0.17
+++ b/metadata/md5-cache/dev-db/plr-8.3.0.17
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=dev-lang/R postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) virtual/pkgconfig
+DEPEND=dev-lang/R postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) virtual/pkgconfig
 DESCRIPTION=R language extension for postgresql database
 EAPI=6
 HOMEPAGE=http://www.joeconway.com/plr/
-IUSE=postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+IUSE=postgres_targets_postgres10 postgres_targets_postgres9_6
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=dev-lang/R postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] )
-REQUIRED_USE=|| ( postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 )
+RDEPEND=dev-lang/R postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] )
+REQUIRED_USE=|| ( postgres_targets_postgres10 postgres_targets_postgres9_6 )
 SLOT=0
 SRC_URI=https://github.com/postgres-plr/plr/archive/REL8_3_0_17.tar.gz -> plr-8.3.0.17.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	45f967e4809b0f1162e4e2c726308439	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=c6fcddcde95e18beefd7fe1ea77db33f
+_md5_=f751532e8451660f2c792eaaaa3b522d
diff --git a/metadata/md5-cache/dev-db/plr-8.4.1 b/metadata/md5-cache/dev-db/plr-8.4.1
index d2d952b69fa9..4608413690d0 100644
--- a/metadata/md5-cache/dev-db/plr-8.4.1
+++ b/metadata/md5-cache/dev-db/plr-8.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=dev-lang/R postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) virtual/pkgconfig
+DEPEND=dev-lang/R postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) virtual/pkgconfig
 DESCRIPTION=R language extension for postgresql database
 EAPI=6
 HOMEPAGE=http://www.joeconway.com/plr/
-IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=dev-lang/R postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] )
-REQUIRED_USE=|| ( postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 )
+RDEPEND=dev-lang/R postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] )
+REQUIRED_USE=|| ( postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 )
 SLOT=0
 SRC_URI=https://github.com/postgres-plr/plr/archive/REL8_4_1.tar.gz -> plr-8.4.1.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	45f967e4809b0f1162e4e2c726308439	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=078792f66868df4bd542da036cd30c4f
+_md5_=1c520e39b36cb2482655924033bbfdd8
diff --git a/metadata/md5-cache/dev-db/postgis-3.0.3-r2 b/metadata/md5-cache/dev-db/postgis-3.0.3-r2
index e98ff76bb75f..c71d0b192097 100644
--- a/metadata/md5-cache/dev-db/postgis-3.0.3-r2
+++ b/metadata/md5-cache/dev-db/postgis-3.0.3-r2
@@ -1,16 +1,16 @@
 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
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c:= >=sci-libs/geos-3.6.0 >=sci-libs/proj-4.9.0:= >=sci-libs/gdal-1.10.0:= address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt virtual/imagemagick-tools[png] ) test? ( dev-util/cunit )
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c:= >=sci-libs/geos-3.6.0 >=sci-libs/proj-4.9.0:= >=sci-libs/gdal-1.10.0:= address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt virtual/imagemagick-tools[png] ) test? ( dev-util/cunit )
 DESCRIPTION=Geographic Objects for PostgreSQL
 EAPI=7
 HOMEPAGE=https://postgis.net
-IUSE=address-standardizer doc gtk static-libs test topology postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+IUSE=address-standardizer doc gtk static-libs test topology postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c:= >=sci-libs/geos-3.6.0 >=sci-libs/proj-4.9.0:= >=sci-libs/gdal-1.10.0:= address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 )
-REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 )
+RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c:= >=sci-libs/geos-3.6.0 >=sci-libs/proj-4.9.0:= >=sci-libs/gdal-1.10.0:= address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 )
+REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.osgeo.org/postgis/source/postgis-3.0.3.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	45f967e4809b0f1162e4e2c726308439	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=a928a4fd10de8529004cb161f2c7c131
+_md5_=8203e2c0786155e8872841c5d9342600
diff --git a/metadata/md5-cache/dev-db/postgis-9999 b/metadata/md5-cache/dev-db/postgis-9999
index 12b341e01c10..94f6a88194ff 100644
--- a/metadata/md5-cache/dev-db/postgis-9999
+++ b/metadata/md5-cache/dev-db/postgis-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c:= >=sci-libs/geos-3.6.0 >=sci-libs/proj-4.9.0:= >=sci-libs/gdal-1.10.0:= address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt virtual/imagemagick-tools[png] ) test? ( dev-util/cunit ) 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 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c:= >=sci-libs/geos-3.6.0 >=sci-libs/proj-4.9.0:= >=sci-libs/gdal-1.10.0:= address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt virtual/imagemagick-tools[png] ) test? ( dev-util/cunit ) 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 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Geographic Objects for PostgreSQL
 EAPI=6
 HOMEPAGE=https://postgis.net
-IUSE=address-standardizer doc gtk static-libs test topology postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+IUSE=address-standardizer doc gtk static-libs test topology postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c:= >=sci-libs/geos-3.6.0 >=sci-libs/proj-4.9.0:= >=sci-libs/gdal-1.10.0:= address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 )
-REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 )
+RDEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c:= >=sci-libs/geos-3.6.0 >=sci-libs/proj-4.9.0:= >=sci-libs/gdal-1.10.0:= address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 )
+REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 )
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	45f967e4809b0f1162e4e2c726308439	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d2c82535d25aae1171248c9a76613e81
+_md5_=5073cbfcd8e7b733656954b30c02cacb
diff --git a/metadata/md5-cache/dev-db/slony1-2.2.10 b/metadata/md5-cache/dev-db/slony1-2.2.10
index 8bf9d8184c88..ad33a13264ce 100644
--- a/metadata/md5-cache/dev-db/slony1-2.2.10
+++ b/metadata/md5-cache/dev-db/slony1-2.2.10
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server,threads] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server,threads] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server,threads] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server,threads] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server,threads] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server,threads] ) perl? ( dev-perl/DBD-Pg )
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server,threads] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server,threads] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server,threads] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server,threads] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server,threads] ) perl? ( dev-perl/DBD-Pg )
 DESCRIPTION=A replication system for the PostgreSQL Database Management System
 EAPI=7
 HOMEPAGE=https://slony.info/
-IUSE=doc perl postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+IUSE=doc perl postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6
 KEYWORDS=amd64 ppc x86
 LICENSE=BSD GPL-2
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server,threads] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server,threads] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server,threads] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server,threads] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server,threads] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server,threads] ) perl? ( dev-perl/DBD-Pg )
+RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server,threads] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server,threads] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server,threads] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server,threads] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server,threads] ) perl? ( dev-perl/DBD-Pg )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://slony.info/downloads/2.2/source/slony1-2.2.10.tar.bz2 doc? ( https://slony.info/downloads/2.2/source/slony1-2.2.10-docs.tar.bz2 )
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	45f967e4809b0f1162e4e2c726308439	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=41998a3fdcd226c8e2e02f825f0f13dc
+_md5_=48121439eec755a6ab660255c5418de5
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 5598245ed2bf..11356a4f9270 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/libftdi-0.20-r1 b/metadata/md5-cache/dev-embedded/libftdi-0.20-r1
index b0f88a4c8161..ab8aeed35323 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-0.20-r1
+++ b/metadata/md5-cache/dev-embedded/libftdi-0.20-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Userspace access to FTDI USB interface chips
 EAPI=7
 HOMEPAGE=https://www.intra2net.com/en/developer/libftdi/
 IUSE=cxx doc examples python static-libs python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 sparc x86
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2
 RDEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( 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? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=https://www.intra2net.com/en/developer/libftdi/download/libftdi-0.20.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7af105bb693551cce71a0137163ffcac
+_md5_=758ec0858cc2eb16744b9f25fdfa1459
diff --git a/metadata/md5-cache/dev-embedded/libftdi-1.5-r3 b/metadata/md5-cache/dev-embedded/libftdi-1.5-r3
index 2c35b4573546..b8239cb0b422 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-1.5-r3
+++ b/metadata/md5-cache/dev-embedded/libftdi-1.5-r3
@@ -5,7 +5,7 @@ DESCRIPTION=Userspace access to FTDI USB interface chips
 EAPI=7
 HOMEPAGE=https://www.intra2net.com/en/developer/libftdi/
 IUSE=cxx doc examples python test tools python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 sparc x86
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2
 RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( 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] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.5.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cbffaaaa86648bd7c4bbf2be03135cac
+_md5_=f9c1e5daae90d196016a7c3eb949a3e1
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index f6d200f7634d..ba5603d3310b 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/flatzebra-0.1.7 b/metadata/md5-cache/dev-games/flatzebra-0.1.7
deleted file mode 100644
index ecbeeed8ec10..000000000000
--- a/metadata/md5-cache/dev-games/flatzebra-0.1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer
-DESCRIPTION=Generic game engine for 2D double-buffering animation
-EAPI=7
-HOMEPAGE=http://perso.b2b2c.ca/~sarrazip/dev/batrachians.html
-IUSE=static-libs
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer
-SLOT=0
-SRC_URI=http://perso.b2b2c.ca/~sarrazip/dev/flatzebra-0.1.7.tar.gz
-_md5_=9468236520350b6ed9c7d0cf291bbf7d
diff --git a/metadata/md5-cache/dev-games/flatzebra-0.1.7-r1 b/metadata/md5-cache/dev-games/flatzebra-0.1.7-r1
new file mode 100644
index 000000000000..5d0c308e2eef
--- /dev/null
+++ b/metadata/md5-cache/dev-games/flatzebra-0.1.7-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libsdl[joystick,video] media-libs/sdl-image media-libs/sdl-mixer
+DESCRIPTION=Generic game engine for 2D double-buffering animation
+EAPI=7
+HOMEPAGE=http://perso.b2b2c.ca/~sarrazip/dev/batrachians.html
+IUSE=static-libs
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libsdl[joystick,video] media-libs/sdl-image media-libs/sdl-mixer
+SLOT=0
+SRC_URI=http://perso.b2b2c.ca/~sarrazip/dev/flatzebra-0.1.7.tar.gz
+_md5_=9a1d20c4d6af6e3feecd422b5326a60b
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 5619d42720c5..578b93e59e36 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/commons-vfs-2.0-r2 b/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
index 0eb174188b16..a62dc63e8aa5 100644
--- a/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
+++ b/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A single API for accessing various different file systems
 EAPI=7
 HOMEPAGE=http://commons.apache.org/vfs/
 IUSE=elibc_FreeBSD source
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/vfs/source/commons-vfs-2.0-src.tar.gz
 _eclasses_=java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	ac9fb9efa5413c5fb85a4203fe930e88	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e6a5bb066430a4ee0727b2d72c79e80b
+_md5_=986e75214a297550e46e5aca3f14ef12
diff --git a/metadata/md5-cache/dev-java/fontbox-2.0.24 b/metadata/md5-cache/dev-java/fontbox-2.0.24
index d00407326522..bc9bf84f380b 100644
--- a/metadata/md5-cache/dev-java/fontbox-2.0.24
+++ b/metadata/md5-cache/dev-java/fontbox-2.0.24
@@ -5,11 +5,11 @@ DESCRIPTION=An open source Java library for parsing font files
 EAPI=7
 HOMEPAGE=https://pdfbox.apache.org/
 IUSE=elibc_FreeBSD doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.24/pdfbox-2.0.24-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf )
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	ac9fb9efa5413c5fb85a4203fe930e88
-_md5_=3cc790247c17998f90447d003066d94c
+_md5_=e26898c9a485d82259b3f6936a3d1302
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.1 b/metadata/md5-cache/dev-java/gradle-bin-7.1
deleted file mode 100644
index b02a503ee825..000000000000
--- a/metadata/md5-cache/dev-java/gradle-bin-7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-eselect/eselect-gradle >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A project automation and build tool with a Groovy based DSL
-EAPI=7
-HOMEPAGE=https://www.gradle.org/
-IUSE=doc elibc_FreeBSD source
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=7.1
-SRC_URI=https://services.gradle.org/distributions/gradle-7.1-all.zip -> gradle-bin-7.1.zip
-_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	ac9fb9efa5413c5fb85a4203fe930e88
-_md5_=6e66e2f2b2d3975e2e9a5002bb932c0c
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.2 b/metadata/md5-cache/dev-java/gradle-bin-7.2
new file mode 100644
index 000000000000..c47d27552ae6
--- /dev/null
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.2
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=app-eselect/eselect-gradle >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=A project automation and build tool with a Groovy based DSL
+EAPI=7
+HOMEPAGE=https://www.gradle.org/
+IUSE=doc elibc_FreeBSD source
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=7.2
+SRC_URI=https://services.gradle.org/distributions/gradle-7.2-all.zip -> gradle-bin-7.2.zip
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	ac9fb9efa5413c5fb85a4203fe930e88
+_md5_=6e66e2f2b2d3975e2e9a5002bb932c0c
diff --git a/metadata/md5-cache/dev-java/jsr101-1.4-r3 b/metadata/md5-cache/dev-java/jsr101-1.4-r3
deleted file mode 100644
index f532a87de3e3..000000000000
--- a/metadata/md5-cache/dev-java/jsr101-1.4-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 java-virtuals/saaj-api:0 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java(TM) API for XML-Based RPC Specification Interface Classes
-EAPI=5
-HOMEPAGE=http://jcp.org/aboutJava/communityprocess/first/jsr101/
-IUSE=elibc_FreeBSD doc source
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 java-virtuals/saaj-api:0 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/jsr101-1.4.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	ac9fb9efa5413c5fb85a4203fe930e88	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e17ab1f7c1c530394e9c36340b9c99e9
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 94d9ae2defb1..3a48bb7a59bc 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/go-1.16.6 b/metadata/md5-cache/dev-lang/go-1.16.6
deleted file mode 100644
index e54f4ca1f0e0..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.16.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
-DEFINED_PHASES=compile install postinst test
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-IUSE=cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=strip
-SLOT=0/1.16.6
-SRC_URI=https://storage.googleapis.com/golang/go1.16.6.src.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=80db695f63702dfb0c0561b339cdd164
diff --git a/metadata/md5-cache/dev-lang/go-1.16.7 b/metadata/md5-cache/dev-lang/go-1.16.7
index 099ab69e286d..5d09920fc775 100644
--- a/metadata/md5-cache/dev-lang/go-1.16.7
+++ b/metadata/md5-cache/dev-lang/go-1.16.7
@@ -4,11 +4,11 @@ DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=7
 HOMEPAGE=https://golang.org
 IUSE=cpu_flags_x86_sse2
-KEYWORDS=-* amd64 ~arm ~arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=strip
 SLOT=0/1.16.7
 SRC_URI=https://storage.googleapis.com/golang/go1.16.7.src.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dd49df880e4e7330d57ce48cb47947a9
+_md5_=80db695f63702dfb0c0561b339cdd164
diff --git a/metadata/md5-cache/dev-lang/go-1.17 b/metadata/md5-cache/dev-lang/go-1.17
index 1de84189f2fa..ae02d1e330d3 100644
--- a/metadata/md5-cache/dev-lang/go-1.17
+++ b/metadata/md5-cache/dev-lang/go-1.17
@@ -4,11 +4,11 @@ DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=7
 HOMEPAGE=https://golang.org
 IUSE=cpu_flags_x86_sse2
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=strip
 SLOT=0/1.17
 SRC_URI=https://storage.googleapis.com/golang/go1.17.src.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=618b5afc461facf94f24c9869612942e
+_md5_=b80c207d7ef4132c15362c13d580a720
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 9dd2e57d0221..b220967d4e17 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/argtable-2.13-r1 b/metadata/md5-cache/dev-libs/argtable-2.13-r1
index 6947568c225d..6747b892d659 100644
--- a/metadata/md5-cache/dev-libs/argtable-2.13-r1
+++ b/metadata/md5-cache/dev-libs/argtable-2.13-r1
@@ -3,9 +3,9 @@ DESCRIPTION=An ANSI C library for parsing GNU-style command-line options with mi
 EAPI=6
 HOMEPAGE=http://argtable.sourceforge.net/
 IUSE=doc debug examples static-libs
-KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/argtable/argtable2-13.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=3319a7b18fabe89393ce12f0856636c7
+_md5_=8816d38239d38f6608f37836a3c52b6a
diff --git a/metadata/md5-cache/dev-libs/boost-1.77.0 b/metadata/md5-cache/dev-libs/boost-1.77.0
deleted file mode 100644
index 2284855b643f..000000000000
--- a/metadata/md5-cache/dev-libs/boost-1.77.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/boost-build-1.77-r2
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[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=Boost Libraries for C++
-EAPI=8
-HOMEPAGE=https://www.boost.org/
-IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_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
-LICENSE=Boost-1.0
-RDEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-RESTRICT=test
-SLOT=0/1.77.0
-SRC_URI=https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.bz2
-_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fe739b89df1ac1cf54d30278b86b6901
diff --git a/metadata/md5-cache/dev-libs/boost-1.77.0-r1 b/metadata/md5-cache/dev-libs/boost-1.77.0-r1
new file mode 100644
index 000000000000..80e09124daa8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/boost-1.77.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/boost-build-1.77-r2
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[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=Boost Libraries for C++
+EAPI=8
+HOMEPAGE=https://www.boost.org/
+IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_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
+LICENSE=Boost-1.0
+RDEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+RESTRICT=test
+SLOT=0/1.77.0
+SRC_URI=https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.bz2
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4837096877a3bc77205ab424b11a52d7
diff --git a/metadata/md5-cache/dev-libs/botan-2.18.1-r1 b/metadata/md5-cache/dev-libs/botan-2.18.1-r1
index 3c4828529c9e..f33412be1170 100644
--- a/metadata/md5-cache/dev-libs/botan-2.18.1-r1
+++ b/metadata/md5-cache/dev-libs/botan-2.18.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=C++ crypto library
 EAPI=7
 HOMEPAGE=https://botan.randombit.net/
 IUSE=bindist doc boost bzip2 lzma python ssl static-libs sqlite zlib cpu_flags_arm_aes cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_rdrand cpu_flags_x86_sse2 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~ppc-macos
 LICENSE=BSD-2
 RDEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ssl? ( dev-libs/openssl:0=[bindist(-)=] ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=2/2.18
 SRC_URI=https://botan.randombit.net/releases/Botan-2.18.1.tar.xz verify-sig? ( https://botan.randombit.net/releases/Botan-2.18.1.tar.xz.asc )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=b5eb004215cb498efef4accb3499a792
+_md5_=9f7c5958734c0c9905c0d90e82b5d39e
diff --git a/metadata/md5-cache/dev-libs/dbus-glib-0.112 b/metadata/md5-cache/dev-libs/dbus-glib-0.112
index f9bf35fc3c84..ca104f7dc6c7 100644
--- a/metadata/md5-cache/dev-libs/dbus-glib-0.112
+++ b/metadata/md5-cache/dev-libs/dbus-glib-0.112
@@ -5,11 +5,11 @@ DESCRIPTION=D-Bus bindings for glib
 EAPI=7
 HOMEPAGE=https://dbus.freedesktop.org/
 IUSE=debug static-libs test 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 ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 AFL-2.1 )
 RDEPEND=>=dev-libs/expat-2.1.0-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(-)?] >=dev-libs/glib-2.40: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(-)?] >=sys-apps/dbus-1.8[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? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.112.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b7ca12a3628d442d16049e0428cd5e51
+_md5_=ffcb665a517e80df466e4d127d883325
diff --git a/metadata/md5-cache/dev-libs/ell-0.43 b/metadata/md5-cache/dev-libs/ell-0.43
new file mode 100644
index 000000000000..d148b36eb55c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ell-0.43
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=test? ( sys-apps/dbus )
+DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
+EAPI=7
+HOMEPAGE=https://01.org/ell
+IUSE=pie test kernel_linux 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 ~sparc ~x86
+LICENSE=LGPL-2.1
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.43.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6e97d65fae6e9f9d9c1bb91b323a8506
diff --git a/metadata/md5-cache/dev-libs/icinga-php-library-0.6.1 b/metadata/md5-cache/dev-libs/icinga-php-library-0.6.1
deleted file mode 100644
index 03bcc09c67a6..000000000000
--- a/metadata/md5-cache/dev-libs/icinga-php-library-0.6.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/php:*
-DESCRIPTION=Icinga PHP libraries for Icinga Web 2.
-EAPI=7
-HOMEPAGE=https://github.com/Icinga/icinga-php-library
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*
-SLOT=0
-SRC_URI=https://github.com/Icinga/icinga-php-library/archive/refs/tags/v0.6.1.tar.gz -> icinga-php-library-0.6.1.tar.gz
-_md5_=326fb8dca6e0e9170cb5445aaf38f925
diff --git a/metadata/md5-cache/dev-libs/icinga-php-library-0.6.1-r1 b/metadata/md5-cache/dev-libs/icinga-php-library-0.6.1-r1
new file mode 100644
index 000000000000..9a7cc551d042
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/icinga-php-library-0.6.1-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/php:*
+DESCRIPTION=Icinga PHP libraries for Icinga Web 2.
+EAPI=7
+HOMEPAGE=https://github.com/Icinga/icinga-php-library
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:*
+SLOT=0
+SRC_URI=https://github.com/Icinga/icinga-php-library/archive/refs/tags/v0.6.1.tar.gz -> icinga-php-library-0.6.1.tar.gz
+_md5_=c7e0163af68954781ca6dbd647528ae9
diff --git a/metadata/md5-cache/dev-libs/icinga-php-thirdparty-0.10.0 b/metadata/md5-cache/dev-libs/icinga-php-thirdparty-0.10.0
deleted file mode 100644
index 0ef1bdd21ff2..000000000000
--- a/metadata/md5-cache/dev-libs/icinga-php-thirdparty-0.10.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/php:*
-DESCRIPTION=Icinga PHP libraries for Icinga Web 2.
-EAPI=7
-HOMEPAGE=https://github.com/Icinga/icinga-php-library
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*
-SLOT=0
-SRC_URI=https://github.com/Icinga/icinga-php-thirdparty/archive/refs/tags/v0.10.0.tar.gz -> icinga-php-thirdparty-0.10.0.tar.gz
-_md5_=f514d94b18d67a03f3bf50947f35fda7
diff --git a/metadata/md5-cache/dev-libs/icinga-php-thirdparty-0.10.0-r1 b/metadata/md5-cache/dev-libs/icinga-php-thirdparty-0.10.0-r1
new file mode 100644
index 000000000000..f2f74f50d969
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/icinga-php-thirdparty-0.10.0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/php:*
+DESCRIPTION=Icinga PHP libraries for Icinga Web 2.
+EAPI=7
+HOMEPAGE=https://github.com/Icinga/icinga-php-library
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:*
+SLOT=0
+SRC_URI=https://github.com/Icinga/icinga-php-thirdparty/archive/refs/tags/v0.10.0.tar.gz -> icinga-php-thirdparty-0.10.0.tar.gz
+_md5_=68cd8a6e6cd7eefc84a90b88eb6dd507
diff --git a/metadata/md5-cache/dev-libs/intel-neo-21.33.20678 b/metadata/md5-cache/dev-libs/intel-neo-21.33.20678
new file mode 100644
index 000000000000..dc6425c45465
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/intel-neo-21.33.20678
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.8365 >=media-libs/gmmlib-21.2.1 >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.4.1 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva ) media-libs/mesa
+DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
+EAPI=7
+HOMEPAGE=https://github.com/intel/compute-runtime
+IUSE=+l0 +vaapi
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.8365 >=media-libs/gmmlib-21.2.1 >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.4.1 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
+SLOT=0
+SRC_URI=https://github.com/intel/compute-runtime/archive/21.33.20678.tar.gz -> intel-neo-21.33.20678.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=53a5e2f40012da025d86aeeac664283f
diff --git a/metadata/md5-cache/dev-libs/intel-neo-21.33.20678-r1 b/metadata/md5-cache/dev-libs/intel-neo-21.33.20678-r1
new file mode 100644
index 000000000000..63ccd54e6a82
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/intel-neo-21.33.20678-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.8365 dev-util/intel-graphics-system-controller >=media-libs/gmmlib-21.2.1 >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.4.1 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva ) media-libs/mesa
+DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
+EAPI=7
+HOMEPAGE=https://github.com/intel/compute-runtime
+IUSE=+l0 +vaapi
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.8365 dev-util/intel-graphics-system-controller >=media-libs/gmmlib-21.2.1 >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.4.1 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
+SLOT=0
+SRC_URI=https://github.com/intel/compute-runtime/archive/21.33.20678.tar.gz -> intel-neo-21.33.20678.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=76a5d3af7e0e7a7665dec6cdb00e1539
diff --git a/metadata/md5-cache/dev-libs/json-glib-1.6.6 b/metadata/md5-cache/dev-libs/json-glib-1.6.6
new file mode 100644
index 000000000000..64a12be8ce48
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/json-glib-1.6.6
@@ -0,0 +1,14 @@
+BDEPEND=~app-text/docbook-xml-dtd-4.1.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.20 ) >=sys-devel/gettext-0.18 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=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:= )
+DESCRIPTION=Library providing GLib serialization and deserialization for the JSON format
+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 ~riscv ~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.6.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9fbf2e1cdecf68b9b8e7c63701e2fba0
diff --git a/metadata/md5-cache/dev-libs/libbpf-0.4.0 b/metadata/md5-cache/dev-libs/libbpf-0.4.0
index 0985b4b49548..cd9107c77931 100644
--- a/metadata/md5-cache/dev-libs/libbpf-0.4.0
+++ b/metadata/md5-cache/dev-libs/libbpf-0.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=Stand-alone build of libbpf from the Linux kernel
 EAPI=7
 HOMEPAGE=https://github.com/libbpf/libbpf
 IUSE=+static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2 LGPL-2.1 BSD-2
 RDEPEND=virtual/libelf
 SLOT=0/0.4.0
 SRC_URI=https://github.com/libbpf/libbpf/archive/refs/tags/v0.4.0.tar.gz -> libbpf-0.4.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dc921b337792dd77f927c954c22cdecb
+_md5_=77b39ed04f1a9fd7e548d8a83379a237
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.10.0 b/metadata/md5-cache/dev-libs/libbsd-0.10.0
deleted file mode 100644
index 9ca7bb223fb1..000000000000
--- a/metadata/md5-cache/dev-libs/libbsd-0.10.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install setup test
-DEPEND=>=sys-kernel/linux-headers-3.17
-DESCRIPTION=An library to provide useful functions commonly found on BSD systems
-EAPI=7
-HOMEPAGE=https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd
-IUSE=static-libs 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
-LICENSE=BSD BSD-2 BSD-4 ISC
-SLOT=0
-SRC_URI=https://libbsd.freedesktop.org/releases/libbsd-0.10.0.tar.xz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6763ee9d0aa09d6bcbc9a8e7a79b6ce5
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.11.3 b/metadata/md5-cache/dev-libs/libbsd-0.11.3
index a1c14e8baa84..5b4f14d820c9 100644
--- a/metadata/md5-cache/dev-libs/libbsd-0.11.3
+++ b/metadata/md5-cache/dev-libs/libbsd-0.11.3
@@ -4,10 +4,10 @@ DESCRIPTION=Library to provide useful functions commonly found on BSD systems
 EAPI=8
 HOMEPAGE=https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd
 IUSE=static-libs 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 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD BSD-2 BSD-4 ISC
 RDEPEND=app-crypt/libmd[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
 SRC_URI=https://libbsd.freedesktop.org/releases/libbsd-0.11.3.tar.xz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c82860a8a8281c92cdf2b708768188ca
+_md5_=ee7bff778b018b99c0881fff4dea059c
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1
index 09e4d00b6831..dec51936d73b 100644
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=an advanced CDDA reader with error correction
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libcdio/
 IUSE=+cxx static-libs test 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3+ GPL-2+ LGPL-2.1
 RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94: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(-)?] >=virtual/libiconv-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(-)?]
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+2.0.1.tar.bz2
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a484589a07c3c0f3a583cf9b5586c432
+_md5_=ef47924e38e96797caae8a2941000436
diff --git a/metadata/md5-cache/dev-libs/libgudev-237 b/metadata/md5-cache/dev-libs/libgudev-237
index 30acc0a831ea..4ed5a00c4a6b 100644
--- a/metadata/md5-cache/dev-libs/libgudev-237
+++ b/metadata/md5-cache/dev-libs/libgudev-237
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://download.gnome.org/sources/libgudev/237/libgudev-237.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9feffb478eb762372e11aa1fed7497d6
+_md5_=743f4d9c96dd315b4e242cc7c964a5ec
diff --git a/metadata/md5-cache/dev-libs/libotf-0.9.16 b/metadata/md5-cache/dev-libs/libotf-0.9.16
index 2a30fdb20ef0..f0ff19a3be7f 100644
--- a/metadata/md5-cache/dev-libs/libotf-0.9.16
+++ b/metadata/md5-cache/dev-libs/libotf-0.9.16
@@ -4,10 +4,10 @@ DESCRIPTION=Library for handling OpenType fonts (OTF)
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/m17n/
 IUSE=static-libs X
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/freetype-2.4.9 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://nongnu/m17n/libotf-0.9.16.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=74671f5422d2b92f4484dd155669451a
+_md5_=6f903ec0c74be71ce5c33cf4b0b176a7
diff --git a/metadata/md5-cache/dev-libs/libowfat-0.32-r3 b/metadata/md5-cache/dev-libs/libowfat-0.32-r3
deleted file mode 100644
index d0c5857d42be..000000000000
--- a/metadata/md5-cache/dev-libs/libowfat-0.32-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )
-DESCRIPTION=reimplement libdjb - excellent libraries from Dan Bernstein
-EAPI=8
-HOMEPAGE=https://www.fefe.de/libowfat/
-IUSE=diet
-KEYWORDS=~amd64 ~hppa ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )
-SLOT=0
-SRC_URI=https://www.fefe.de/libowfat/libowfat-0.32.tar.xz
-_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7cfe283f87619a3ec27f0105300483f7
diff --git a/metadata/md5-cache/dev-libs/libowfat-0.32-r4 b/metadata/md5-cache/dev-libs/libowfat-0.32-r4
new file mode 100644
index 000000000000..79eac8cba4aa
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libowfat-0.32-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install setup
+DEPEND=diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )
+DESCRIPTION=reimplement libdjb - excellent libraries from Dan Bernstein
+EAPI=8
+HOMEPAGE=https://www.fefe.de/libowfat/
+IUSE=diet
+KEYWORDS=~amd64 ~hppa ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )
+SLOT=0
+SRC_URI=https://www.fefe.de/libowfat/libowfat-0.32.tar.xz
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=03d859923b56e1415e08457d01f9afbe
diff --git a/metadata/md5-cache/dev-libs/libvoikko-4.3.1 b/metadata/md5-cache/dev-libs/libvoikko-4.3.1
index d9792e207d59..865188fdf1f4 100644
--- a/metadata/md5-cache/dev-libs/libvoikko-4.3.1
+++ b/metadata/md5-cache/dev-libs/libvoikko-4.3.1
@@ -5,7 +5,7 @@ DESCRIPTION=Spell checking, hyphenation and morphological analysis tool for Finn
 EAPI=7
 HOMEPAGE=https://voikko.puimula.org/
 IUSE=+expvfst +hfst verify-sig python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] hfst? ( >=dev-util/hfstospell-0.5.0 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.puimula.org/voikko-sources/libvoikko/libvoikko-4.3.1.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/libvoikko/libvoikko-4.3.1.tar.gz.asc )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=a54a1c15766559b8f0d99e7ce62b9a22
+_md5_=1429b0f3cf8e436335f80cc267ccff0e
diff --git a/metadata/md5-cache/dev-libs/libwacom-1.11 b/metadata/md5-cache/dev-libs/libwacom-1.11
index 871887a1a490..37912b689ac9 100644
--- a/metadata/md5-cache/dev-libs/libwacom-1.11
+++ b/metadata/md5-cache/dev-libs/libwacom-1.11
@@ -5,11 +5,11 @@ DESCRIPTION=Library for identifying Wacom tablets and their model-specific featu
 EAPI=8
 HOMEPAGE=https://github.com/linuxwacom/libwacom
 IUSE=doc test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 dev-libs/libgudev:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.11/libwacom-1.11.tar.bz2
 _eclasses_=meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490
-_md5_=8223f4294ca10c9e71bc0e54b787115e
+_md5_=a27f44780a14fa029547e55c8a52a9cc
diff --git a/metadata/md5-cache/dev-libs/libwacom-1.9 b/metadata/md5-cache/dev-libs/libwacom-1.9
deleted file mode 100644
index 95bb1876c195..000000000000
--- a/metadata/md5-cache/dev-libs/libwacom-1.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.9 dev-python/python-libevdev[python_targets_python3_9(-)] dev-python/pyudev[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/python-libevdev[python_targets_python3_8(-)] dev-python/pyudev[python_targets_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)] ) ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install setup test
-DEPEND=dev-libs/glib:2 dev-libs/libgudev:=
-DESCRIPTION=Library for identifying Wacom tablets and their model-specific features
-EAPI=7
-HOMEPAGE=https://github.com/linuxwacom/libwacom
-IUSE=doc test
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=dev-libs/glib:2 dev-libs/libgudev:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.9/libwacom-1.9.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490
-_md5_=1a44e7f87a1914ca1c6500985cfed86b
diff --git a/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.3 b/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.3
index d5aa6c6946eb..b44fd0d57804 100644
--- a/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.3
+++ b/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.3
@@ -4,9 +4,9 @@ DESCRIPTION=Small library to access XDG Base Directories Specification paths
 EAPI=7
 HOMEPAGE=https://github.com/devnev/libxdg-basedir
 IUSE=doc
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x64-macos ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/devnev/libxdg-basedir/archive/libxdg-basedir-1.2.3.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dd613b2aae7a9f7ce3c8cdbb978a9bd5
+_md5_=809f0fd1b8d596f5d6244f2c300a2257
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.12-r5 b/metadata/md5-cache/dev-libs/libxml2-2.9.12-r5
index f61ebd346297..52df95fd8008 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.12-r5
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.12-r5
@@ -5,7 +5,7 @@ DESCRIPTION=XML C parser and toolkit
 EAPI=7
 HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
 IUSE=debug examples icu ipv6 lzma +python readline static-libs test python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.2.8-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(-)?] icu? ( >=dev-libs/icu-51.2-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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.12-r5-patchset.tar.bz2 test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz ) verify-sig? ( ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz.asc )
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ad5bf29d313c0c0e28abbfb018615232
+_md5_=066a160ab4aee186589d2eb77c55a3bd
diff --git a/metadata/md5-cache/dev-libs/m17n-lib-1.8.0 b/metadata/md5-cache/dev-libs/m17n-lib-1.8.0
index 3d5b4d81e224..364c6cb6e942 100644
--- a/metadata/md5-cache/dev-libs/m17n-lib-1.8.0
+++ b/metadata/md5-cache/dev-libs/m17n-lib-1.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Multilingual Library for Unix/Linux
 EAPI=6
 HOMEPAGE=https://savannah.nongnu.org/projects/m17n https://git.savannah.nongnu.org/cgit/m17n/m17n-lib.git
 IUSE=X anthy athena bidi fontconfig gd libotf libxml2 spell xft
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=~dev-db/m17n-db-1.8.0 X? ( x11-libs/libX11 athena? ( x11-libs/libXaw ) bidi? ( dev-libs/fribidi ) fontconfig? ( media-libs/fontconfig ) gd? ( media-libs/gd[png] ) libotf? ( dev-libs/libotf ) xft? ( media-libs/freetype x11-libs/libXft ) ) anthy? ( app-i18n/anthy ) libxml2? ( dev-libs/libxml2 ) spell? ( app-text/aspell )
 SLOT=0
 SRC_URI=mirror://nongnu/m17n/m17n-lib-1.8.0.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e7ea7679b4079a3a88d77eedc54c3c3c
+_md5_=f439305c1d87d79e62d322738a4f344a
diff --git a/metadata/md5-cache/dev-libs/metee-3.1.0 b/metadata/md5-cache/dev-libs/metee-3.1.0
new file mode 100644
index 000000000000..e8b7195dd23c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/metee-3.1.0
@@ -0,0 +1,12 @@
+BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Cross-platform access library for Intel CSME HECI interface
+EAPI=7
+HOMEPAGE=https://github.com/intel/compute-runtime
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/intel/metee/archive/refs/tags/3.1.0.tar.gz -> metee-3.1.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9883259c97bef4097986ee9cae204512
diff --git a/metadata/md5-cache/dev-libs/nss-pem-1.0.8 b/metadata/md5-cache/dev-libs/nss-pem-1.0.8
new file mode 100644
index 000000000000..bd3c9fff2816
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nss-pem-1.0.8
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-libs/nss-3.50-r1 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<=dev-libs/nss-3.50 >=dev-libs/nss-3.50-r1
+DESCRIPTION=PEM file reader for Network Security Services (NSS)
+EAPI=7
+HOMEPAGE=https://github.com/kdudka/nss-pem
+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 ~s390 ~sparc ~x86 ~x64-solaris
+LICENSE=MPL-1.1
+RDEPEND=>=dev-libs/nss-3.50-r1
+SLOT=0
+SRC_URI=https://github.com/kdudka/nss-pem/releases/download/nss-pem-1.0.8/nss-pem-1.0.8.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=886101a80f4ea1c4e9fda60980b86d79
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1l b/metadata/md5-cache/dev-libs/openssl-1.1.1l
new file mode 100644
index 000000000000..54b2b606ac3b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1l
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,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=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=7
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
+RESTRICT=!bindist? ( bindist ) !test? ( test )
+SLOT=0/1.1
+SRC_URI=mirror://openssl/source/openssl-1.1.1l.tar.gz bindist? ( mirror://gentoo/openssl-1.1.1i-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.1.1i-bindist-1.0.tar.xz )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c97b606ba4e4f6ec5e485fe301ea9551
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.0_beta1-r1 b/metadata/md5-cache/dev-libs/openssl-3.0.0_beta1-r1
deleted file mode 100644
index 20a2b05a1db3..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-3.0.0_beta1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 dev-perl/Text-Template sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,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=Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)
-EAPI=7
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm cpu_flags_x86_sse2 elibc_musl ktls rfc3779 sctp static-libs test tls-compression vanilla kernel_linux 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=Apache-2.0
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,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? ( test )
-SLOT=0/3
-SRC_URI=mirror://openssl/source/openssl-3.0.0-beta1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=03490e00cffc2dfcadad8474029315dd
diff --git a/metadata/md5-cache/dev-libs/rocksdb-6.17.3 b/metadata/md5-cache/dev-libs/rocksdb-6.17.3
index f9764523f5b5..2d4c482e35ae 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-6.17.3
+++ b/metadata/md5-cache/dev-libs/rocksdb-6.17.3
@@ -5,10 +5,10 @@ DESCRIPTION=Embeddable, persistent key-value store for fast storage
 EAPI=7
 HOMEPAGE=http://rocksdb.org https://github.com/facebook/rocksdb/
 IUSE=cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 -riscv ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= dev-cpp/gflags dev-python/zstandard:= sys-libs/zlib:= jemalloc? ( dev-libs/jemalloc:= )
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v6.17.3.tar.gz -> rocksdb-6.17.3.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ab611f734b8735ab2d4257172bf869f8
+_md5_=83eda0a72e8f41862e37f86d029b5f7e
diff --git a/metadata/md5-cache/dev-libs/serd-0.30.10 b/metadata/md5-cache/dev-libs/serd-0.30.10
index c4cf881ae36a..ec8653cc973e 100644
--- a/metadata/md5-cache/dev-libs/serd-0.30.10
+++ b/metadata/md5-cache/dev-libs/serd-0.30.10
@@ -5,10 +5,10 @@ DESCRIPTION=Library for RDF syntax which supports reading and writing Turtle and
 EAPI=7
 HOMEPAGE=http://drobilla.net/software/serd/
 IUSE=doc static-libs test 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 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=ISC
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/serd-0.30.10.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
-_md5_=6a1ff5577d9d5d65b7448ad9f3277e62
+_md5_=ff6d360e204facc04b1c4f9c5c579588
diff --git a/metadata/md5-cache/dev-libs/sord-0.16.8-r1 b/metadata/md5-cache/dev-libs/sord-0.16.8-r1
index d1d3bd1b1d75..cc6f14a62a6e 100644
--- a/metadata/md5-cache/dev-libs/sord-0.16.8-r1
+++ b/metadata/md5-cache/dev-libs/sord-0.16.8-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Library for storing RDF data in memory
 EAPI=7
 HOMEPAGE=http://drobilla.net/software/sord/
 IUSE=doc static-libs test 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 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=ISC
 RDEPEND=dev-libs/libpcre dev-libs/serd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/sord-0.16.8.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
-_md5_=cf0ae49f16780aa437a508fa52af9ac8
+_md5_=75cc55a82e93876710b9dec7f831dc2f
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.9.2 b/metadata/md5-cache/dev-libs/spdlog-1.9.2
new file mode 100644
index 000000000000..6d2fd6da5cd4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/spdlog-1.9.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libfmt-6.1.2:=
+DESCRIPTION=Very fast, header only, C++ logging library
+EAPI=7
+HOMEPAGE=https://github.com/gabime/spdlog
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/libfmt-6.1.2:=
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://github.com/gabime/spdlog/archive/v1.9.2.tar.gz -> spdlog-1.9.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6fb0b89b1b89435daa43afd889a6ab32
diff --git a/metadata/md5-cache/dev-libs/tinyxml2-9.0.0 b/metadata/md5-cache/dev-libs/tinyxml2-9.0.0
index 319d37d68e7d..e4181705afd1 100644
--- a/metadata/md5-cache/dev-libs/tinyxml2-9.0.0
+++ b/metadata/md5-cache/dev-libs/tinyxml2-9.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=A simple, small, efficient, C++ XML parser
 EAPI=7
 HOMEPAGE=http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/
 IUSE=test 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 ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86
 LICENSE=ZLIB
 RESTRICT=!test? ( test )
 SLOT=0/9
 SRC_URI=https://github.com/leethomason/tinyxml2/archive/9.0.0.tar.gz -> tinyxml2-9.0.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=934c2641e6a24418d9c26bd6b520e1f6
+_md5_=dd14115f3927d8ecbc7256fe67c809c8
diff --git a/metadata/md5-cache/dev-libs/weston-9.0.0-r1 b/metadata/md5-cache/dev-libs/weston-9.0.0-r1
index b7f2de767dc6..0429949da65c 100644
--- a/metadata/md5-cache/dev-libs/weston-9.0.0-r1
+++ b/metadata/md5-cache/dev-libs/weston-9.0.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Wayland reference compositor
 EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
 IUSE=colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland
-KEYWORDS=amd64 arm arm64 ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
 LICENSE=MIT CC-BY-SA-3.0
 RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.18 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.2:= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xwayland x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
 REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/weston-9.0.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4c72d637ccaaf6b09977e882a4eece20
+_md5_=55b2b1b66b0816ea0bdc752ecf8a9f8a
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 16c3a95bc4dd..3cf71cdf0be2 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/cstruct-5.2.0 b/metadata/md5-cache/dev-ml/cstruct-5.2.0
deleted file mode 100644
index b58b56a44e2b..000000000000
--- a/metadata/md5-cache/dev-ml/cstruct-5.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/async_unix:= dev-ml/bigarray-compat:= >=dev-ml/ppx_tools_versioned-5.4.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Map OCaml arrays onto C-like structs
-EAPI=7
-HOMEPAGE=https://github.com/mirage/ocaml-cstruct https://mirage.io
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-ml/async_unix:= dev-ml/bigarray-compat:= >=dev-ml/ppx_tools_versioned-5.4.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0/5.2.0
-SRC_URI=https://github.com/mirage/ocaml-cstruct/releases/download/v5.2.0/cstruct-v5.2.0.tbz
-_eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=3aa3509542e95d6d1ee013daa642ae62
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.790.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.790.0
index e4dc21b8037b..1b7b93bfd266 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.790.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.790.0
@@ -5,11 +5,11 @@ DESCRIPTION=Parse and Format DateTimes using Strptime
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime-Format-Strptime
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1 >=dev-perl/DateTime-Locale-1.300.0 >=dev-perl/DateTime-TimeZone-2.90.0 virtual/perl-Exporter dev-perl/Params-ValidationCompiler >=dev-perl/Specio-0.330.0 dev-perl/Try-Tiny virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.79.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=efbb43ad0edbfd8b17210cdf7e883de9
+_md5_=375dfda643626c235d6e3512dac11525
diff --git a/metadata/md5-cache/dev-perl/File-MimeInfo-0.300.0 b/metadata/md5-cache/dev-perl/File-MimeInfo-0.300.0
index c35179bc0b45..dde36c0fddf3 100644
--- a/metadata/md5-cache/dev-perl/File-MimeInfo-0.300.0
+++ b/metadata/md5-cache/dev-perl/File-MimeInfo-0.300.0
@@ -5,11 +5,11 @@ DESCRIPTION=Determine file type
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-MimeInfo
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Encode-Locale virtual/perl-Exporter >=dev-perl/File-BaseDir-0.30.0 >=dev-perl/File-DesktopEntry-0.40.0 x11-misc/shared-mime-info dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.30.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=31a8824c09477caf05c9c725b7ca7488
+_md5_=263ab58acc4b6d668f56c627fa23671d
diff --git a/metadata/md5-cache/dev-perl/IO-AIO-4.750.0 b/metadata/md5-cache/dev-perl/IO-AIO-4.750.0
index 086836f51b41..d4325640f3be 100644
--- a/metadata/md5-cache/dev-perl/IO-AIO-4.750.0
+++ b/metadata/md5-cache/dev-perl/IO-AIO-4.750.0
@@ -5,11 +5,11 @@ DESCRIPTION=Asynchronous Input/Output
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-AIO
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm64 ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/common-sense dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/IO-AIO-4.75.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=f9974970aed28ea6cd7a3a77c994bd3a
+_md5_=fac5b484fec113a283691203fc24a886
diff --git a/metadata/md5-cache/dev-perl/IO-stringy-2.113.0 b/metadata/md5-cache/dev-perl/IO-stringy-2.113.0
index e39a3bd55053..3f8e817b087e 100644
--- a/metadata/md5-cache/dev-perl/IO-stringy-2.113.0
+++ b/metadata/md5-cache/dev-perl/IO-stringy-2.113.0
@@ -5,11 +5,11 @@ DESCRIPTION=I/O on in-core objects like strings and arrays
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-Stringy
 IUSE=test
-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=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CAPOEIRAB/IO-Stringy-2.113.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=2009d68cb3e77fd10de1c58a411bd279
+_md5_=37e1f0c95e89b118bb652371097d2f76
diff --git a/metadata/md5-cache/dev-perl/Inline-C-0.810.0 b/metadata/md5-cache/dev-perl/Inline-C-0.810.0
index 728faf697d26..9cdccac555a3 100644
--- a/metadata/md5-cache/dev-perl/Inline-C-0.810.0
+++ b/metadata/md5-cache/dev-perl/Inline-C-0.810.0
@@ -5,11 +5,11 @@ DESCRIPTION=C Language Support for Inline
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Inline-C
 IUSE=test test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-ExtUtils-MakeMaker-7 >=virtual/perl-File-Spec-0.800.0 >=dev-perl/Inline-0.830.0 >=dev-perl/Parse-RecDescent-1.967.9 >=dev-perl/Pegex-0.660.0 !<dev-perl/Inline-0.510.0 dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TINITA/Inline-C-0.81.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=ef860543ffb502ce663e17a8ac9bdab2
+_md5_=b2b88b9b193ed697aae04fe18787553e
diff --git a/metadata/md5-cache/dev-perl/JSON-Parse-0.610.0 b/metadata/md5-cache/dev-perl/JSON-Parse-0.610.0
index 2ee259301ec1..afe9e400c392 100644
--- a/metadata/md5-cache/dev-perl/JSON-Parse-0.610.0
+++ b/metadata/md5-cache/dev-perl/JSON-Parse-0.610.0
@@ -5,11 +5,11 @@ DESCRIPTION=Read JSON into a Perl Variable
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/JSON-Parse
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm64 ppc ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Getopt-Long dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.61.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=3075a694b203855f0c2c364c9f28e642
+_md5_=4bffcac8626f0cb963f285dc7401550e
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 547279480576..67031ae3c769 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Module-ScanDeps-1.310.0 b/metadata/md5-cache/dev-perl/Module-ScanDeps-1.310.0
index 16ff5ee7d38e..22b5c4b7c0b8 100644
--- a/metadata/md5-cache/dev-perl/Module-ScanDeps-1.310.0
+++ b/metadata/md5-cache/dev-perl/Module-ScanDeps-1.310.0
@@ -5,11 +5,11 @@ DESCRIPTION=Recursively scan Perl code for dependencies
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Module-ScanDeps
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-Module-Metadata virtual/perl-Text-ParseWords virtual/perl-version dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.31.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=79b7060e5046703ed80f91b9b3af4594
+_md5_=b1d4012122becacfa673f6dcd2629139
diff --git a/metadata/md5-cache/dev-perl/Module-Signature-0.870.0 b/metadata/md5-cache/dev-perl/Module-Signature-0.870.0
index 19e894d6fe37..29f18fad4090 100644
--- a/metadata/md5-cache/dev-perl/Module-Signature-0.870.0
+++ b/metadata/md5-cache/dev-perl/Module-Signature-0.870.0
@@ -5,11 +5,11 @@ DESCRIPTION=Module signature file manipulation
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Module-Signature
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=CC0-1.0 || ( Artistic GPL-2+ )
 RDEPEND=dev-perl/Crypt-OpenPGP app-crypt/gnupg virtual/perl-File-Temp dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-0.87.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=b10e168ef6af24b059e43da48ff6115c
+_md5_=2139bd9c3a6cff27f2b358f32efa05b3
diff --git a/metadata/md5-cache/dev-perl/Mojolicious-9.190.0 b/metadata/md5-cache/dev-perl/Mojolicious-9.190.0
index a69b592fcc78..f4515a06b2c1 100644
--- a/metadata/md5-cache/dev-perl/Mojolicious-9.190.0
+++ b/metadata/md5-cache/dev-perl/Mojolicious-9.190.0
@@ -5,11 +5,11 @@ DESCRIPTION=Real-time web framework
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mojolicious
 IUSE=minimal test examples
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=Artistic-2
 RDEPEND=!minimal? ( >=dev-perl/Cpanel-JSON-XS-4.90.0 >=dev-perl/EV-4.0.0 ) >=virtual/perl-IO-Socket-IP-0.370.0 >=virtual/perl-Scalar-List-Utils-1.410.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.19.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=1d5394a15418f1990e3a200f8a7cfe67
+_md5_=38333dd2282e0e0213d569420046bb85
diff --git a/metadata/md5-cache/dev-perl/Moo-2.5.4 b/metadata/md5-cache/dev-perl/Moo-2.5.4
index 3d5d91235bdd..f222a4ef8826 100644
--- a/metadata/md5-cache/dev-perl/Moo-2.5.4
+++ b/metadata/md5-cache/dev-perl/Moo-2.5.4
@@ -5,11 +5,11 @@ DESCRIPTION=Minimalist Object Orientation (with Moose compatiblity)
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Moo
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Class-Method-Modifiers-1.100.0 >=virtual/perl-Exporter-5.570.0 >=dev-perl/Role-Tiny-2.2.3 >=virtual/perl-Scalar-List-Utils-1.0.0 >=dev-perl/Sub-Quote-2.6.6 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Moo-2.005004.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=c29e0d69248904a04baa8621e7a374f4
+_md5_=00bb0c438a347a22096204bc1e30d71b
diff --git a/metadata/md5-cache/dev-perl/MooX-HandlesVia-0.1.9 b/metadata/md5-cache/dev-perl/MooX-HandlesVia-0.1.9
index b7eaaa9c1594..fd11a2d39f8d 100644
--- a/metadata/md5-cache/dev-perl/MooX-HandlesVia-0.1.9
+++ b/metadata/md5-cache/dev-perl/MooX-HandlesVia-0.1.9
@@ -5,11 +5,11 @@ DESCRIPTION=NativeTrait-like behavior for Moo
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/MooX-HandlesVia
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~amd64 ~hppa ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Method-Modifiers >=dev-perl/Data-Perl-0.2.6 dev-perl/Module-Runtime >=dev-perl/Moo-1.3.0 dev-perl/Role-Tiny dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/MooX-HandlesVia-0.001009.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=2d30a3f61ec7a3be186efc705acf0cde
+_md5_=f0133a44d4e408c39c484bceb05b9938
diff --git a/metadata/md5-cache/dev-perl/Moose-2.201.500 b/metadata/md5-cache/dev-perl/Moose-2.201.500
index c233703019b2..51c04ad31c55 100644
--- a/metadata/md5-cache/dev-perl/Moose-2.201.500
+++ b/metadata/md5-cache/dev-perl/Moose-2.201.500
@@ -5,11 +5,11 @@ DESCRIPTION=A postmodern object system for Perl 5
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Moose
 IUSE=test examples
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<=dev-perl/Catalyst-5.900.499.990 !<=dev-perl/Config-MVP-2.200.4 !<=dev-perl/Devel-REPL-1.3.20 !<=dev-perl/Dist-Zilla-5.43.0 !<=dev-perl/Dist-Zilla-Plugin-Git-2.16.0 !<=dev-perl/Fey-0.360.0 !<=dev-perl/Fey-ORM-0.420.0 !<=dev-perl/File-ChangeNotify-0.150.0 !<=dev-perl/HTTP-Throwable-0.17.0 !<=dev-perl/KiokuDB-0.510.0 !<=dev-perl/Markdent-0.160.0 !<=dev-perl/Mason-2.180.0 !<=dev-perl/Moose-Autobox-0.150.0 !<=dev-perl/MooseX-ABC-0.50.0 !<=dev-perl/MooseX-Aliases-0.80.0 !<=dev-perl/MooseX-AlwaysCoerce-0.130.0 !<=dev-perl/MooseX-App-1.220.0 !<=dev-perl/MooseX-Attribute-Deflator-2.1.7 !<=dev-perl/MooseX-Attribute-Dependent-1.1.3 !<=dev-perl/MooseX-Attribute-Prototype-0.100.0 !<=dev-perl/MooseX-AttributeHelpers-0.220.0 !<=dev-perl/MooseX-AttributeIndexes-1.0.0 !<=dev-perl/MooseX-AttributeInflate-0.20.0 !<=dev-perl/MooseX-CascadeClearing-0.30.0 !<=dev-perl/MooseX-ClassAttribute-0.260.0 !<=dev-perl/MooseX-Constructor-AllErrors-0.21.0 !<=dev-perl/MooseX-Declare-0.350.0 !<=dev-perl/MooseX-FollowPBP-0.20.0 !<=dev-perl/MooseX-Getopt-0.560.0 !<=dev-perl/MooseX-InstanceTracking-0.40.0 !<=dev-perl/MooseX-LazyRequire-0.60.0 !<=dev-perl/MooseX-Meta-Attribute-Index-0.40.0 !<=dev-perl/MooseX-Meta-Attribute-Lvalue-0.50.0 !<=dev-perl/MooseX-Method-Signatures-0.440.0 !<=dev-perl/MooseX-MethodAttributes-0.220.0 !<=dev-perl/MooseX-NonMoose-0.240.0 !<=dev-perl/MooseX-Object-Pluggable-0.1.100 !<=dev-perl/MooseX-POE-0.214.0 !<=dev-perl/MooseX-Params-Validate-0.50.0 !<=dev-perl/MooseX-PrivateSetters-0.30.0 !<=dev-perl/MooseX-Role-Cmd-0.60.0 !<=dev-perl/MooseX-Role-Parameterized-1.0.0 !<=dev-perl/MooseX-Role-WithOverloading-0.140.0 !<=dev-perl/MooseX-Runnable-0.30.0 !<=dev-perl/MooseX-Scaffold-0.50.0 !<=dev-perl/MooseX-SemiAffordanceAccessor-0.50 !<=dev-perl/MooseX-SetOnce-0.100.473 !<=dev-perl/MooseX-Singleton-0.250.0 !<=dev-perl/MooseX-SlurpyConstructor-1.100.0 !<=dev-perl/MooseX-Storage-0.420.0 !<=dev-perl/MooseX-StrictConstructor-0.120.0 !<=dev-perl/MooseX-Traits-0.110.0 !<=dev-perl/MooseX-Types-0.190.0 !<=dev-perl/MooseX-Types-Parameterizable-0.50.0 !<=dev-perl/MooseX-Types-Set-Object-0.30.0 !<=dev-perl/MooseX-Types-Signal-1.101.930 !<=dev-perl/MooseX-UndefTolerant-0.110.0 !<=dev-perl/PRANG-0.140.0 !<=dev-perl/Pod-Elemental-0.93.280 !<=dev-perl/Pod-Weaver-3.101.638 !<=dev-perl/Reaction-0.2.3 !<=dev-perl/Test-Able-0.100.0 !<=dev-perl/Test-CleanNamespaces-0.30.0 !<=dev-perl/Test-Moose-More-0.22.0 !<=dev-perl/Test-TempDir-0.50.0 !<=dev-perl/Throwable-0.102.80 !<=dev-perl/namespace-autoclean-0.80.0 >=virtual/perl-Carp-1.220.0 >=dev-perl/Class-Load-0.90.0 >=dev-perl/Class-Load-XS-0.10.0 >=dev-perl/Data-OptList-0.110.0 dev-perl/Devel-GlobalDestruction >=dev-perl/Devel-OverloadInfo-0.5.0 >=dev-perl/Devel-StackTrace-2.30.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Eval-Closure-0.40.0 >=virtual/perl-Scalar-List-Utils-1.560.0 >=dev-perl/MRO-Compat-0.50.0 >=dev-perl/Module-Runtime-0.14.0 >=dev-perl/Module-Runtime-Conflicts-0.2.0 >=dev-perl/Package-DeprecationManager-0.110.0 >=dev-perl/Package-Stash-0.320.0 >=dev-perl/Package-Stash-XS-0.240.0 >=dev-perl/Params-Util-1.0.0 >=dev-perl/Sub-Exporter-0.980.0 >=dev-perl/Sub-Name-0.200.0 >=dev-perl/Try-Tiny-0.170.0 >=virtual/perl-parent-0.223.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2015.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=11d5ed4e800fea1a0433c8350c42a770
+_md5_=f55e5a92891dd51454663eda4b8e2b6a
diff --git a/metadata/md5-cache/dev-perl/Net-CIDR-0.210.0 b/metadata/md5-cache/dev-perl/Net-CIDR-0.210.0
index e0adda75e59c..b24c309a980c 100644
--- a/metadata/md5-cache/dev-perl/Net-CIDR-0.210.0
+++ b/metadata/md5-cache/dev-perl/Net-CIDR-0.210.0
@@ -5,11 +5,11 @@ DESCRIPTION=Manipulate netblock lists in CIDR notation
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-CIDR
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.21.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=b9703f1dbed2b593e546789a1a6a1e41
+_md5_=a7b14b808ed67bc357e1715500c12bd2
diff --git a/metadata/md5-cache/dev-perl/Net-DBus-1.2.0 b/metadata/md5-cache/dev-perl/Net-DBus-1.2.0
index 88fdfe61b6f1..21ceea7c620e 100644
--- a/metadata/md5-cache/dev-perl/Net-DBus-1.2.0
+++ b/metadata/md5-cache/dev-perl/Net-DBus-1.2.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl extension for the DBus message system
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-DBus
 IUSE=test
-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=|| ( Artistic GPL-1+ )
 RDEPEND=sys-apps/dbus virtual/perl-Time-HiRes dev-perl/XML-Twig dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Net-DBus-1.2.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=607fe708c66a47088203a61d759d4ae4
+_md5_=6de6bc6dd1b33001e3e8f78b01de84ae
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-1.310.0 b/metadata/md5-cache/dev-perl/Net-DNS-1.310.0
index 7c47f6bb9fa1..ac2e4ca82e2e 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-1.310.0
+++ b/metadata/md5-cache/dev-perl/Net-DNS-1.310.0
@@ -5,7 +5,7 @@ DESCRIPTION=Perl Interface to the Domain Name System
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-DNS
 IUSE=minimal test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=!minimal? ( >=dev-perl/Net-DNS-SEC-1.30.0 )
 RDEPEND=>=virtual/perl-Carp-1.100.0 >=dev-perl/Digest-HMAC-1.30.0 >=virtual/perl-Digest-MD5-2.130.0 >=virtual/perl-Digest-SHA-5.230.0 >=virtual/perl-Encode-2.260.0 >=virtual/perl-Exporter-5.560.0 >=virtual/perl-File-Spec-0.860.0 >=virtual/perl-MIME-Base64-2.130.0 >=virtual/perl-Scalar-List-Utils-1.250.0 >=virtual/perl-Time-Local-1.190.0 >=virtual/perl-IO-Socket-IP-0.380.0 >=virtual/perl-IO-1.80.0 !minimal? ( >=dev-perl/Digest-BubbleBabble-0.10.0 >=dev-perl/Net-LibIDN2-1.0.0 ) dev-lang/perl:=
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.31.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5c7692b93ef7aff7f4d494a1794a33db
+_md5_=b59f41e669afda1f6164e40ca0bdbf35
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Mock-1.202.2.150 b/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Mock-1.202.2.150
index b444a8f3c432..d34353197e7b 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Mock-1.202.2.150
+++ b/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Mock-1.202.2.150
@@ -5,11 +5,11 @@ DESCRIPTION=Mock a DNS Resolver object for testing
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-DNS-Resolver-Mock
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Net-DNS dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20200215.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=0b71c6130f61bb8ffecbd9a54ff246e2
+_md5_=188566df9df60e5a9ac33780bf036ae8
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.180.0 b/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.180.0
index bb1b5e69cc15..5ddd7ff2e5ef 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.180.0
+++ b/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.180.0
@@ -5,11 +5,11 @@ DESCRIPTION=DNSSEC extensions to Net::DNS
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-DNS-SEC
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=virtual/perl-Carp-1.100.0 >=virtual/perl-Exporter-5.560.0 >=virtual/perl-File-Spec-0.860.0 >=virtual/perl-MIME-Base64-2.130.0 >=dev-perl/Net-DNS-1.80.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-SEC-1.18.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=57effddade8b6efec8a35d8d21707760
+_md5_=1c8f6fcefa4a0fd998eb583b23b7c4b9
diff --git a/metadata/md5-cache/dev-perl/Net-Daemon-0.490.0 b/metadata/md5-cache/dev-perl/Net-Daemon-0.490.0
index 186269c7350d..7760adb58889 100644
--- a/metadata/md5-cache/dev-perl/Net-Daemon-0.490.0
+++ b/metadata/md5-cache/dev-perl/Net-Daemon-0.490.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl extension for portable daemons
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-Daemon
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Net-Daemon-0.49.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=7f854c80a459547b75d975a2f622a3c8
+_md5_=54fe68a78e4a4507e97f09aece026408
diff --git a/metadata/md5-cache/dev-perl/Net-Ident-1.250.0 b/metadata/md5-cache/dev-perl/Net-Ident-1.250.0
index db2603053942..87e40a249ca4 100644
--- a/metadata/md5-cache/dev-perl/Net-Ident-1.250.0
+++ b/metadata/md5-cache/dev-perl/Net-Ident-1.250.0
@@ -5,11 +5,11 @@ DESCRIPTION=lookup the username on the remote end of a TCP/IP connection
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-Ident
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Socket dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Net-Ident-1.25.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=ade1dff0a52a1cf4786eca2256dc2ef2
+_md5_=f219efbcd0140c5f27bf3d4f0515d50b
diff --git a/metadata/md5-cache/dev-perl/Net-LibIDN2-1.10.0 b/metadata/md5-cache/dev-perl/Net-LibIDN2-1.10.0
index 9ff23885e1c5..7e6699c45498 100644
--- a/metadata/md5-cache/dev-perl/Net-LibIDN2-1.10.0
+++ b/metadata/md5-cache/dev-perl/Net-LibIDN2-1.10.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl bindings for GNU Libidn2
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-LibIDN2
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=net-dns/libidn2:= dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TH/THOR/Net-LibIDN2-1.01.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=68d02dfc08d146f076a30ebcb6e4ca48
+_md5_=ef809c6c3f1429066186fcc6e07742b3
diff --git a/metadata/md5-cache/dev-perl/Net-SFTP-Foreign-1.930.0 b/metadata/md5-cache/dev-perl/Net-SFTP-Foreign-1.930.0
index ecc89bfd75cb..25e802798427 100644
--- a/metadata/md5-cache/dev-perl/Net-SFTP-Foreign-1.930.0
+++ b/metadata/md5-cache/dev-perl/Net-SFTP-Foreign-1.930.0
@@ -5,11 +5,11 @@ DESCRIPTION=SSH File Transfer Protocol client
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-SFTP-Foreign
 IUSE=examples test examples
-KEYWORDS=~amd64 ~hppa ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/ssh dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Net-SFTP-Foreign-1.93.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=cd731a8623c1918f0da3308a176232d5
+_md5_=0a23e886b75c216ffb5f195ee5e123ae
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.900.0 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.900.0
index 85deb7b17bfc..80828c4a635e 100644
--- a/metadata/md5-cache/dev-perl/Net-SSLeay-1.900.0
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.900.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl extension for using OpenSSL
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-SSLeay
 IUSE=minimal examples test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=dev-libs/openssl:0= virtual/perl-MIME-Base64 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.90.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=526d6617cfc169ef68b9ba8b5e966b04
+_md5_=d25936ee77d0d4487b9412b91d7efef2
diff --git a/metadata/md5-cache/dev-perl/Net-Server-2.10.0 b/metadata/md5-cache/dev-perl/Net-Server-2.10.0
index 5984228eb37d..ed16bb52fc86 100644
--- a/metadata/md5-cache/dev-perl/Net-Server-2.10.0
+++ b/metadata/md5-cache/dev-perl/Net-Server-2.10.0
@@ -5,11 +5,11 @@ DESCRIPTION=Extensible, general Perl server engine
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-Server
 IUSE=ipv6 test
-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=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Temp virtual/perl-IO virtual/perl-Time-HiRes dev-perl/IO-Multiplex ipv6? ( dev-perl/IO-Socket-INET6 ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.010.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=11c6b4032b6e4b19b80efa08aa679822
+_md5_=2d4b6a83989790b251e4ed24049b5825
diff --git a/metadata/md5-cache/dev-perl/Net-Telnet-3.50.0 b/metadata/md5-cache/dev-perl/Net-Telnet-3.50.0
index 3a52bc90a98d..9c662e4273c1 100644
--- a/metadata/md5-cache/dev-perl/Net-Telnet-3.50.0
+++ b/metadata/md5-cache/dev-perl/Net-Telnet-3.50.0
@@ -5,11 +5,11 @@ DESCRIPTION=interact with TELNET port or other TCP ports in Perl
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-Telnet
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-libnet-1.70.300 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JR/JROGERS/Net-Telnet-3.05.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=0ea09935322c72b64fb75f2a602343c2
+_md5_=4abdbdabfd46dcb9e9618a5a88ffc02a
diff --git a/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.120.0 b/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.120.0
index bb51438cfd27..8558fea8a34f 100644
--- a/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.120.0
+++ b/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.120.0
@@ -5,11 +5,11 @@ DESCRIPTION=Automate telnet sessions w/ routers&switches
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-Telnet-Cisco
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-Telnet-3.20.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VINSWORLD/Net-Telnet-Cisco-1.12.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=9b7f7a48512e49077ebd489b5eeba52e
+_md5_=c4d1d7ce816b29bab0af7d49ce541a8b
diff --git a/metadata/md5-cache/dev-perl/Net-UPnP-1.4.6 b/metadata/md5-cache/dev-perl/Net-UPnP-1.4.6
index 80debf4070c4..567f8db4e0d3 100644
--- a/metadata/md5-cache/dev-perl/Net-UPnP-1.4.6
+++ b/metadata/md5-cache/dev-perl/Net-UPnP-1.4.6
@@ -5,11 +5,11 @@ DESCRIPTION=Perl extension for UPnP
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-UPnP
 IUSE=examples test
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-solaris
+KEYWORDS=amd64 ppc x86 ~x86-solaris
 LICENSE=BSD
 RDEPEND=virtual/perl-version dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SK/SKONNO/Net-UPnP-1.4.6.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=17062ba379235d83f6a512e1e24224ca
+_md5_=d32e964577b2f8a9c23592a0e5493e1b
diff --git a/metadata/md5-cache/dev-perl/NetPacket-1.7.2 b/metadata/md5-cache/dev-perl/NetPacket-1.7.2
index fb0968e09510..5ad5e2f4b34f 100644
--- a/metadata/md5-cache/dev-perl/NetPacket-1.7.2
+++ b/metadata/md5-cache/dev-perl/NetPacket-1.7.2
@@ -5,11 +5,11 @@ DESCRIPTION=Assemble / disassemble network packets at the protocol level
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/NetPacket
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YA/YANICK/NetPacket-1.7.2.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=3694dff5138932c5cfdab915afb3b17d
+_md5_=0126acf6ae804f0cabb3f640889f7c01
diff --git a/metadata/md5-cache/dev-perl/Object-Realize-Later-0.210.0 b/metadata/md5-cache/dev-perl/Object-Realize-Later-0.210.0
index e72825b0e8e4..221451bd6c21 100644
--- a/metadata/md5-cache/dev-perl/Object-Realize-Later-0.210.0
+++ b/metadata/md5-cache/dev-perl/Object-Realize-Later-0.210.0
@@ -5,11 +5,11 @@ DESCRIPTION=Delayed creation of objects
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Object-Realize-Later
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Object-Realize-Later-0.21.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=eda1256c4f7f8191aa655a4e3fc9b4ad
+_md5_=f14ac6b92c984fc9a81fbb57dd8f9f35
diff --git a/metadata/md5-cache/dev-perl/Ogg-Vorbis-Header-0.110.0 b/metadata/md5-cache/dev-perl/Ogg-Vorbis-Header-0.110.0
index 415e35a9f537..8780a18128aa 100644
--- a/metadata/md5-cache/dev-perl/Ogg-Vorbis-Header-0.110.0
+++ b/metadata/md5-cache/dev-perl/Ogg-Vorbis-Header-0.110.0
@@ -5,11 +5,11 @@ DESCRIPTION=An object-oriented interface to Ogg Vorbis information and comment f
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Ogg-Vorbis-Header
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~sparc x86
 LICENSE=GPL-2+ LGPL-2
 RDEPEND=>=dev-perl/Inline-0.440.0 dev-perl/Inline-C media-libs/libogg media-libs/libvorbis dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Ogg-Vorbis-Header-0.11.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=ed719c1de41ab9d4d6175ad3dab2cc36
+_md5_=5d07694f4fa893d891788be532350384
diff --git a/metadata/md5-cache/dev-perl/Ogg-Vorbis-Header-PurePerl-1.50.0 b/metadata/md5-cache/dev-perl/Ogg-Vorbis-Header-PurePerl-1.50.0
index 08a1eed8fc11..4c055ef0714e 100644
--- a/metadata/md5-cache/dev-perl/Ogg-Vorbis-Header-PurePerl-1.50.0
+++ b/metadata/md5-cache/dev-perl/Ogg-Vorbis-Header-PurePerl-1.50.0
@@ -5,11 +5,11 @@ DESCRIPTION=Object-oriented interface to Ogg Vorbis information and comment fiel
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Ogg-Vorbis-Header-PurePerl
 IUSE=test examples
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Ogg-Vorbis-Header-PurePerl-1.05.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=941adbe7129fa615712a6dcdf85d1a25
+_md5_=b23fca8beede7b15a6d467ccc8227b58
diff --git a/metadata/md5-cache/dev-perl/PAR-1.17.0 b/metadata/md5-cache/dev-perl/PAR-1.17.0
index c7622ddc87d6..100249e014c3 100644
--- a/metadata/md5-cache/dev-perl/PAR-1.17.0
+++ b/metadata/md5-cache/dev-perl/PAR-1.17.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl Archive Toolkit
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/PAR
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-solaris
+KEYWORDS=~amd64 ppc ~x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Archive-Zip-1.0.0 >=virtual/perl-AutoLoader-5.660.200 >=virtual/perl-Digest-SHA-5.450.0 >=virtual/perl-File-Temp-0.50.0 >=virtual/perl-IO-Compress-1.300.0 >=dev-perl/PAR-Dist-0.320.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-1.017.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=e6bbfe19653896653e41bf82bb5c2f15
+_md5_=1b1a683ffbf9587bdbab2fd6269b9767
diff --git a/metadata/md5-cache/dev-perl/PAR-Dist-0.510.0 b/metadata/md5-cache/dev-perl/PAR-Dist-0.510.0
index 9b58f85da7a4..30662f763855 100644
--- a/metadata/md5-cache/dev-perl/PAR-Dist-0.510.0
+++ b/metadata/md5-cache/dev-perl/PAR-Dist-0.510.0
@@ -5,11 +5,11 @@ DESCRIPTION=Create and manipulate PAR distributions
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/PAR-Dist
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-File-Temp || ( dev-perl/YAML-Syck dev-perl/YAML ) dev-perl/Archive-Zip dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-Dist-0.51.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=6eb6d1ba350ef050bd0487c0367c728c
+_md5_=9700300ca0ba672bbc82eedec5807e61
diff --git a/metadata/md5-cache/dev-perl/PDF-API2-2.40.0 b/metadata/md5-cache/dev-perl/PDF-API2-2.40.0
index d8a552542d12..4ace1c651e4c 100644
--- a/metadata/md5-cache/dev-perl/PDF-API2-2.40.0
+++ b/metadata/md5-cache/dev-perl/PDF-API2-2.40.0
@@ -5,11 +5,11 @@ DESCRIPTION=Facilitates the creation and modification of PDF files
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/PDF-API2
 IUSE=test examples
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=virtual/perl-IO-Compress-1.0.0 dev-perl/Font-TTF dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.040.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=afced0880335ae5c532dd6d891678f92
+_md5_=020944639c699905de9188eaeefa5498
diff --git a/metadata/md5-cache/dev-perl/PDF-Create-1.460.0 b/metadata/md5-cache/dev-perl/PDF-Create-1.460.0
index 4239be2f09d8..2951bd3e1fca 100644
--- a/metadata/md5-cache/dev-perl/PDF-Create-1.460.0
+++ b/metadata/md5-cache/dev-perl/PDF-Create-1.460.0
@@ -5,11 +5,11 @@ DESCRIPTION=Create PDF documents in Perl
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/PDF-Create
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~ia64 ppc sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper >=dev-perl/File-Share-0.250.0 dev-perl/JSON virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/PDF-Create-1.46.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=02b2d217eb0a2fe2166890b504ec5b47
+_md5_=ea24918dae9cdaa7cf9ce6d5636f24a3
diff --git a/metadata/md5-cache/dev-perl/Package-Stash-XS-0.290.0 b/metadata/md5-cache/dev-perl/Package-Stash-XS-0.290.0
index 3e878225917f..88871834acf3 100644
--- a/metadata/md5-cache/dev-perl/Package-Stash-XS-0.290.0
+++ b/metadata/md5-cache/dev-perl/Package-Stash-XS-0.290.0
@@ -5,11 +5,11 @@ DESCRIPTION=Faster and more correct implementation of the Package::Stash API
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Package-Stash-XS
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-XS-0.29.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=fd23df429511322b9268629cef073bea
+_md5_=195b213d9c090b000e7422d2e91c86cf
diff --git a/metadata/md5-cache/dev-perl/PadWalker-2.500.0 b/metadata/md5-cache/dev-perl/PadWalker-2.500.0
index 14d4acf8dea6..5f9377cb0084 100644
--- a/metadata/md5-cache/dev-perl/PadWalker-2.500.0
+++ b/metadata/md5-cache/dev-perl/PadWalker-2.500.0
@@ -5,11 +5,11 @@ DESCRIPTION=play with other peoples' lexical variables
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/PadWalker
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-2.5.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=294925e30042cc55d2e69c87024a36f5
+_md5_=38ead5236b9ef509f8ad4cebf5ba094d
diff --git a/metadata/md5-cache/dev-perl/Parallel-ForkManager-2.20.0 b/metadata/md5-cache/dev-perl/Parallel-ForkManager-2.20.0
index 0d7b18ed025d..4405aeb82c47 100644
--- a/metadata/md5-cache/dev-perl/Parallel-ForkManager-2.20.0
+++ b/metadata/md5-cache/dev-perl/Parallel-ForkManager-2.20.0
@@ -5,11 +5,11 @@ DESCRIPTION=A simple parallel processing fork manager
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Parallel-ForkManager
 IUSE=minimal test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/Moo virtual/perl-Storable dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YA/YANICK/Parallel-ForkManager-2.02.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=9b9edec1f4c48360bba512d326ae5795
+_md5_=4105f9d8655e02c9e325d0f8ac16da04
diff --git a/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.300.0 b/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.300.0
index d4f60a9f2bcc..dea624a566f1 100644
--- a/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.300.0
+++ b/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.300.0
@@ -5,11 +5,11 @@ DESCRIPTION=Build an optimized subroutine parameter validator once, use it forev
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Params-ValidationCompiler
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp dev-perl/Eval-Closure dev-perl/Exception-Class virtual/perl-Exporter >=virtual/perl-Scalar-List-Utils-1.400.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.30.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=dd34831d84269d0d177d780ce6eaf55e
+_md5_=6eebf6f38e07b869e56da3b013be27e3
diff --git a/metadata/md5-cache/dev-perl/Path-Tiny-0.118.0 b/metadata/md5-cache/dev-perl/Path-Tiny-0.118.0
index 9cfe4bde5681..c7956641cb7f 100644
--- a/metadata/md5-cache/dev-perl/Path-Tiny-0.118.0
+++ b/metadata/md5-cache/dev-perl/Path-Tiny-0.118.0
@@ -5,11 +5,11 @@ DESCRIPTION=File path utility
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Path-Tiny
 IUSE=minimal test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=!minimal? ( >=dev-perl/Unicode-UTF8-0.580.0 ) virtual/perl-Carp >=virtual/perl-Digest-1.30.0 >=virtual/perl-Digest-SHA-5.450.0 virtual/perl-Encode >=virtual/perl-Exporter-5.570.0 >=virtual/perl-File-Path-2.70.0 >=virtual/perl-File-Spec-0.860.0 >=virtual/perl-File-Temp-0.190.0 virtual/perl-if dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.118.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=c9b67cc4eecf31ac6624982daa6e40d8
+_md5_=93daae31ae801932e74a87d95202ee0d
diff --git a/metadata/md5-cache/dev-perl/Type-Tiny-XS-0.22.0 b/metadata/md5-cache/dev-perl/Type-Tiny-XS-0.22.0
index 09286098ca38..7c4f0bf53dba 100644
--- a/metadata/md5-cache/dev-perl/Type-Tiny-XS-0.22.0
+++ b/metadata/md5-cache/dev-perl/Type-Tiny-XS-0.22.0
@@ -5,11 +5,11 @@ DESCRIPTION=provides an XS boost for some of Type::Tiny's built-in type constrai
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Type-Tiny-XS
 IUSE=test minimal
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Type-Tiny ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-XS-0.022.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=2eb9b11eebd99d67fc1eb6510550a5bc
+_md5_=69846891f87670b212eacf2fb64c4927
diff --git a/metadata/md5-cache/dev-perl/glib-perl-1.329.300 b/metadata/md5-cache/dev-perl/glib-perl-1.329.300
index 7d1f71ffaa9b..522999517d54 100644
--- a/metadata/md5-cache/dev-perl/glib-perl-1.329.300
+++ b/metadata/md5-cache/dev-perl/glib-perl-1.329.300
@@ -5,11 +5,11 @@ DESCRIPTION=Glib - Perl wrappers for the GLib utility and Object libraries
 EAPI=8
 HOMEPAGE=http://gtk2-perl.sf.net/ https://metacpan.org/release/Glib
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 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 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3293.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=5bd3c286638a88eb776c515a609a75db
+_md5_=96eadd5d95bf837401ab6e88895147b5
diff --git a/metadata/md5-cache/dev-perl/gnome2-canvas-1.6.0 b/metadata/md5-cache/dev-perl/gnome2-canvas-1.6.0
index f02f807c903c..f8f346dbc2c5 100644
--- a/metadata/md5-cache/dev-perl/gnome2-canvas-1.6.0
+++ b/metadata/md5-cache/dev-perl/gnome2-canvas-1.6.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl interface to the Gnome Canvas
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Gnome2-Canvas
 IUSE=examples test
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc sparc x86
 LICENSE=LGPL-2
 RDEPEND=x11-libs/gtk+:2 >=gnome-base/libgnomecanvas-2 >=dev-perl/glib-perl-1.120.0 >=dev-perl/Gtk2-1.100.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Gnome2-Canvas-1.006.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=dcad1db98d345f151e76ee841d8752fa
+_md5_=7657c3385fbfb53abdac01af014f9679
diff --git a/metadata/md5-cache/dev-perl/gnome2-wnck-0.180.0 b/metadata/md5-cache/dev-perl/gnome2-wnck-0.180.0
index c7aa1568d879..ca51444aa3fe 100644
--- a/metadata/md5-cache/dev-perl/gnome2-wnck-0.180.0
+++ b/metadata/md5-cache/dev-perl/gnome2-wnck-0.180.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl interface to the Window Navigator Construction Kit
 EAPI=7
 HOMEPAGE=http://gtk2-perl.sourceforge.net/ https://metacpan.org/release/Gnome2-Wnck
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-perl/glib-perl-1.180.0 >=dev-perl/Gtk2-1.42.0 >=x11-libs/libwnck-2.20:1 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Gnome2-Wnck-0.18.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=8d9ecfeb68fe8568bd916d2f8229f71a
+_md5_=91b30c4a262579c42044691f91dcfccb
diff --git a/metadata/md5-cache/dev-perl/gtk2-gladexml-1.8.0 b/metadata/md5-cache/dev-perl/gtk2-gladexml-1.8.0
index 76cdf324c561..747ddbd5c3ac 100644
--- a/metadata/md5-cache/dev-perl/gtk2-gladexml-1.8.0
+++ b/metadata/md5-cache/dev-perl/gtk2-gladexml-1.8.0
@@ -5,11 +5,11 @@ DESCRIPTION=Create user interfaces directly from Glade XML files
 EAPI=7
 HOMEPAGE=http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-GladeXML
 IUSE=examples test
-KEYWORDS=~alpha ~amd64 ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=x11-libs/gtk+:2 gnome-base/libglade:2.0 >=dev-perl/glib-perl-1.020 >=dev-perl/Gtk2-1.012 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Gtk2-GladeXML-1.008.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=46fcf34dc20f90359ab926d262db3ca6
+_md5_=ca8eb32cf072364c69c94460351baddd
diff --git a/metadata/md5-cache/dev-perl/indirect-0.390.0 b/metadata/md5-cache/dev-perl/indirect-0.390.0
index 91b6c90936bc..46e03cf20453 100644
--- a/metadata/md5-cache/dev-perl/indirect-0.390.0
+++ b/metadata/md5-cache/dev-perl/indirect-0.390.0
@@ -5,11 +5,11 @@ DESCRIPTION=Lexically warn about using the indirect method call syntax
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/indirect
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/indirect-0.39.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=b2b22322a52181b6f0c04a2793e1975f
+_md5_=082e86f85d4f3c9a86048c68b8645c54
diff --git a/metadata/md5-cache/dev-perl/libintl-perl-1.320.0 b/metadata/md5-cache/dev-perl/libintl-perl-1.320.0
index 37b4056507c3..97ce20b78677 100644
--- a/metadata/md5-cache/dev-perl/libintl-perl-1.320.0
+++ b/metadata/md5-cache/dev-perl/libintl-perl-1.320.0
@@ -5,11 +5,11 @@ DESCRIPTION=High-Level Interface to Uniforum Message Translation
 EAPI=8
 HOMEPAGE=http://guido-flohr.net/projects/libintl-perl https://metacpan.org/release/libintl-perl
 IUSE=minimal test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=virtual/libintl !minimal? ( dev-perl/File-ShareDir ) virtual/perl-File-Spec >=virtual/perl-version-0.770.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.32.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=b652f6217e821395f509dbccf2464a47
+_md5_=acbbf88b96fabf68d449fbc8dfc02a44
diff --git a/metadata/md5-cache/dev-perl/libwww-perl-6.550.0 b/metadata/md5-cache/dev-perl/libwww-perl-6.550.0
index ec14f8b7d084..12eed352ca73 100644
--- a/metadata/md5-cache/dev-perl/libwww-perl-6.550.0
+++ b/metadata/md5-cache/dev-perl/libwww-perl-6.550.0
@@ -5,7 +5,7 @@ DESCRIPTION=A collection of Perl Modules for the WWW
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/libwww-perl
 IUSE=ssl test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=ssl? ( >=dev-perl/LWP-Protocol-https-6.20.0 )
 RDEPEND=virtual/perl-Digest-MD5 >=virtual/perl-Encode-2.120.0 dev-perl/Encode-Locale >=dev-perl/File-Listing-6.0.0 >=dev-perl/HTML-Parser-3.340.0 >=dev-perl/HTTP-Cookies-6.0.0 >=dev-perl/HTTP-Date-6.0.0 >=dev-perl/HTTP-Negotiate-6.0.0 >=dev-perl/HTTP-Message-6.70.0 virtual/perl-IO >=dev-perl/LWP-MediaTypes-6.0.0 >=virtual/perl-MIME-Base64-2.100.0 >=virtual/perl-libnet-2.580.0 >=dev-perl/Net-HTTP-6.180.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny >=dev-perl/URI-1.100.0 >=dev-perl/WWW-RobotRules-6.0.0 dev-lang/perl:=
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.55.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=26d0411de81568a6e8a0bae98667d17f
+_md5_=95857bf792765f2e2ce3c17986c93bbd
diff --git a/metadata/md5-cache/dev-perl/multidimensional-0.14.0 b/metadata/md5-cache/dev-perl/multidimensional-0.14.0
index e767e7e396d5..6b84a2b16cf3 100644
--- a/metadata/md5-cache/dev-perl/multidimensional-0.14.0
+++ b/metadata/md5-cache/dev-perl/multidimensional-0.14.0
@@ -5,11 +5,11 @@ DESCRIPTION=disables multidimensional array emulation
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/multidimensional
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Hooks-OP-Check-0.190.0 virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/multidimensional-0.014.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=a69a61ce90b3e658428e39f336312cf7
+_md5_=e9e2071da4639cf88ecbdf29e82965ed
diff --git a/metadata/md5-cache/dev-perl/namespace-autoclean-0.290.0 b/metadata/md5-cache/dev-perl/namespace-autoclean-0.290.0
index bd39156d2768..648d3aa209c3 100644
--- a/metadata/md5-cache/dev-perl/namespace-autoclean-0.290.0
+++ b/metadata/md5-cache/dev-perl/namespace-autoclean-0.290.0
@@ -5,11 +5,11 @@ DESCRIPTION=Keep imports out of your namespace
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/namespace-autoclean
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Hooks-EndOfScope-0.120.0 virtual/perl-Scalar-List-Utils dev-perl/Sub-Identify >=dev-perl/namespace-clean-0.200.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/namespace-autoclean-0.29.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=19ba4b4641019a101ec8178f681855f1
+_md5_=b09f9e598b7b2ed3bbc37f9f2cfa267e
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index fdd4ce87296b..66b48baca591 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/PHPMailer-6.5.1 b/metadata/md5-cache/dev-php/PHPMailer-6.5.1
new file mode 100644
index 000000000000..efc4e50b480c
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PHPMailer-6.5.1
@@ -0,0 +1,12 @@
+BDEPEND=doc? ( dev-php/phpDocumentor )
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=Full-featured email creation and transfer class for PHP
+EAPI=7
+HOMEPAGE=https://github.com/PHPMailer/PHPMailer
+IUSE=doc idn ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=ssl? ( idn? ( dev-lang/php:*[ctype,filter,intl,ssl,unicode] ) !idn? ( dev-lang/php:*[ctype,filter,ssl] ) ) !ssl? ( idn? ( dev-lang/php:*[ctype,filter,intl,unicode] ) !idn? ( dev-lang/php:*[ctype,filter] ) )
+SLOT=0
+SRC_URI=https://github.com/PHPMailer/PHPMailer/archive/v6.5.1.tar.gz -> PHPMailer-6.5.1.tar.gz
+_md5_=d68ab92d4149669c47b54d95d74f9c74
diff --git a/metadata/md5-cache/dev-php/composer-2.1.6 b/metadata/md5-cache/dev-php/composer-2.1.6
new file mode 100644
index 000000000000..7c8c9b75ab12
--- /dev/null
+++ b/metadata/md5-cache/dev-php/composer-2.1.6
@@ -0,0 +1,11 @@
+BDEPEND=dev-php/theseer-Autoload
+DEFINED_PHASES=install prepare
+DESCRIPTION=Dependency Manager for PHP
+EAPI=7
+HOMEPAGE=https://github.com/composer/composer
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.0 dev-php/fedora-autoloader >=dev-php/jsonlint-1.4 >=dev-php/json-schema-5.2.11 >=dev-php/metadata-minifier-1.0 >=dev-php/phar-utils-1.0 >=dev-php/psr-log-1.0 >=dev-php/reactphp-promise-2.7 >=dev-php/semver-3.0 >=dev-php/spdx-licenses-1.2 >=dev-php/symfony-console-2.8.52 >=dev-php/symfony-filesystem-2.8.52 >=dev-php/symfony-finder-2.8.52 >=dev-php/symfony-process-2.8.52 >=dev-php/xdebug-handler-2
+SLOT=0
+SRC_URI=https://github.com/composer/composer/archive/2.1.6.tar.gz -> composer-2.1.6.tar.gz
+_md5_=5f96352db72337049e4508dbaf7bdb84
diff --git a/metadata/md5-cache/dev-php/igbinary-3.2.6 b/metadata/md5-cache/dev-php/igbinary-3.2.6
new file mode 100644
index 000000000000..756245ccd421
--- /dev/null
+++ b/metadata/md5-cache/dev-php/igbinary-3.2.6
@@ -0,0 +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 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DESCRIPTION=A fast drop-in replacement for the standard PHP serialize
+EAPI=7
+HOMEPAGE=https://github.com/igbinary/igbinary
+IUSE=php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
+SLOT=0
+SRC_URI=https://github.com/igbinary/igbinary/archive/3.2.6.tar.gz -> igbinary-3.2.6.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=142b11a4cd3b74df28ad64e832013326
diff --git a/metadata/md5-cache/dev-python/Faker-8.10.0 b/metadata/md5-cache/dev-python/Faker-8.10.0
deleted file mode 100644
index 2669d1bd3cdd..000000000000
--- a/metadata/md5-cache/dev-python/Faker-8.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-8.10.0.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c84b768513e08347afc638daf4125a99
diff --git a/metadata/md5-cache/dev-python/Faker-8.10.1 b/metadata/md5-cache/dev-python/Faker-8.10.1
deleted file mode 100644
index f6454bd84dce..000000000000
--- a/metadata/md5-cache/dev-python/Faker-8.10.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-8.10.1.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c84b768513e08347afc638daf4125a99
diff --git a/metadata/md5-cache/dev-python/Faker-8.10.2 b/metadata/md5-cache/dev-python/Faker-8.10.2
deleted file mode 100644
index dcfd76d5efea..000000000000
--- a/metadata/md5-cache/dev-python/Faker-8.10.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-8.10.2.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c84b768513e08347afc638daf4125a99
diff --git a/metadata/md5-cache/dev-python/Faker-8.10.3 b/metadata/md5-cache/dev-python/Faker-8.10.3
deleted file mode 100644
index fd00037a8f57..000000000000
--- a/metadata/md5-cache/dev-python/Faker-8.10.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-8.10.3.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c84b768513e08347afc638daf4125a99
diff --git a/metadata/md5-cache/dev-python/Faker-8.11.0 b/metadata/md5-cache/dev-python/Faker-8.11.0
deleted file mode 100644
index 5cb99467e9a1..000000000000
--- a/metadata/md5-cache/dev-python/Faker-8.11.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-8.11.0.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c84b768513e08347afc638daf4125a99
diff --git a/metadata/md5-cache/dev-python/Faker-8.12.1 b/metadata/md5-cache/dev-python/Faker-8.12.1
new file mode 100644
index 000000000000..074a3f7eace3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Faker-8.12.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python package that generates fake data for you
+EAPI=8
+HOMEPAGE=https://github.com/joke2k/faker
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/F/Faker/Faker-8.12.1.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f4247b2caef34c612e26a81090b53eba
diff --git a/metadata/md5-cache/dev-python/Faker-8.8.2 b/metadata/md5-cache/dev-python/Faker-8.8.2
deleted file mode 100644
index 027a23eefd45..000000000000
--- a/metadata/md5-cache/dev-python/Faker-8.8.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=7
-HOMEPAGE=https://github.com/joke2k/faker
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-8.8.2.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3fd18c2308cbd91bf9c1a721db634362
diff --git a/metadata/md5-cache/dev-python/Faker-8.9.0 b/metadata/md5-cache/dev-python/Faker-8.9.0
deleted file mode 100644
index aae8c12f98e5..000000000000
--- a/metadata/md5-cache/dev-python/Faker-8.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-8.9.0.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c84b768513e08347afc638daf4125a99
diff --git a/metadata/md5-cache/dev-python/Faker-8.9.1 b/metadata/md5-cache/dev-python/Faker-8.9.1
deleted file mode 100644
index 88d6f050523d..000000000000
--- a/metadata/md5-cache/dev-python/Faker-8.9.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-8.9.1.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c84b768513e08347afc638daf4125a99
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 766ea4b1a1bb..5293ae383fc8 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/PyContracts-1.8.14-r1 b/metadata/md5-cache/dev-python/PyContracts-1.8.14-r1
index f05b52fa6ab9..a503e6909133 100644
--- a/metadata/md5-cache/dev-python/PyContracts-1.8.14-r1
+++ b/metadata/md5-cache/dev-python/PyContracts-1.8.14-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/decorator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/future[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) 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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
+BDEPEND=test? ( python_targets_python3_8? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) test? ( dev-python/decorator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Declare constraints on function parameters and return values
 EAPI=7
-HOMEPAGE=https://andreacensi.github.com/contracts/ https://pypi.org/project/PyContracts/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+HOMEPAGE=https://andreacensi.github.io/contracts/ https://pypi.org/project/PyContracts/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
-RDEPEND=dev-python/decorator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/future[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) 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_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/decorator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyContracts/PyContracts-1.8.14.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=52d8fea7678c22b82dea253523fce4e6
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a394a311b046bbb68c0c8f82b0e8c2f7
diff --git a/metadata/md5-cache/dev-python/aesara-2.2.1 b/metadata/md5-cache/dev-python/aesara-2.2.1
new file mode 100644
index 000000000000..265fac21638a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aesara-2.2.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Library for operating on mathematical expressions with multi-dimensional arrays
+EAPI=8
+HOMEPAGE=https://github.com/aesara-devs/aesara
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aesara-devs/aesara/archive/rel-2.2.1.tar.gz -> aesara-rel-2.2.1.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c25bf36f8974cd8077d9af1b0995dc3f
diff --git a/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1 b/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1
index 9f4303e23401..dd1c0d722466 100644
--- a/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1
+++ b/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pytest-aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/selenium[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/aiohttp-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/pytest-aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/selenium[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/aiohttp-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Implements CORS support for aiohttp asyncio-powered asynchronous HTTP server
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/aiohttp-cors
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aiohttp-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/aiohttp-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/aiohttp-cors/archive/v0.7.0.tar.gz -> aiohttp-cors-0.7.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=93d1b3629cac8dabed0cf3c81e50e1e7
+_md5_=59c0569e67d8fac7e09dabc13a280e48
diff --git a/metadata/md5-cache/dev-python/aiohttp-jinja2-1.5 b/metadata/md5-cache/dev-python/aiohttp-jinja2-1.5
new file mode 100644
index 000000000000..6f7927b6dabc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aiohttp-jinja2-1.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-aiohttp-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/aiohttp-2.3.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/alabaster[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=jinja2 template renderer for aiohttp.web
+EAPI=8
+HOMEPAGE=https://github.com/aio-libs/aiohttp-jinja2
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aiohttp-2.3.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/aiohttp-jinja2/aiohttp-jinja2-1.5.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c2c3854346f2a0acdb08dae3c229117d
diff --git a/metadata/md5-cache/dev-python/argcomplete-1.12.3 b/metadata/md5-cache/dev-python/argcomplete-1.12.3
index adfa2e14a811..8037bf3120fe 100644
--- a/metadata/md5-cache/dev-python/argcomplete-1.12.3
+++ b/metadata/md5-cache/dev-python/argcomplete-1.12.3
@@ -4,7 +4,7 @@ DESCRIPTION=Bash tab completion for argparse
 EAPI=7
 HOMEPAGE=https://pypi.org/project/argcomplete/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( <dev-python/importlib_metadata-5[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argcomplete/argcomplete-1.12.3.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bdfc7bd646f91447bf82fe7aa65fb706
+_md5_=617ffb63ad394ff97ac8afceb82af5d3
diff --git a/metadata/md5-cache/dev-python/astor-0.8.1 b/metadata/md5-cache/dev-python/astor-0.8.1
index 4a98092c306e..6de10547429c 100644
--- a/metadata/md5-cache/dev-python/astor-0.8.1
+++ b/metadata/md5-cache/dev-python/astor-0.8.1
@@ -4,7 +4,7 @@ DESCRIPTION=Read/rewrite/write Python ASTs
 EAPI=7
 HOMEPAGE=https://pypi.org/project/astor/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=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(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astor/astor-0.8.1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b906272f9ce3e6aeb0a2bde8ba53f6f3
+_md5_=c8bc641b05a6221da20c16ee7b419a4f
diff --git a/metadata/md5-cache/dev-python/bitarray-2.3.2 b/metadata/md5-cache/dev-python/bitarray-2.3.2
new file mode 100644
index 000000000000..e12ba9e09598
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bitarray-2.3.2
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Efficient arrays of booleans -- C extension
+EAPI=8
+HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=PSF-2
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/b/bitarray/bitarray-2.3.2.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=83c3618eca0c3f422984662fe0f911ef
diff --git a/metadata/md5-cache/dev-python/black-21.7_beta0 b/metadata/md5-cache/dev-python/black-21.7_beta0
index 4cd68b4c4b42..9950a12c43a5 100644
--- a/metadata/md5-cache/dev-python/black-21.7_beta0
+++ b/metadata/md5-cache/dev-python/black-21.7_beta0
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/aiohttp-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-8.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/tomli-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/aiohttp-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-8.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/tomli-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=The uncompromising Python code formatter
 EAPI=7
 HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-8.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/tomli-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-8.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/tomli-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psf/black/archive/21.7b0.tar.gz -> black-21.7b0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=21d62b1b62c8621522569e86da393bd3
+_md5_=ac261421e4bf39fad1176d8acd8f3a71
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.27 b/metadata/md5-cache/dev-python/boto3-1.18.27
new file mode 100644
index 000000000000..7d7ad760669f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.27
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.27[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.27[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.18.27.tar.gz -> boto3-1.18.27.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.28 b/metadata/md5-cache/dev-python/boto3-1.18.28
new file mode 100644
index 000000000000..2cfef160d870
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.28
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.18.28.tar.gz -> boto3-1.18.28.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.27 b/metadata/md5-cache/dev-python/botocore-1.21.27
new file mode 100644
index 000000000000..b2730aa998b8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.27
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.21.27.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.28 b/metadata/md5-cache/dev-python/botocore-1.21.28
new file mode 100644
index 000000000000..0ae58f09170f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.28
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.21.28.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2 b/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2
index 8be1bb16e308..08592db60c1b 100644
--- a/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2
+++ b/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2
@@ -5,7 +5,7 @@ DESCRIPTION=Python binding to the Brotli library
 EAPI=7
 HOMEPAGE=https://github.com/python-hyper/brotlicffi/ https://pypi.org/project/brotlicffi/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=app-arch/brotli:= virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/brotlicffi/archive/v1.0.9.2.tar.gz -> brotlicffi-1.0.9.2.gh.tar.gz test? ( https://github.com/google/brotli/archive/46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz -> brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz )
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=236096af30a471a433cc3e365f8a6824
+_md5_=c9de132a62d598c04cda3ec377cca2db
diff --git a/metadata/md5-cache/dev-python/bsddb3-6.2.9 b/metadata/md5-cache/dev-python/bsddb3-6.2.9
index d1f975876a32..3f80625f4b16 100644
--- a/metadata/md5-cache/dev-python/bsddb3-6.2.9
+++ b/metadata/md5-cache/dev-python/bsddb3-6.2.9
@@ -5,11 +5,11 @@ DESCRIPTION=Python bindings for Berkeley DB
 EAPI=7
 HOMEPAGE=https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=<sys-libs/db-6.3:= || ( sys-libs/db:6.2 sys-libs/db:6.1 sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 ) 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_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bsddb3/bsddb3-6.2.9.tar.gz
 _eclasses_=db-use	063d3e7add942762a8203b52ec3066c2	distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c2fb9a0ca1bfb50875d53b129096c35e
+_md5_=88ae5503ce6d263b418621f5f2c100fa
diff --git a/metadata/md5-cache/dev-python/charset_normalizer-2.0.4 b/metadata/md5-cache/dev-python/charset_normalizer-2.0.4
index 1c679ebe7eca..d6939df880fe 100644
--- a/metadata/md5-cache/dev-python/charset_normalizer-2.0.4
+++ b/metadata/md5-cache/dev-python/charset_normalizer-2.0.4
@@ -4,7 +4,7 @@ DESCRIPTION=The Real First Universal Charset Detector
 EAPI=7
 HOMEPAGE=https://pypi.org/project/charset-normalizer/ https://github.com/ousret/charset_normalizer/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ousret/charset_normalizer/archive/2.0.4.tar.gz -> charset_normalizer-2.0.4.gh.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=889c8c961a96d9f6bd9683a043aff28a
+_md5_=950cc12f0b2483f9f33eb515377a7c95
diff --git a/metadata/md5-cache/dev-python/colorlog-6.4.1 b/metadata/md5-cache/dev-python/colorlog-6.4.1
new file mode 100644
index 000000000000..9602ce29128c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/colorlog-6.4.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Log formatting with colors
+EAPI=8
+HOMEPAGE=https://pypi.org/project/colorlog/ https://github.com/borntyping/python-colorlog
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/colorlog/colorlog-6.4.1.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5dd846596739807733859695d6222618
diff --git a/metadata/md5-cache/dev-python/construct-2.10.67 b/metadata/md5-cache/dev-python/construct-2.10.67
index 4e647a1dd3ba..53684c356588 100644
--- a/metadata/md5-cache/dev-python/construct-2.10.67
+++ b/metadata/md5-cache/dev-python/construct-2.10.67
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/arrow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.15.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/arrow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.15.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A powerful declarative parser for binary data
 EAPI=7
 HOMEPAGE=https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/construct/construct/archive/v2.10.67.tar.gz -> construct-2.10.67.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4da9a61739ca915430836720eb0e2360
+_md5_=d29654f00e594caba6d5b4448cb0e64f
diff --git a/metadata/md5-cache/dev-python/coverage-5.5 b/metadata/md5-cache/dev-python/coverage-5.5
index 9c50f622be1b..50562f224856 100644
--- a/metadata/md5-cache/dev-python/coverage-5.5
+++ b/metadata/md5-cache/dev-python/coverage-5.5
@@ -4,7 +4,7 @@ DESCRIPTION=Code coverage measurement for Python
 EAPI=7
 HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-5.5.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3fc89a30e074abd50dc8517bb7f829ce
+_md5_=7afed1f37b2736d7e2ddd4856649ab32
diff --git a/metadata/md5-cache/dev-python/cryptography-3.4.7-r2 b/metadata/md5-cache/dev-python/cryptography-3.4.7-r2
index 8b86824a3c68..c092af5f70d5 100644
--- a/metadata/md5-cache/dev-python/cryptography-3.4.7-r2
+++ b/metadata/md5-cache/dev-python/cryptography-3.4.7-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Library providing cryptographic recipes and primitives
 EAPI=7
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=python_targets_python3_8? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-libs/openssl-1.0.2o-r6:0= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-3.4.7.tar.gz test? ( mirror://pypi/c/cryptography_vectors/cryptography_vectors-3.4.7.tar.gz )
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=02cc385be17176f0c85bfda63a69bc30
+_md5_=d0934a49acc8f2e578385d8a6f4d3d88
diff --git a/metadata/md5-cache/dev-python/cssselect-1.1.0-r1 b/metadata/md5-cache/dev-python/cssselect-1.1.0-r1
index b0002de0389b..ee0731753fdf 100644
--- a/metadata/md5-cache/dev-python/cssselect-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/cssselect-1.1.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=parses CSS3 Selectors and translates them to XPath 1.0
 EAPI=7
 HOMEPAGE=https://cssselect.readthedocs.io/en/latest/ https://pypi.org/project/cssselect/ https://github.com/scrapy/cssselect
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/scrapy/cssselect/archive/v1.1.0.tar.gz -> cssselect-1.1.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=787bdced8442340c89e01cfc7626dfab
+_md5_=34782e4560eaf18cdd6bb0499900d40d
diff --git a/metadata/md5-cache/dev-python/curtsies-0.3.5 b/metadata/md5-cache/dev-python/curtsies-0.3.5
index 6a53f058ed17..6affc0de100b 100644
--- a/metadata/md5-cache/dev-python/curtsies-0.3.5
+++ b/metadata/md5-cache/dev-python/curtsies-0.3.5
@@ -1,16 +1,15 @@
-BDEPEND=test? ( >=dev-python/blessings-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cwcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/pyte[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/blessings-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cwcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pyte[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 DESCRIPTION=Curses-like terminal wrapper, with colored strings
 EAPI=7
-HOMEPAGE=https://github.com/thomasballinger/curtsies
-IUSE=test python_targets_python3_8 python_targets_python3_9
+HOMEPAGE=https://github.com/bpython/curtsies
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=dev-python/blessings-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cwcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/blessings-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cwcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/curtsies/curtsies-0.3.5.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=055be85b6246be195f14ef1029081137
+_md5_=0ef04af9c332563ce535613b4a447128
diff --git a/metadata/md5-cache/dev-python/cython-0.29.21-r1 b/metadata/md5-cache/dev-python/cython-0.29.21-r1
deleted file mode 100644
index 0e50160f61a9..000000000000
--- a/metadata/md5-cache/dev-python/cython-0.29.21-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( python_targets_python3_8? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_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_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_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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cython/cython/archive/0.29.21.tar.gz -> cython-0.29.21.gh.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=da93e472f6a940c3f128d79a9d8360f1
diff --git a/metadata/md5-cache/dev-python/cython-0.29.22 b/metadata/md5-cache/dev-python/cython-0.29.22
deleted file mode 100644
index 967f1ab94ea5..000000000000
--- a/metadata/md5-cache/dev-python/cython-0.29.22
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( python_targets_python3_8? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_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_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_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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cython/cython/archive/0.29.22.tar.gz -> cython-0.29.22.gh.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75caa6d71571d1137dd9008e69a4035a
diff --git a/metadata/md5-cache/dev-python/cython-0.29.24 b/metadata/md5-cache/dev-python/cython-0.29.24
index e80f1d540251..6361a634d2e3 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.24
+++ b/metadata/md5-cache/dev-python/cython-0.29.24
@@ -4,7 +4,7 @@ DESCRIPTION=A Python to C compiler
 EAPI=8
 HOMEPAGE=https://cython.org https://pypi.org/project/Cython/ https://github.com/cython/cython
 IUSE=emacs test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cython/cython/archive/0.29.24.tar.gz -> cython-0.29.24.gh.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	elisp-common	cf4fd1b0835b9f3e638724840468064a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f3bf824f60b03bba99a96f63e39b58cf
+_md5_=d33eef4f27aceca5553b17a16978f25f
diff --git a/metadata/md5-cache/dev-python/debugpy-1.4.1 b/metadata/md5-cache/dev-python/debugpy-1.4.1
new file mode 100644
index 000000000000..83a35d6befb5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/debugpy-1.4.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An implementation of the Debug Adapter Protocol for Python
+EAPI=8
+HOMEPAGE=https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/microsoft/debugpy/archive/refs/tags/v1.4.1.tar.gz -> debugpy-1.4.1.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=af9fd86a511f974d0b5e2f37ff20470c
diff --git a/metadata/md5-cache/dev-python/deprecation-2.1.0 b/metadata/md5-cache/dev-python/deprecation-2.1.0
index bd784559d985..0660ae41d21a 100644
--- a/metadata/md5-cache/dev-python/deprecation-2.1.0
+++ b/metadata/md5-cache/dev-python/deprecation-2.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=A library to handle automated deprecations
 EAPI=8
 HOMEPAGE=https://deprecation.readthedocs.io/
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/deprecation/deprecation-2.1.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a84dadfd399d1be1cbd1da74d48767e4
+_md5_=46f6f13ca1f6143c32360c2ed4719af6
diff --git a/metadata/md5-cache/dev-python/dicttoxml-1.7.4-r2 b/metadata/md5-cache/dev-python/dicttoxml-1.7.4-r2
new file mode 100644
index 000000000000..06b62179054a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dicttoxml-1.7.4-r2
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Converts a Python dictionary or other data type to a valid XML string
+EAPI=8
+HOMEPAGE=https://github.com/quandyfactory/dicttoxml https://pypi.org/project/dicttoxml/
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/d/dicttoxml/dicttoxml-1.7.4.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ae85b009586977d66e440d9622cc897c
diff --git a/metadata/md5-cache/dev-python/discogs-client-2.3.12-r1 b/metadata/md5-cache/dev-python/discogs-client-2.3.12-r1
new file mode 100644
index 000000000000..4c087697c92b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/discogs-client-2.3.12-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/oauthlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Continuation of the official Python API client for Discogs
+EAPI=8
+HOMEPAGE=https://github.com/joalla/discogs_client https://pypi.org/project/python3-discogs-client/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/oauthlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/python3-discogs-client/python3-discogs-client-2.3.12.tar.gz -> discogs-client-2.3.12.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6cda58647a585d4fd3d093bc3a195cd4
diff --git a/metadata/md5-cache/dev-python/discogs-client-9999 b/metadata/md5-cache/dev-python/discogs-client-9999
index 7a7fe775d9ba..409e44dbc9be 100644
--- a/metadata/md5-cache/dev-python/discogs-client-9999
+++ b/metadata/md5-cache/dev-python/discogs-client-9999
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/oauthlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sh[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauthlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/oauthlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Continuation of the official Python API client for Discogs
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/joalla/discogs_client https://pypi.org/project/python3-discogs-client/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=BSD-2
 PROPERTIES=live
-RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauthlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/oauthlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=64e3012d8d40fbf5d130608e9ee0ee6d
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6cda58647a585d4fd3d093bc3a195cd4
diff --git a/metadata/md5-cache/dev-python/django-mptt-0.13.1 b/metadata/md5-cache/dev-python/django-mptt-0.13.1
new file mode 100644
index 000000000000..8284695f8379
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-mptt-0.13.1
@@ -0,0 +1,14 @@
+BDEPEND=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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=utilities for modified preorder tree traversal and trees of model instances
+EAPI=8
+HOMEPAGE=https://github.com/django-mptt/django-mptt
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/django-js-asset[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/django-mptt/django-mptt/archive/0.13.1.tar.gz -> django-mptt-0.13.1.gh.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a448b459ce4e8f6c1dec0f65f3458784
diff --git a/metadata/md5-cache/dev-python/django-redis-5.0.0 b/metadata/md5-cache/dev-python/django-redis-5.0.0
new file mode 100644
index 000000000000..4ba3a2743e19
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-redis-5.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-db/redis dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/redis-py-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Full featured redis cache backend for Django
+EAPI=8
+HOMEPAGE=https://github.com/jazzband/django-redis/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/redis-py-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/django-redis/django-redis-5.0.0.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=41b5861c07fe8963334405b73c295357
diff --git a/metadata/md5-cache/dev-python/elementpath-2.2.3 b/metadata/md5-cache/dev-python/elementpath-2.2.3
index 1c38242373f6..0e2b6405fc2b 100644
--- a/metadata/md5-cache/dev-python/elementpath-2.2.3
+++ b/metadata/md5-cache/dev-python/elementpath-2.2.3
@@ -4,7 +4,7 @@ DESCRIPTION=XPath 1.0/2.0 parsers and selectors for ElementTree and lxml
 EAPI=7
 HOMEPAGE=https://github.com/sissaschool/elementpath/ https://pypi.org/project/elementpath/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sissaschool/elementpath/archive/v2.2.3.tar.gz -> elementpath-2.2.3.gh.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d21901b11ea74fb7f0bc32b9ab6f6988
+_md5_=c95f8407b81f8104cdd949603378df35
diff --git a/metadata/md5-cache/dev-python/emcee-3.1.1 b/metadata/md5-cache/dev-python/emcee-3.1.1
new file mode 100644
index 000000000000..5fd30ca09ccb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/emcee-3.1.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=Python ensemble sampling toolkit for affine-invariant MCMC
+EAPI=8
+HOMEPAGE=https://emcee.readthedocs.io/en/stable/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/e/emcee/emcee-3.1.1.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=183a3c42d0db71bd17f60a2bf02ee89d
diff --git a/metadata/md5-cache/dev-python/eventlet-0.31.1 b/metadata/md5-cache/dev-python/eventlet-0.31.1
index 209dd07899c5..f0aac702de51 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.31.1
+++ b/metadata/md5-cache/dev-python/eventlet-0.31.1
@@ -4,7 +4,7 @@ DESCRIPTION=Highly concurrent networking library
 EAPI=8
 HOMEPAGE=https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/
 IUSE=examples test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/dnspython-1.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/dnspython-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/python-greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.31.1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7b4290e5e9c7696e26165e1089eb4a8b
+_md5_=e4a296a1c4bd209880d4eb9f728e5b34
diff --git a/metadata/md5-cache/dev-python/eyeD3-0.9.6 b/metadata/md5-cache/dev-python/eyeD3-0.9.6
index 3b59d53d20d4..7f18f8480b2a 100644
--- a/metadata/md5-cache/dev-python/eyeD3-0.9.6
+++ b/metadata/md5-cache/dev-python/eyeD3-0.9.6
@@ -4,7 +4,7 @@ DESCRIPTION=Module for manipulating ID3 (v1 + v2) tags in Python
 EAPI=7
 HOMEPAGE=https://eyed3.nicfit.net/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filetype[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0.7
 SRC_URI=https://github.com/nicfit/eyeD3/archive/v0.9.6.tar.gz -> eyeD3-0.9.6.tar.gz test? ( https://eyed3.nicfit.net/releases/eyeD3-test-data.tgz )
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7dd57a5b11b2e70e4cbda297fab3b9bc
+_md5_=b5b4c0fb12b01450b2f42576546fd160
diff --git a/metadata/md5-cache/dev-python/filelock-3.0.12-r1 b/metadata/md5-cache/dev-python/filelock-3.0.12-r1
index f90266c742e6..0d385b72ff05 100644
--- a/metadata/md5-cache/dev-python/filelock-3.0.12-r1
+++ b/metadata/md5-cache/dev-python/filelock-3.0.12-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A platform independent file lock for Python
 EAPI=7
 HOMEPAGE=https://github.com/benediktschmitt/py-filelock https://pypi.org/project/filelock/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Unlicense
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/benediktschmitt/py-filelock/archive/v3.0.12.tar.gz -> py-filelock-3.0.12.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=72023d55da3d1c2cd3261a5a629c0fc0
+_md5_=e7afec7fbc83a88cfcaa830ab3545f3d
diff --git a/metadata/md5-cache/dev-python/filetype-1.0.7 b/metadata/md5-cache/dev-python/filetype-1.0.7
index 2dfc724ff0c9..3aae11b1cc26 100644
--- a/metadata/md5-cache/dev-python/filetype-1.0.7
+++ b/metadata/md5-cache/dev-python/filetype-1.0.7
@@ -4,7 +4,7 @@ DESCRIPTION=Small, dependency-free, fast Python package to infer binary file typ
 EAPI=7
 HOMEPAGE=https://github.com/h2non/filetype.py
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/filetype/filetype-1.0.7.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a8642d27795c87abc5a6b3dae8f5f339
+_md5_=288f517c8a636fc6b87b081549ec5b02
diff --git a/metadata/md5-cache/dev-python/flask-2.0.1 b/metadata/md5-cache/dev-python/flask-2.0.1
index a544e62c0abd..9e2db8ee167a 100644
--- a/metadata/md5-cache/dev-python/flask-2.0.1
+++ b/metadata/md5-cache/dev-python/flask-2.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=A microframework based on Werkzeug, Jinja2 and good intentions
 EAPI=7
 HOMEPAGE=https://github.com/pallets/flask/
 IUSE=examples doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/click-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/itsdangerous-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/werkzeug-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask/Flask-2.0.1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dd199980b3d58e560961e766f50e10b7
+_md5_=59c712c3ae6270189733d9e04b91432b
diff --git a/metadata/md5-cache/dev-python/flask-babelex-0.9.4 b/metadata/md5-cache/dev-python/flask-babelex-0.9.4
index 22c039efbfd1..82b189fd6b01 100644
--- a/metadata/md5-cache/dev-python/flask-babelex-0.9.4
+++ b/metadata/md5-cache/dev-python/flask-babelex-0.9.4
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/Babel-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/speaklater-1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/flask-sphinx-themes[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/flask-sphinx-themes[python_targets_python3_8(-)] ) ) ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/speaklater-1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/flask-sphinx-themes[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/flask-sphinx-themes[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/flask-sphinx-themes[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Adds i18n/l10n support to Flask applications
 EAPI=7
 HOMEPAGE=https://github.com/mrjoes/flask-babelex https://pypi.org/project/Flask-BabelEx/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/Babel-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/speaklater-1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/speaklater-1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-BabelEx/Flask-BabelEx-0.9.4.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c055bcb116a1cd2740e56997548cb464
+_md5_=3f2727e98b8b631cb440d90ecc251f33
diff --git a/metadata/md5-cache/dev-python/flask-login-0.5.0 b/metadata/md5-cache/dev-python/flask-login-0.5.0
index 569d58ebfc6a..c06bcbe3db9b 100644
--- a/metadata/md5-cache/dev-python/flask-login-0.5.0
+++ b/metadata/md5-cache/dev-python/flask-login-0.5.0
@@ -1,16 +1,16 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/flask-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/flask-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/blinker[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/semantic_version[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DEPEND=test? ( dev-python/blinker[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/semantic_version[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 DESCRIPTION=Login session support for Flask
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Flask-Login/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
-RDEPEND=>=dev-python/flask-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/flask-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxcountryman/flask-login/archive/0.5.0.tar.gz -> flask-login-0.5.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=46354f03cf872bde5639b9eabdee3aba
+_md5_=7e20e70f5b53557392c0be09d5749363
diff --git a/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1 b/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
index c2fd18900f78..fb4e8037396e 100644
--- a/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
+++ b/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/speaklater[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/blinker[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/speaklater[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blinker[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Flask extension for sending email
 EAPI=7
 HOMEPAGE=https://pythonhosted.org/Flask-Mail/ https://pypi.org/project/Flask-Mail/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/blinker[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blinker[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Mail/Flask-Mail-0.9.1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8122554e4a552efc268a8cd8d778651c
+_md5_=ba3bfbb327661648d66429d6bbd0b9e3
diff --git a/metadata/md5-cache/dev-python/flask-restful-0.3.9 b/metadata/md5-cache/dev-python/flask-restful-0.3.9
index 39e42977ccf2..ac5a260ec67c 100644
--- a/metadata/md5-cache/dev-python/flask-restful-0.3.9
+++ b/metadata/md5-cache/dev-python/flask-restful-0.3.9
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/aniso8601-0.82[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/aniso8601-0.82[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Simple framework for creating REST APIs
 EAPI=7
 HOMEPAGE=https://flask-restful.readthedocs.io/en/latest/ https://github.com/flask-restful/flask-restful/
-IUSE=examples doc test python_targets_python3_8 python_targets_python3_9
+IUSE=examples doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
-RDEPEND=>=dev-python/aniso8601-0.82[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/aniso8601-0.82[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flask-restful/flask-restful/archive/v0.3.9.tar.gz -> flask-restful-0.3.9.gh.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e8f75d5b18856220cc484590d72eb06e
+_md5_=b97f75ef1494a25dad7183e522f72e15
diff --git a/metadata/md5-cache/dev-python/flask-script-2.0.6 b/metadata/md5-cache/dev-python/flask-script-2.0.6
index ccf9034025c9..d2d21a352822 100644
--- a/metadata/md5-cache/dev-python/flask-script-2.0.6
+++ b/metadata/md5-cache/dev-python/flask-script-2.0.6
@@ -1,16 +1,15 @@
-BDEPEND=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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/flask-0.10.1-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/flask-0.10.1-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 DESCRIPTION=Flask support for writing external scripts
 EAPI=7
 HOMEPAGE=https://flask-script.readthedocs.io/en/latest/ https://flask-script.readthedocs.io/en/latest/ https://pypi.org/project/Flask-Script/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=>=dev-python/flask-0.10.1-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/flask-0.10.1-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Script/Flask-Script-2.0.6.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8607c9b49525cdcd46c9df666f53c676
+_md5_=affced5869d023f3d3fb14398f09d163
diff --git a/metadata/md5-cache/dev-python/flask-wtf-0.15.1 b/metadata/md5-cache/dev-python/flask-wtf-0.15.1
index 4f26263b2ba9..e48f02c94cff 100644
--- a/metadata/md5-cache/dev-python/flask-wtf-0.15.1
+++ b/metadata/md5-cache/dev-python/flask-wtf-0.15.1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Simple integration of Flask and WTForms
 EAPI=7
 HOMEPAGE=https://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF/
-IUSE=doc test doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/Babel-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wtforms-1.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-WTF/Flask-WTF-0.15.1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a9ae4aa4e74d1ae5040f1bf21cd76246
+_md5_=b5952421c6c638ed495560455be57b97
diff --git a/metadata/md5-cache/dev-python/flexmock-0.10.6 b/metadata/md5-cache/dev-python/flexmock-0.10.6
index 2ff00b87648d..3fb18758ded6 100644
--- a/metadata/md5-cache/dev-python/flexmock-0.10.6
+++ b/metadata/md5-cache/dev-python/flexmock-0.10.6
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flexmock/flexmock-0.10.6.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5efd350031d531feaa27b5fde3e9c859
+_md5_=047e72acd38631018e4b2227f34ba195
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.18.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.18.0
new file mode 100644
index 000000000000..ac6e884ac6c2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.18.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google API Client for Python
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-api-python-client
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.18.0.tar.gz -> google-api-python-client-2.18.0.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8abbbdb6e29d0b0db60ffb2569384fd6
diff --git a/metadata/md5-cache/dev-python/huawei-lte-api-1.4.18 b/metadata/md5-cache/dev-python/huawei-lte-api-1.4.18
index eb1bc55861bc..04d15cfe4cbb 100644
--- a/metadata/md5-cache/dev-python/huawei-lte-api-1.4.18
+++ b/metadata/md5-cache/dev-python/huawei-lte-api-1.4.18
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/dicttoxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) 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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/dicttoxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=API For huawei LAN/WAN LTE Modems
 EAPI=7
 HOMEPAGE=https://github.com/Salamek/huawei-lte-api
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-python/dicttoxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) 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_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/dicttoxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Salamek/huawei-lte-api/archive/1.4.18.tar.gz -> huawei-lte-api-1.4.18.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ac33a68a06bee7556f1cd59b4ab2e4f8
+_md5_=82e25b8e709e7eb9adfdf28cc51d77a6
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.14.9 b/metadata/md5-cache/dev-python/hypothesis-6.14.9
index bfd15debb0e2..bcf62a55d113 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.14.9
+++ b/metadata/md5-cache/dev-python/hypothesis-6.14.9
@@ -4,7 +4,7 @@ DESCRIPTION=A library for property based testing
 EAPI=8
 HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
 IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.14.9.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4bd3e94e96fddf6e9204e69b30d2b2f8
+_md5_=cdaecf1681a7634538ca5e9b47917683
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.15.0 b/metadata/md5-cache/dev-python/hypothesis-6.15.0
new file mode 100644
index 000000000000..8d4a0d17b7ff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.15.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.15.0.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cdaecf1681a7634538ca5e9b47917683
diff --git a/metadata/md5-cache/dev-python/immutables-0.16 b/metadata/md5-cache/dev-python/immutables-0.16
index 4cce2de7cbf8..45ba23576521 100644
--- a/metadata/md5-cache/dev-python/immutables-0.16
+++ b/metadata/md5-cache/dev-python/immutables-0.16
@@ -4,7 +4,7 @@ DESCRIPTION=A high-performance immutable mapping type for Python
 EAPI=8
 HOMEPAGE=https://github.com/MagicStack/immutables
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/MagicStack/immutables/archive/v0.16.tar.gz -> immutables-0.16.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8313995cd4419d7d846586bec67319f2
+_md5_=acf4389906dcad01c24a9ec3e203374f
diff --git a/metadata/md5-cache/dev-python/influxdb-5.3.0-r1 b/metadata/md5-cache/dev-python/influxdb-5.3.0-r1
index 36f96f0a1ac3..0a7affd143b7 100644
--- a/metadata/md5-cache/dev-python/influxdb-5.3.0-r1
+++ b/metadata/md5-cache/dev-python/influxdb-5.3.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-db/influxdb dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/msgpack-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-db/influxdb dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/msgpack-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=InfluxDB client
 EAPI=7
 HOMEPAGE=https://github.com/influxdb/influxdb-python https://pypi.org/project/influxdb/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=dev-python/msgpack-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/msgpack-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/influxdb/influxdb-5.3.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=98cd076ab5670ce384d878aa899ccc15
+_md5_=74ecb2975e5e979574a387bb2a38c64c
diff --git a/metadata/md5-cache/dev-python/iniconfig-1.1.1 b/metadata/md5-cache/dev-python/iniconfig-1.1.1
index 13fdff479ee2..2a224b356000 100644
--- a/metadata/md5-cache/dev-python/iniconfig-1.1.1
+++ b/metadata/md5-cache/dev-python/iniconfig-1.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Brain-dead simple config-ini parsing
 EAPI=7
 HOMEPAGE=https://github.com/RonnyPfannschmidt/iniconfig
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/iniconfig/iniconfig-1.1.1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=74e449e85544b5fa5dacf3b4f2bb2be7
+_md5_=e83387e7b2aaf15b395037f0d8508c3d
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.2.0 b/metadata/md5-cache/dev-python/ipykernel-6.2.0
new file mode 100644
index 000000000000..bd8a20f77312
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipykernel-6.2.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nose_warnings_filters[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipyparallel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/debugpy-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/debugpy-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/ipython-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/traitlets-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_client-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <www-servers/tornado-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/matplotlib-inline-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=IPython Kernel for Jupyter
+EAPI=8
+HOMEPAGE=https://github.com/ipython/ipykernel
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-python/debugpy-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/debugpy-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/ipython-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/traitlets-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_client-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <www-servers/tornado-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/matplotlib-inline-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.2.0.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=88823445d4652beca002b5210a80f636
diff --git a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r2 b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r2
index 727f26ddb8f6..3291d38b52ca 100644
--- a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r2
+++ b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Vestigial utilities from IPython
 EAPI=7
 HOMEPAGE=https://github.com/ipython/ipython_genutils
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython_genutils/ipython_genutils-0.2.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=69bdf0c78c42d4e5ee514dbac117424b
+_md5_=2f683665793583413ebac3bc4cc3889f
diff --git a/metadata/md5-cache/dev-python/isodate-0.6.0-r2 b/metadata/md5-cache/dev-python/isodate-0.6.0-r2
index f46bafe0bb0d..eb58d6b1dd44 100644
--- a/metadata/md5-cache/dev-python/isodate-0.6.0-r2
+++ b/metadata/md5-cache/dev-python/isodate-0.6.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=ISO 8601 date/time/duration parser and formatter
 EAPI=8
 HOMEPAGE=https://pypi.org/project/isodate/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/isodate/isodate-0.6.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4e3921f1ef7d21461b3b760533caffcc
+_md5_=7cfba1339bfc005623ea8a2420f44a0b
diff --git a/metadata/md5-cache/dev-python/jedi-0.17.2-r1 b/metadata/md5-cache/dev-python/jedi-0.17.2-r1
index a898c12020e1..c35f1832016d 100644
--- a/metadata/md5-cache/dev-python/jedi-0.17.2-r1
+++ b/metadata/md5-cache/dev-python/jedi-0.17.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Autocompletion library for Python
 EAPI=7
 HOMEPAGE=https://github.com/davidhalter/jedi
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=MIT test? ( Apache-2.0 )
 RDEPEND==dev-python/parso-0.7*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.17.2.tar.gz -> jedi-0.17.2.tar.gz https://github.com/davidhalter/typeshed/archive/jedi_v0.16.0.tar.gz -> typeshed-jedi_v0.16.0.tar.gz https://github.com/davidhalter/django-stubs/archive/v1.5.0.tar.gz -> django-stubs-1.5.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3a826d167057b9725211d998b25649a4
+_md5_=55fc501a559b7c27ad8c700b3dec331f
diff --git a/metadata/md5-cache/dev-python/jedi-0.18.0 b/metadata/md5-cache/dev-python/jedi-0.18.0
index f09d93372339..506481a1a743 100644
--- a/metadata/md5-cache/dev-python/jedi-0.18.0
+++ b/metadata/md5-cache/dev-python/jedi-0.18.0
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( =dev-python/parso-0.8*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/parso[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/parso[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/parso[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( =dev-python/parso-0.8*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Autocompletion library for Python
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.18.0.tar.gz -> jedi-0.18.0.tar.gz https://github.com/davidhalter/typeshed/archive/jedi_v0.16.0.tar.gz -> typeshed-jedi_v0.16.0.tar.gz https://github.com/davidhalter/django-stubs/archive/v1.5.0.tar.gz -> django-stubs-1.5.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e931dcc01d819e00cbe639f62d82972b
+_md5_=05702e3a85b30e73f3759cd120bb12f3
diff --git a/metadata/md5-cache/dev-python/jinja-3.0.1 b/metadata/md5-cache/dev-python/jinja-3.0.1
index ad0d21073ccb..c55697f2019d 100644
--- a/metadata/md5-cache/dev-python/jinja-3.0.1
+++ b/metadata/md5-cache/dev-python/jinja-3.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=A full-featured template engine for Python
 EAPI=7
 HOMEPAGE=https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/
 IUSE=examples doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=BSD
 RDEPEND=>=dev-python/markupsafe-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/jinja:compat python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/jinja/archive/3.0.1.tar.gz -> jinja-3.0.1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0c30950a13968131f160998fbb16461a
+_md5_=65fc8357788a99d2fe5f25023506a231
diff --git a/metadata/md5-cache/dev-python/jsondiff-1.3.0 b/metadata/md5-cache/dev-python/jsondiff-1.3.0
index 065f73005b41..609b71e5c9b3 100644
--- a/metadata/md5-cache/dev-python/jsondiff-1.3.0
+++ b/metadata/md5-cache/dev-python/jsondiff-1.3.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/nose-random[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/nose-random[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Diff JSON and JSON-like structures in Python
 EAPI=7
 HOMEPAGE=https://github.com/xlwings/jsondiff/ https://pypi.org/project/jsondiff/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xlwings/jsondiff/archive/1.3.0.tar.gz -> jsondiff-1.3.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77296c93b0d51dc92db0f7873098caf0
+_md5_=e0d4228e7be3c3d93e77f9c6cb4f5c3a
diff --git a/metadata/md5-cache/dev-python/jsonext-0.4.2 b/metadata/md5-cache/dev-python/jsonext-0.4.2
index 29dec1d826ef..fd79e0de9452 100644
--- a/metadata/md5-cache/dev-python/jsonext-0.4.2
+++ b/metadata/md5-cache/dev-python/jsonext-0.4.2
@@ -1,14 +1,14 @@
-BDEPEND=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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Well-structured helpers for serializing commonly encountered structures to JSON.
 EAPI=7
 HOMEPAGE=https://github.com/mbr/jsonext
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
-RDEPEND=dev-python/arrow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/arrow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonext/jsonext-0.4.2.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5ca9961c5cd4372cfe73ed443528a83e
+_md5_=70e7a2d7d680ff124226237eea0fb963
diff --git a/metadata/md5-cache/dev-python/jupyter_client-7.0.1 b/metadata/md5-cache/dev-python/jupyter_client-7.0.1
index d39b845ec11e..60895e98b6b2 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-7.0.1
+++ b/metadata/md5-cache/dev-python/jupyter_client-7.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Jupyter protocol implementation and client libraries
 EAPI=8
 HOMEPAGE=https://jupyter.org
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-14.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-7.0.1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9e42984c10cd16ad2b6ec8ad23cf6543
+_md5_=774fa22fcf3f985efe6932953f0c7855
diff --git a/metadata/md5-cache/dev-python/jupyterlab_pygments-0.1.2 b/metadata/md5-cache/dev-python/jupyterlab_pygments-0.1.2
index 49d20989872e..9b3c77c46dbc 100644
--- a/metadata/md5-cache/dev-python/jupyterlab_pygments-0.1.2
+++ b/metadata/md5-cache/dev-python/jupyterlab_pygments-0.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Pygments theme making use of JupyterLab CSS variables
 EAPI=8
 HOMEPAGE=https://github.com/jupyterlab/jupyterlab_pygments
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/jupyterlab/jupyterlab_pygments/archive/0.1.2.tar.gz -> jupyterlab_pygments-0.1.2.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=451651bb8f5c31c4f48efc5e2263e680
+_md5_=51ae87d8b8e5a56182b0c411981cf59e
diff --git a/metadata/md5-cache/dev-python/kombu-5.1.0 b/metadata/md5-cache/dev-python/kombu-5.1.0
new file mode 100644
index 000000000000..335e3ceb03d1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/kombu-5.1.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/case-1.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/kazoo[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/msgpack-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pycurl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pymongo-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyro:4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/redis-py-3.3.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sqlalchemy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zstandard[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/py-amqp-5.0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/py-amqp-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/vine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_celery[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_celery[python_targets_python3_8(-)] ) ) ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=AMQP Messaging Framework for Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/kombu/ https://github.com/celery/kombu
+IUSE=examples test doc python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/py-amqp-5.0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/py-amqp-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/vine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/k/kombu/kombu-5.1.0.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ce9b0c947da1371f1b138ae8a0ff0c8e
diff --git a/metadata/md5-cache/dev-python/lxml-4.6.3-r1 b/metadata/md5-cache/dev-python/lxml-4.6.3-r1
index 523a4cfe98ae..3c70d10213ba 100644
--- a/metadata/md5-cache/dev-python/lxml-4.6.3-r1
+++ b/metadata/md5-cache/dev-python/lxml-4.6.3-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
 EAPI=7
 HOMEPAGE=https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml
 IUSE=doc examples +threads test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD ElementTree GPL-2 PSF-2
 RDEPEND=>=dev-libs/libxml2-2.9.12-r2 >=dev-libs/libxslt-1.1.28 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxml/lxml/archive/lxml-4.6.3.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8d63292d01d5f3b9a1fe1e056df6b27c
+_md5_=261a7547499f9b3b00113e8fd6460101
diff --git a/metadata/md5-cache/dev-python/markupsafe-2.0.1 b/metadata/md5-cache/dev-python/markupsafe-2.0.1
index 9fc370e35781..1e34d265fb56 100644
--- a/metadata/md5-cache/dev-python/markupsafe-2.0.1
+++ b/metadata/md5-cache/dev-python/markupsafe-2.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Implements a XML/HTML/XHTML Markup safe string for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/MarkupSafe/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/MarkupSafe/MarkupSafe-2.0.1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f29adae07790c1608dc1357e49e66ff
+_md5_=029037c1f791220b8ec5c6c583beca10
diff --git a/metadata/md5-cache/dev-python/more-itertools-8.8.0 b/metadata/md5-cache/dev-python/more-itertools-8.8.0
index c86850533cfc..246c8fab143f 100644
--- a/metadata/md5-cache/dev-python/more-itertools-8.8.0
+++ b/metadata/md5-cache/dev-python/more-itertools-8.8.0
@@ -4,7 +4,7 @@ DESCRIPTION=More routines for operating on iterables, beyond itertools
 EAPI=7
 HOMEPAGE=https://pypi.org/project/more-itertools/
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/more-itertools/more-itertools-8.8.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7d4d7ad881e68510aa9094783224c136
+_md5_=9f2247a76effd2e09271ffe1e0d23f47
diff --git a/metadata/md5-cache/dev-python/moto-2.0.10 b/metadata/md5-cache/dev-python/moto-2.0.10
deleted file mode 100644
index 0d9f0cffbff4..000000000000
--- a/metadata/md5-cache/dev-python/moto-2.0.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dicttoxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Mock library for boto
-EAPI=7
-HOMEPAGE=https://github.com/spulec/moto
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dicttoxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/moto/moto-2.0.10.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9115f59ea8837f7be30ac36690f0dd41
diff --git a/metadata/md5-cache/dev-python/moto-2.0.10-r1 b/metadata/md5-cache/dev-python/moto-2.0.10-r1
new file mode 100644
index 000000000000..c00d7d64888b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/moto-2.0.10-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Mock library for boto
+EAPI=7
+HOMEPAGE=https://github.com/spulec/moto
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/moto/moto-2.0.10.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b84c9bbd5a3fa1032da529eb58c6092d
diff --git a/metadata/md5-cache/dev-python/moto-2.0.5 b/metadata/md5-cache/dev-python/moto-2.0.5
deleted file mode 100644
index 62deaa293017..000000000000
--- a/metadata/md5-cache/dev-python/moto-2.0.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dicttoxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Mock library for boto
-EAPI=7
-HOMEPAGE=https://github.com/spulec/moto
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dicttoxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/moto/moto-2.0.5.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bf12b791cf5d39cb60d901b565b15db2
diff --git a/metadata/md5-cache/dev-python/moto-2.0.5-r1 b/metadata/md5-cache/dev-python/moto-2.0.5-r1
new file mode 100644
index 000000000000..2c1c52681bb2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/moto-2.0.5-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Mock library for boto
+EAPI=7
+HOMEPAGE=https://github.com/spulec/moto
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 ~arm ~arm64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/moto/moto-2.0.5.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=510ba8b7c81b8dcd0912b95a924bc97c
diff --git a/metadata/md5-cache/dev-python/moto-2.2.0 b/metadata/md5-cache/dev-python/moto-2.2.0
deleted file mode 100644
index 09f880c03699..000000000000
--- a/metadata/md5-cache/dev-python/moto-2.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dicttoxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Mock library for boto
-EAPI=8
-HOMEPAGE=https://github.com/spulec/moto
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dicttoxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/moto/moto-2.2.0.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d1fcb0f73c62b6b0d167ebaa13f98eef
diff --git a/metadata/md5-cache/dev-python/moto-2.2.0-r1 b/metadata/md5-cache/dev-python/moto-2.2.0-r1
new file mode 100644
index 000000000000..0c8d9de91d47
--- /dev/null
+++ b/metadata/md5-cache/dev-python/moto-2.2.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Mock library for boto
+EAPI=8
+HOMEPAGE=https://github.com/spulec/moto
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/moto/moto-2.2.0.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=619abd790af5e89902cc5acd5e143e58
diff --git a/metadata/md5-cache/dev-python/moto-2.2.2 b/metadata/md5-cache/dev-python/moto-2.2.2
deleted file mode 100644
index 839e00af5ac8..000000000000
--- a/metadata/md5-cache/dev-python/moto-2.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dicttoxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Mock library for boto
-EAPI=8
-HOMEPAGE=https://github.com/spulec/moto
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dicttoxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/moto/moto-2.2.2.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7677117a630be3a69eca4c050904c640
diff --git a/metadata/md5-cache/dev-python/moto-2.2.2-r1 b/metadata/md5-cache/dev-python/moto-2.2.2-r1
new file mode 100644
index 000000000000..84d85f3d6d8e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/moto-2.2.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Mock library for boto
+EAPI=8
+HOMEPAGE=https://github.com/spulec/moto
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/moto/moto-2.2.2.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3ef9cab908e4e0fab6f7879dab7f4ebc
diff --git a/metadata/md5-cache/dev-python/moto-2.2.3 b/metadata/md5-cache/dev-python/moto-2.2.3
deleted file mode 100644
index ab152fcc5249..000000000000
--- a/metadata/md5-cache/dev-python/moto-2.2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dicttoxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Mock library for boto
-EAPI=8
-HOMEPAGE=https://github.com/spulec/moto
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dicttoxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/moto/moto-2.2.3.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7677117a630be3a69eca4c050904c640
diff --git a/metadata/md5-cache/dev-python/moto-2.2.3-r1 b/metadata/md5-cache/dev-python/moto-2.2.3-r1
new file mode 100644
index 000000000000..2051a1d88d89
--- /dev/null
+++ b/metadata/md5-cache/dev-python/moto-2.2.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Mock library for boto
+EAPI=8
+HOMEPAGE=https://github.com/spulec/moto
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/moto/moto-2.2.3.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3ef9cab908e4e0fab6f7879dab7f4ebc
diff --git a/metadata/md5-cache/dev-python/moto-2.2.4-r1 b/metadata/md5-cache/dev-python/moto-2.2.4-r1
new file mode 100644
index 000000000000..7a70da73c50b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/moto-2.2.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Mock library for boto
+EAPI=8
+HOMEPAGE=https://github.com/spulec/moto
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/moto/moto-2.2.4.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3ef9cab908e4e0fab6f7879dab7f4ebc
diff --git a/metadata/md5-cache/dev-python/mypy-0.910 b/metadata/md5-cache/dev-python/mypy-0.910
index 697a27448ed6..597243c28e22 100644
--- a/metadata/md5-cache/dev-python/mypy-0.910
+++ b/metadata/md5-cache/dev-python/mypy-0.910
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/attrs-18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/lxml-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-6.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-xdist-1.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/py-1.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/virtualenv-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( !dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/typed-ast-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/typing-extensions-3.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mypy_extensions-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/attrs-18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-xdist-1.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/py-1.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( !dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/typed-ast-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/mypy_extensions-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Optional static typing for Python
 EAPI=7
 HOMEPAGE=http://www.mypy-lang.org/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
-RDEPEND=!dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/typed-ast-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/typing-extensions-3.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mypy_extensions-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=!dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/typed-ast-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/mypy_extensions-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy/archive/v0.910.tar.gz -> mypy-0.910.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e5aa9b6c06f62aec4a5ee71eac0b12ca
+_md5_=3da039fcfcb07ca00c385d3a95b4c64c
diff --git a/metadata/md5-cache/dev-python/nest_asyncio-1.5.1 b/metadata/md5-cache/dev-python/nest_asyncio-1.5.1
index 1ac65d7ffe74..19f69c6d08b4 100644
--- a/metadata/md5-cache/dev-python/nest_asyncio-1.5.1
+++ b/metadata/md5-cache/dev-python/nest_asyncio-1.5.1
@@ -4,7 +4,7 @@ DESCRIPTION=Patch asyncio to allow nested event loops
 EAPI=8
 HOMEPAGE=https://github.com/erdewit/nest_asyncio/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nest_asyncio/nest_asyncio-1.5.1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=722d742cab85f06dc41c1c251855b2fc
+_md5_=29bbf1ae28dd79900b1d87a7e5870d7e
diff --git a/metadata/md5-cache/dev-python/networkx-2.5 b/metadata/md5-cache/dev-python/networkx-2.5
deleted file mode 100644
index 990ef6414549..000000000000
--- a/metadata/md5-cache/dev-python/networkx-2.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/scipy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/decorator-4.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] extras? ( >=dev-python/pydot-1.2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-python/pygraphviz-1.5[python_targets_python3_8(-)?] >=sci-libs/gdal-1.10.0[python,python_targets_python3_8(-)?] ) ) pandas? ( python_targets_python3_8? ( >=dev-python/pandas-0.23.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/pandas-0.23.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) scipy? ( >=dev-python/scipy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) xml? ( >=dev-python/lxml-4.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python tools to manipulate graphs and complex networks
-EAPI=7
-HOMEPAGE=https://networkx.org/ https://github.com/networkx/networkx
-IUSE=examples extras pandas scipy test xml yaml test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/decorator-4.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] extras? ( >=dev-python/pydot-1.2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-python/pygraphviz-1.5[python_targets_python3_8(-)?] >=sci-libs/gdal-1.10.0[python,python_targets_python3_8(-)?] ) ) pandas? ( python_targets_python3_8? ( >=dev-python/pandas-0.23.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/pandas-0.23.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) scipy? ( >=dev-python/scipy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) xml? ( >=dev-python/lxml-4.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/networkx/networkx-2.5.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=aa8763d9cf0465b49fe5f1899b2560cf
diff --git a/metadata/md5-cache/dev-python/networkx-2.6.1 b/metadata/md5-cache/dev-python/networkx-2.6.1
deleted file mode 100644
index 7af3469dfb2e..000000000000
--- a/metadata/md5-cache/dev-python/networkx-2.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/matplotlib-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] extras? ( >=dev-python/pydot-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-python/pygraphviz-1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/gdal-1.10.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/pygraphviz-1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/gdal-1.10.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) xml? ( >=dev-python/lxml-4.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python tools to manipulate graphs and complex networks
-EAPI=7
-HOMEPAGE=https://networkx.org/ https://github.com/networkx/networkx
-IUSE=examples extras xml yaml test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/matplotlib-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] extras? ( >=dev-python/pydot-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-python/pygraphviz-1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/gdal-1.10.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/pygraphviz-1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/gdal-1.10.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) xml? ( >=dev-python/lxml-4.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/networkx/networkx-2.6.1.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=c4d316c9535e9233f4d70f849e82fd0a
diff --git a/metadata/md5-cache/dev-python/networkx-2.6.2 b/metadata/md5-cache/dev-python/networkx-2.6.2
index d6036b94256c..8d9b6dae94c6 100644
--- a/metadata/md5-cache/dev-python/networkx-2.6.2
+++ b/metadata/md5-cache/dev-python/networkx-2.6.2
@@ -4,7 +4,7 @@ DESCRIPTION=Python tools to manipulate graphs and complex networks
 EAPI=7
 HOMEPAGE=https://networkx.org/ https://github.com/networkx/networkx
 IUSE=examples extras xml yaml test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/matplotlib-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] extras? ( >=dev-python/pydot-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-python/pygraphviz-1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/gdal-1.10.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/pygraphviz-1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/gdal-1.10.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) xml? ( >=dev-python/lxml-4.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-2.6.2.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=3dd7f2db799f70cf22be4785fcbe1336
+_md5_=84df5861d01a301d70787c45f9114948
diff --git a/metadata/md5-cache/dev-python/nose-random-1.0.0 b/metadata/md5-cache/dev-python/nose-random-1.0.0
index b207e460e0a1..51e7fb402ee1 100644
--- a/metadata/md5-cache/dev-python/nose-random-1.0.0
+++ b/metadata/md5-cache/dev-python/nose-random-1.0.0
@@ -1,14 +1,14 @@
-BDEPEND=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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Nose plugin to facilitate randomized unit testing
 EAPI=7
 HOMEPAGE=https://github.com/fzumstein/nose-random
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
-RDEPEND=dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/fzumstein/nose-random/archive/1.0.0.tar.gz -> nose-random-1.0.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ddcb22af06030124953a4a4dcc17f734
+_md5_=8b8085d47e451937b2ed14df7642df57
diff --git a/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r3 b/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r3
index f6d0cd7c5bd2..61e094b14e42 100644
--- a/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r3
+++ b/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r3
@@ -4,7 +4,7 @@ DESCRIPTION=A python module to inject warning filters during nosetest
 EAPI=7
 HOMEPAGE=https://github.com/Carreau/nose_warnings_filters
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose_warnings_filters/nose_warnings_filters-0.1.5.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=06e3e557d90731bdd10a0ad3759e339a
+_md5_=3eb3160a45e60b651534454c3997f956
diff --git a/metadata/md5-cache/dev-python/numpy-1.21.2 b/metadata/md5-cache/dev-python/numpy-1.21.2
index 62fed17a9ebb..8471fa29f5b3 100644
--- a/metadata/md5-cache/dev-python/numpy-1.21.2
+++ b/metadata/md5-cache/dev-python/numpy-1.21.2
@@ -1,11 +1,11 @@
-BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) app-arch/unzip >=dev-python/cython-0.29.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] lapack? ( virtual/pkgconfig ) test? ( >=dev-python/hypothesis-5.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cffi-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] lapack? ( virtual/fortran )
+BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) app-arch/unzip >=dev-python/cython-0.29.24[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] lapack? ( virtual/pkgconfig ) test? ( >=dev-python/hypothesis-5.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cffi-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] lapack? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=lapack? ( virtual/fortran )
 DESCRIPTION=Fast array and numerical python library
 EAPI=7
 HOMEPAGE=https://numpy.org/
 IUSE=doc lapack test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.21.2.zip doc? ( https://numpy.org/doc/1.21/numpy-html.zip -> numpy-html-1.21.2.zip https://numpy.org/doc/1.21/numpy-ref.pdf -> numpy-ref-1.21.2.pdf https://numpy.org/doc/1.21/numpy-user.pdf -> numpy-user-1.21.2.pdf )
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=587e58e2d3829b0cdb52c026cf65e308
+_md5_=9b418a0aec3ef0db904db3262135f346
diff --git a/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1 b/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
index b8b587a2a65d..c6c40d6f245b 100644
--- a/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
+++ b/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DEPEND=test? ( dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 DESCRIPTION=Library for OAuth version 1.0
 EAPI=7
 HOMEPAGE=https://pypi.org/project/oauth2/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauth2/oauth2-1.9.0.post1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ad8dc18780adecde907ddfa3f76a9523
+_md5_=dd033bef89b9b4ba13faf50577f13f35
diff --git a/metadata/md5-cache/dev-python/oslo-config-8.3.3-r1 b/metadata/md5-cache/dev-python/oslo-config-8.3.3-r1
deleted file mode 100644
index 8d9b2c9c75be..000000000000
--- a/metadata/md5-cache/dev-python/oslo-config-8.3.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pbr-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-mock-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pbr-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rfc3986-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Oslo Configuration API
-EAPI=7
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rfc3986-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.config/oslo.config-8.3.3.tar.gz -> oslo-config-8.3.3.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=88fd94b1d43031fe6692dd255e37b128
diff --git a/metadata/md5-cache/dev-python/oslo-config-8.7.1 b/metadata/md5-cache/dev-python/oslo-config-8.7.1
index 1b0b4beb92d1..80bd9b027f50 100644
--- a/metadata/md5-cache/dev-python/oslo-config-8.7.1
+++ b/metadata/md5-cache/dev-python/oslo-config-8.7.1
@@ -4,7 +4,7 @@ DESCRIPTION=Oslo Configuration API
 EAPI=8
 HOMEPAGE=https://launchpad.net/oslo
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rfc3986-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.config/oslo.config-8.7.1.tar.gz -> oslo-config-8.7.1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9c529be474c8c08aa28e7dabe26798f6
+_md5_=f0217c3de08ab410dca6317f5700190f
diff --git a/metadata/md5-cache/dev-python/outcome-1.1.0 b/metadata/md5-cache/dev-python/outcome-1.1.0
index 1eab32c8769b..e08a2f6194ef 100644
--- a/metadata/md5-cache/dev-python/outcome-1.1.0
+++ b/metadata/md5-cache/dev-python/outcome-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Capture the outcome of Python function calls
 EAPI=7
 HOMEPAGE=https://github.com/python-trio/outcome https://pypi.org/project/outcome
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( Apache-2.0 MIT )
 RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-trio/outcome/archive/v1.1.0.tar.gz -> outcome-1.1.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=774c0bc6698ea937d1aace382e0d4223
+_md5_=99779ce3c0e61db837651591325017f0
diff --git a/metadata/md5-cache/dev-python/pandocfilters-1.4.3 b/metadata/md5-cache/dev-python/pandocfilters-1.4.3
index 653bfd0b4e07..d6dbb40aaf8f 100644
--- a/metadata/md5-cache/dev-python/pandocfilters-1.4.3
+++ b/metadata/md5-cache/dev-python/pandocfilters-1.4.3
@@ -4,11 +4,11 @@ DESCRIPTION=Utilities for writing pandoc filters in python
 EAPI=7
 HOMEPAGE=https://github.com/jgm/pandocfilters
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandocfilters/pandocfilters-1.4.3.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=696e9594b040d6cf5e39acbd71b3f027
+_md5_=6f6243650a9b0d046221c29eed4022a6
diff --git a/metadata/md5-cache/dev-python/parso-0.7.1-r1 b/metadata/md5-cache/dev-python/parso-0.7.1-r1
index 07f18f56cc29..0e9ca31ffa7c 100644
--- a/metadata/md5-cache/dev-python/parso-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/parso-0.7.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=a python parser that supports error recovery and round-trip parsing
 EAPI=7
 HOMEPAGE=https://github.com/davidhalter/parso https://pypi.org/project/parso/
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/parso/archive/v0.7.1.tar.gz -> parso-0.7.1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=be2293f02413fcac9d16fe495ab7c041
+_md5_=afced3b21b51eff93b4538e82b72d219
diff --git a/metadata/md5-cache/dev-python/passlib-1.7.4 b/metadata/md5-cache/dev-python/passlib-1.7.4
index e081006ba5e2..da596dd62f2d 100644
--- a/metadata/md5-cache/dev-python/passlib-1.7.4
+++ b/metadata/md5-cache/dev-python/passlib-1.7.4
@@ -4,7 +4,7 @@ DESCRIPTION=Password hashing framework supporting over 20 schemes
 EAPI=7
 HOMEPAGE=https://foss.heptapod.net/python-libs/passlib/wikis/home
 IUSE=+bcrypt doc +scrypt +totp test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=bcrypt? ( dev-python/bcrypt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) totp? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) scrypt? ( dev-python/scrypt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/passlib/passlib-1.7.4.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b6ed587f547836e33d27b4e14fc85580
+_md5_=fad47ff46588caf0462c3c427910718f
diff --git a/metadata/md5-cache/dev-python/pebble-4.6.2 b/metadata/md5-cache/dev-python/pebble-4.6.2
new file mode 100644
index 000000000000..487c108ebfe2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pebble-4.6.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Threading and multiprocessing eye-candy
+EAPI=8
+HOMEPAGE=https://pypi.org/project/Pebble/ https://pebble.readthedocs.io/ https://github.com/noxdafox/pebble
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-3+
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/P/Pebble/Pebble-4.6.2.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fce9c56586455ca249161489008f93d8
diff --git a/metadata/md5-cache/dev-python/pebble-4.6.3 b/metadata/md5-cache/dev-python/pebble-4.6.3
new file mode 100644
index 000000000000..ac3b0b1d4c5b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pebble-4.6.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Threading and multiprocessing eye-candy
+EAPI=8
+HOMEPAGE=https://pypi.org/project/Pebble/ https://pebble.readthedocs.io/ https://github.com/noxdafox/pebble
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-3+
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/P/Pebble/Pebble-4.6.3.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fce9c56586455ca249161489008f93d8
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.31 b/metadata/md5-cache/dev-python/phonenumbers-8.12.31
new file mode 100644
index 000000000000..ad9bb9c49018
--- /dev/null
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.31
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python port of Google's libphonenumber
+EAPI=8
+HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.31.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f70b6d8f0abc35acbb5be565add89672
diff --git a/metadata/md5-cache/dev-python/phply-1.2.5 b/metadata/md5-cache/dev-python/phply-1.2.5
index 3e5f2597287a..8829cf33089c 100644
--- a/metadata/md5-cache/dev-python/phply-1.2.5
+++ b/metadata/md5-cache/dev-python/phply-1.2.5
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Lexer and parser for PHP source implemented using PLY
 EAPI=7
 HOMEPAGE=https://github.com/viraptor/phply/ https://pypi.org/project/phply/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm64 x86
 LICENSE=BSD
-RDEPEND=dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/viraptor/phply/archive/1.2.5.tar.gz -> phply-1.2.5.gh.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=525e0f55d0083b7a46b0e7631d0ec524
+_md5_=db252728f180f5698e5c8c36709a61e7
diff --git a/metadata/md5-cache/dev-python/platformdirs-2.2.0 b/metadata/md5-cache/dev-python/platformdirs-2.2.0
new file mode 100644
index 000000000000..88d0be307bd9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/platformdirs-2.2.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A small Python module for determining appropriate platform-specific dirs
+EAPI=8
+HOMEPAGE=https://pypi.org/project/platformdirs/ https://github.com/platformdirs/platformdirs/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/platformdirs/platformdirs/archive/2.2.0.tar.gz -> platformdirs-2.2.0.gh.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4f81f81984c02583a577f0c9ddfb95b2
diff --git a/metadata/md5-cache/dev-python/plotly-5.2.2 b/metadata/md5-cache/dev-python/plotly-5.2.2
new file mode 100644
index 000000000000..86525b076a87
--- /dev/null
+++ b/metadata/md5-cache/dev-python/plotly-5.2.2
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Browser-based graphing library for Python
+EAPI=8
+HOMEPAGE=https://plotly.com/python/
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/tenacity-6.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/p/plotly/plotly-5.2.2.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a2bd896c4fa3b4493ccfa51741ce18e4
diff --git a/metadata/md5-cache/dev-python/pluggy-0.13.1-r1 b/metadata/md5-cache/dev-python/pluggy-0.13.1-r1
index 2e4deee913ee..741bdc8b1504 100644
--- a/metadata/md5-cache/dev-python/pluggy-0.13.1-r1
+++ b/metadata/md5-cache/dev-python/pluggy-0.13.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=plugin and hook calling mechanisms for python
 EAPI=7
 HOMEPAGE=https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluggy/pluggy-0.13.1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0cc23a754c80668abc651762086a0f25
+_md5_=b0e9c3ceecc567a82a789fa9a5c4e5c6
diff --git a/metadata/md5-cache/dev-python/pockets-0.9.1-r2 b/metadata/md5-cache/dev-python/pockets-0.9.1-r2
new file mode 100644
index 000000000000..96dea3a0e25f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pockets-0.9.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of helpful Python tools
+EAPI=8
+HOMEPAGE=https://pockets.readthedocs.io/ https://pypi.org/project/pockets/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/RobRuana/pockets/archive/777724c8eabaf76f6d0c5e4837c982d110509b2e.tar.gz -> pockets-0.9.1.gh.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d95a8772e2f99f48b70fe003997fc8e3
diff --git a/metadata/md5-cache/dev-python/progressbar2-3.39.3 b/metadata/md5-cache/dev-python/progressbar2-3.39.3
deleted file mode 100644
index 3c9443b1a6d6..000000000000
--- a/metadata/md5-cache/dev-python/progressbar2-3.39.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!dev-python/progressbar[python_targets_pypy3(-)?] dev-python/python-utils[python_targets_pypy3(-)?] dev-python/setuptools[python_targets_pypy3(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Text progressbar library for python
-EAPI=7
-HOMEPAGE=https://pypi.org/project/progressbar2/
-IUSE=python_targets_pypy3
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=!dev-python/progressbar[python_targets_pypy3(-)?] dev-python/python-utils[python_targets_pypy3(-)?] dev-python/setuptools[python_targets_pypy3(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 )
-SLOT=0
-SRC_URI=mirror://pypi/p/progressbar2/progressbar2-3.39.3.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=becc9fd75060dd931a0b25b7c77652c7
diff --git a/metadata/md5-cache/dev-python/progressbar2-3.53.1 b/metadata/md5-cache/dev-python/progressbar2-3.53.1
index a94a14fc8329..b937d3d32b0b 100644
--- a/metadata/md5-cache/dev-python/progressbar2-3.53.1
+++ b/metadata/md5-cache/dev-python/progressbar2-3.53.1
@@ -1,15 +1,15 @@
-BDEPEND=!dev-python/progressbar[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-utils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( !dev-python/progressbar[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-utils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) 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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/python-utils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/progressbar >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Text progressbar library for python
 EAPI=7
-HOMEPAGE=https://pypi.org/project/progressbar2/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+HOMEPAGE=https://progressbar-2.readthedocs.io/ https://pypi.org/project/progressbar2/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~x86
 LICENSE=BSD
-RDEPEND=!dev-python/progressbar[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-utils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) 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_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/python-utils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/progressbar python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/progressbar2/progressbar2-3.53.1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3212296ba9f6ab5c4c377688d821bf6c
+_md5_=fa73b2da344c80e8f77149c8ea205cce
diff --git a/metadata/md5-cache/dev-python/psutil-5.7.3 b/metadata/md5-cache/dev-python/psutil-5.7.3
index ffdd0e168735..ca6087509401 100644
--- a/metadata/md5-cache/dev-python/psutil-5.7.3
+++ b/metadata/md5-cache/dev-python/psutil-5.7.3
@@ -4,7 +4,7 @@ DESCRIPTION=Retrieve information on running processes and system utilization
 EAPI=7
 HOMEPAGE=https://github.com/giampaolo/psutil https://pypi.org/project/psutil/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.7.3.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=80ec7296ffd077c3a6b24de83960c614
+_md5_=3a78ddc286fd9b2293bb5dd3d1e728c1
diff --git a/metadata/md5-cache/dev-python/py-amqp-5.0.6 b/metadata/md5-cache/dev-python/py-amqp-5.0.6
index 96569c3683b0..be08649a2dc5 100644
--- a/metadata/md5-cache/dev-python/py-amqp-5.0.6
+++ b/metadata/md5-cache/dev-python/py-amqp-5.0.6
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-python/vine-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/case-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-rerunfailures-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_celery[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_celery[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=>=dev-python/vine-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/case-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-rerunfailures-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_celery[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_celery[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_celery[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Low-level AMQP client for Python (fork of amqplib)
 EAPI=7
 HOMEPAGE=https://github.com/celery/py-amqp https://pypi.org/project/amqp/
-IUSE=extras doc test python_targets_python3_8 python_targets_python3_9
+IUSE=extras doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
-RDEPEND=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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/amqp/amqp-5.0.6.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fad5b6c059fa76f6f2c3a0154a8da88c
+_md5_=71eb87d7c04363ddde431a9b383fa49e
diff --git a/metadata/md5-cache/dev-python/pycups-2.0.1 b/metadata/md5-cache/dev-python/pycups-2.0.1
new file mode 100644
index 000000000000..8dbc3f3ca8a5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycups-2.0.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-print/cups
+DESCRIPTION=Python bindings for the CUPS API
+EAPI=8
+HOMEPAGE=https://github.com/OpenPrinting/pycups
+IUSE=examples python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=net-print/cups python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pycups/pycups-2.0.1.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dcd2bc2743b6adcda6ed1e767149d710
diff --git a/metadata/md5-cache/dev-python/pydyf-0.1.0 b/metadata/md5-cache/dev-python/pydyf-0.1.0
new file mode 100644
index 000000000000..5776ee47dfca
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pydyf-0.1.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-text/ghostscript-gpl dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A low-level PDF generator
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pydyf/ https://github.com/CourtBouillon/pydyf/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/CourtBouillon/pydyf/archive/v0.1.0.tar.gz -> pydyf-0.1.0.gh.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fd23dc08e7ae253cb0c004dcf95738c5
diff --git a/metadata/md5-cache/dev-python/pydyf-0.1.1 b/metadata/md5-cache/dev-python/pydyf-0.1.1
new file mode 100644
index 000000000000..0503ea23b995
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pydyf-0.1.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-text/ghostscript-gpl dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A low-level PDF generator
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pydyf/ https://github.com/CourtBouillon/pydyf/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/CourtBouillon/pydyf/archive/v0.1.1.tar.gz -> pydyf-0.1.1.gh.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fd23dc08e7ae253cb0c004dcf95738c5
diff --git a/metadata/md5-cache/dev-python/pygresql-5.2.2 b/metadata/md5-cache/dev-python/pygresql-5.2.2
index 56547e4965a5..2983a09894a4 100644
--- a/metadata/md5-cache/dev-python/pygresql-5.2.2
+++ b/metadata/md5-cache/dev-python/pygresql-5.2.2
@@ -1,15 +1,15 @@
 BDEPEND=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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 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= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= )
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= )
 DESCRIPTION=A Python interface for the PostgreSQL database
 EAPI=7
 HOMEPAGE=https://pygresql.org/
-IUSE=python_targets_python3_8 python_targets_python3_9 postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+IUSE=python_targets_python3_8 python_targets_python3_9 postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ~sparc x86
 LICENSE=POSTGRESQL
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) 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(-)?]
+RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) 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(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyGreSQL/PyGreSQL-5.2.2.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	postgres	c90f34fec636bb31d36838ad7e11b37b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=11f6fbd77e7e0dccf209ea6dfdcc3900
+_md5_=5ae9f9ec6588f17152cf6f4be031b09a
diff --git a/metadata/md5-cache/dev-python/pylama-7.7.1-r1 b/metadata/md5-cache/dev-python/pylama-7.7.1-r1
index 4f0a6aad23f4..6a47c0771af9 100644
--- a/metadata/md5-cache/dev-python/pylama-7.7.1-r1
+++ b/metadata/md5-cache/dev-python/pylama-7.7.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/mccabe-0.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pycodestyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pydocstyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyflakes[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/mypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/mccabe-0.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycodestyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pydocstyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyflakes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Code audit tool for python
 EAPI=7
 HOMEPAGE=https://github.com/klen/pylama
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=LGPL-3
-RDEPEND=>=dev-python/mccabe-0.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pycodestyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pydocstyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyflakes[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/mccabe-0.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycodestyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pydocstyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyflakes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/klen/pylama/archive/7.7.1.tar.gz -> pylama-7.7.1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8535fd27b1fdd09f1f1d116a1c96fa29
+_md5_=4a302d02cf937c694b8fb6cfbf7c5e94
diff --git a/metadata/md5-cache/dev-python/pylast-4.2.1 b/metadata/md5-cache/dev-python/pylast-4.2.1
index b40ff510fed7..adf650091dc6 100644
--- a/metadata/md5-cache/dev-python/pylast-4.2.1
+++ b/metadata/md5-cache/dev-python/pylast-4.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python interface to last.fm and other api-compatible websites
 EAPI=7
 HOMEPAGE=https://github.com/pylast/pylast
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pylast/pylast/archive/4.2.1.tar.gz -> pylast-4.2.1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=06d86c35b7eeabc56461655cb79eb70a
+_md5_=59eb184d4556f6f26bd8e39e0454622d
diff --git a/metadata/md5-cache/dev-python/pylint-2.10.2 b/metadata/md5-cache/dev-python/pylint-2.10.2
new file mode 100644
index 000000000000..4c2a4f6057bd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylint-2.10.2
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx ) test? ( <dev-python/astroid-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python code static checker
+EAPI=8
+HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint/
+IUSE=examples doc test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=<dev-python/astroid-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pycqa/pylint/archive/v2.10.2.tar.gz -> pylint-2.10.2.gh.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2f00726bbe4af8855ef86ccbba5d6446
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.4.7-r1 b/metadata/md5-cache/dev-python/pyparsing-2.4.7-r1
index 474db9bec9ce..7db5307f5506 100644
--- a/metadata/md5-cache/dev-python/pyparsing-2.4.7-r1
+++ b/metadata/md5-cache/dev-python/pyparsing-2.4.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Easy-to-use Python module for text parsing
 EAPI=7
 HOMEPAGE=https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/
 IUSE=examples python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/pyparsing/pyparsing/archive/pyparsing_2.4.7.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=863f3afdb669b1b80ed8114090ed4eb9
+_md5_=67cb2de9c515b47641b72f8912880946
diff --git a/metadata/md5-cache/dev-python/pyqtgraph-0.12.1 b/metadata/md5-cache/dev-python/pyqtgraph-0.12.1
deleted file mode 100644
index da92812e0a02..000000000000
--- a/metadata/md5-cache/dev-python/pyqtgraph-0.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[svg,testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/numpy-1.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[gui,widgets,opengl=,svg=,python_targets_python3_8(-)?,python_targets_python3_9(-)?] opengl? ( dev-python/pyopengl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A pure-python graphics and GUI library built on PyQt and numpy
-EAPI=7
-HOMEPAGE=http://www.pyqtgraph.org/ https://pypi.org/project/pyqtgraph/
-IUSE=examples opengl svg doc test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/numpy-1.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[gui,widgets,opengl=,svg=,python_targets_python3_8(-)?,python_targets_python3_9(-)?] opengl? ( dev-python/pyopengl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pyqtgraph/pyqtgraph/archive/pyqtgraph-0.12.1.tar.gz test? ( https://github.com/pyqtgraph/test-data/archive/test-data-8.tar.gz -> pyqtgraph-test-data-8.tar.gz )
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=a40c8dfdff6ef6c61635d2856e7999f2
diff --git a/metadata/md5-cache/dev-python/pyqtgraph-0.12.2 b/metadata/md5-cache/dev-python/pyqtgraph-0.12.2
index 3208ff1d42bf..ab8fa6667665 100644
--- a/metadata/md5-cache/dev-python/pyqtgraph-0.12.2
+++ b/metadata/md5-cache/dev-python/pyqtgraph-0.12.2
@@ -4,7 +4,7 @@ DESCRIPTION=A pure-python graphics and GUI library built on PyQt and numpy
 EAPI=8
 HOMEPAGE=https://www.pyqtgraph.org/ https://pypi.org/project/pyqtgraph/
 IUSE=examples opengl svg doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/numpy-1.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[gui,widgets,opengl=,svg=,python_targets_python3_8(-)?,python_targets_python3_9(-)?] opengl? ( dev-python/pyopengl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyqtgraph/pyqtgraph/archive/pyqtgraph-0.12.2.tar.gz test? ( https://github.com/pyqtgraph/test-data/archive/test-data-8.tar.gz -> pyqtgraph-test-data-8.tar.gz )
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4cb8894ea102a270952155246e619e76
+_md5_=3e2ce0606f16949c4068e8419dee818b
diff --git a/metadata/md5-cache/dev-python/pytest-6.2.4-r1 b/metadata/md5-cache/dev-python/pytest-6.2.4-r1
index 181e9582161a..d77792d59085 100644
--- a/metadata/md5-cache/dev-python/pytest-6.2.4-r1
+++ b/metadata/md5-cache/dev-python/pytest-6.2.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Simple powerful testing with Python
 EAPI=7
 HOMEPAGE=https://pytest.org/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) dev-python/iniconfig[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pluggy-1 >=dev-python/py-1.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-6.2.4.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d9f1fe7e08436bb9eefed85326774397
+_md5_=f65d7491672203074e0a3e17dba360e1
diff --git a/metadata/md5-cache/dev-python/pytest-forked-1.3.0-r1 b/metadata/md5-cache/dev-python/pytest-forked-1.3.0-r1
index 13a4c0bee72f..9953599bc496 100644
--- a/metadata/md5-cache/dev-python/pytest-forked-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-forked-1.3.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=run tests in isolated forked subprocesses
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-forked/ https://github.com/pytest-dev/pytest-forked
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-forked/pytest-forked-1.3.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9e03ba4a9fc0ac225f42ed8b2fcef5ac
+_md5_=88aa19e492c270fe0cb7dc058c4cbd5d
diff --git a/metadata/md5-cache/dev-python/pytest-subtests-0.5.0 b/metadata/md5-cache/dev-python/pytest-subtests-0.5.0
index 0e751e2c99b9..d17e72e15d89 100644
--- a/metadata/md5-cache/dev-python/pytest-subtests-0.5.0
+++ b/metadata/md5-cache/dev-python/pytest-subtests-0.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=unittest subTest() support and subtests fixture
 EAPI=7
 HOMEPAGE=https://github.com/pytest-dev/pytest-subtests/ https://pypi.org/project/pytest-subtests/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pytest-5.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/typing-extensions ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-subtests/archive/refs/tags/0.5.0.tar.gz -> pytest-subtests-0.5.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8c9cf3103ff0b2688741e9f3b03ef1b4
+_md5_=869ab3d35f54fd8439933510e78b1cef
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-2.3.0 b/metadata/md5-cache/dev-python/pytest-xdist-2.3.0
index 3961daad6d40..ceb1f78e5dee 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-2.3.0
+++ b/metadata/md5-cache/dev-python/pytest-xdist-2.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=Distributed testing and loop-on-failing modes
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-2.3.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a86fe828483bd8b8aeb3893166419fe6
+_md5_=190e49a669bbfd95abb18db4c7e25832
diff --git a/metadata/md5-cache/dev-python/python-levenshtein-0.12.2 b/metadata/md5-cache/dev-python/python-levenshtein-0.12.2
new file mode 100644
index 000000000000..74dbc9f6d293
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-levenshtein-0.12.2
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Functions for fast computation of Levenshtein distance, and edit operations
+EAPI=8
+HOMEPAGE=https://pypi.org/project/python-Levenshtein/ https://github.com/ztane/python-Levenshtein/
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-Levenshtein/python-Levenshtein-0.12.2.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=43310b6b2266d8ba4b6387bdb0b1f4d6
diff --git a/metadata/md5-cache/dev-python/python-slip-0.6.5-r1 b/metadata/md5-cache/dev-python/python-slip-0.6.5-r1
index d21087475d89..b3f3167e59c5 100644
--- a/metadata/md5-cache/dev-python/python-slip-0.6.5-r1
+++ b/metadata/md5-cache/dev-python/python-slip-0.6.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Miscellaneous convenience, extension and workaround code for Python
 EAPI=7
 HOMEPAGE=https://github.com/nphilipp/python-slip
 IUSE=dbus selinux python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=dbus? ( dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-auth/polkit ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/nphilipp/python-slip/releases/download/python-slip-0.6.5/python-slip-0.6.5.tar.bz2
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0ef079eef8ac8f7c93f87f923567d39d
+_md5_=2ef94f40892bcf5046f43e9468746fe2
diff --git a/metadata/md5-cache/dev-python/rdflib-5.0.0 b/metadata/md5-cache/dev-python/rdflib-5.0.0
index 4a73aaf065aa..28783a972f05 100644
--- a/metadata/md5-cache/dev-python/rdflib-5.0.0
+++ b/metadata/md5-cache/dev-python/rdflib-5.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=RDF library containing a triple store and parser/serializer
 EAPI=7
 HOMEPAGE=https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib/
 IUSE=berkdb examples sqlite test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/isodate[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?] berkdb? ( dev-python/bsddb3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rdflib/rdflib-5.0.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3ed7fd0eb998e5f5b2cc7bde50a563f6
+_md5_=5524a4ccfa834c4bd68e312ec0463363
diff --git a/metadata/md5-cache/dev-python/regex-2021.8.21 b/metadata/md5-cache/dev-python/regex-2021.8.21
new file mode 100644
index 000000000000..330421e613c1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/regex-2021.8.21
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Alternative regular expression module to replace re
+EAPI=8
+HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/regex/regex-2021.8.21.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c215181d822813e87f5b3f57e0288080
diff --git a/metadata/md5-cache/dev-python/requests-2.26.0 b/metadata/md5-cache/dev-python/requests-2.26.0
index f1225f237270..f1b3f2e0ceea 100644
--- a/metadata/md5-cache/dev-python/requests-2.26.0
+++ b/metadata/md5-cache/dev-python/requests-2.26.0
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP library for human beings
 EAPI=7
 HOMEPAGE=https://requests.readthedocs.io/
 IUSE=socks5 test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/certifi-2017.4.17[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/charset_normalizer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/idna-4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/urllib3-1.27[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] socks5? ( >=dev-python/PySocks-1.5.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.26.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6d9dc410b2437ba523db2ac751f78234
+_md5_=e3ffaafce991363fd5378f3d2a8b487c
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-0.17.13 b/metadata/md5-cache/dev-python/ruamel-yaml-0.17.13
new file mode 100644
index 000000000000..b5437cfa5aee
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-0.17.13
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/ruamel-std-pathlib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/namespace-ruamel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml-clib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=YAML parser/emitter that supports roundtrip comment preservation
+EAPI=8
+HOMEPAGE=https://pypi.org/project/ruamel.yaml/ https://sourceforge.net/p/ruamel-yaml/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/namespace-ruamel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml-clib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruamel-dl-tagged-releases/ruamel.yaml-0.17.13.tar.xz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7ac4d22ac47cc0afabdf834d91bf32c0
diff --git a/metadata/md5-cache/dev-python/scrypt-0.8.16 b/metadata/md5-cache/dev-python/scrypt-0.8.16
index c84070b9c945..02fd12a13a6c 100644
--- a/metadata/md5-cache/dev-python/scrypt-0.8.16
+++ b/metadata/md5-cache/dev-python/scrypt-0.8.16
@@ -5,7 +5,7 @@ DESCRIPTION=Bindings for the scrypt key derivation function library
 EAPI=7
 HOMEPAGE=https://github.com/holgern/py-scrypt/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=dev-libs/openssl:0= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scrypt/scrypt-0.8.16.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fb4d096277c686932c5803ab00fd9868
+_md5_=70c484c6d03ef88b04a0b9271787672e
diff --git a/metadata/md5-cache/dev-python/scrypt-0.8.18 b/metadata/md5-cache/dev-python/scrypt-0.8.18
index 633a2a339058..27ba6c413b11 100644
--- a/metadata/md5-cache/dev-python/scrypt-0.8.18
+++ b/metadata/md5-cache/dev-python/scrypt-0.8.18
@@ -5,6 +5,7 @@ DESCRIPTION=Bindings for the scrypt key derivation function library
 EAPI=7
 HOMEPAGE=https://github.com/holgern/py-scrypt/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~m68k
 LICENSE=BSD-2
 RDEPEND=dev-libs/openssl:0= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scrypt/scrypt-0.8.18.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=90056e373b48528a96d56dcff8cfd871
+_md5_=a33e2431319d79afcd0d2cd3d0fd040e
diff --git a/metadata/md5-cache/dev-python/setuptools-57.4.0-r2 b/metadata/md5-cache/dev-python/setuptools-57.4.0-r2
index 7973f4ad1303..86faba704dd3 100644
--- a/metadata/md5-cache/dev-python/setuptools-57.4.0-r2
+++ b/metadata/md5-cache/dev-python/setuptools-57.4.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of extensions to Distutils
 EAPI=7
 HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-57.4.0.tar.gz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.0rc1.tar.xz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7df918ae19788e0f8e7b52a1b8ce1984
+_md5_=84ff34807678813e7fa0ad2a634560e9
diff --git a/metadata/md5-cache/dev-python/simplejson-3.17.5 b/metadata/md5-cache/dev-python/simplejson-3.17.5
new file mode 100644
index 000000000000..bc6d4725572a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/simplejson-3.17.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simple, fast, extensible JSON encoder/decoder for Python
+EAPI=8
+HOMEPAGE=https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=|| ( MIT AFL-2.1 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/simplejson/simplejson-3.17.5.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9f7bbb51bbf34df107b2086dc1c679e8
diff --git a/metadata/md5-cache/dev-python/sniffio-1.2.0 b/metadata/md5-cache/dev-python/sniffio-1.2.0
index 3d4cba3bf67f..3185cf0612c3 100644
--- a/metadata/md5-cache/dev-python/sniffio-1.2.0
+++ b/metadata/md5-cache/dev-python/sniffio-1.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Sniff out which async library your code is running under
 EAPI=7
 HOMEPAGE=https://github.com/python-trio/sniffio/ https://pypi.org/project/sniffio/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=|| ( Apache-2.0 MIT )
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-trio/sniffio/archive/v1.2.0.tar.gz -> sniffio-1.2.0.gh.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b4302304e6f660208ead5dbb2c1f3911
+_md5_=f78d78b78557bc04e522993b57e8b81e
diff --git a/metadata/md5-cache/dev-python/sortedcontainers-2.4.0 b/metadata/md5-cache/dev-python/sortedcontainers-2.4.0
index 6f653a49c83a..1f105e4587bd 100644
--- a/metadata/md5-cache/dev-python/sortedcontainers-2.4.0
+++ b/metadata/md5-cache/dev-python/sortedcontainers-2.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python library to sort collections and containers
 EAPI=7
 HOMEPAGE=http://www.grantjenks.com/docs/sortedcontainers/ https://pypi.org/project/sortedcontainers/ https://github.com/grantjenks/python-sortedcontainers/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grantjenks/python-sortedcontainers/archive/v2.4.0.tar.gz -> python-sortedcontainers-2.4.0.gh.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=20b0124a0ecdd2f9bc6c5b038b171810
+_md5_=4efe21ea05f5e1740d9eb126d63dc6b4
diff --git a/metadata/md5-cache/dev-python/sphinx_lv2_theme-1.0.0-r1 b/metadata/md5-cache/dev-python/sphinx_lv2_theme-1.0.0-r1
index 36392765acdc..4a1c084a0614 100644
--- a/metadata/md5-cache/dev-python/sphinx_lv2_theme-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/sphinx_lv2_theme-1.0.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Minimal pure-CSS Sphinx theme using the LV2 plugin documentation sty
 EAPI=7
 HOMEPAGE=https://gitlab.com/lv2/sphinx_lv2_theme
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=ISC
 RDEPEND=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(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://gitlab.com/lv2/sphinx_lv2_theme/-/archive/v1.0.0/sphinx_lv2_theme-v1.0.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=396ad8460c66dbf2a7c15bcd09a942ba
+_md5_=b1e5c8d46772faa9e939c935aed53284
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2 b/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
index d58e305a48d1..3621a9f33c11 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=Make Sphinx better at documenting Python functions and methods
 EAPI=8
 HOMEPAGE=https://github.com/python-trio/sphinxcontrib-trio https://pypi.org/project/sphinxcontrib-trio
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( Apache-2.0 MIT )
 RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e8ad564f72c75a8fd18db55a31f7c0ba
+_md5_=9b9cdadbb9c9440ae5a47449952454c9
diff --git a/metadata/md5-cache/dev-python/svg-path-4.0.2 b/metadata/md5-cache/dev-python/svg-path-4.0.2
deleted file mode 100644
index ef2734e2cd68..000000000000
--- a/metadata/md5-cache/dev-python/svg-path-4.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=SVG path objects and parser
-EAPI=7
-HOMEPAGE=https://github.com/regebro/svg.path
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/regebro/svg.path/archive/4.0.2.tar.gz -> svg.path-4.0.2.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f9153ffc0558ff1437a18ddec3eaa697
diff --git a/metadata/md5-cache/dev-python/svg-path-4.1 b/metadata/md5-cache/dev-python/svg-path-4.1
index b110471c4896..340627989f06 100644
--- a/metadata/md5-cache/dev-python/svg-path-4.1
+++ b/metadata/md5-cache/dev-python/svg-path-4.1
@@ -1,14 +1,14 @@
-BDEPEND=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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=SVG path objects and parser
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/regebro/svg.path
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/regebro/svg.path/archive/4.1.tar.gz -> svg.path-4.1.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f2715c8a84d660ed39dd046007b52f1b
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2d8cf324690a2b999095b0e384a66cf3
diff --git a/metadata/md5-cache/dev-python/toml-0.10.2 b/metadata/md5-cache/dev-python/toml-0.10.2
index f9b98a9bc5bb..bd07d1514bc2 100644
--- a/metadata/md5-cache/dev-python/toml-0.10.2
+++ b/metadata/md5-cache/dev-python/toml-0.10.2
@@ -4,7 +4,7 @@ DESCRIPTION=Python library for handling TOML files
 EAPI=7
 HOMEPAGE=https://github.com/uiri/toml
 IUSE=test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uiri/toml/archive/0.10.2.tar.gz -> toml-0.10.2-1.tar.gz test? ( https://github.com/BurntSushi/toml-test/archive/280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz -> toml-test-280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz )
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6f76fe083a4fe5fa17c3f23a181a6bb7
+_md5_=d2b3bb4a118cd698e07298748fa2c9ac
diff --git a/metadata/md5-cache/dev-python/tox-3.24.3 b/metadata/md5-cache/dev-python/tox-3.24.3
new file mode 100644
index 000000000000..cb65e5fb2cd1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tox-3.24.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?] ) dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flaky-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/freezegun-0.3.11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=virtualenv-based automation of test activities
+EAPI=8
+HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?] ) dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tox-dev/tox/archive/3.24.3.tar.gz -> tox-3.24.3.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c50bb5d9abedd9e403e9ff4506ee5c45
diff --git a/metadata/md5-cache/dev-python/tqdm-4.62.2 b/metadata/md5-cache/dev-python/tqdm-4.62.2
new file mode 100644
index 000000000000..49b43838f929
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tqdm-4.62.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Add a progress meter to your loops in a second
+EAPI=8
+HOMEPAGE=https://github.com/tqdm/tqdm
+IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/tqdm/tqdm-4.62.2.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=371002b80430ed56ae171cdeed4ede93
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.4.0 b/metadata/md5-cache/dev-python/translate-toolkit-3.4.0
index fa682cdede1e..2cc10d1d53a0 100644
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.4.0
+++ b/metadata/md5-cache/dev-python/translate-toolkit-3.4.0
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-python/six-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/phply[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9[sqlite] dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[sqlite] dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/six-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=>=dev-python/six-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/phply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10[sqlite] dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9[sqlite] dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[sqlite] dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/six-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Toolkit to convert between many translation formats
 EAPI=7
 HOMEPAGE=https://github.com/translate/translate
-IUSE=+html +ical +ini +subtitles +yaml doc test python_targets_python3_8 python_targets_python3_9
+IUSE=+html +ical +ini +subtitles +yaml doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/translate/translate/archive/refs/tags/3.4.0.tar.gz -> translate-3.4.0.gh.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e7e574db8fbed78ee28db14f9a2394f9
+_md5_=fcae6bf0cd63d893e2457a7e37143612
diff --git a/metadata/md5-cache/dev-python/ubelt-0.10.0 b/metadata/md5-cache/dev-python/ubelt-0.10.0
new file mode 100644
index 000000000000..cda82c1d8979
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ubelt-0.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ordered-set[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/xdoctest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DESCRIPTION=A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress
+EAPI=8
+HOMEPAGE=https://github.com/Erotemic/ubelt
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ordered-set[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Erotemic/ubelt/archive/0.10.0.tar.gz -> ubelt-0.10.0.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=00aae720b2f7a93d9cf3dc2ff8df088d
diff --git a/metadata/md5-cache/dev-python/ubelt-0.10.1 b/metadata/md5-cache/dev-python/ubelt-0.10.1
new file mode 100644
index 000000000000..2ccb750623ed
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ubelt-0.10.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ordered-set[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/xdoctest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DESCRIPTION=A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress
+EAPI=8
+HOMEPAGE=https://github.com/Erotemic/ubelt
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ordered-set[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Erotemic/ubelt/archive/0.10.1.tar.gz -> ubelt-0.10.1.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=00aae720b2f7a93d9cf3dc2ff8df088d
diff --git a/metadata/md5-cache/dev-python/uncertainties-3.1.6 b/metadata/md5-cache/dev-python/uncertainties-3.1.6
index 2e83d6ae272e..b8cf0316e89a 100644
--- a/metadata/md5-cache/dev-python/uncertainties-3.1.6
+++ b/metadata/md5-cache/dev-python/uncertainties-3.1.6
@@ -1,16 +1,15 @@
-BDEPEND=doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( dev-python/sphinx ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Python module for calculations with uncertainties
 EAPI=8
 HOMEPAGE=https://pythonhosted.org/uncertainties/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uncertainties/uncertainties-3.1.6.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5d92ee4b9a7e33a9482211bd9ffaa829
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=06963ac294d79042416aeec903f90ccf
diff --git a/metadata/md5-cache/dev-python/unittest-or-fail-1 b/metadata/md5-cache/dev-python/unittest-or-fail-1
index 2684e4ddf9d2..6e0dfb35981b 100644
--- a/metadata/md5-cache/dev-python/unittest-or-fail-1
+++ b/metadata/md5-cache/dev-python/unittest-or-fail-1
@@ -4,11 +4,11 @@ DESCRIPTION=Run unittests or fail if no tests were found
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/unittest-or-fail/
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/unittest-or-fail/archive/v1.tar.gz -> unittest-or-fail-1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7131eb411db1ecb0155c999b44321ec0
+_md5_=07ef6f9005ec29888e6fc50f7a88ee1f
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.6 b/metadata/md5-cache/dev-python/urllib3-1.26.6
index a7a9ce7c1464..8070dc15aa3e 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.26.6
+++ b/metadata/md5-cache/dev-python/urllib3-1.26.6
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and mor
 EAPI=7
 HOMEPAGE=https://github.com/urllib3/urllib3
 IUSE=brotli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.6.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3804a719e97344a7038115cccab7cccd
+_md5_=925b697435d45b5532595fd22b264d5f
diff --git a/metadata/md5-cache/dev-python/utidylib-0.7 b/metadata/md5-cache/dev-python/utidylib-0.7
new file mode 100644
index 000000000000..4d5bc85dabfe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/utidylib-0.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-text/tidy-html5 >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=TidyLib Python wrapper
+EAPI=8
+HOMEPAGE=https://cihar.com/software/utidylib/ https://pypi.org/project/uTidylib/
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=app-text/tidy-html5 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nijel/utidylib/archive/v0.7.tar.gz -> utidylib-0.7.gh.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=449b9b825b0485007f093dc8edc27bb7
diff --git a/metadata/md5-cache/dev-python/watchdog-2.1.5 b/metadata/md5-cache/dev-python/watchdog-2.1.5
new file mode 100644
index 000000000000..d79d1f9baff1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/watchdog-2.1.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/argh[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/pytest-timeout-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DESCRIPTION=Python API and shell utilities to monitor file system events
+EAPI=8
+HOMEPAGE=https://github.com/gorakhargosh/watchdog
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/argh[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v2.1.5.tar.gz -> watchdog-2.1.5.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3dedb723669673975deb024c02b4c79b
diff --git a/metadata/md5-cache/dev-python/websockets-9.1-r1 b/metadata/md5-cache/dev-python/websockets-9.1-r1
index f13f992494c4..82538c1a2a97 100644
--- a/metadata/md5-cache/dev-python/websockets-9.1-r1
+++ b/metadata/md5-cache/dev-python/websockets-9.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Library for building WebSocket servers and clients in Python
 EAPI=8
 HOMEPAGE=https://websockets.readthedocs.io/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aaugustin/websockets/archive/9.1.tar.gz -> websockets-9.1-src.tar.gz https://dev.gentoo.org/~sbraz/websockets-9.1-python-3.10-support.patch.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7b1108be964119a9a3feddc41fd27a90
+_md5_=40063ec01cc871d38997441d67ad5f02
diff --git a/metadata/md5-cache/dev-python/xdg-5.1.0 b/metadata/md5-cache/dev-python/xdg-5.1.0
deleted file mode 100644
index ef8212f144b0..000000000000
--- a/metadata/md5-cache/dev-python/xdg-5.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( !dev-python/pyxdg >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Implementation of the XDG Base Directory Specification in Python
-EAPI=7
-HOMEPAGE=https://github.com/srstevenson/xdg/ https://pypi.org/project/xdg/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=!dev-python/pyxdg python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/srstevenson/xdg/archive/5.1.0.tar.gz -> xdg-5.1.0.gh.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=034e94cb4e7638fa26daa2acbcc3d858
diff --git a/metadata/md5-cache/dev-python/xdg-5.1.1 b/metadata/md5-cache/dev-python/xdg-5.1.1
deleted file mode 100644
index 73db474dc3e7..000000000000
--- a/metadata/md5-cache/dev-python/xdg-5.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( !dev-python/pyxdg >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Implementation of the XDG Base Directory Specification in Python
-EAPI=8
-HOMEPAGE=https://github.com/srstevenson/xdg/ https://pypi.org/project/xdg/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=!dev-python/pyxdg python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/srstevenson/xdg/archive/5.1.1.tar.gz -> xdg-5.1.1.gh.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d0544afad72bb3c274174b7e87f91d62
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.7.0 b/metadata/md5-cache/dev-python/xmlschema-1.7.0
index f48473882564..2595dfa8d856 100644
--- a/metadata/md5-cache/dev-python/xmlschema-1.7.0
+++ b/metadata/md5-cache/dev-python/xmlschema-1.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=An XML Schema validator and decoder
 EAPI=8
 HOMEPAGE=https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/elementpath-2.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.7.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=85455f365f3a786128b2dbede2438b10
+_md5_=eb6d0e5a386174ea15fd1baa61228f7e
diff --git a/metadata/md5-cache/dev-python/xmltodict-0.12.0-r1 b/metadata/md5-cache/dev-python/xmltodict-0.12.0-r1
index 5d99d7eaaedc..c6ac6b39f04c 100644
--- a/metadata/md5-cache/dev-python/xmltodict-0.12.0-r1
+++ b/metadata/md5-cache/dev-python/xmltodict-0.12.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Makes working with XML feel like you are working with JSON
 EAPI=7
 HOMEPAGE=https://github.com/martinblech/xmltodict/ https://pypi.org/project/xmltodict/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmltodict/xmltodict-0.12.0.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a5f79e07ae974e61343ba7a9f6f57478
+_md5_=57ccb1bbf44e445d7141cefd13f2a039
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 3c13c1520ca1..5f653ea3a23e 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/assistant-5.15.2 b/metadata/md5-cache/dev-qt/assistant-5.15.2
index 5a880cdc84a0..b94f6999864c 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.15.2
+++ b/metadata/md5-cache/dev-qt/assistant-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2 ~dev-qt/qthelp-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtprintsupport-5.15.2 ~dev-qt/qtsql-5.15.2[sqlite] ~dev-qt/qtwidgets-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2 ~dev-qt/qthelp-5.15.2 ~dev
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=dbb934ec9f8c6c7f609ee1fb35f3ef00
diff --git a/metadata/md5-cache/dev-qt/designer-5.15.2 b/metadata/md5-cache/dev-qt/designer-5.15.2
index 5fb2ef4e9cee..dac0c010afde 100644
--- a/metadata/md5-cache/dev-qt/designer-5.15.2
+++ b/metadata/md5-cache/dev-qt/designer-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2:5= ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtprintsupport-5.15.2 ~dev-qt/qtwidgets-5.15.2 ~dev-qt/qtxml-5.15.2 declarative? ( ~dev-qt/qtdeclarative-5.15.2[widgets] ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2:5= ~dev-qt/qtnetwork-5.15.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4a781a5743b6b8cb43566b88fca38fba
diff --git a/metadata/md5-cache/dev-qt/linguist-5.15.2 b/metadata/md5-cache/dev-qt/linguist-5.15.2
index d661df988efe..07695afa3608 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.15.2
+++ b/metadata/md5-cache/dev-qt/linguist-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/designer-5.15.2 ~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2:5= ~dev-qt/qtprintsupport-5.15.2 ~dev-qt/qtwidgets-5.15.2 ~dev-qt/qtxml-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Graphical tool for translating Qt applications
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/designer-5.15.2 ~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=cd01067fdabb913aa4c6a9ad4519f3a3
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.15.2 b/metadata/md5-cache/dev-qt/linguist-tools-5.15.2
index 63947a3ac47b..87154db037e6 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.15.2
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtxml-5.15.2 qml? ( ~dev-qt/qtdeclarative-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Tools for working with Qt translation data files
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtxml-5.15.2 qml? ( ~dev-qt/qtdeclarati
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ca836fa1010e257b8499cf24d8092c7c
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.15.2 b/metadata/md5-cache/dev-qt/pixeltool-5.15.2
index d12f53058fa0..421af588eebc 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.15.2
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2:5= ~dev-qt/qtwidgets-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Qt screen magnifier
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2:5= ~dev-qt/qtwidgets-5.15.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ceb05d5429c2b36d206e4cd094f7e8c0
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.15.2 b/metadata/md5-cache/dev-qt/qdbus-5.15.2
index 57256f90a47c..895d36153de3 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.15.2
+++ b/metadata/md5-cache/dev-qt/qdbus-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdbus-5.15.2 ~dev-qt/qtxml-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Interface to Qt applications communicating over D-Bus
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdbus-5.15.2 ~dev-qt/qtxml-5.15.2
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=744c48ed63a131f3d53eb4fe12a80f30
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.2 b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.2
index 0f9589959612..c8fd79dc2b75 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.2
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdbus-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtwidgets-5.15.2 ~dev-qt/qtxml-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdbus-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4588a8568a547e07e8ee5bb67dd2df93
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.15.2 b/metadata/md5-cache/dev-qt/qdoc-5.15.2
index 883c193b97ab..fa04aa92a1b9 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.15.2
+++ b/metadata/md5-cache/dev-qt/qdoc-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2:5= sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Qt documentation generator
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2:5= sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fecd5923d26ee3723191d2cd93490040
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.15.2-r1 b/metadata/md5-cache/dev-qt/qdoc-5.15.2-r1
new file mode 100644
index 000000000000..87cb48175ade
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qdoc-5.15.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=~dev-qt/qtcore-5.15.2:5= sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.15.2 ) ~dev-qt/qtxml-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Qt documentation generator
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2:5= sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.15.2 )
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=b2852b18f679247c598a9a9bcb7db81c
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.15.2 b/metadata/md5-cache/dev-qt/qt3d-5.15.2
index 86f79f0ffba9..1d63f2960106 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.15.2
+++ b/metadata/md5-cache/dev-qt/qt3d-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtconcurrent-5.15.2 ~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2:5=[vulkan=] ~dev-qt/qtnetwork-5.15.2 >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-5.15.2 ) qml? ( ~dev-qt/qtdeclarative-5.15.2[gles2-only=] ) vulkan? ( dev-util/vulkan-headers ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=3D rendering module for the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.15.2 ~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2:5
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6368f9c71b01ffc04d4ec43774778394
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.15.2-r10 b/metadata/md5-cache/dev-qt/qt3d-5.15.2-r10
new file mode 100644
index 000000000000..aa2fb2eaffd1
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qt3d-5.15.2-r10
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtconcurrent-5.15.2 ~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2:5=[vulkan=] ~dev-qt/qtnetwork-5.15.2 >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-5.15.2 ) qml? ( ~dev-qt/qtdeclarative-5.15.2[gles2-only=] ) vulkan? ( dev-util/vulkan-headers ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=3D rendering module for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=gamepad gles2-only qml vulkan debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtconcurrent-5.15.2 ~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2:5=[vulkan=] ~dev-qt/qtnetwork-5.15.2 >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-5.15.2 ) qml? ( ~dev-qt/qtdeclarative-5.15.2[gles2-only=] )
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qt3d/-/archive/7edec6e014de27b9dd03f63875c471aac606a918/qt3d-7edec6e014de27b9dd03f63875c471aac606a918.tar.gz -> qt3d-5.15.2-7edec6e0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=c803f5334b15f8e9f01d273e725aece2
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.2 b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.2
index 6e1fcaf2c305..393978f686a5 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtconcurrent-5.15.2 ~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtdbus-5.15.2 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.15.2 ) ~dev-qt/qtnetwork-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Bluetooth support library for the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.15.2 ~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtdbus-5.15
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a504516ce1aca4ac10920ac88130c5cb
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.15.2 b/metadata/md5-cache/dev-qt/qtcharts-5.15.2
index abb0a5d507a4..d0af49c6784e 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtwidgets-5.15.2 qml? ( ~dev-qt/qtdeclarative-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Chart component library for the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtwidgets-5.15.2 qml?
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=33ef6afa7bfe5f6bdade1890b622ab61
diff --git a/metadata/md5-cache/dev-qt/qtchooser-66-r1 b/metadata/md5-cache/dev-qt/qtchooser-66-r1
new file mode 100644
index 000000000000..8917ea243cdd
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtchooser-66-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install test
+DEPEND=test? ( dev-qt/qtcore:5 dev-qt/qttest:5 )
+DESCRIPTION=Tool to quickly switch between multiple Qt installations
+EAPI=8
+HOMEPAGE=https://code.qt.io/cgit/qtsdk/qtchooser.git/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( LGPL-2.1 GPL-3 )
+RDEPEND=!<dev-qt/qtcore-5.15.2-r10:5
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://download.qt.io/official_releases/qtchooser/qtchooser-66.tar.xz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=836127b48db9c96392157c006260105a
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2
index 9ef9d28d524c..6b0cc5c06427 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2:5= test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=48b0c77f5f07332436cfd11ed7b6eee7
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r1
new file mode 100644
index 000000000000..5a5b1d7fdb1e
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=~dev-qt/qtcore-5.15.2:5= test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2:5=
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ea9317e81e6d2b864cf5e0fd1eda1316
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r10
new file mode 100644
index 000000000000..e5ddb75887c7
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r10
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.15.2:5= test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2:5=
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=d1a8744eea70bc9c204b7889a2d2c739
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtcore-5.15.2-r10
new file mode 100644
index 000000000000..9071b9e12afa
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.2-r10
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare pretend setup test unpack
+DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Cross-platform application development framework
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=icu old-kernel systemd kernel_linux debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) >=dev-qt/qtchooser-66-r1
+RESTRICT=test
+SLOT=5/5.15.2
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=18d4093a5de987e90013917b2ca0a95d
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.2-r2 b/metadata/md5-cache/dev-qt/qtcore-5.15.2-r2
deleted file mode 100644
index 38599c764e6d..000000000000
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) test? ( ~dev-qt/qttest-5.15.2 )
-DESCRIPTION=Cross-platform application development framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=icu old-kernel systemd kernel_linux debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15.2
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ba6e8beec6d7f986ac2806162ba876cf
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.2-r3 b/metadata/md5-cache/dev-qt/qtcore-5.15.2-r3
new file mode 100644
index 000000000000..20cc34567f9f
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.2-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Cross-platform application development framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=icu old-kernel systemd kernel_linux debug test
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.15.2
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ba6e8beec6d7f986ac2806162ba876cf
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.2 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.2
index a1dfac017379..d3be3bfaf906 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2[gles2-only=] qml? ( ~dev-qt/qtdeclarative-5.15.2[gles2-only=] ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=3D data visualization library for the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2[gles2-only=] qml? ( ~dev-qt/q
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdatavis3d-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a18293a850561ffdc6ce731f3bff5ad3
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.2 b/metadata/md5-cache/dev-qt/qtdbus-5.15.2
deleted file mode 100644
index 9f6b301c1ce2..000000000000
--- a/metadata/md5-cache/dev-qt/qtdbus-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.2:5= >=sys-apps/dbus-1.4.20 test? ( ~dev-qt/qttest-5.15.2 )
-DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=69ca3aa84cf9f4f4a27ac134dc6352f9
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r1
new file mode 100644
index 000000000000..1be0d94703a3
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=~dev-qt/qtcore-5.15.2:5= >=sys-apps/dbus-1.4.20 test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2:5= >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=69ca3aa84cf9f4f4a27ac134dc6352f9
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r10
new file mode 100644
index 000000000000..f35ac6a1a8fe
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r10
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.15.2:5= >=sys-apps/dbus-1.4.20 test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2:5= >=sys-apps/dbus-1.4.20
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=83f4afdb0fb1c8f6bf9653ed2ab31dda
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2
deleted file mode 100644
index 5fbb2cae5b2e..000000000000
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2:5=[gles2-only=,vulkan=] ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qttest-5.15.2 localstorage? ( ~dev-qt/qtsql-5.15.2 ) widgets? ( ~dev-qt/qtwidgets-5.15.2[gles2-only=] ) test? ( ~dev-qt/qttest-5.15.2 )
-DESCRIPTION=The QML and Quick modules for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2-only +jit localstorage vulkan +widgets debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2:5=[gles2-only=,vulkan=] ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qttest-5.15.2 localstorage? ( ~dev-qt/qtsql-5.15.2 ) widgets? ( ~dev-qt/qtwidgets-5.15.2[gles2-only=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=69ec8401e85dc29701e203601154998b
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r1
new file mode 100644
index 000000000000..20591dc4cf00
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2:5=[gles2-only=,vulkan=] ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qttest-5.15.2 localstorage? ( ~dev-qt/qtsql-5.15.2 ) widgets? ( ~dev-qt/qtwidgets-5.15.2[gles2-only=] ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=The QML and Quick modules for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2-only +jit localstorage vulkan +widgets debug test
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2:5=[gles2-only=,vulkan=] ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qttest-5.15.2 localstorage? ( ~dev-qt/qtsql-5.15.2 ) widgets? ( ~dev-qt/qtwidgets-5.15.2[gles2-only=] ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=69ec8401e85dc29701e203601154998b
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r10
new file mode 100644
index 000000000000..e7afe74ed85d
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r10
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare setup test unpack
+DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2:5=[gles2-only=,vulkan=] ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qttest-5.15.2 localstorage? ( ~dev-qt/qtsql-5.15.2 ) widgets? ( ~dev-qt/qtwidgets-5.15.2[gles2-only=] ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=The QML and Quick modules for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=gles2-only +jit localstorage vulkan +widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2:5=[gles2-only=,vulkan=] ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qttest-5.15.2 localstorage? ( ~dev-qt/qtsql-5.15.2 ) widgets? ( ~dev-qt/qtwidgets-5.15.2[gles2-only=] )
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qtdeclarative/-/archive/92225b72b9ca6b1efc9bc7bb0c12dd7487e900a7/qtdeclarative-92225b72b9ca6b1efc9bc7bb0c12dd7487e900a7.tar.gz -> qtdeclarative-5.15.2-92225b72.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=44b36f2c079246847b063eb28385ae75
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.15.2 b/metadata/md5-cache/dev-qt/qtdiag-5.15.2
index 8005af9cc737..5a3cb0f01048 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2:5= network? ( ~dev-qt/qtnetwork-5.15.2[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.15.2 ) ~dev-qt/qtxml-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Tool for reporting diagnostic information about Qt and its environment
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2:5= network? ( ~dev-qt/qtne
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=519976c80581a2afa2bb37a67b45e3a6
diff --git a/metadata/md5-cache/dev-qt/qtgamepad-5.15.2 b/metadata/md5-cache/dev-qt/qtgamepad-5.15.2
index 1053a11db6ae..d48fad847b08 100644
--- a/metadata/md5-cache/dev-qt/qtgamepad-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtgamepad-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2[evdev?] evdev? ( virtual/libudev:= ) qml? ( ~dev-qt/qtdeclarative-5.15.2 ) sdl? ( media-libs/libsdl ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Qt module to support gamepad hardware
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2[evdev?] evdev? ( virtual/libu
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgamepad-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=53280113991d384cd0fcb3e68e0e5a6d
diff --git a/metadata/md5-cache/dev-qt/qtgamepad-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtgamepad-5.15.2-r1
new file mode 100644
index 000000000000..37c2e9cca78c
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtgamepad-5.15.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2[evdev?] evdev? ( virtual/libudev:= ) qml? ( ~dev-qt/qtdeclarative-5.15.2 ) sdl? ( media-libs/libsdl2 ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Qt module to support gamepad hardware
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+IUSE=evdev qml sdl debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2[evdev?] evdev? ( virtual/libudev:= ) qml? ( ~dev-qt/qtdeclarative-5.15.2 ) sdl? ( media-libs/libsdl2 )
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgamepad-everywhere-src-5.15.2.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=1f8b3465fb181735e39ec1e3b2143dbe
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.2 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.2
index c53c299e26bc..239a28996b66 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Set of QML types for adding visual effects to user interfaces
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=79c1bd9e42384a6e79c4b0fc9618612b
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtgui-5.15.2-r1
deleted file mode 100644
index f58e82e7924f..000000000000
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.15.2:5= dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= dbus? ( ~dev-qt/qtdbus-5.15.2 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-5.15.2 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.15.2 ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) test? ( ~dev-qt/qttest-5.15.2 )
-DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg +libinput +png tslib tuio +udev vnc vulkan wayland +X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( ~dev-qt/qtwayland-5.15.2 )
-RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.15.2:5= dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= dbus? ( ~dev-qt/qtdbus-5.15.2 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-5.15.2 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.15.2 ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) dev-qt/qtchooser
-REQUIRED_USE=|| ( eglfs X ) accessibility? ( dbus X ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) X? ( gles2-only? ( egl ) )
-RESTRICT=test
-SLOT=5/5.15.2
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c98732c6c50f40e03f78be12a61d5673
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtgui-5.15.2-r10
new file mode 100644
index 000000000000..a87385c9e600
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.2-r10
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.15.2:5= dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= dbus? ( ~dev-qt/qtdbus-5.15.2 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-5.15.2 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.15.2 ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( ~dev-qt/qtwayland-5.15.2 )
+RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.15.2:5= dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= dbus? ( ~dev-qt/qtdbus-5.15.2 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-5.15.2 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.15.2 ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm )
+REQUIRED_USE=|| ( eglfs X ) accessibility? ( dbus X ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) X? ( gles2-only? ( egl ) )
+RESTRICT=test
+SLOT=5/5.15.2
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=3232cd281fdd3050fe02b319f581cb7a
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.2-r2 b/metadata/md5-cache/dev-qt/qtgui-5.15.2-r2
new file mode 100644
index 000000000000..94d1af74eebd
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.2-r2
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.15.2:5= dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= dbus? ( ~dev-qt/qtdbus-5.15.2 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-5.15.2 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.15.2 ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg +libinput +png tslib tuio +udev vnc vulkan wayland +X debug test
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( ~dev-qt/qtwayland-5.15.2 )
+RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.15.2:5= dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= dbus? ( ~dev-qt/qtdbus-5.15.2 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-5.15.2 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.15.2 ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) dev-qt/qtchooser
+REQUIRED_USE=|| ( eglfs X ) accessibility? ( dbus X ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) X? ( gles2-only? ( egl ) )
+RESTRICT=test
+SLOT=5/5.15.2
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c98732c6c50f40e03f78be12a61d5673
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.15.2 b/metadata/md5-cache/dev-qt/qthelp-5.15.2
index 88ca2d05ab7b..c847fa06ad90 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.15.2
+++ b/metadata/md5-cache/dev-qt/qthelp-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtsql-5.15.2[sqlite] ~dev-qt/qtwidgets-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Qt5 module for integrating online documentation into applications
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7a5ec176637afffeba87004c92974d8c
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.2 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.2
index 3b1c3d76a05f..70a862d0b2eb 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2 media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Additional format plugins for the Qt image I/O system
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2 media-libs/libwebp:= media-li
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f9ca4a4ee98af1946b74d20dae78faed
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.2-r10
new file mode 100644
index 000000000000..82af04c91492
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.15.2-r10
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2 media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Additional format plugins for the Qt image I/O system
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=mng debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2 media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= )
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qtimageformats/-/archive/cb82c74310837fe4e832c8ab72176a5d63e4355f/qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.gz -> qtimageformats-5.15.2-cb82c743.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=25a793629d0d5ce5cabbe95cd41cc7ec
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r1
index b16bc5f508f5..df0ce282433e 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r1
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-libs/icu:= ~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtpositioning-5.15.2[qml] ~dev-qt/qtsql-5.15.2 sys-libs/zlib ~dev-qt/qtconcurrent-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Location (places, maps, navigation) library for the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/icu:= ~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-q
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=da34b906972e384f418fee1becc881bd
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r10
new file mode 100644
index 000000000000..2c01290e080b
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r10
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=dev-libs/icu:= ~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtpositioning-5.15.2[qml] ~dev-qt/qtsql-5.15.2 sys-libs/zlib ~dev-qt/qtconcurrent-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Location (places, maps, navigation) library for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-libs/icu:= ~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtpositioning-5.15.2[qml] ~dev-qt/qtsql-5.15.2 sys-libs/zlib
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qtlocation/-/archive/861e372b6ad81570d4f496e42fb25a6699b72f2f/qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.gz -> qtlocation-5.15.2-861e372b.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=ce88224ed7022597a519dd917c87bc45
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.2 b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.2
index 053d2f52e9c4..24d257ef6413 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtnetwork-5.15.2 alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio[glib] ) qml? ( ~dev-qt/qtdeclarative-5.15.2 gles2-only? ( ~dev-qt/qtgui-5.15.2[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.15.2 ~dev-qt/qtwidgets-5.15.2[gles2-only=] ) gstreamer? ( x11-base/xorg-proto ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtnetwor
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=19b15009791d135da355bc31a12b8455
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r10
new file mode 100644
index 000000000000..4c997ecba6ad
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r10
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare setup test unpack
+DEPEND=~dev-qt/qtcore-5.15.2:5= sys-libs/zlib:= connman? ( ~dev-qt/qtdbus-5.15.2 ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.15.2 ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist(-)=] ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Network abstraction library for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=bindist connman gssapi libproxy networkmanager sctp +ssl debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2:5= sys-libs/zlib:= connman? ( ~dev-qt/qtdbus-5.15.2 ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.15.2 ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist(-)=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager )
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=4cd3bc41922f07a128ee312ad98be9f8
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r2 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r2
index e327e251ddd5..d788d546909d 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r2
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=~dev-qt/qtcore-5.15.2:5= sys-libs/zlib:= connman? ( ~dev-qt/qtdbus-5.15.2 ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.15.2 ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist(-)=] ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Network abstraction library for the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2:5= sys-libs/zlib:= connman? ( ~dev-qt/qtdbus-5.15.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bbf11240d510f108fa4f775e40cd88c6
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.2 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.2
index cac44f771d8f..de24ff2d0ae8 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtnetwork-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Network authorization library for the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtnetwork-5.15.2
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtnetworkauth-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=14b4dbc26d97b820d9fd3c810d26fc7d
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.15.2 b/metadata/md5-cache/dev-qt/qtopengl-5.15.2
deleted file mode 100644
index a21d5702bbb3..000000000000
--- a/metadata/md5-cache/dev-qt/qtopengl-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtwidgets-5.15.2[gles2-only=] !gles2-only? ( virtual/opengl ) test? ( ~dev-qt/qttest-5.15.2 )
-DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2-only test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtwidgets-5.15.2[gles2-only=] !gles2-only? ( virtual/opengl )
-RESTRICT=!test? ( test ) test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e9b49bbb495a747b35bf3e57f4a51700
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r1
new file mode 100644
index 000000000000..c46a2837fdac
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtwidgets-5.15.2[gles2-only=] !gles2-only? ( virtual/opengl ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2-only test debug test
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtwidgets-5.15.2[gles2-only=] !gles2-only? ( virtual/opengl )
+RESTRICT=!test? ( test ) test
+SLOT=5/5.15
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e9b49bbb495a747b35bf3e57f4a51700
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r10
new file mode 100644
index 000000000000..4dacef0a492f
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r10
@@ -0,0 +1,15 @@
+BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtwidgets-5.15.2[gles2-only=] !gles2-only? ( virtual/opengl ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=gles2-only test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtwidgets-5.15.2[gles2-only=] !gles2-only? ( virtual/opengl )
+RESTRICT=!test? ( test ) test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=bf6171cc8751d0b546da5c6afa67fe08
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.15.2 b/metadata/md5-cache/dev-qt/qtpaths-5.15.2
index cc8dc2dd19ff..938f51a31c9b 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Command line client to QStandardPaths
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=437526ccc2e3697db6568a7fde0cedd6
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.2 b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.2
index a2652b0edd16..5aff65a6ab64 100644
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Qt5 plugin metadata dumper
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=16b8dea25c993ea246532b13f068edf7
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.2-r1
new file mode 100644
index 000000000000..26ce6f53feba
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtxml-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Qt5 plugin metadata dumper
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=cafaf1d7c6c41c431a85de0d4756ebfe
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.15.2 b/metadata/md5-cache/dev-qt/qtpositioning-5.15.2
index a7aa421b6490..7dba6bd10353 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=~dev-qt/qtcore-5.15.2 geoclue? ( ~dev-qt/qtdbus-5.15.2 ) qml? ( ~dev-qt/qtdeclarative-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Physical position determination library for the Qt5 framework
 EAPI=7
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 geoclue? ( ~dev-qt/qtdbus-5.15.2 ) qml? ( ~dev-qt/
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=352854e3adc4be8706ce39add02d8f50
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2
deleted file mode 100644
index 4c8cb7edffee..000000000000
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtwidgets-5.15.2[gles2-only=] cups? ( >=net-print/cups-1.4 ) test? ( ~dev-qt/qtnetwork-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
-DESCRIPTION=Printing support library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=cups gles2-only test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtwidgets-5.15.2[gles2-only=] cups? ( >=net-print/cups-1.4 )
-RESTRICT=!test? ( test ) test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4c5bb09aeac65c43a0e305a0e3c90402
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r1
new file mode 100644
index 000000000000..cb89df443b49
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtwidgets-5.15.2[gles2-only=] cups? ( >=net-print/cups-1.4 ) test? ( ~dev-qt/qtnetwork-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Printing support library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=cups gles2-only test debug test
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtwidgets-5.15.2[gles2-only=] cups? ( >=net-print/cups-1.4 )
+RESTRICT=!test? ( test ) test
+SLOT=5/5.15
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4c5bb09aeac65c43a0e305a0e3c90402
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r10
new file mode 100644
index 000000000000..fb657638fd2e
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r10
@@ -0,0 +1,15 @@
+BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtwidgets-5.15.2[gles2-only=] cups? ( >=net-print/cups-1.4 ) test? ( ~dev-qt/qtnetwork-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Printing support library for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=cups gles2-only test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtwidgets-5.15.2[gles2-only=] cups? ( >=net-print/cups-1.4 )
+RESTRICT=!test? ( test ) test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=74161741cc9f58c9bdaa0d1a89e14e88
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.2 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.2
index 0f905e2348f7..aaca8b0485e4 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 widgets? ( ~dev-qt/qtwidgets-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Set of Qt Quick controls to create complete user interfaces (deprecated)
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3eb3b77b081febeb8e1c4aad6e54b157
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2
index 2a5f121a9e49..c998c7532b67 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 widgets? ( ~dev-qt/qtwidgets-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=695fae016e2aaf5a9cadcdca88b0af9d
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2-r10
new file mode 100644
index 000000000000..b5064b08ca3a
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2-r10
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 widgets? ( ~dev-qt/qtwidgets-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 widgets? ( ~dev-qt/qtwidgets-5.15.2 ) ~dev-qt/qtgraphicaleffects-5.15.2
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qtquickcontrols2/-/archive/a2593ff9cf5d0af885c20c2e9f9faa6ca4f1c1a3/qtquickcontrols2-a2593ff9cf5d0af885c20c2e9f9faa6ca4f1c1a3.tar.gz -> qtquickcontrols2-5.15.2-a2593ff9.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=11c126234b09499af2ad64f1d9ba2f74
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.2 b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.2
index ca1b8dbdc4e1..2a9612e55095 100644
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Qt module for keyframe-based timeline construction
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b0eff6cfd15907b642c9f5a072732c6a
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.15.2 b/metadata/md5-cache/dev-qt/qtscript-5.15.2
index bd777f84d8c2..149bd125fdf2 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtscript-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 scripttools? ( ~dev-qt/qtgui-5.15.2 ~dev-qt/qtwidgets-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 scripttools? ( ~dev-qt/qtgui-5.15.2 ~dev-qt/qtwidg
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0cd5c3af8e64666c7bd3da183bd1d3cb
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.15.2 b/metadata/md5-cache/dev-qt/qtscxml-5.15.2
index 6f08ec037130..e5b72bf43b17 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=State Chart XML (SCXML) support library for the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4ce707c1fabbd9c4d5c82dedd503e08d
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.15.2 b/metadata/md5-cache/dev-qt/qtsensors-5.15.2
index 56655cdec60e..7add944a9cbb 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdbus-5.15.2 qml? ( ~dev-qt/qtdeclarative-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Hardware sensor access library for the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdbus-5.15.2 qml? ( ~dev-qt/qtdeclarative
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4d9ba474ce18712ba1488bc5fa11daba
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.15.2 b/metadata/md5-cache/dev-qt/qtserialbus-5.15.2
index da4d3628f3e3..52521357da5a 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtserialport-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Qt module to access CAN, ModBus, and other industrial serial buses and protocols
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtserialport-5.15
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eb9768ec584fd00f322c4ed232125925
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.15.2 b/metadata/md5-cache/dev-qt/qtserialport-5.15.2
index 15573b355b5a..9b2995727510 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 virtual/libudev:= test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Serial port abstraction library for the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 virtual/libudev:=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=82e61169ba7a263bbb1d624ec2d0d4d1
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.15.2 b/metadata/md5-cache/dev-qt/qtspeech-5.15.2
index 02a1238f6c77..2f302c1bd06a 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Text-to-speech library for the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.15.2
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtspeech-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a71a15f0841255f2aa86d9c9a875a465
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtspeech-5.15.2-r1
new file mode 100644
index 000000000000..cbd33339830d
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.15.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.15.2 flite? ( >=app-accessibility/flite-2[alsa?] ~dev-qt/qtmultimedia-5.15.2[alsa?] alsa? ( media-libs/alsa-lib ) ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Text-to-speech library for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+IUSE=alsa flite debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.15.2 flite? ( >=app-accessibility/flite-2[alsa?] ~dev-qt/qtmultimedia-5.15.2[alsa?] alsa? ( media-libs/alsa-lib ) )
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtspeech-everywhere-src-5.15.2.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=4e255ce4daa59cb2be904cb73627053d
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.2 b/metadata/md5-cache/dev-qt/qtsql-5.15.2
deleted file mode 100644
index e320e1df1fe4..000000000000
--- a/metadata/md5-cache/dev-qt/qtsql-5.15.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.2:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) test? ( ~dev-qt/qttest-5.15.2 )
-DESCRIPTION=SQL abstraction library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
-REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
-RESTRICT=test
-SLOT=5/5.15.2
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b3a9b3594799ce6a6f4773949b17edcd
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtsql-5.15.2-r1
new file mode 100644
index 000000000000..ddd39834baa0
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsql-5.15.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=~dev-qt/qtcore-5.15.2:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=SQL abstraction library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
+REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
+RESTRICT=test
+SLOT=5/5.15.2
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b3a9b3594799ce6a6f4773949b17edcd
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtsql-5.15.2-r10
new file mode 100644
index 000000000000..f5cc39e02f17
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsql-5.15.2-r10
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.15.2:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=SQL abstraction library for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
+REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
+RESTRICT=test
+SLOT=5/5.15.2
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=7880b8e9085ecee19f5566ddaebba6e3
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.2 b/metadata/md5-cache/dev-qt/qtsvg-5.15.2
index b7d89005439c..042160f850ee 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtwidgets-5.15.2 sys-libs/zlib:= test? ( ~dev-qt/qtxml-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=SVG rendering library for the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtwidgets-5.15.2 sys-
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c825817b870d45d822c617c864f6fe63
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtsvg-5.15.2-r10
new file mode 100644
index 000000000000..5c53e29811d2
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.15.2-r10
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtwidgets-5.15.2 sys-libs/zlib:= test? ( ~dev-qt/qtxml-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=SVG rendering library for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtwidgets-5.15.2 sys-libs/zlib:=
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qtsvg/-/archive/cfc616978b52a396b2ef6900546f7fc086d7cab3/qtsvg-cfc616978b52a396b2ef6900546f7fc086d7cab3.tar.gz -> qtsvg-5.15.2-cfc61697.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=a9ab2a5a0d538334666eb5619ad9fe57
diff --git a/metadata/md5-cache/dev-qt/qttest-5.15.2 b/metadata/md5-cache/dev-qt/qttest-5.15.2
deleted file mode 100644
index 04d8b55c0a91..000000000000
--- a/metadata/md5-cache/dev-qt/qttest-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.2:5= test? ( ~dev-qt/qtgui-5.15.2 ~dev-qt/qtxml-5.15.2 )
-DESCRIPTION=Unit testing library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5=
-RESTRICT=!test? ( test ) test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=941eec18a689d151624dbfac49e2ba2b
diff --git a/metadata/md5-cache/dev-qt/qttest-5.15.2-r1 b/metadata/md5-cache/dev-qt/qttest-5.15.2-r1
new file mode 100644
index 000000000000..29bc606dd38c
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qttest-5.15.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=~dev-qt/qtcore-5.15.2:5= test? ( ~dev-qt/qtgui-5.15.2 ~dev-qt/qtxml-5.15.2 )
+DESCRIPTION=Unit testing library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2:5=
+RESTRICT=!test? ( test ) test
+SLOT=5/5.15
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=941eec18a689d151624dbfac49e2ba2b
diff --git a/metadata/md5-cache/dev-qt/qttest-5.15.2-r10 b/metadata/md5-cache/dev-qt/qttest-5.15.2-r10
new file mode 100644
index 000000000000..c3599e2e66eb
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qttest-5.15.2-r10
@@ -0,0 +1,15 @@
+BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.15.2:5= test? ( ~dev-qt/qtgui-5.15.2 ~dev-qt/qtxml-5.15.2 )
+DESCRIPTION=Unit testing library for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2:5=
+RESTRICT=!test? ( test ) test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=c9e5e438f62dbdf3c1c4ff46a802c4d7
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.15.2 b/metadata/md5-cache/dev-qt/qttranslations-5.15.2
index 86aa2b4623b0..583c29a17abe 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.15.2
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/linguist-tools-5.15.2 ~dev-qt/qtcore-5.15.2 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Translation files for the Qt5 framework
 EAPI=7
@@ -10,5 +10,5 @@ LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttranslations-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7fbb36c23171daa9a49d066b6573e2d7
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2
index 10d6eef909c0..9c9b9db445f6 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtsvg-5.15.2 spell? ( app-text/hunspell:= ) X? ( x11-libs/libxcb:= ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Customizable input framework and virtual keyboard for Qt
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7eb35e8564e87550055c55bc60045f13
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2-r10
new file mode 100644
index 000000000000..1e716dac5753
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2-r10
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtsvg-5.15.2 spell? ( app-text/hunspell:= ) X? ( x11-libs/libxcb:= ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Customizable input framework and virtual keyboard for Qt
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=handwriting +spell +X debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtsvg-5.15.2 spell? ( app-text/hunspell:= ) X? ( x11-libs/libxcb:= )
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qtvirtualkeyboard/-/archive/2f0e9f98c6c6fdac09f762d41fddcc114f64b28a/qtvirtualkeyboard-2f0e9f98c6c6fdac09f762d41fddcc114f64b28a.tar.gz -> qtvirtualkeyboard-5.15.2-2f0e9f98.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=f6ee55d3e7971885d854dc31532eb3d4
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r1
index dd36014dd82d..236ffd7782fe 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r1
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2[egl,libinput,vulkan=] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 vulkan? ( dev-util/vulkan-headers ) X? ( ~dev-qt/qtgui-5.15.2[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Wayland platform plugin for Qt
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.1
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4aff741e7fcb13d9d1b128999a03fb20
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r10
new file mode 100644
index 000000000000..1292e4db03ff
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r10
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=dev-libs/wayland ~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtdeclarative-5.15.2:5= ~dev-qt/qtgui-5.15.2:5=[egl,libinput,vulkan=] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 vulkan? ( dev-util/vulkan-headers ) X? ( ~dev-qt/qtgui-5.15.2[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Wayland platform plugin for Qt
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=vulkan X debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-libs/wayland ~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtdeclarative-5.15.2:5= ~dev-qt/qtgui-5.15.2:5=[egl,libinput,vulkan=] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 vulkan? ( dev-util/vulkan-headers ) X? ( ~dev-qt/qtgui-5.15.2[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite )
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qtwayland/-/archive/d4c41797b61a5a8da47c5821711aca72e756dcbf/qtwayland-d4c41797b61a5a8da47c5821711aca72e756dcbf.tar.gz -> qtwayland-5.15.2-d4c41797.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=e9e6e484eb7ae665c96c7befc25f769c
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.2 b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.2
index f26b9ee4cd16..d53c59156f65 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 qml? ( ~dev-qt/qtdeclarative-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 qml? ( ~dev-qt/qtdeclarative-5.15.2 )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=18be00a042503f495e354a247e5397f6
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210625 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210625
index a97141863830..cb7c9a7b1af2 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210625
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210625
@@ -12,5 +12,5 @@ REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.2_p20210625.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-chromium87-ppc64le.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f746640059d9173ce133955c52ede695
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2 b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2
index ba1d9829e982..d43c20e2c308 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtnetwork-5.15.2[ssl=] qml? ( ~dev-qt/qtdeclarative-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtnetwork-5.15.2[ssl=] qml? ( ~dev-qt/qtde
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ceaf68474f9988c350012c7f6432f1b9
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2-r10
new file mode 100644
index 000000000000..0beb7595c5b7
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2-r10
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtnetwork-5.15.2[ssl=] qml? ( ~dev-qt/qtdeclarative-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=qml +ssl debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtnetwork-5.15.2[ssl=] qml? ( ~dev-qt/qtdeclarative-5.15.2 )
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qtwebsockets/-/archive/e7883bc64440b1ff4666272ac6eb710ee4bc221b/qtwebsockets-e7883bc64440b1ff4666272ac6eb710ee4bc221b.tar.gz -> qtwebsockets-5.15.2-e7883bc6.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=822ead4a4d1f7a63d4d1c5fc124e9edd
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtwebview-5.15.2-r1
index e3fc4a06966f..37b11856f5d4 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.15.2-r1
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 =dev-qt/qtwebengine-5.15.2*:5 test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Module for displaying web content in a QML application using the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b5ed32fb148f4ccb8803475eebaa02ac
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.2 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.2
deleted file mode 100644
index ab1244019b74..000000000000
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=,png=,X?] gtk? ( ~dev-qt/qtgui-5.15.2[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) test? ( ~dev-qt/qttest-5.15.2 )
-DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2-only gtk +png +X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=,png=,X?] gtk? ( ~dev-qt/qtgui-5.15.2[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d8ede20cd3333bc4ec7a704159095c29
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r1
new file mode 100644
index 000000000000..3ecd82e8e175
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=,png=,X?] gtk? ( ~dev-qt/qtgui-5.15.2[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2-only gtk +png +X debug test
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=,png=,X?] gtk? ( ~dev-qt/qtgui-5.15.2[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d8ede20cd3333bc4ec7a704159095c29
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r10
new file mode 100644
index 000000000000..09732df35d17
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r10
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=,png=,X?] gtk? ( ~dev-qt/qtgui-5.15.2[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=gles2-only gtk +png +X debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=,png=,X?] gtk? ( ~dev-qt/qtgui-5.15.2[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango )
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=5e6e4055b59a1214feef046193dbdb33
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.15.2 b/metadata/md5-cache/dev-qt/qtx11extras-5.15.2
index 3083be99f2df..d2dab59952e5 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2[X] test? ( ~dev-qt/qtwidgets-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2[X]
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d0b03d840ecf476be2e7c6fb422afa70
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.15.2 b/metadata/md5-cache/dev-qt/qtxml-5.15.2
deleted file mode 100644
index 3c4ffeab2b78..000000000000
--- a/metadata/md5-cache/dev-qt/qtxml-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.2:5= test? ( ~dev-qt/qtnetwork-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
-DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5=
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=717c1de67be20e241b10afe96a458695
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtxml-5.15.2-r1
new file mode 100644
index 000000000000..5bfbceb7b6f6
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtxml-5.15.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=~dev-qt/qtcore-5.15.2:5= test? ( ~dev-qt/qtnetwork-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2:5=
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=717c1de67be20e241b10afe96a458695
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtxml-5.15.2-r10
new file mode 100644
index 000000000000..e4a84943e331
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtxml-5.15.2-r10
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.15.2:5= test? ( ~dev-qt/qtnetwork-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
+DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.2:5=
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=19be9e35dedb70d5637a606e0ac7d0c5
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.2 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.2
index 09d4a3b8eabe..5b92f0d87436 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.2
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtnetwork-5.15.2 qml? ( ~dev-qt/qtdeclarative-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
 DESCRIPTION=XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtnetwork-5.15.2 qml? ( ~dev-qt/qtdeclarat
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qt5-build	c3128f7c30df5180500062de5f1ce0d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f313b79baf05c3874908fa68ef948e81
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index a772e05c99d1..cfd822c5923f 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/backports-3.20.2-r1 b/metadata/md5-cache/dev-ruby/backports-3.20.2-r1
index 06537c40703a..c415b10ba402 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.20.2-r1
+++ b/metadata/md5-cache/dev-ruby/backports-3.20.2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Backports of Ruby features for older Ruby
 EAPI=7
 HOMEPAGE=https://github.com/marcandre/backports
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~s390 sparc 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_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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marcandre/backports/archive/v3.20.2.tar.gz -> backports-3.20.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=730a853fa3990672af23f9a0e0da16bb
+_md5_=9f6655d9100d08b883aa8bcd4299eb97
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.34.0 b/metadata/md5-cache/dev-ruby/capybara-3.34.0
index 040faf751575..38886a52f640 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.34.0
+++ b/metadata/md5-cache/dev-ruby/capybara-3.34.0
@@ -5,7 +5,7 @@ DESCRIPTION=Capybara aims to simplify the process of integration testing Rack ap
 EAPI=7
 HOMEPAGE=https://github.com/jnicklas/capybara
 IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby25(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby26(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/addressable[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby27(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby27(-)] >=dev-ruby/xpath-3.2:3[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? ( 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capybara-3.34.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=e5b91971aae024c219f57dd6e4fbcafd
+_md5_=05a85f09ef910f657dee1184f4c4478c
diff --git a/metadata/md5-cache/dev-ruby/faker-2.14.0 b/metadata/md5-cache/dev-ruby/faker-2.14.0
deleted file mode 100644
index 849dabcd0624..000000000000
--- a/metadata/md5-cache/dev-ruby/faker-2.14.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby25(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby26(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/timecop[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/timecop[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/timecop[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? ( 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_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(-)] ) )
-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(-)] )
-DESCRIPTION=A library for generating fake data such as names, addresses, and phone numbers
-EAPI=7
-HOMEPAGE=https://github.com/stympy/faker
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby25(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby26(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] !!<dev-ruby/faker-1.9.6-r1[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? ( 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 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/stympy/faker/archive/v2.14.0.tar.gz -> faker-2.14.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=563237782cb36522cc8d9ab4fd5e8de8
diff --git a/metadata/md5-cache/dev-ruby/faker-2.15.1 b/metadata/md5-cache/dev-ruby/faker-2.15.1
deleted file mode 100644
index 247695d5c760..000000000000
--- a/metadata/md5-cache/dev-ruby/faker-2.15.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby25(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby26(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/timecop[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/timecop[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/timecop[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? ( 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_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(-)] ) )
-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(-)] )
-DESCRIPTION=A library for generating fake data such as names, addresses, and phone numbers
-EAPI=7
-HOMEPAGE=https://github.com/stympy/faker
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby25(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby26(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] !!<dev-ruby/faker-1.9.6-r1[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? ( 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 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/stympy/faker/archive/v2.15.1.tar.gz -> faker-2.15.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7fb4c8db7fefa036bead2d05a24a1679
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.15.0 b/metadata/md5-cache/dev-ruby/ffaker-2.15.0
deleted file mode 100644
index 5c5d21959480..000000000000
--- a/metadata/md5-cache/dev-ruby/ffaker-2.15.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/test-unit:2[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/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_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(-)] ) )
-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(-)] )
-DESCRIPTION=Faster Faker, generates dummy data
-EAPI=7
-HOMEPAGE=https://github.com/emmanueloga/ffaker
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
-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 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/ffaker-2.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0c0ed6d81907a5ebe527ca74366c8c28
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.16.0 b/metadata/md5-cache/dev-ruby/ffaker-2.16.0
deleted file mode 100644
index 2c7eb0678619..000000000000
--- a/metadata/md5-cache/dev-ruby/ffaker-2.16.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/test-unit:2[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/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_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(-)] ) )
-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(-)] )
-DESCRIPTION=Faster Faker, generates dummy data
-EAPI=7
-HOMEPAGE=https://github.com/emmanueloga/ffaker
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
-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 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/ffaker-2.16.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=435213dbf69946621bef414744831344
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.19.0 b/metadata/md5-cache/dev-ruby/ffaker-2.19.0
new file mode 100644
index 000000000000..b4653176a8e4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.19.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby30(-)] ) ) 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_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_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_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_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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) 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=Faster Faker, generates dummy data
+EAPI=8
+HOMEPAGE=https://github.com/emmanueloga/ffaker
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=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_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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/ffaker-2.19.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0dbb345876586e8bf39ca63c05980d3c
diff --git a/metadata/md5-cache/dev-ruby/haml-5.2.2 b/metadata/md5-cache/dev-ruby/haml-5.2.2
new file mode 100644
index 000000000000..a9cb23ffed4b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/haml-5.2.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby26(-)] dev-ruby/tilt:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby27(-)] dev-ruby/tilt:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] dev-ruby/railties:6.0[ruby_targets_ruby26(-)] dev-ruby/activemodel:6.0[ruby_targets_ruby26(-)] dev-ruby/actionpack:6.0[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/nokogiri[ruby_targets_ruby27(-)] dev-ruby/railties:6.0[ruby_targets_ruby27(-)] dev-ruby/activemodel:6.0[ruby_targets_ruby27(-)] dev-ruby/actionpack:6.0[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A ruby web page templating engine
+EAPI=8
+HOMEPAGE=https://haml.info/
+IUSE=doc test test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!!<dev-ruby/haml-4.0.7-r2 ruby_targets_ruby26? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby26(-)] dev-ruby/tilt:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby27(-)] dev-ruby/tilt:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=https://github.com/haml/haml/archive/v5.2.2.tar.gz -> haml-5.2.2.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4d5ae6d1dd321b83baa0814eec1a6cec
diff --git a/metadata/md5-cache/dev-ruby/jwt-2.2.3 b/metadata/md5-cache/dev-ruby/jwt-2.2.3
new file mode 100644
index 000000000000..d5c2c3e490f7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/jwt-2.2.3
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/rbnacl[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rbnacl[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rbnacl[ruby_targets_ruby30(-)] ) ) 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_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_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_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_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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) 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 Ruby implementation of JSON Web Token draft 06
+EAPI=8
+HOMEPAGE=https://github.com/jwt/ruby-jwt
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=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_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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/jwt/ruby-jwt/archive/v2.2.3.tar.gz -> jwt-2.2.3.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b769bfb940bf040c19bb02b01e002a96
diff --git a/metadata/md5-cache/dev-ruby/listen-3.3.3 b/metadata/md5-cache/dev-ruby/listen-3.3.3
deleted file mode 100644
index 5559fa8917c4..000000000000
--- a/metadata/md5-cache/dev-ruby/listen-3.3.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/thor[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/thor[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/thor[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? ( 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(-)] ) )
-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(-)] )
-DESCRIPTION=Listens to file modifications and notifies you about the changes
-EAPI=7
-HOMEPAGE=https://github.com/guard/listen
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2 ruby_targets_ruby25? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rb-inotify-0.9.10[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? ( 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 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/guard/listen/archive/v3.3.3.tar.gz -> listen-3.3.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1b6818c7545d40982876014b19860731
diff --git a/metadata/md5-cache/dev-ruby/listen-3.7.0 b/metadata/md5-cache/dev-ruby/listen-3.7.0
new file mode 100644
index 000000000000..a5a644ba2c90
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/listen-3.7.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/thor[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/thor[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/thor[ruby_targets_ruby30(-)] ) ) 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_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_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_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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) 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=Listens to file modifications and notifies you about the changes
+EAPI=8
+HOMEPAGE=https://github.com/guard/listen
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2 ruby_targets_ruby26? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby30(-)] ) 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_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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://github.com/guard/listen/archive/v3.7.0.tar.gz -> listen-3.7.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3a7c928e6e73b500c0f2e131b11e0a33
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-1.0.3 b/metadata/md5-cache/dev-ruby/mini_mime-1.0.3
index d9138337dc8d..2fa1698429e9 100644
--- a/metadata/md5-cache/dev-ruby/mini_mime-1.0.3
+++ b/metadata/md5-cache/dev-ruby/mini_mime-1.0.3
@@ -5,7 +5,7 @@ DESCRIPTION=A lightweight mime type lookup toy
 EAPI=7
 HOMEPAGE=https://github.com/discourse/mini_mime
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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_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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/discourse/mini_mime/archive/v1.0.3.tar.gz -> mini_mime-1.0.3.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ce608a712dcd8d0fe30ecd308fc81163
+_md5_=fc8267fc90625e5f91550b2fb0eb3b7c
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-1.1.1 b/metadata/md5-cache/dev-ruby/mini_mime-1.1.1
new file mode 100644
index 000000000000..dc780656f655
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mini_mime-1.1.1
@@ -0,0 +1,16 @@
+BDEPEND=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_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_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_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_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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) 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 lightweight mime type lookup toy
+EAPI=8
+HOMEPAGE=https://github.com/discourse/mini_mime
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=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_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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/discourse/mini_mime/archive/v1.1.1.tar.gz -> mini_mime-1.1.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1d9e10f54460beb2f18dff4263ea037a
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-7.5.0 b/metadata/md5-cache/dev-ruby/puppetdb-termini-7.5.0
index 388087579da5..61ecbd075cbb 100644
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-7.5.0
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-7.5.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Library needed to connect puppet to puppetdb
 EAPI=7
 HOMEPAGE=https://puppet.com/docs/puppetdb/latest/index.html
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/stretch/puppet/p/puppetdb-termini/puppetdb-termini_7.5.0-1stretch_all.deb
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=96988590c2b67b60ffc27080a1c54d60
+_md5_=30cbd67d502d678d77ca54b7fb8b2de7
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.2 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.2
new file mode 100644
index 000000000000..9d9cc84dbb25
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Sanitize HTML fragments in Rails applications
+EAPI=8
+HOMEPAGE=https://github.com/rafaelfranca/rails-html-sanitizer
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://rubygems.org/gems/rails-html-sanitizer-1.4.2.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ca4c76cbb73d41b1905d8944235b6d66
diff --git a/metadata/md5-cache/dev-ruby/sfl-2.2-r2 b/metadata/md5-cache/dev-ruby/sfl-2.2-r2
deleted file mode 100644
index 62a70a85452b..000000000000
--- a/metadata/md5-cache/dev-ruby/sfl-2.2-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby27(-)] >=dev-ruby/rspec-core-2.14.8-r2[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(-)] ) )
-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(-)] )
-DESCRIPTION=Library providing spawn() which is almost perfectly compatible with ruby 1.9's
-EAPI=7
-HOMEPAGE=https://github.com/ujihisa/spawn-for-legacy
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=|| ( Ruby BSD-2 )
-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 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/sfl-2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3a9ab2dffafa50a3622db7d68d830d84
diff --git a/metadata/md5-cache/dev-ruby/tty-screen-0.8.1 b/metadata/md5-cache/dev-ruby/tty-screen-0.8.1
index 40659b89ec3c..04514a9c3256 100644
--- a/metadata/md5-cache/dev-ruby/tty-screen-0.8.1
+++ b/metadata/md5-cache/dev-ruby/tty-screen-0.8.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-screen/archive/v0.8.1.tar.gz -> tty-screen-0.8.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=df378af2e46a2b44023f29f0e7cc8bc5
+_md5_=0244ffc18ebd2f3e2aafb57d1bacac48
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 354fa5b38452..9ad062414821 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/build-0.3.10 b/metadata/md5-cache/dev-util/build-0.3.10
deleted file mode 100644
index 7a847cef7a32..000000000000
--- a/metadata/md5-cache/dev-util/build-0.3.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A massively-parallel software build system implemented on top of GNU make
-EAPI=6
-HOMEPAGE=https://www.codesynthesis.com/projects/build/
-IUSE=examples
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!dev-util/build:0.3
-SLOT=0
-SRC_URI=https://www.codesynthesis.com/download/build/0.3/build-0.3.10.tar.bz2
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=fb7de777b4e4bd20a908825ca4175a75
diff --git a/metadata/md5-cache/dev-util/clippy-8.0-r1 b/metadata/md5-cache/dev-util/clippy-8.0-r1
new file mode 100644
index 000000000000..52dfce0c024e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/clippy-8.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex 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
+DEFINED_PHASES=configure install prepare setup
+DEPEND=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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) virtual/libelf:=
+DESCRIPTION=Standalone clippy tool built from FRR sources
+EAPI=8
+HOMEPAGE=https://frrouting.org/
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) virtual/libelf:=
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/FRRouting/frr/archive/frr-8.0.tar.gz -> clippy-8.0.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ff664739683877c700f3d24dc5b15af3
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20210621-r1 b/metadata/md5-cache/dev-util/dialog-1.3.20210621-r1
index 88a47f4006f9..f565693eb1c7 100644
--- a/metadata/md5-cache/dev-util/dialog-1.3.20210621-r1
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20210621-r1
@@ -5,9 +5,9 @@ DESCRIPTION=Tool to display dialog boxes from a shell
 EAPI=7
 HOMEPAGE=https://invisible-island.net/dialog/
 IUSE=examples minimal nls unicode
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?]
 SLOT=0/15
 SRC_URI=https://invisible-mirror.net/archives/dialog/dialog-1.3-20210621.tgz
-_md5_=5932191c1c86db3a38e6f8fbb1a454e4
+_md5_=c5cfa2a3bc28a5b9f303b354d6303aec
diff --git a/metadata/md5-cache/dev-util/diffoscope-181 b/metadata/md5-cache/dev-util/diffoscope-181
new file mode 100644
index 000000000000..198f6e1eb01b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/diffoscope-181
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( app-text/docx2txt media-libs/libcaca )
+DESCRIPTION=Will try to get to the bottom of what makes files or directories different
+EAPI=8
+HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
+IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/diffoscope/diffoscope-181.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=eac6588a17b0de0197091c4aace8ef90
diff --git a/metadata/md5-cache/dev-util/hfstospell-0.5.2-r1 b/metadata/md5-cache/dev-util/hfstospell-0.5.2-r1
index 07db338a6a34..41eb3ebe116b 100644
--- a/metadata/md5-cache/dev-util/hfstospell-0.5.2-r1
+++ b/metadata/md5-cache/dev-util/hfstospell-0.5.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=HFST spell checker library and command line tool
 EAPI=7
 HOMEPAGE=https://github.com/hfst/hfst-ospell
 IUSE=clang
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=app-arch/libarchive dev-libs/icu:= !clang? ( dev-cpp/libxmlpp:2.6 dev-libs/tinyxml2 )
 SLOT=0
 SRC_URI=https://github.com/hfst/hfst-ospell/archive/v0.5.2.tar.gz -> hfstospell-0.5.2.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=691781ce5b374b4d9202449555625eb9
+_md5_=3ae9e155577c96f680702113742e286c
diff --git a/metadata/md5-cache/dev-util/idea-community-2021.1.3.211.7628.21 b/metadata/md5-cache/dev-util/idea-community-2021.1.3.211.7628.21
deleted file mode 100644
index c59804cbb747..000000000000
--- a/metadata/md5-cache/dev-util/idea-community-2021.1.3.211.7628.21
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=install prepare unpack
-DEPEND=|| ( >=dev-java/openjdk-11.0.11_p9-r1:11 >=dev-java/openjdk-bin-11.0.11_p9-r1:11 )
-DESCRIPTION=A complete toolset for web, mobile and enterprise development
-EAPI=7
-HOMEPAGE=https://www.jetbrains.com/idea
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception ISC JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT MPL-1.0 MPL-1.1 OFL ZLIB
-RDEPEND=|| ( >=dev-java/openjdk-11.0.11_p9-r1:11 >=dev-java/openjdk-bin-11.0.11_p9-r1:11 ) dev-java/jansi-native dev-libs/libdbusmenu media-libs/harfbuzz =dev-util/lldb-10*
-RESTRICT=splitdebug
-SLOT=0
-SRC_URI=https://download.jetbrains.com/idea/ideaIC-2021.1.3-no-jbr.tar.gz?_ga=2.23517177.257203969.1622674002-682219170.1619910833 -> ideaIC-1.3.211.7628.21.tar.gz amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_10-linux-x64-b1428.2.tar.gz -> jbr-11_0_10-linux-x64-b1428.2.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=abf87509422bad0e2aaad6a2b81c9169
diff --git a/metadata/md5-cache/dev-util/idea-community-2021.2.1.212.5080.55 b/metadata/md5-cache/dev-util/idea-community-2021.2.1.212.5080.55
new file mode 100644
index 000000000000..bae702663941
--- /dev/null
+++ b/metadata/md5-cache/dev-util/idea-community-2021.2.1.212.5080.55
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=install prepare unpack
+DEPEND=|| ( >=dev-java/openjdk-11.0.11_p9-r1:11 >=dev-java/openjdk-bin-11.0.11_p9-r1:11 )
+DESCRIPTION=A complete toolset for web, mobile and enterprise development
+EAPI=7
+HOMEPAGE=https://www.jetbrains.com/idea
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception ISC JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT MPL-1.0 MPL-1.1 OFL ZLIB
+RDEPEND=|| ( >=dev-java/openjdk-11.0.11_p9-r1:11 >=dev-java/openjdk-bin-11.0.11_p9-r1:11 ) dev-java/jansi-native dev-libs/libdbusmenu media-libs/harfbuzz =dev-util/lldb-10*
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=https://download.jetbrains.com/idea/ideaIC-2021.2.1-no-jbr.tar.gz?_ga=2.28899775.2679204.1629809316-850001349.1629809316 -> ideaIC-2.1.212.5080.55.tar.gz amd64? ( https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-11_0_11-linux-x64-b1504.12.tar.gz -> jbr-11_0_11-linux-x64-b1504.12.tar.gz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3727f75866cc6ef28fae22ab7e526152
diff --git a/metadata/md5-cache/dev-util/idea-community-2021.2.212.4746.92 b/metadata/md5-cache/dev-util/idea-community-2021.2.212.4746.92
deleted file mode 100644
index 740a38b27a2e..000000000000
--- a/metadata/md5-cache/dev-util/idea-community-2021.2.212.4746.92
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=install prepare unpack
-DEPEND=|| ( >=dev-java/openjdk-11.0.11_p9-r1:11 >=dev-java/openjdk-bin-11.0.11_p9-r1:11 )
-DESCRIPTION=A complete toolset for web, mobile and enterprise development
-EAPI=7
-HOMEPAGE=https://www.jetbrains.com/idea
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception ISC JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT MPL-1.0 MPL-1.1 OFL ZLIB
-RDEPEND=|| ( >=dev-java/openjdk-11.0.11_p9-r1:11 >=dev-java/openjdk-bin-11.0.11_p9-r1:11 ) dev-java/jansi-native dev-libs/libdbusmenu media-libs/harfbuzz =dev-util/lldb-10*
-RESTRICT=splitdebug
-SLOT=0
-SRC_URI=https://download.jetbrains.com/idea/ideaIC-2021.2-no-jbr.tar.gz?_ga=2.8475829.1475113311.1627561399-1267779196.1624449062 -> ideaIC-2.212.4746.92.tar.gz amd64? ( https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-11_0_11-linux-x64-b1504.12.tar.gz -> jbr-11_0_11-linux-x64-b1504.12.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e579f6f1080ff8704859671bbbe5d360
diff --git a/metadata/md5-cache/dev-util/intel-graphics-system-controller-0.2.3 b/metadata/md5-cache/dev-util/intel-graphics-system-controller-0.2.3
new file mode 100644
index 000000000000..0b8e5d5b3a45
--- /dev/null
+++ b/metadata/md5-cache/dev-util/intel-graphics-system-controller-0.2.3
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-doc/doxygen || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/metee
+DESCRIPTION=Intel graphics system controller firmware update library
+EAPI=7
+HOMEPAGE=https://github.com/intel/igsc
+IUSE=+cli doc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/metee
+SLOT=0
+SRC_URI=https://github.com/intel/igsc/archive/refs/tags/V0.2.3.tar.gz -> intel-graphics-system-controller-0.2.3.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4fa761061e422a24cc6f8d93ad323f52
diff --git a/metadata/md5-cache/dev-util/kbuild-0.1.9998.3499 b/metadata/md5-cache/dev-util/kbuild-0.1.9998.3499
new file mode 100644
index 000000000000..75298c41bf77
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kbuild-0.1.9998.3499
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig 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
+DEFINED_PHASES=compile install prepare setup
+DEPEND=sys-apps/texinfo sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( dev-util/byacc dev-util/yacc <sys-devel/bison-3.7 )
+DESCRIPTION=A makefile framework for writing simple makefiles for complex tasks
+EAPI=8
+HOMEPAGE=http://svn.netlabs.org/kbuild/wiki
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~polynomial-c/kbuild-0.1.9998.3499-src.tar.xz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=be2b056454d931837b8680b9a7aee398
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.6.2 b/metadata/md5-cache/dev-util/kdevelop-python-5.6.2
index 182246efbc7e..fe00b006395f 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.6.2
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.6.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.77.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 dev-util/kdevelop:5= >=kde-frameworks/kcompletion-5.77.0:5 >=kde-frameworks/kconfig-5.77.0:5 >=kde-frameworks/kcoreaddons-5.77.0:5 >=kde-frameworks/ki18n-5.77.0:5 >=kde-frameworks/kio-5.77.0:5 >=kde-frameworks/kitemmodels-5.77.0:5 >=kde-frameworks/knewstuff-5.77.0:5 >=kde-frameworks/kparts-5.77.0:5 >=kde-frameworks/ktexteditor-5.77.0:5 >=kde-frameworks/kwidgetsaddons-5.77.0:5 >=kde-frameworks/kxmlgui-5.77.0:5 >=kde-frameworks/threadweaver-5.77.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 dev-util/kdevelop:5= >=kde-frameworks/kcompletion-5.77.0:5 >=kde-frameworks/kconfig-5.77.0:5 >=kde-frameworks/kcoreaddons-5.77.0:5 >=kde-frameworks/ki18n-5.77.0:5 >=kde-frameworks/kio-5.77.0:5 >=kde-frameworks/kitemmodels-5.77.0:5 >=kde-frameworks/knewstuff-5.77.0:5 >=kde-frameworks/kparts-5.77.0:5 >=kde-frameworks/ktexteditor-5.77.0:5 >=kde-frameworks/kwidgetsaddons-5.77.0:5 >=kde-frameworks/kxmlgui-5.77.0:5 >=kde-frameworks/threadweaver-5.77.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Python plugin for KDevelop
 EAPI=7
 HOMEPAGE=https://kdevelop.org/
-IUSE=debug test python_single_target_python3_8 python_single_target_python3_9
+IUSE=debug test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=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/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 dev-util/kdevelop:5= >=kde-frameworks/kcompletion-5.77.0:5 >=kde-frameworks/kconfig-5.77.0:5 >=kde-frameworks/kcoreaddons-5.77.0:5 >=kde-frameworks/ki18n-5.77.0:5 >=kde-frameworks/kio-5.77.0:5 >=kde-frameworks/kitemmodels-5.77.0:5 >=kde-frameworks/knewstuff-5.77.0:5 >=kde-frameworks/kparts-5.77.0:5 >=kde-frameworks/ktexteditor-5.77.0:5 >=kde-frameworks/kwidgetsaddons-5.77.0:5 >=kde-frameworks/kxmlgui-5.77.0:5 >=kde-frameworks/threadweaver-5.77.0:5 python_single_target_python3_8? ( dev-python/pycodestyle[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycodestyle[python_targets_python3_9(-)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 dev-util/kdevelop:5= >=kde-frameworks/kcompletion-5.77.0:5 >=kde-frameworks/kconfig-5.77.0:5 >=kde-frameworks/kcoreaddons-5.77.0:5 >=kde-frameworks/ki18n-5.77.0:5 >=kde-frameworks/kio-5.77.0:5 >=kde-frameworks/kitemmodels-5.77.0:5 >=kde-frameworks/knewstuff-5.77.0:5 >=kde-frameworks/kparts-5.77.0:5 >=kde-frameworks/ktexteditor-5.77.0:5 >=kde-frameworks/kwidgetsaddons-5.77.0:5 >=kde-frameworks/kxmlgui-5.77.0:5 >=kde-frameworks/threadweaver-5.77.0:5 python_single_target_python3_8? ( dev-python/pycodestyle[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycodestyle[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycodestyle[python_targets_python3_10(-)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.6.2/src/kdev-python-5.6.2.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e02259f7a74653dee7e73b5d1b84e89e
+_md5_=c1a8197f76f001892904d888d29e39c6
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.10.12-r1 b/metadata/md5-cache/dev-util/lttng-modules-2.10.12-r1
index d49a65f44f9d..a66291ef7ad3 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.10.12-r1
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.10.12-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/2.10
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.10.12.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=61d6957e67c17e6643143404e100ce61
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.11.0-r1 b/metadata/md5-cache/dev-util/lttng-modules-2.11.0-r1
index 0c6a4b797921..8458b6e115c0 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.11.0-r1
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.11.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/2.11
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.11.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=61d6957e67c17e6643143404e100ce61
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.11.8 b/metadata/md5-cache/dev-util/lttng-modules-2.11.8
index 1ce042aa4e4a..d505aae812fc 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.11.8
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.11.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/2.11
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.11.8.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3e9422dce2ef0f7c01dedd08f65bc2f6
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.12.5 b/metadata/md5-cache/dev-util/lttng-modules-2.12.5
index 59e2670e1604..5042901d4350 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.12.5
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.12.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/2.12
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.12.5.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=72e832555c6b5455db4cd7d50858d8ba
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.7.1-r1 b/metadata/md5-cache/dev-util/lttng-modules-2.7.1-r1
index fceb3b6c9390..aa2df7169bcf 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.7.1-r1
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.7.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/2.7
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.7.1.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=142006e0e3165b1d581a9ffe08354ba7
diff --git a/metadata/md5-cache/dev-util/meson-0.57.2 b/metadata/md5-cache/dev-util/meson-0.57.2
deleted file mode 100644
index 392e80949285..000000000000
--- a/metadata/md5-cache/dev-util/meson-0.57.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig )
-DESCRIPTION=Open source build system
-EAPI=7
-HOMEPAGE=https://mesonbuild.com/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/meson/meson-0.57.2.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=509be8bdd37dfc38957c7e431e42e745
diff --git a/metadata/md5-cache/dev-util/meson-0.58.2 b/metadata/md5-cache/dev-util/meson-0.58.2
index 550ba273c94d..72a5d6b6e4de 100644
--- a/metadata/md5-cache/dev-util/meson-0.58.2
+++ b/metadata/md5-cache/dev-util/meson-0.58.2
@@ -5,7 +5,7 @@ DESCRIPTION=Open source build system
 EAPI=7
 HOMEPAGE=https://mesonbuild.com/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.58.2.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f63d9c500884927eb6ab089c83df31c2
+_md5_=b45cc25c04271425de28060ea0245e32
diff --git a/metadata/md5-cache/dev-util/meson-0.59.1 b/metadata/md5-cache/dev-util/meson-0.59.1
new file mode 100644
index 000000000000..705dc6551129
--- /dev/null
+++ b/metadata/md5-cache/dev-util/meson-0.59.1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig )
+DESCRIPTION=Open source build system
+EAPI=7
+HOMEPAGE=https://mesonbuild.com/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/meson/meson-0.59.1.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f63d9c500884927eb6ab089c83df31c2
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.4.1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.4.1
deleted file mode 100644
index 669652206563..000000000000
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare pretend setup unpack
-DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
-EAPI=7
-HOMEPAGE=https://developer.nvidia.com/cuda-zone
-IUSE=debugger nsight profiler vis-profiler sanitizer
-KEYWORDS=-* ~amd64 ~amd64-linux
-LICENSE=NVIDIA-CUDA
-RDEPEND=<sys-devel/gcc-11_pre[cxx] >=x11-drivers/nvidia-drivers-470.57.02 debugger? ( dev-libs/openssl sys-libs/libtermcap-compat sys-libs/ncurses-compat:5[tinfo] ) vis-profiler? ( dev-libs/openssl >=virtual/jre-1.8:* )
-RESTRICT=bindist mirror
-SLOT=0/11.4.1
-SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.4.1/local_installers/cuda_11.4.1_470.57.02_linux.run
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=9ff1e6ae0dc8783542ace984210f44b6
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.4.1-r2 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.4.1-r2
new file mode 100644
index 000000000000..99d7ef2eaa14
--- /dev/null
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.4.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare pretend setup unpack
+DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
+EAPI=7
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=debugger nsight profiler vis-profiler sanitizer
+KEYWORDS=-* ~amd64 ~amd64-linux
+LICENSE=NVIDIA-CUDA
+RDEPEND=<sys-devel/gcc-12_pre[cxx] >=x11-drivers/nvidia-drivers-470.57.02 debugger? ( dev-libs/openssl sys-libs/libtermcap-compat sys-libs/ncurses-compat:5[tinfo] ) vis-profiler? ( dev-libs/openssl >=virtual/jre-1.8:* )
+RESTRICT=bindist mirror
+SLOT=0/11.4.1
+SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.4.1/local_installers/cuda_11.4.1_470.57.02_linux.run
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=52429d9e22aa78a7c79dfe733f2d3f3a
diff --git a/metadata/md5-cache/dev-util/patchelf-0.11 b/metadata/md5-cache/dev-util/patchelf-0.11
deleted file mode 100644
index 5fbe65de2a1f..000000000000
--- a/metadata/md5-cache/dev-util/patchelf-0.11
+++ /dev/null
@@ -1,11 +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
-DEFINED_PHASES=prepare test
-DESCRIPTION=Small utility to modify the dynamic linker and RPATH of ELF executables
-EAPI=7
-HOMEPAGE=https://nixos.org/patchelf.html
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://nixos.org/releases/patchelf/patchelf-0.11/patchelf-0.11.tar.bz2
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=527b40fb4494a8b2e80550ee41dec7e3
diff --git a/metadata/md5-cache/dev-util/patchelf-0.13 b/metadata/md5-cache/dev-util/patchelf-0.13
new file mode 100644
index 000000000000..f5f1703ca49f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/patchelf-0.13
@@ -0,0 +1,11 @@
+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
+DEFINED_PHASES=prepare
+DESCRIPTION=Small utility to modify the dynamic linker and RPATH of ELF executables
+EAPI=8
+HOMEPAGE=https://github.com/NixOS/patchelf
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://github.com/NixOS/patchelf/archive/0.13.tar.gz -> patchelf-0.13.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9d63a9910e208d2aeaf71f68f435e79b
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.0 b/metadata/md5-cache/dev-util/pkgcheck-0.10.0
deleted file mode 100644
index 58367b49c562..000000000000
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=pkgcore-based QA utility for ebuild repos
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.0.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5f66d8826c1135783a856f43e64c1ff4
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.2 b/metadata/md5-cache/dev-util/pkgcheck-0.10.2
deleted file mode 100644
index f98d4739675b..000000000000
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=pkgcore-based QA utility for ebuild repos
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.2.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=419a1119b0e3342c96aa35f86f87934a
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.4 b/metadata/md5-cache/dev-util/pkgcheck-0.10.4
deleted file mode 100644
index 50813e796bd6..000000000000
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=pkgcore-based QA utility for ebuild repos
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.4.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=419a1119b0e3342c96aa35f86f87934a
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.9.7-r2 b/metadata/md5-cache/dev-util/pkgcheck-0.9.7-r2
deleted file mode 100644
index db6468aad30e..000000000000
--- a/metadata/md5-cache/dev-util/pkgcheck-0.9.7-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=pkgcore-based QA utility for ebuild repos
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-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	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=65498faacf2070d7836a833978b240f5
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.9.7-r3 b/metadata/md5-cache/dev-util/pkgcheck-0.9.7-r3
deleted file mode 100644
index 389e6ab01152..000000000000
--- a/metadata/md5-cache/dev-util/pkgcheck-0.9.7-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=pkgcore-based QA utility for ebuild repos
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-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	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7c45cae09cf28b3b6f938b53ff1f767e
diff --git a/metadata/md5-cache/dev-util/sysdig-kmod-0.27.0 b/metadata/md5-cache/dev-util/sysdig-kmod-0.27.0
index 86de263a9895..23c42d7998f9 100644
--- a/metadata/md5-cache/dev-util/sysdig-kmod-0.27.0
+++ b/metadata/md5-cache/dev-util/sysdig-kmod-0.27.0
@@ -10,5 +10,5 @@ LICENSE=|| ( MIT GPL-2 )
 RDEPEND=!<=dev-util/sysdig-0.26.4[modules] kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/draios/sysdig/archive/0.27.0.tar.gz -> sysdig-0.27.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=61741cb5f2da07566fea735d3cd01476
diff --git a/metadata/md5-cache/dev-util/sysdig-kmod-0.27.1 b/metadata/md5-cache/dev-util/sysdig-kmod-0.27.1
index 8fed9a57239e..e929b848f9f2 100644
--- a/metadata/md5-cache/dev-util/sysdig-kmod-0.27.1
+++ b/metadata/md5-cache/dev-util/sysdig-kmod-0.27.1
@@ -10,5 +10,5 @@ LICENSE=|| ( MIT GPL-2 )
 RDEPEND=!<=dev-util/sysdig-0.26.4[modules] kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/draios/sysdig/archive/0.27.1.tar.gz -> sysdig-0.27.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=61741cb5f2da07566fea735d3cd01476
diff --git a/metadata/md5-cache/dev-util/visualvm-2.0.7 b/metadata/md5-cache/dev-util/visualvm-2.0.7
deleted file mode 100644
index 3287c385e67f..000000000000
--- a/metadata/md5-cache/dev-util/visualvm-2.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Integrates commandline JDK tools and profiling capabilities
-EAPI=7
-HOMEPAGE=https://visualvm.github.io
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=7
-SRC_URI=https://github.com/oracle/visualvm/archive/2.0.7.tar.gz -> visualvm-2.0.7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	ac9fb9efa5413c5fb85a4203fe930e88	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d4c1b1a9bed7c605b090a084dbd39cb1
diff --git a/metadata/md5-cache/dev-util/visualvm-2.1 b/metadata/md5-cache/dev-util/visualvm-2.1
index b850c645a817..68753805c237 100644
--- a/metadata/md5-cache/dev-util/visualvm-2.1
+++ b/metadata/md5-cache/dev-util/visualvm-2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Integrates commandline JDK tools and profiling capabilities
 EAPI=7
 HOMEPAGE=https://visualvm.github.io
 IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=7
 SRC_URI=https://github.com/oracle/visualvm/archive/2.1.tar.gz -> visualvm-2.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	ac9fb9efa5413c5fb85a4203fe930e88	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=794a9752c5337a0e9da0e6442c944ea0
+_md5_=b0ee90939a21891b3238f187de09ad14
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index b030a1a2143b..74172d5822a8 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-sizer-1.4.0 b/metadata/md5-cache/dev-vcs/git-sizer-1.4.0
new file mode 100644
index 000000000000..b11fc4e4ad2c
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-sizer-1.4.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Compute various size metrics for a Git repository
+EAPI=8
+HOMEPAGE=https://github.com/github/git-sizer
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 BSD BSD-2 ISC
+RDEPEND=dev-vcs/git
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/github/git-sizer/archive/refs/tags/v1.4.0.tar.gz -> git-sizer-1.4.0.tar.gz mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.zip -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.mod -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.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/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/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.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.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//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 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/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.7.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
+_md5_=8cbb2e5f80abba7031e5df70b8e698f2
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.8.1 b/metadata/md5-cache/dev-vcs/mercurial-5.8.1
index 972d35b58189..ee1a19607622 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.8.1
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.8.1
@@ -5,7 +5,7 @@ DESCRIPTION=Scalable distributed SCM
 EAPI=7
 HOMEPAGE=https://www.mercurial-scm.org/
 IUSE=+chg emacs gpg test tk rust debug python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ rust? ( BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 ISC MIT PSF-2 Unlicense )
 RDEPEND=app-misc/ca-certificates gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.8.1.tar.gz rust? ( 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/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitmaps/2.1.0/download -> bitmaps-2.1.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-cast/0.1.0/download -> bytes-cast-0.1.0.crate https://crates.io/api/v1/crates/bytes-cast-derive/0.1.0/download -> bytes-cast-derive-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/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/const_fn/0.4.4/download -> const_fn-0.4.4.crate https://crates.io/api/v1/crates/cpython/0.5.2/download -> cpython-0.5.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-channel/0.4.4/download -> crossbeam-channel-0.4.4.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.0/download -> crossbeam-channel-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download -> crossbeam-deque-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.1/download -> crossbeam-epoch-0.9.1.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/ctor/0.1.16/download -> ctor-0.1.16.crate https://crates.io/api/v1/crates/derive_more/0.99.11/download -> derive_more-0.99.11.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/flate2/1.0.19/download -> flate2-1.0.19.crate https://crates.io/api/v1/crates/format-bytes/0.2.2/download -> format-bytes-0.2.2.crate https://crates.io/api/v1/crates/format-bytes-macros/0.3.0/download -> format-bytes-macros-0.3.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/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.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/home/0.5.3/download -> home-0.5.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/im-rc/15.0.0/download -> im-rc-15.0.0.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.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.81/download -> libc-0.2.81.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.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/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.6.1/download -> memoffset-0.6.1.crate https://crates.io/api/v1/crates/micro-timer/0.3.1/download -> micro-timer-0.3.1.crate https://crates.io/api/v1/crates/micro-timer-macros/0.3.1/download -> micro-timer-macros-0.3.1.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/num-integer/0.1.44/download -> num-integer-0.1.44.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/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.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/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.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-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/python27-sys/0.5.2/download -> python27-sys-0.5.2.crate https://crates.io/api/v1/crates/python3-sys/0.5.2/download -> python3-sys-0.5.2.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/1.0.7/download -> quote-1.0.7.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.7.3/download -> rand-0.7.3.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_distr/0.2.2/download -> rand_distr-0.2.2.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_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rand_xoshiro/0.4.0/download -> rand_xoshiro-0.4.0.crate https://crates.io/api/v1/crates/rayon/1.5.0/download -> rayon-1.5.0.crate https://crates.io/api/v1/crates/rayon-core/1.9.0/download -> rayon-core-1.9.0.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.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/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/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.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/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/sized-chunks/0.6.2/download -> sized-chunks-0.6.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.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/syn/1.0.54/download -> syn-1.0.54.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.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/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/twox-hash/1.6.0/download -> twox-hash-1.6.0.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.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.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.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.9.2/download -> version_check-0.9.2.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/winapi/0.3.9/download -> winapi-0.3.9.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/zstd/0.5.3+zstd.1.4.5/download -> zstd-0.5.3+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-safe/2.0.5+zstd.1.4.5/download -> zstd-safe-2.0.5+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-sys/1.4.17+zstd.1.4.5/download -> zstd-sys-1.4.17+zstd.1.4.5.crate )
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f2bc25ebdd75fe026221e4c0ff5b9e3c
+_md5_=48b5f190e43bb0c7e241625123dbba31
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 538775aaac3b..11c60df7f80b 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/atanks-6.5 b/metadata/md5-cache/games-action/atanks-6.5
deleted file mode 100644
index 8f4a267dbac1..000000000000
--- a/metadata/md5-cache/games-action/atanks-6.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=media-libs/allegro:0[X]
-DESCRIPTION=Worms and Scorched Earth-like game
-EAPI=7
-HOMEPAGE=https://atanks.sourceforge.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/allegro:0[X]
-SLOT=0
-SRC_URI=mirror://sourceforge/atanks/atanks-6.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0b56c23a719011ebd2f87cde456fd8c9
diff --git a/metadata/md5-cache/games-action/beathazardultra-20130308-r2 b/metadata/md5-cache/games-action/beathazardultra-20130308-r2
index 9c95af05af61..2fd5cc4b691e 100644
--- a/metadata/md5-cache/games-action/beathazardultra-20130308-r2
+++ b/metadata/md5-cache/games-action/beathazardultra-20130308-r2
@@ -11,4 +11,4 @@ RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=beathazard-installer_03-08-13
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=16e898fa87c52db11fd1a6c813c8ed4a
+_md5_=763ac459c796ed2ce9946bc8a7a75f0a
diff --git a/metadata/md5-cache/games-action/crimsonland-1.3.5 b/metadata/md5-cache/games-action/crimsonland-1.3.5
index e4ab388a3661..85088a8a953a 100644
--- a/metadata/md5-cache/games-action/crimsonland-1.3.5
+++ b/metadata/md5-cache/games-action/crimsonland-1.3.5
@@ -1,4 +1,5 @@
-DEFINED_PHASES=install nofetch postinst postrm
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A top-down shooter with a touch of RPG
 EAPI=7
 HOMEPAGE=https://crimsonland.com/
@@ -8,5 +9,5 @@ RDEPEND=media-libs/libsdl2[abi_x86_32,opengl,video] media-libs/openal[abi_x86_32
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=Crimsonland-Linux-x86-1.3.5.tar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9347a4c56dff666b0238c22bbe361065
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4c9b12ffdff72c081a69c1e31970c2ea
diff --git a/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1 b/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1
deleted file mode 100644
index 36ec57f70e37..000000000000
--- a/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=games-util/loki_patch
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Indoor/outdoor 3D combat with evil robotic mining spacecraft
-EAPI=7
-HOMEPAGE=http://www.lokigames.com/products/descent3/
-IUSE=alsa pulseaudio
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=sys-libs/glibc >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] alsa? ( media-libs/alsa-oss[abi_x86_32(-)] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )
-REQUIRED_USE=?? ( alsa pulseaudio )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=mirror://lokigames/loki_demos/descent3-demo.run
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3435882d6d5e9315e1cb8367c48c2cee
diff --git a/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r2 b/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r2
new file mode 100644
index 000000000000..732c769ce44f
--- /dev/null
+++ b/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r2
@@ -0,0 +1,16 @@
+BDEPEND=games-util/loki_patch
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Indoor/outdoor 3D combat with evil robotic mining spacecraft
+EAPI=7
+HOMEPAGE=http://www.lokigames.com/products/descent3/
+IUSE=alsa pulseaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=sys-libs/glibc >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] alsa? ( media-libs/alsa-oss[abi_x86_32(-)] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )
+REQUIRED_USE=?? ( alsa pulseaudio )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=mirror://lokigames/loki_demos/descent3-demo.run
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2270f6bd512d2651437c012078c8a8f0
diff --git a/metadata/md5-cache/games-action/heretic2-demo-1.06a-r1 b/metadata/md5-cache/games-action/heretic2-demo-1.06a-r1
deleted file mode 100644
index 93b5746d1719..000000000000
--- a/metadata/md5-cache/games-action/heretic2-demo-1.06a-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=games-util/loki_patch
-DEFINED_PHASES=install unpack
-DESCRIPTION=Third-person classic magical action-adventure game
-EAPI=7
-HOMEPAGE=http://www.lokigames.com/products/heretic2/ http://www.hereticii.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=LOKI-EULA
-RDEPEND=x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)]
-RESTRICT=strip mirror bindist
-SLOT=0
-SRC_URI=mirror://lokigames/loki_demos/heretic2-demo.run
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=22e6f778eb778e3358de161ebb58754d
diff --git a/metadata/md5-cache/games-action/heretic2-demo-1.06a-r2 b/metadata/md5-cache/games-action/heretic2-demo-1.06a-r2
new file mode 100644
index 000000000000..70195eefb3e1
--- /dev/null
+++ b/metadata/md5-cache/games-action/heretic2-demo-1.06a-r2
@@ -0,0 +1,13 @@
+BDEPEND=games-util/loki_patch
+DEFINED_PHASES=install unpack
+DESCRIPTION=Third-person classic magical action-adventure game
+EAPI=7
+HOMEPAGE=http://www.lokigames.com/products/heretic2/ http://www.hereticii.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=LOKI-EULA
+RDEPEND=x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)]
+RESTRICT=strip mirror bindist
+SLOT=0
+SRC_URI=mirror://lokigames/loki_demos/heretic2-demo.run
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fe24402a5706d97954e542d286ca3144
diff --git a/metadata/md5-cache/games-action/hotline-miami-1.0.9a_p20140221-r2 b/metadata/md5-cache/games-action/hotline-miami-1.0.9a_p20140221-r2
deleted file mode 100644
index 9a68283e15d9..000000000000
--- a/metadata/md5-cache/games-action/hotline-miami-1.0.9a_p20140221-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch
-DESCRIPTION=High-octane action game overflowing with raw brutality
-EAPI=7
-HOMEPAGE=http://www.devolverdigital.com/games/view/hotline-miami
-IUSE=bundled-libs +launcher
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=amd64? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)] !bundled-libs? ( >=media-gfx/nvidia-cg-toolkit-3.1.0013-r3[abi_x86_32(-)] >=media-libs/libogg-1.3.0[abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) launcher? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)] ) ) x86? ( x11-libs/libX11 !bundled-libs? ( media-gfx/nvidia-cg-toolkit media-libs/libogg media-libs/libvorbis media-libs/openal ) launcher? ( media-libs/freetype x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/libxcb ) )
-RESTRICT=bindist fetch splitdebug
-SLOT=0
-SRC_URI=HotlineMiami_linux_1392944501.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d5037e01ebb6c72b7fa45cc2727a4305
diff --git a/metadata/md5-cache/games-action/hotline-miami-1.0.9a_p20140221-r3 b/metadata/md5-cache/games-action/hotline-miami-1.0.9a_p20140221-r3
new file mode 100644
index 000000000000..740862918e66
--- /dev/null
+++ b/metadata/md5-cache/games-action/hotline-miami-1.0.9a_p20140221-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch
+DESCRIPTION=High-octane action game overflowing with raw brutality
+EAPI=7
+HOMEPAGE=http://www.devolverdigital.com/games/view/hotline-miami
+IUSE=bundled-libs +launcher
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=amd64? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)] !bundled-libs? ( >=media-gfx/nvidia-cg-toolkit-3.1.0013-r3[abi_x86_32(-)] >=media-libs/libogg-1.3.0[abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) launcher? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)] ) ) x86? ( x11-libs/libX11 !bundled-libs? ( media-gfx/nvidia-cg-toolkit media-libs/libogg media-libs/libvorbis media-libs/openal ) launcher? ( media-libs/freetype x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/libxcb ) )
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=HotlineMiami_linux_1392944501.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ed47fe969ab4a619ab896917eda78741
diff --git a/metadata/md5-cache/games-action/intrusion2-1.024-r1 b/metadata/md5-cache/games-action/intrusion2-1.024-r1
deleted file mode 100644
index 72718ce21bbb..000000000000
--- a/metadata/md5-cache/games-action/intrusion2-1.024-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Fast paced action sidescroller set in a sci-fi environment
-EAPI=7
-HOMEPAGE=http://intrusion2.com
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=amd64? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=dev-libs/atk-2.10.0[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36[abi_x86_32(-)] >=media-libs/gstreamer-0.10.36-r2[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=x11-libs/pango-1.36.3[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] >=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)] ) x86? ( >=dev-libs/glib-2.34.3:2 >=dev-libs/atk-2.10.0 >=media-libs/gst-plugins-base-0.10.36 >=media-libs/gstreamer-0.10.36-r2 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.0.1 >=x11-libs/gdk-pixbuf-2.30.7 >=x11-libs/gtk+-2.24.23:2 >=x11-libs/pango-1.36.3 >=x11-libs/libSM-1.2.1-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXext-1.3.2 >=x11-libs/libXinerama-1.1.3 >=x11-libs/libXtst-1.2.1-r1 )
-RESTRICT=bindist fetch
-SLOT=0
-SRC_URI=intrusion2-1370288626-bin
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0f113c3ffa39101e3cae44f7de69e82e
diff --git a/metadata/md5-cache/games-action/intrusion2-1.024-r2 b/metadata/md5-cache/games-action/intrusion2-1.024-r2
new file mode 100644
index 000000000000..f8c8b5b58546
--- /dev/null
+++ b/metadata/md5-cache/games-action/intrusion2-1.024-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Fast paced action sidescroller set in a sci-fi environment
+EAPI=7
+HOMEPAGE=http://intrusion2.com
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=amd64? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=dev-libs/atk-2.10.0[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36[abi_x86_32(-)] >=media-libs/gstreamer-0.10.36-r2[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=x11-libs/pango-1.36.3[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] >=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)] ) x86? ( >=dev-libs/glib-2.34.3:2 >=dev-libs/atk-2.10.0 >=media-libs/gst-plugins-base-0.10.36 >=media-libs/gstreamer-0.10.36-r2 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.0.1 >=x11-libs/gdk-pixbuf-2.30.7 >=x11-libs/gtk+-2.24.23:2 >=x11-libs/pango-1.36.3 >=x11-libs/libSM-1.2.1-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXext-1.3.2 >=x11-libs/libXinerama-1.1.3 >=x11-libs/libXtst-1.2.1-r1 )
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=intrusion2-1370288626-bin
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=da106d282895f8dd977af38536bad3c9
diff --git a/metadata/md5-cache/games-action/swordandsworcery-1.02-r1 b/metadata/md5-cache/games-action/swordandsworcery-1.02-r1
deleted file mode 100644
index 804ee11a101e..000000000000
--- a/metadata/md5-cache/games-action/swordandsworcery-1.02-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch prepare
-DESCRIPTION=An exploratory action adventure game with an emphasis on audiovisual style
-EAPI=7
-HOMEPAGE=http://www.swordandsworcery.com/
-IUSE=bundled-libs
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=CAPYBARA-EULA LGPL-3
-RDEPEND=virtual/opengl amd64? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] >=media-libs/flac-1.2.1-r5[abi_x86_32(-)] >=media-libs/libogg-1.3.0[abi_x86_32(-)] >=media-libs/libsndfile-1.0.25[abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)] >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)] !bundled-libs? ( >=net-misc/curl-7.36.0[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[X,sound,video,opengl,joystick,abi_x86_32(-)] ) ) x86? ( dev-libs/openssl:0= media-libs/alsa-lib media-libs/flac media-libs/libogg media-libs/libsndfile media-libs/libvorbis media-sound/pulseaudio sys-libs/zlib virtual/glu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXtst !bundled-libs? ( net-misc/curl media-libs/libsdl[X,sound,video,opengl,joystick] ) )
-RESTRICT=bindist fetch splitdebug
-SLOT=0
-SRC_URI=swordandsworcery_1.02.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=0e5c7f7ae989710a8c4aa9abe8ea168f
diff --git a/metadata/md5-cache/games-action/swordandsworcery-1.02-r2 b/metadata/md5-cache/games-action/swordandsworcery-1.02-r2
new file mode 100644
index 000000000000..eb31cdd31700
--- /dev/null
+++ b/metadata/md5-cache/games-action/swordandsworcery-1.02-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch prepare
+DESCRIPTION=An exploratory action adventure game with an emphasis on audiovisual style
+EAPI=7
+HOMEPAGE=http://www.swordandsworcery.com/
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=CAPYBARA-EULA LGPL-3
+RDEPEND=virtual/opengl amd64? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] >=media-libs/flac-1.2.1-r5[abi_x86_32(-)] >=media-libs/libogg-1.3.0[abi_x86_32(-)] >=media-libs/libsndfile-1.0.25[abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)] >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)] !bundled-libs? ( >=net-misc/curl-7.36.0[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[X,sound,video,opengl,joystick,abi_x86_32(-)] ) ) x86? ( dev-libs/openssl:0= media-libs/alsa-lib media-libs/flac media-libs/libogg media-libs/libsndfile media-libs/libvorbis media-sound/pulseaudio sys-libs/zlib virtual/glu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXtst !bundled-libs? ( net-misc/curl media-libs/libsdl[X,sound,video,opengl,joystick] ) )
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=swordandsworcery_1.02.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=e8106a0cf5ffb9eb4e42b7ef3250da31
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index a0775096843f..73f27cdce664 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/aquaria-1.1.3-r2 b/metadata/md5-cache/games-arcade/aquaria-1.1.3-r2
deleted file mode 100644
index 983f87e24bad..000000000000
--- a/metadata/md5-cache/games-arcade/aquaria-1.1.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=A 2D scroller set in a massive ocean world
-EAPI=7
-HOMEPAGE=http://www.bit-blot.com/aquaria/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)]
-RESTRICT=strip fetch bindist
-SLOT=0
-SRC_URI=aquaria-lnx-humble-bundle.mojo.run
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=98b7b00c81fe137545469d2eb23cad0b
diff --git a/metadata/md5-cache/games-arcade/aquaria-1.1.3-r3 b/metadata/md5-cache/games-arcade/aquaria-1.1.3-r3
new file mode 100644
index 000000000000..6819ac83d202
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/aquaria-1.1.3-r3
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=A 2D scroller set in a massive ocean world
+EAPI=7
+HOMEPAGE=http://www.bit-blot.com/aquaria/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)]
+RESTRICT=strip fetch bindist
+SLOT=0
+SRC_URI=aquaria-lnx-humble-bundle.mojo.run
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c757ec429320f9d4feee7c9a9fec18c8
diff --git a/metadata/md5-cache/games-arcade/barbarian-bin-1.01-r2 b/metadata/md5-cache/games-arcade/barbarian-bin-1.01-r2
deleted file mode 100644
index 66b0705c2fc9..000000000000
--- a/metadata/md5-cache/games-arcade/barbarian-bin-1.01-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Save Princess Mariana through one-on-one battles with demonic barbarians
-EAPI=7
-HOMEPAGE=http://www.tdbsoft.com/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=CC-BY-NC-ND-2.0
-RDEPEND=acct-group/gamestat >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)] sys-libs/libstdc++-v3:5 amd64? ( sys-libs/libstdc++-v3:5[multilib] )
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://www.pcpages.com/tomberrr/downloads/barbarian101_linux.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=72e55d7d3eb3be2ae48d3c089e7ec119
diff --git a/metadata/md5-cache/games-arcade/barbarian-bin-1.01-r3 b/metadata/md5-cache/games-arcade/barbarian-bin-1.01-r3
new file mode 100644
index 000000000000..9a72f58bc6c6
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/barbarian-bin-1.01-r3
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Save Princess Mariana through one-on-one battles with demonic barbarians
+EAPI=7
+HOMEPAGE=http://www.tdbsoft.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=CC-BY-NC-ND-2.0
+RDEPEND=acct-group/gamestat >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)] sys-libs/libstdc++-v3:5 amd64? ( sys-libs/libstdc++-v3:5[multilib] )
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://www.pcpages.com/tomberrr/downloads/barbarian101_linux.zip
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=180f8d435d0b0989cb08cea35633bf25
diff --git a/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r2 b/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r2
deleted file mode 100644
index 0cd3f6033c5b..000000000000
--- a/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r2
+++ /dev/null
@@ -1,13 +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
-DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libXt
-DESCRIPTION=SDL OpenGL pinball game
-EAPI=7
-HOMEPAGE=http://pinball.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libltdl:0 media-libs/libsdl[joystick,opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] x11-libs/libICE x11-libs/libSM virtual/opengl virtual/glu acct-group/gamestat
-SLOT=0
-SRC_URI=mirror://sourceforge/pinball/pinball-0.3.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a32be532f204093e2258d397db69e00b
diff --git a/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r3 b/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r3
new file mode 100644
index 000000000000..df7827e74b7d
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r3
@@ -0,0 +1,13 @@
+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
+DEFINED_PHASES=compile configure install prepare
+DEPEND=x11-libs/libXt
+DESCRIPTION=SDL OpenGL pinball game
+EAPI=7
+HOMEPAGE=http://pinball.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libltdl:0 media-libs/libsdl[joystick,opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] x11-libs/libICE x11-libs/libSM virtual/opengl virtual/glu acct-group/gamestat
+SLOT=0
+SRC_URI=mirror://sourceforge/pinball/pinball-0.3.1.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2d5faa08c52d4cde67da3fcc39010600
diff --git a/metadata/md5-cache/games-arcade/gunocide2ex-1.0-r2 b/metadata/md5-cache/games-arcade/gunocide2ex-1.0-r2
deleted file mode 100644
index 3ae17537b7e8..000000000000
--- a/metadata/md5-cache/games-arcade/gunocide2ex-1.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis]
-DESCRIPTION=Fast-paced 2D shoot'em'up
-EAPI=7
-HOMEPAGE=http://g2ex.sourceforge.net/
-KEYWORDS=~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] acct-group/gamestat
-SLOT=0
-SRC_URI=mirror://sourceforge/g2ex/g2ex-setup.run
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=824b1a3e92f440f3c94fe216102dd9e1
diff --git a/metadata/md5-cache/games-arcade/gunocide2ex-1.0-r3 b/metadata/md5-cache/games-arcade/gunocide2ex-1.0-r3
new file mode 100644
index 000000000000..6a1f515aab08
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/gunocide2ex-1.0-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis]
+DESCRIPTION=Fast-paced 2D shoot'em'up
+EAPI=7
+HOMEPAGE=http://g2ex.sourceforge.net/
+KEYWORDS=~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] acct-group/gamestat
+SLOT=0
+SRC_URI=mirror://sourceforge/g2ex/g2ex-setup.run
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=3988a09e8c6336272ec6bee68a0900ee
diff --git a/metadata/md5-cache/games-arcade/jardinains-2.0-r2 b/metadata/md5-cache/games-arcade/jardinains-2.0-r2
deleted file mode 100644
index 866da62d6dc5..000000000000
--- a/metadata/md5-cache/games-arcade/jardinains-2.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare unpack
-DESCRIPTION=Arkanoid with Gnomes
-EAPI=7
-HOMEPAGE=http://www.jardinains2.com
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=jardinains
-RDEPEND=acct-group/gamestat sys-libs/libstdc++-v3:5 >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] amd64? ( sys-libs/libstdc++-v3:5[multilib] )
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://gentoo/JN2_1_FREE_LIN.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fcc8465dc09fc2b8a1803e57ebc022ce
diff --git a/metadata/md5-cache/games-arcade/jardinains-2.0-r4 b/metadata/md5-cache/games-arcade/jardinains-2.0-r4
new file mode 100644
index 000000000000..b80997f65e60
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/jardinains-2.0-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare unpack
+DESCRIPTION=Arkanoid with Gnomes
+EAPI=7
+HOMEPAGE=http://www.jardinains2.com
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=jardinains
+RDEPEND=acct-group/gamestat sys-libs/libstdc++-v3:5 >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] amd64? ( sys-libs/libstdc++-v3:5[multilib] )
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://gentoo/JN2_1_FREE_LIN.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=918cb6bb4e49f2b630a5a3a8998be043
diff --git a/metadata/md5-cache/games-arcade/pachi-1.0-r1 b/metadata/md5-cache/games-arcade/pachi-1.0-r1
deleted file mode 100644
index 7d402b42a324..000000000000
--- a/metadata/md5-cache/games-arcade/pachi-1.0-r1
+++ /dev/null
@@ -1,13 +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
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-mixer[mod]
-DESCRIPTION=platform game inspired by games like Manic Miner and Jet Set Willy
-EAPI=7
-HOMEPAGE=http://dragontech.sourceforge.net/index.php?main=pachi&lang=en
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-mixer[mod] acct-group/gamestat
-SLOT=0
-SRC_URI=mirror://gentoo/pachi-1.0.tar.bz2
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1edccb755b6783a2219a26a3b776a923
diff --git a/metadata/md5-cache/games-arcade/pachi-1.0-r2 b/metadata/md5-cache/games-arcade/pachi-1.0-r2
new file mode 100644
index 000000000000..f8e576353714
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/pachi-1.0-r2
@@ -0,0 +1,13 @@
+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
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-mixer[mod]
+DESCRIPTION=platform game inspired by games like Manic Miner and Jet Set Willy
+EAPI=7
+HOMEPAGE=http://dragontech.sourceforge.net/index.php?main=pachi&lang=en
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-mixer[mod] acct-group/gamestat
+SLOT=0
+SRC_URI=mirror://gentoo/pachi-1.0.tar.bz2
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3471768d8fb5a89187a8d028fa9d7c5d
diff --git a/metadata/md5-cache/games-arcade/shovel-knight-3.3 b/metadata/md5-cache/games-arcade/shovel-knight-3.3
index eb84cdc120c6..2ec2c4b90902 100644
--- a/metadata/md5-cache/games-arcade/shovel-knight-3.3
+++ b/metadata/md5-cache/games-arcade/shovel-knight-3.3
@@ -1,4 +1,5 @@
-DEFINED_PHASES=install nofetch postinst postrm unpack
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Sweeping classic action adventure with an 8-bit retro aesthetic
 EAPI=7
 HOMEPAGE=https://yachtclubgames.com/shovel-knight/
@@ -8,5 +9,5 @@ RDEPEND=media-libs/glew:1.10 media-libs/libsdl2[opengl,sound,video] virtual/open
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=shovel_knight_treasure_trove_en_3_3_15418.sh
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1b12acfd3871b0342c2cb9c37a60356e
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d6b6d021e29c14dd1358508b3c7a1886
diff --git a/metadata/md5-cache/games-arcade/tomatoes-1.55-r3 b/metadata/md5-cache/games-arcade/tomatoes-1.55-r3
deleted file mode 100644
index 6998924e86df..000000000000
--- a/metadata/md5-cache/games-arcade/tomatoes-1.55-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] virtual/opengl virtual/glu
-DESCRIPTION=How many tomatoes can you smash in ten short minutes?
-EAPI=7
-HOMEPAGE=http://tomatoes.sourceforge.net/about.html
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=ZLIB
-RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] virtual/opengl virtual/glu acct-group/gamestat
-SLOT=0
-SRC_URI=mirror://sourceforge/tomatoes/tomatoes-linux-src-1.55.tar.bz2 mirror://sourceforge/tomatoes/tomatoes-linux-1.5.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4b1920e4ba4f4b70b6eaeb866b4ce2f4
diff --git a/metadata/md5-cache/games-arcade/tomatoes-1.55-r4 b/metadata/md5-cache/games-arcade/tomatoes-1.55-r4
new file mode 100644
index 000000000000..5512a80b3d22
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/tomatoes-1.55-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] virtual/opengl virtual/glu
+DESCRIPTION=How many tomatoes can you smash in ten short minutes?
+EAPI=7
+HOMEPAGE=http://tomatoes.sourceforge.net/about.html
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=ZLIB
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] virtual/opengl virtual/glu acct-group/gamestat
+SLOT=0
+SRC_URI=mirror://sourceforge/tomatoes/tomatoes-linux-src-1.55.tar.bz2 mirror://sourceforge/tomatoes/tomatoes-linux-1.5.tar.bz2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0dcc892c182f0dbf63d8373fbde489db
diff --git a/metadata/md5-cache/games-arcade/xbill-2.1-r3 b/metadata/md5-cache/games-arcade/xbill-2.1-r3
deleted file mode 100644
index 448caa75bf76..000000000000
--- a/metadata/md5-cache/games-arcade/xbill-2.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig 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
-DEFINED_PHASES=configure install prepare
-DEPEND=acct-group/gamestat media-fonts/font-misc-misc gtk? ( x11-libs/gtk+:2 ) !gtk? ( x11-libs/libXaw )
-DESCRIPTION=A game about an evil hacker called Bill!
-EAPI=7
-HOMEPAGE=http://www.xbill.org/
-IUSE=gtk
-KEYWORDS=~alpha ~amd64 ~x86
-LICENSE=GPL-1
-RDEPEND=acct-group/gamestat media-fonts/font-misc-misc gtk? ( x11-libs/gtk+:2 ) !gtk? ( x11-libs/libXaw )
-SLOT=0
-SRC_URI=http://www.xbill.org/download/xbill-2.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3098eae60ca9fdb1efa716f80cd3388e
diff --git a/metadata/md5-cache/games-arcade/xbill-2.1-r4 b/metadata/md5-cache/games-arcade/xbill-2.1-r4
new file mode 100644
index 000000000000..d76a5d93f604
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/xbill-2.1-r4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig 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
+DEFINED_PHASES=configure install prepare
+DEPEND=acct-group/gamestat media-fonts/font-misc-misc gtk? ( x11-libs/gtk+:2 ) !gtk? ( x11-libs/libXaw )
+DESCRIPTION=A game about an evil hacker called Bill!
+EAPI=7
+HOMEPAGE=http://www.xbill.org/
+IUSE=gtk
+KEYWORDS=~alpha ~amd64 ~x86
+LICENSE=GPL-1
+RDEPEND=acct-group/gamestat media-fonts/font-misc-misc gtk? ( x11-libs/gtk+:2 ) !gtk? ( x11-libs/libXaw )
+SLOT=0
+SRC_URI=http://www.xbill.org/download/xbill-2.1.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9f9f09c5b15958d2b252ebeda2601066
diff --git a/metadata/md5-cache/games-arcade/xgalaga-2.1.1.0-r1 b/metadata/md5-cache/games-arcade/xgalaga-2.1.1.0-r1
index 673f651b493e..adbbe554ddda 100644
--- a/metadata/md5-cache/games-arcade/xgalaga-2.1.1.0-r1
+++ b/metadata/md5-cache/games-arcade/xgalaga-2.1.1.0-r1
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm x11-libs/libXext x11-lib
 SLOT=0
 SRC_URI=mirror://sourceforge/xgalaga/xgalaga-2.1.1.0.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f00903c1f8ca9477c0175b8be6d8af19
+_md5_=31209a9861cd6de7c00cf4d99df68beb
diff --git a/metadata/md5-cache/games-arcade/xjump-2.7.5-r1 b/metadata/md5-cache/games-arcade/xjump-2.7.5-r1
deleted file mode 100644
index 68af31610123..000000000000
--- a/metadata/md5-cache/games-arcade/xjump-2.7.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXpm x11-libs/libXt x11-base/xorg-proto
-DESCRIPTION=An X game where one tries to jump up as many levels as possible
-EAPI=7
-HOMEPAGE=http://packages.debian.org/stable/games/xjump
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXpm x11-libs/libXt acct-group/gamestat
-SLOT=0
-SRC_URI=mirror://debian/pool/main/x/xjump/xjump_2.7.5.orig.tar.gz mirror://debian/pool/main/x/xjump/xjump_2.7.5-6.1.debian.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fbf56f88a5166b93575358276b2aef1a
diff --git a/metadata/md5-cache/games-arcade/xjump-2.7.5-r2 b/metadata/md5-cache/games-arcade/xjump-2.7.5-r2
new file mode 100644
index 000000000000..baa646538841
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/xjump-2.7.5-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXpm x11-libs/libXt x11-base/xorg-proto
+DESCRIPTION=An X game where one tries to jump up as many levels as possible
+EAPI=7
+HOMEPAGE=http://packages.debian.org/stable/games/xjump
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXpm x11-libs/libXt acct-group/gamestat
+SLOT=0
+SRC_URI=mirror://debian/pool/main/x/xjump/xjump_2.7.5.orig.tar.gz mirror://debian/pool/main/x/xjump/xjump_2.7.5-6.1.debian.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=601886164d8d234479067606e3cc13b0
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index d3b4a82274d1..4fc3b181ad64 100644
--- a/metadata/md5-cache/games-board/Manifest.gz
+++ b/metadata/md5-cache/games-board/Manifest.gz
diff --git a/metadata/md5-cache/games-board/pysolfc-2.12.0 b/metadata/md5-cache/games-board/pysolfc-2.12.0
new file mode 100644
index 000000000000..7316296db4f0
--- /dev/null
+++ b/metadata/md5-cache/games-board/pysolfc-2.12.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_single_target_python3_8? ( dev-python/attrs[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/pysol_cards[python_targets_python3_8(-)] dev-python/random2[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] !minimal? ( dev-python/pillow[jpeg,tk,python_targets_python3_8(-)] dev-tcltk/tktable ) sound? ( dev-python/pygame[python_targets_python3_8(-)] media-libs/sdl2-mixer[mod] ) ) python_single_target_python3_9? ( dev-python/attrs[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/pysol_cards[python_targets_python3_9(-)] dev-python/random2[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] !minimal? ( dev-python/pillow[jpeg,tk,python_targets_python3_9(-)] dev-tcltk/tktable ) sound? ( dev-python/pygame[python_targets_python3_9(-)] media-libs/sdl2-mixer[mod] ) ) python_single_target_python3_8? ( dev-python/unittest-or-fail[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/unittest-or-fail[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) 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 preinst prepare setup test
+DESCRIPTION=Exciting collection of more than 1000 solitaire card games
+EAPI=8
+HOMEPAGE=https://pysolfc.sourceforge.io/
+IUSE=extra-cardsets minimal +sound test python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ GPL-2+
+RDEPEND=python_single_target_python3_8? ( dev-python/attrs[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/pysol_cards[python_targets_python3_8(-)] dev-python/random2[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] !minimal? ( dev-python/pillow[jpeg,tk,python_targets_python3_8(-)] dev-tcltk/tktable ) sound? ( dev-python/pygame[python_targets_python3_8(-)] media-libs/sdl2-mixer[mod] ) ) python_single_target_python3_9? ( dev-python/attrs[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/pysol_cards[python_targets_python3_9(-)] dev-python/random2[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] !minimal? ( dev-python/pillow[jpeg,tk,python_targets_python3_9(-)] dev-tcltk/tktable ) sound? ( dev-python/pygame[python_targets_python3_9(-)] media-libs/sdl2-mixer[mod] ) ) python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/pysolfc/PySolFC-2.12.0.tar.xz extra-cardsets? ( mirror://sourceforge/pysolfc/PySolFC-Cardsets-2.1PRE.tar.bz2 ) !extra-cardsets? ( mirror://sourceforge/pysolfc/PySolFC-Cardsets--Minimal-2.0.2.tar.xz ) sound? ( mirror://sourceforge/pysolfc/pysol-music-4.50.tar.xz )
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9b7d65151cd1e8d7e9acf8937c9c0c31
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 1e8a9a49bdb2..8b7fdf3e33cc 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
diff --git a/metadata/md5-cache/games-fps/etqw-bin-1.5-r3 b/metadata/md5-cache/games-fps/etqw-bin-1.5-r3
deleted file mode 100644
index cee64baab5f9..000000000000
--- a/metadata/md5-cache/games-fps/etqw-bin-1.5-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install postinst unpack
-DESCRIPTION=Enemy Territory: Quake Wars
-EAPI=7
-HOMEPAGE=http://zerowing.idsoftware.com/linux/etqw/ETQWFrontPage/
-IUSE=cdinstall
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=ETQW
-RDEPEND=>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] sys-libs/glibc >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] virtual/jpeg-compat:62[abi_x86_32(-)] amd64? ( sys-libs/glibc[multilib] ) cdinstall? ( games-fps/etqw-data )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=http://ftp.jeuxlinux.fr/files/ETQW-client-1.5-full.x86.run
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fa0fc3080c8e8cf73430d132df9aa6f3
diff --git a/metadata/md5-cache/games-fps/etqw-bin-1.5-r4 b/metadata/md5-cache/games-fps/etqw-bin-1.5-r4
new file mode 100644
index 000000000000..b83ee6afdee7
--- /dev/null
+++ b/metadata/md5-cache/games-fps/etqw-bin-1.5-r4
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst unpack
+DESCRIPTION=Enemy Territory: Quake Wars
+EAPI=7
+HOMEPAGE=http://zerowing.idsoftware.com/linux/etqw/ETQWFrontPage/
+IUSE=cdinstall
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=ETQW
+RDEPEND=>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] sys-libs/glibc >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] virtual/jpeg-compat:62[abi_x86_32(-)] amd64? ( sys-libs/glibc[multilib] ) cdinstall? ( games-fps/etqw-data )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=http://ftp.jeuxlinux.fr/files/ETQW-client-1.5-full.x86.run
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d0d66d6e0f9d4ff48dee4eb36c328fa6
diff --git a/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r3 b/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r3
deleted file mode 100644
index c08bc03b56b8..000000000000
--- a/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install unpack
-DESCRIPTION=Enemy Territory: Quake Wars demo
-EAPI=7
-HOMEPAGE=http://zerowing.idsoftware.com/linux/etqw/
-KEYWORDS=~amd64 ~x86
-LICENSE=ETQW
-RDEPEND=>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)] sys-libs/ncurses-compat[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] virtual/jpeg-compat:62[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-RESTRICT=bindist strip mirror
-SLOT=0
-SRC_URI=mirror://idsoftware/etqw/ETQW-demo2-client-full.r1.x86.run
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=acda4955078394b2a60f91e2768e5d52
diff --git a/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r4 b/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r4
new file mode 100644
index 000000000000..856e6bdb8859
--- /dev/null
+++ b/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r4
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install unpack
+DESCRIPTION=Enemy Territory: Quake Wars demo
+EAPI=7
+HOMEPAGE=http://zerowing.idsoftware.com/linux/etqw/
+KEYWORDS=~amd64 ~x86
+LICENSE=ETQW
+RDEPEND=>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)] sys-libs/ncurses-compat[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] virtual/jpeg-compat:62[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+RESTRICT=bindist strip mirror
+SLOT=0
+SRC_URI=mirror://idsoftware/etqw/ETQW-demo2-client-full.r1.x86.run
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b2298d26ed461acffd459f512978bf6f
diff --git a/metadata/md5-cache/games-fps/ezquake-bin-2.2-r2 b/metadata/md5-cache/games-fps/ezquake-bin-2.2-r2
deleted file mode 100644
index 161bf0273199..000000000000
--- a/metadata/md5-cache/games-fps/ezquake-bin-2.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DEPEND=cdinstall? ( games-fps/quake1-data )
-DESCRIPTION=Quakeworld client with mqwcl functionality and many more features
-EAPI=7
-HOMEPAGE=http://ezquake.sf.net/
-IUSE=cdinstall
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=cdinstall? ( games-fps/quake1-data ) virtual/opengl x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=amd64? ( mirror://sourceforge/ezquake/ezquake_linux-x86_64.1.9.3.tar.gz mirror://sourceforge/ezquake/ezquake_linux64_2.2.tar.gz ) x86? ( mirror://sourceforge/ezquake/ezquake_linux-x86_1.9.3.tar.gz mirror://sourceforge/ezquake/ezquake_linux32_2.2.tar.gz )
-_eclasses_=wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=265f2bdc84283b7c6704b2f185302186
diff --git a/metadata/md5-cache/games-fps/ezquake-bin-2.2-r3 b/metadata/md5-cache/games-fps/ezquake-bin-2.2-r3
new file mode 100644
index 000000000000..6b2bbe8b7294
--- /dev/null
+++ b/metadata/md5-cache/games-fps/ezquake-bin-2.2-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst unpack
+DEPEND=cdinstall? ( games-fps/quake1-data )
+DESCRIPTION=Quakeworld client with mqwcl functionality and many more features
+EAPI=7
+HOMEPAGE=http://ezquake.sf.net/
+IUSE=cdinstall
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=cdinstall? ( games-fps/quake1-data ) virtual/opengl x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=amd64? ( mirror://sourceforge/ezquake/ezquake_linux-x86_64.1.9.3.tar.gz mirror://sourceforge/ezquake/ezquake_linux64_2.2.tar.gz ) x86? ( mirror://sourceforge/ezquake/ezquake_linux-x86_1.9.3.tar.gz mirror://sourceforge/ezquake/ezquake_linux32_2.2.tar.gz )
+_eclasses_=wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f188ce171c8504ea4d5e72f398a4be65
diff --git a/metadata/md5-cache/games-fps/ut2004-demo-3334-r2 b/metadata/md5-cache/games-fps/ut2004-demo-3334-r2
deleted file mode 100644
index 424e6f110fa4..000000000000
--- a/metadata/md5-cache/games-fps/ut2004-demo-3334-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DESCRIPTION=Demo for the critically-acclaimed first-person shooter
-EAPI=7
-HOMEPAGE=http://www.unrealtournament.com/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=ut2003-demo
-RDEPEND=sys-libs/libstdc++-v3:5 x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)]
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=mirror://gentoo/ut2004-lnx-demo3334.run
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0fb28357884f2d05b61307b40b470320
diff --git a/metadata/md5-cache/games-fps/ut2004-demo-3334-r3 b/metadata/md5-cache/games-fps/ut2004-demo-3334-r3
new file mode 100644
index 000000000000..1eb8b40df3c0
--- /dev/null
+++ b/metadata/md5-cache/games-fps/ut2004-demo-3334-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst unpack
+DESCRIPTION=Demo for the critically-acclaimed first-person shooter
+EAPI=7
+HOMEPAGE=http://www.unrealtournament.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=ut2003-demo
+RDEPEND=sys-libs/libstdc++-v3:5 x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)]
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=mirror://gentoo/ut2004-lnx-demo3334.run
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7ac958b509b6b1460fd6637910f79320
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 2ad69db9170f..fe642c16b695 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/seatris-0.0.14-r1 b/metadata/md5-cache/games-puzzle/seatris-0.0.14-r1
deleted file mode 100644
index 2249ff1ec385..000000000000
--- a/metadata/md5-cache/games-puzzle/seatris-0.0.14-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses:=
-DESCRIPTION=A color ncurses tetris clone
-EAPI=7
-HOMEPAGE=http://www.earth.li/projectpurple/progs/seatris.html
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:= acct-group/gamestat
-SLOT=0
-SRC_URI=http://www.earth.li/projectpurple/files/seatris-0.0.14.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f182616ef7ad4372fe5220b124c85a74
diff --git a/metadata/md5-cache/games-puzzle/seatris-0.0.14-r2 b/metadata/md5-cache/games-puzzle/seatris-0.0.14-r2
new file mode 100644
index 000000000000..e5ebcbf62078
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/seatris-0.0.14-r2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/ncurses:=
+DESCRIPTION=A color ncurses tetris clone
+EAPI=7
+HOMEPAGE=http://www.earth.li/projectpurple/progs/seatris.html
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:= acct-group/gamestat
+SLOT=0
+SRC_URI=http://www.earth.li/projectpurple/files/seatris-0.0.14.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dfa1bec358fd7606bfa8186291a98d26
diff --git a/metadata/md5-cache/games-puzzle/splice-20121120-r1 b/metadata/md5-cache/games-puzzle/splice-20121120-r1
deleted file mode 100644
index b763e3a36072..000000000000
--- a/metadata/md5-cache/games-puzzle/splice-20121120-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch prepare
-DESCRIPTION=An experimental and artistic puzzler set in a microbial world
-EAPI=7
-HOMEPAGE=http://www.cipherprime.com/games/splice/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext
-RESTRICT=bindist fetch splitdebug
-SLOT=0
-SRC_URI=splice-linux-1353389454.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=697600d907bffb731f6f08db08c5e8bf
diff --git a/metadata/md5-cache/games-puzzle/splice-20121120-r2 b/metadata/md5-cache/games-puzzle/splice-20121120-r2
new file mode 100644
index 000000000000..7721f5e2b862
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/splice-20121120-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch prepare
+DESCRIPTION=An experimental and artistic puzzler set in a microbial world
+EAPI=7
+HOMEPAGE=http://www.cipherprime.com/games/splice/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=splice-linux-1353389454.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b6dc94ee286f56159a8f11512d845f3d
diff --git a/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1-r1 b/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1-r1
deleted file mode 100644
index d29c808400e1..000000000000
--- a/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/bzip2
-DEFINED_PHASES=install nofetch prepare
-DESCRIPTION=Combines elements of adventure, jump&run and physical puzzles
-EAPI=7
-HOMEPAGE=http://www.tinyandbig.com/
-IUSE=bundled-libs
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=media-libs/openal virtual/opengl x11-libs/libX11 !bundled-libs? ( media-gfx/nvidia-cg-toolkit )
-RESTRICT=bindist fetch bundled-libs? ( splitdebug )
-SLOT=0
-SRC_URI=tinyandbig_grandpasleftovers-retail-linux-1.4.1_1370968537.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=881347cda223f1e44d58ed8ad1b45b08
diff --git a/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1-r2 b/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1-r2
new file mode 100644
index 000000000000..4c1516bf0f43
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1-r2
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/bzip2
+DEFINED_PHASES=install nofetch prepare
+DESCRIPTION=Combines elements of adventure, jump&run and physical puzzles
+EAPI=7
+HOMEPAGE=http://www.tinyandbig.com/
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=media-libs/openal virtual/opengl x11-libs/libX11 !bundled-libs? ( media-gfx/nvidia-cg-toolkit )
+RESTRICT=bindist fetch bundled-libs? ( splitdebug )
+SLOT=0
+SRC_URI=tinyandbig_grandpasleftovers-retail-linux-1.4.1_1370968537.tar.bz2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=57770555eddc582f86f7e54f94b798de
diff --git a/metadata/md5-cache/games-puzzle/xbomb-2.2b-r1 b/metadata/md5-cache/games-puzzle/xbomb-2.2b-r1
deleted file mode 100644
index 8c41740e8c72..000000000000
--- a/metadata/md5-cache/games-puzzle/xbomb-2.2b-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/libXaw
-DESCRIPTION=Minesweeper clone with hexagonal, rectangular and triangular grid
-EAPI=7
-HOMEPAGE=http://www.gedanken.org.uk/software/xbomb/
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=x11-libs/libXaw acct-group/gamestat
-SLOT=0
-SRC_URI=http://www.gedanken.org.uk/software/xbomb/download/xbomb-2.2b.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3557b3b511d0b7fecad735a68d13fc97
diff --git a/metadata/md5-cache/games-puzzle/xbomb-2.2b-r2 b/metadata/md5-cache/games-puzzle/xbomb-2.2b-r2
new file mode 100644
index 000000000000..e8a8146f35da
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/xbomb-2.2b-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/libXaw
+DESCRIPTION=Minesweeper clone with hexagonal, rectangular and triangular grid
+EAPI=7
+HOMEPAGE=http://www.gedanken.org.uk/software/xbomb/
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=x11-libs/libXaw acct-group/gamestat
+SLOT=0
+SRC_URI=http://www.gedanken.org.uk/software/xbomb/download/xbomb-2.2b.tgz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=89ef996a579134f5bf72dabdf2e211c5
diff --git a/metadata/md5-cache/games-puzzle/xwelltris-1.0.1 b/metadata/md5-cache/games-puzzle/xwelltris-1.0.1
deleted file mode 100644
index 7fd567a97044..000000000000
--- a/metadata/md5-cache/games-puzzle/xwelltris-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=media-libs/libsdl[video] media-libs/sdl-image[gif]
-DESCRIPTION=2.5D tetris like game
-EAPI=7
-HOMEPAGE=http://xnc.jinr.ru/xwelltris/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[gif] acct-group/gamestat
-SLOT=0
-SRC_URI=http://xnc.jinr.ru/xwelltris/src/xwelltris-1.0.1.src.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ecbbce49dce87e732886119c6c45d7a6
diff --git a/metadata/md5-cache/games-puzzle/xwelltris-1.0.1-r1 b/metadata/md5-cache/games-puzzle/xwelltris-1.0.1-r1
new file mode 100644
index 000000000000..451269bb456b
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/xwelltris-1.0.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=media-libs/libsdl[video] media-libs/sdl-image[gif]
+DESCRIPTION=2.5D tetris like game
+EAPI=7
+HOMEPAGE=http://xnc.jinr.ru/xwelltris/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[gif] acct-group/gamestat
+SLOT=0
+SRC_URI=http://xnc.jinr.ru/xwelltris/src/xwelltris-1.0.1.src.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7f77d074e2cb7f657e2119ff73185101
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 0b9e73081527..614969326250 100644
--- a/metadata/md5-cache/games-roguelike/Manifest.gz
+++ b/metadata/md5-cache/games-roguelike/Manifest.gz
diff --git a/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.12 b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.12
index 962b50f2e5e0..788779ed56c9 100644
--- a/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.12
+++ b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.12
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( https://www.bay12games.com/dwarves/df_44_12_linux.tar.bz2 ) x86? ( https://www.bay12games.com/dwarves/df_44_12_linux32.tar.bz2 )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=0f89f58d077012be4a92662873b6bb56
+_md5_=bf1a3e1efb1525343ac446241d94ef83
diff --git a/metadata/md5-cache/games-roguelike/moria-5.7.14 b/metadata/md5-cache/games-roguelike/moria-5.7.14
deleted file mode 100644
index cc8c2c04a8c2..000000000000
--- a/metadata/md5-cache/games-roguelike/moria-5.7.14
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=acct-group/gamestat >=sys-libs/ncurses-6.0:0=
-DESCRIPTION=The Dungeons of Moria, a single player roguelike game, also known as Umoria
-EAPI=7
-HOMEPAGE=https://umoria.org/
-KEYWORDS=~amd64 ~m68k ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/gamestat >=sys-libs/ncurses-6.0:0=
-SLOT=0
-SRC_URI=https://github.com/dungeons-of-moria/umoria/archive/v5.7.14.tar.gz -> moria-5.7.14.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=aca65ec5d3dac2459780681926607d34
diff --git a/metadata/md5-cache/games-roguelike/moria-5.7.14-r1 b/metadata/md5-cache/games-roguelike/moria-5.7.14-r1
new file mode 100644
index 000000000000..a1f462481fe6
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/moria-5.7.14-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=acct-group/gamestat >=sys-libs/ncurses-6.0:0=
+DESCRIPTION=The Dungeons of Moria, a single player roguelike game, also known as Umoria
+EAPI=7
+HOMEPAGE=https://umoria.org/
+KEYWORDS=~amd64 ~m68k ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/gamestat >=sys-libs/ncurses-6.0:0=
+SLOT=0
+SRC_URI=https://github.com/dungeons-of-moria/umoria/archive/v5.7.14.tar.gz -> moria-5.7.14.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=cdf0ccf9809bb78087f124c72804dc9b
diff --git a/metadata/md5-cache/games-roguelike/neon-chrome-1.1.12 b/metadata/md5-cache/games-roguelike/neon-chrome-1.1.12
index e4fbe679a6d1..c588d87bc345 100644
--- a/metadata/md5-cache/games-roguelike/neon-chrome-1.1.12
+++ b/metadata/md5-cache/games-roguelike/neon-chrome-1.1.12
@@ -9,4 +9,4 @@ RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=NeonChrome-Linux-1.1.12.tar
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f11f9e47de67243b0c62965d1b150744
+_md5_=7140e4b2391e3f9087b8f8dd58b34d3c
diff --git a/metadata/md5-cache/games-roguelike/tome-2.3.5 b/metadata/md5-cache/games-roguelike/tome-2.3.5
deleted file mode 100644
index 40a2e85d8ee4..000000000000
--- a/metadata/md5-cache/games-roguelike/tome-2.3.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig x11-misc/makedepend
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=sys-libs/ncurses-5:0= sdl? ( media-libs/sdl-ttf media-libs/sdl-image media-libs/libsdl ) gtk? ( >=x11-libs/gtk+-2.12.8:2 ) X? ( x11-libs/libX11 ) Xaw3d? ( x11-libs/libXaw )
-DESCRIPTION=save the world from Morgoth and battle evil (or become evil ;])
-EAPI=7
-HOMEPAGE=http://t-o-m-e.net/
-IUSE=gtk sdl X Xaw3d
-KEYWORDS=~amd64 ~x86
-LICENSE=Moria
-RDEPEND=>=sys-libs/ncurses-5:0= sdl? ( media-libs/sdl-ttf media-libs/sdl-image media-libs/libsdl ) gtk? ( >=x11-libs/gtk+-2.12.8:2 ) X? ( x11-libs/libX11 ) Xaw3d? ( x11-libs/libXaw ) acct-group/gamestat
-SLOT=0
-SRC_URI=http://t-o-m-e.net/dl/src/tome-235-src.tar.bz2
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a7975bf71d11248b6afcedc33aea1123
diff --git a/metadata/md5-cache/games-roguelike/tome-2.3.5-r1 b/metadata/md5-cache/games-roguelike/tome-2.3.5-r1
new file mode 100644
index 000000000000..95a8996350fe
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/tome-2.3.5-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig x11-misc/makedepend
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=>=sys-libs/ncurses-5:0= sdl? ( media-libs/sdl-ttf media-libs/sdl-image media-libs/libsdl ) gtk? ( >=x11-libs/gtk+-2.12.8:2 ) X? ( x11-libs/libX11 ) Xaw3d? ( x11-libs/libXaw )
+DESCRIPTION=save the world from Morgoth and battle evil (or become evil ;])
+EAPI=7
+HOMEPAGE=http://t-o-m-e.net/
+IUSE=gtk sdl X Xaw3d
+KEYWORDS=~amd64 ~x86
+LICENSE=Moria
+RDEPEND=>=sys-libs/ncurses-5:0= sdl? ( media-libs/sdl-ttf media-libs/sdl-image media-libs/libsdl ) gtk? ( >=x11-libs/gtk+-2.12.8:2 ) X? ( x11-libs/libX11 ) Xaw3d? ( x11-libs/libXaw ) acct-group/gamestat
+SLOT=0
+SRC_URI=http://t-o-m-e.net/dl/src/tome-235-src.tar.bz2
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=836ea3b187516623af3d54d9ad9f78b8
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index 17d639ade672..63ab002fbbb0 100644
--- a/metadata/md5-cache/games-rpg/Manifest.gz
+++ b/metadata/md5-cache/games-rpg/Manifest.gz
diff --git a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1 b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
index b2ad0a4ad43a..a67fe450c8bf 100644
--- a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
+++ b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
@@ -10,4 +10,4 @@ RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=gog_baldur_s_gate_enhanced_edition_2.5.0.9.sh
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=30de1f1a1163a70135b0cb4f6bc58204
+_md5_=5ebea629d34030a326fbe0203ac08df1
diff --git a/metadata/md5-cache/games-rpg/bastion-20161016 b/metadata/md5-cache/games-rpg/bastion-20161016
index add6d5f3300e..d80283b7ebd8 100644
--- a/metadata/md5-cache/games-rpg/bastion-20161016
+++ b/metadata/md5-cache/games-rpg/bastion-20161016
@@ -11,4 +11,4 @@ RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=bastion-10162016-bin
 _eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=45c5f4e991d35a0e9b5b285f891fd106
+_md5_=4a3e077aa2523b5ceed181463168a01b
diff --git a/metadata/md5-cache/games-rpg/broken-age-2.4.800398 b/metadata/md5-cache/games-rpg/broken-age-2.4.800398
index ac5ce81830bb..f16bbf7ebc3c 100644
--- a/metadata/md5-cache/games-rpg/broken-age-2.4.800398
+++ b/metadata/md5-cache/games-rpg/broken-age-2.4.800398
@@ -10,4 +10,4 @@ RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=BrokenAge_linux.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4178c6f810cd12cb33de0ab4fb0fd2e9
+_md5_=58429bc1a6302567c3613ef4c84b3868
diff --git a/metadata/md5-cache/games-rpg/coe2-2007-r2 b/metadata/md5-cache/games-rpg/coe2-2007-r2
deleted file mode 100644
index 4624c8e9a97b..000000000000
--- a/metadata/md5-cache/games-rpg/coe2-2007-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/libsdl[sound,video]
-DESCRIPTION=Precursor to the Dominions series
-EAPI=7
-HOMEPAGE=https://www.shrapnelgames.com/Our_Games/Free_Games.html
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=media-libs/libsdl[sound,video] acct-group/gamestat
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=https://download.shrapnelgames.com/downloads/coe2_2007.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c390b8babac406f1b11c4a873c557afd
diff --git a/metadata/md5-cache/games-rpg/coe2-2007-r3 b/metadata/md5-cache/games-rpg/coe2-2007-r3
new file mode 100644
index 000000000000..2b5155fbe67e
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/coe2-2007-r3
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[sound,video]
+DESCRIPTION=Precursor to the Dominions series
+EAPI=7
+HOMEPAGE=https://www.shrapnelgames.com/Our_Games/Free_Games.html
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=media-libs/libsdl[sound,video] acct-group/gamestat
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=https://download.shrapnelgames.com/downloads/coe2_2007.zip
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=44e29444eccffa032023e55945ce8fb5
diff --git a/metadata/md5-cache/games-rpg/deponia-doomsday-1.2.0267 b/metadata/md5-cache/games-rpg/deponia-doomsday-1.2.0267
index 19da9946b3c9..364ca3c7b441 100644
--- a/metadata/md5-cache/games-rpg/deponia-doomsday-1.2.0267
+++ b/metadata/md5-cache/games-rpg/deponia-doomsday-1.2.0267
@@ -10,4 +10,4 @@ RESTRICT=bindist fetch splitdebug strip
 SLOT=0
 SRC_URI=Deponia4_1.2.0267_DEB_Full_Multi_Daedalic_ESD.tar
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ddd62d90c6b5dfff49f08f3454ac2ae6
+_md5_=be09a7abf20b07372748d7e7c7c0d971
diff --git a/metadata/md5-cache/games-rpg/deponia-tcj-3.3.0156 b/metadata/md5-cache/games-rpg/deponia-tcj-3.3.0156
index 14ff0e655bdf..bf41916f0f74 100644
--- a/metadata/md5-cache/games-rpg/deponia-tcj-3.3.0156
+++ b/metadata/md5-cache/games-rpg/deponia-tcj-3.3.0156
@@ -9,4 +9,4 @@ RESTRICT=bindist fetch splitdebug strip
 SLOT=0
 SRC_URI=DeponiaTCJ_3.3.0156_Full_DEB_DE_EN_FR_IT_RU_PL_Daedalic_ESD.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dd8c3981349ce0a046e64579310889ab
+_md5_=37aba6b1058bcfae5ea53f87474ad6d6
diff --git a/metadata/md5-cache/games-rpg/eschalon-book-1-demo-106-r1 b/metadata/md5-cache/games-rpg/eschalon-book-1-demo-106-r1
index c9e1738d4ee4..779dd661f945 100644
--- a/metadata/md5-cache/games-rpg/eschalon-book-1-demo-106-r1
+++ b/metadata/md5-cache/games-rpg/eschalon-book-1-demo-106-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install
 DESCRIPTION=A classic role-playing game
-EAPI=6
+EAPI=7
 HOMEPAGE=http://basiliskgames.com/eschalon-book-i
 KEYWORDS=~amd64 ~x86
 LICENSE=eschalon-book-1-demo
@@ -8,5 +8,5 @@ RDEPEND=>=media-libs/freetype-2.5.0.1[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~calchan/distfiles/eschalon-book-1-demo-106.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=acb2fdc373a18946662b7d8adda2294f
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=bd37365bb3982412677133fb143d0475
diff --git a/metadata/md5-cache/games-rpg/hatoful-boyfriend-holiday-star-20151218 b/metadata/md5-cache/games-rpg/hatoful-boyfriend-holiday-star-20151218
index bcf032e02d4b..6d8a1cc8347e 100644
--- a/metadata/md5-cache/games-rpg/hatoful-boyfriend-holiday-star-20151218
+++ b/metadata/md5-cache/games-rpg/hatoful-boyfriend-holiday-star-20151218
@@ -11,4 +11,4 @@ RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=Linux-Standalone-20151218.rar
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2722cb1b7d205be17d0ae509d4fd9fa0
+_md5_=4f80ae5c41dc04186765667f05ea31b3
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index a0123dc2c5e4..12d826d4aae4 100644
--- a/metadata/md5-cache/games-server/Manifest.gz
+++ b/metadata/md5-cache/games-server/Manifest.gz
diff --git a/metadata/md5-cache/games-server/etqw-ded-1.5-r1 b/metadata/md5-cache/games-server/etqw-ded-1.5-r1
index 40a41e69fc25..2a34adc471ff 100644
--- a/metadata/md5-cache/games-server/etqw-ded-1.5-r1
+++ b/metadata/md5-cache/games-server/etqw-ded-1.5-r1
@@ -1,7 +1,7 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install nofetch unpack
-DEPEND=app-arch/unzip
 DESCRIPTION=Enemy Territory: Quake Wars dedicated server
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.splashdamage.com/content/et-quake-wars-standalone-server-linux
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=ETQW
@@ -10,4 +10,4 @@ RESTRICT=bindist fetch strip
 SLOT=0
 SRC_URI=ETQW-server-1.5-full.x86.run
 _eclasses_=wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5fcbb18adb8b4e64e5aa6720e4bb242a
+_md5_=d2a159ab3bae2edffdc519f8d4c71297
diff --git a/metadata/md5-cache/games-server/ut2004-ded-3369.3-r2 b/metadata/md5-cache/games-server/ut2004-ded-3369.3-r2
index d3779b2962c6..ca3cf59078d9 100644
--- a/metadata/md5-cache/games-server/ut2004-ded-3369.3-r2
+++ b/metadata/md5-cache/games-server/ut2004-ded-3369.3-r2
@@ -10,4 +10,4 @@ RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=http://ut2004.ut-files.com/Entire_Server_Download/dedicatedserver3339-bonuspack.zip http://ut2004.ut-files.com/Patches/Linux/ut2004-lnxpatch3369-2.tar.bz2 https://dev.gentoo.org/~chewi/distfiles/ut2004-v3369-3-linux-dedicated.7z
 _eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=246cc01e6f4cffed64783aeb84267fbf
+_md5_=95043668ff82f9d3017915ab72a55e9b
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index ec9b911db814..c6eb75a8c80d 100644
--- a/metadata/md5-cache/games-simulation/Manifest.gz
+++ b/metadata/md5-cache/games-simulation/Manifest.gz
diff --git a/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1 b/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
index a06306370291..5de6694613d7 100644
--- a/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
+++ b/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install unpack
 DESCRIPTION=design and build bridges and then stress test them with trains
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.chroniclogic.com/pontifex2.htm
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=BCS
@@ -9,4 +9,4 @@ RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=ftp://ggdev-1.homelan.com/bcs/bcsdemo_v1_3.sh.bin http://www.highprogrammer.com/alan/pfx2/openal-alan-hack-0.0.1.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bea1a9386ec7f69120306e23cb8308f3
+_md5_=24202420ff0ea228a4818077e778ed80
diff --git a/metadata/md5-cache/games-simulation/sky-rogue-1.3 b/metadata/md5-cache/games-simulation/sky-rogue-1.3
index cc147a4a0702..57604e11b3ae 100644
--- a/metadata/md5-cache/games-simulation/sky-rogue-1.3
+++ b/metadata/md5-cache/games-simulation/sky-rogue-1.3
@@ -11,4 +11,4 @@ RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=sky-rogue-linux.zip
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b62609a023eb3b5c38d3d1e2ff0d8729
+_md5_=6592e7b60b0bb6723e2c441eefed8455
diff --git a/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605 b/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
index ac724393220f..9e207f9c27ea 100644
--- a/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
+++ b/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
@@ -11,4 +11,4 @@ RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=slime_rancher_1_4_1c_34605.sh
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5f15fd2faa5c8a7615ae806b55dd976a
+_md5_=bc2bfc361436a3a2da9e9cce082eaaff
diff --git a/metadata/md5-cache/games-simulation/train-valley-1.3.31403 b/metadata/md5-cache/games-simulation/train-valley-1.3.31403
index b067c56e239e..4e15d562cb51 100644
--- a/metadata/md5-cache/games-simulation/train-valley-1.3.31403
+++ b/metadata/md5-cache/games-simulation/train-valley-1.3.31403
@@ -10,4 +10,4 @@ RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=train_valley_1_3_31403.sh
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3d2ecad15059f3ef9ae186d38f73bec6
+_md5_=929076f2acd696b8050a51459595b026
diff --git a/metadata/md5-cache/games-sports/Manifest.gz b/metadata/md5-cache/games-sports/Manifest.gz
index 9dc47e34e19d..76d56c66c46d 100644
--- a/metadata/md5-cache/games-sports/Manifest.gz
+++ b/metadata/md5-cache/games-sports/Manifest.gz
diff --git a/metadata/md5-cache/games-sports/speed-dreams-1.4.0-r1 b/metadata/md5-cache/games-sports/speed-dreams-1.4.0-r1
deleted file mode 100644
index ac8d6346a9f0..000000000000
--- a/metadata/md5-cache/games-sports/speed-dreams-1.4.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=virtual/opengl virtual/glu media-libs/freealut media-libs/freeglut >=media-libs/libpng-1.2.40:0 media-libs/openal sys-libs/zlib x11-libs/libX11 x11-libs/libXxf86vm xrandr? ( x11-libs/libXrandr ) >=media-libs/plib-1.8.3 x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXi x11-libs/libXt x11-libs/libXmu x11-libs/libXrender 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
-DESCRIPTION=A fork of the famous open racing car simulator TORCS
-EAPI=6
-HOMEPAGE=http://speed-dreams.sourceforge.net/
-IUSE=xrandr
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl virtual/glu media-libs/freealut media-libs/freeglut >=media-libs/libpng-1.2.40:0 media-libs/openal sys-libs/zlib x11-libs/libX11 x11-libs/libXxf86vm xrandr? ( x11-libs/libXrandr )
-SLOT=0
-SRC_URI=mirror://sourceforge/speed-dreams/speed-dreams-1.4.0-r2307-src.tar.bz2
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cf11bd6f44464bddb24391ed91254bdc
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index fd2fce5d382d..53ecafb00697 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/colobot-0.2.0_alpha b/metadata/md5-cache/games-strategy/colobot-0.2.0_alpha
new file mode 100644
index 000000000000..6597f59c3d8b
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/colobot-0.2.0_alpha
@@ -0,0 +1,15 @@
+BDEPEND=app-text/po4a dev-lang/perl sys-devel/gettext dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools openal? ( media-libs/openal )
+DESCRIPTION=A real-time strategy game, where you can program your bots
+EAPI=7
+HOMEPAGE=https://colobot.info/
+IUSE=devbuild doc +openal test tools
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools openal? ( media-libs/openal ) ~games-strategy/colobot-data-0.2.0_alpha
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/colobot/colobot/archive/colobot-gold-0.2.0-alpha.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=411ff141a382805ca7c636753eaf1d5d
diff --git a/metadata/md5-cache/games-strategy/colobot-data-0.2.0_alpha b/metadata/md5-cache/games-strategy/colobot-data-0.2.0_alpha
new file mode 100644
index 000000000000..c6bdbf3837b6
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/colobot-data-0.2.0_alpha
@@ -0,0 +1,12 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DESCRIPTION=Data package for colobot (Colonize with Bots)
+EAPI=7
+HOMEPAGE=https://colobot.info/
+IUSE=+music
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=https://github.com/colobot/colobot-data/archive/colobot-gold-0.2.0-alpha.tar.gz -> colobot-gold-0.2.0-alpha.data.tar.gz music? ( https://colobot.info/files/music/colobot-music_ogg_0.2.0-alpha.tar.gz )
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a5a37ed7426e766b5ec23a77a1816063
diff --git a/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9-r2 b/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9-r2
deleted file mode 100644
index 4655aef6473e..000000000000
--- a/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DESCRIPTION=The hyped indie game of the year - by the Uplink creators
-EAPI=7
-HOMEPAGE=http://www.darwinia.co.uk/support/linux.html
-IUSE=cdinstall
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=Introversion
-PROPERTIES=cdinstall? ( interactive )
-RDEPEND=sys-libs/libstdc++-v3:5 media-libs/libsdl[abi_x86_32(-)] media-libs/libvorbis[abi_x86_32(-)] virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)]
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=http://www.introversion.co.uk/darwinia/downloads/darwinia-full-1.4.0b9.sh
-_eclasses_=cdrom	96bb9b81542ce6da0c28603f1b5a98b7	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cdd4930c97f51128f170125d837f89c2
diff --git a/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9-r3 b/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9-r3
new file mode 100644
index 000000000000..d18cf2c951cb
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst unpack
+DESCRIPTION=The hyped indie game of the year - by the Uplink creators
+EAPI=7
+HOMEPAGE=http://www.darwinia.co.uk/support/linux.html
+IUSE=cdinstall
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Introversion
+PROPERTIES=cdinstall? ( interactive )
+RDEPEND=sys-libs/libstdc++-v3:5 media-libs/libsdl[abi_x86_32(-)] media-libs/libvorbis[abi_x86_32(-)] virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)]
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=http://www.introversion.co.uk/darwinia/downloads/darwinia-full-1.4.0b9.sh
+_eclasses_=cdrom	96bb9b81542ce6da0c28603f1b5a98b7	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=21c5c033d552e384f22faa1b8653d647
diff --git a/metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1 b/metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1
index b9f34b5a43d1..8082b49bb40a 100644
--- a/metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1
+++ b/metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1
@@ -9,4 +9,4 @@ RESTRICT=bindist strip
 SLOT=0
 SRC_URI=http://ftp2.za.freebsd.org/pub/FreeBSD/ports/distfiles/majesty_demo.run
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b0b2f53ce3b89894350aad783945bf34
+_md5_=9937f6bc38ee8f265f711959b6c41c22
diff --git a/metadata/md5-cache/games-strategy/satellite-reign-1.13.06 b/metadata/md5-cache/games-strategy/satellite-reign-1.13.06
index 2856c0ab1b5f..5e112adad883 100644
--- a/metadata/md5-cache/games-strategy/satellite-reign-1.13.06
+++ b/metadata/md5-cache/games-strategy/satellite-reign-1.13.06
@@ -11,4 +11,4 @@ RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=SatelliteReignLinux0113_06.zip
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=30fedcf277f91516e92acc0d7109530d
+_md5_=a41872ee04626f0e7cf12912b002d8b4
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 48c978ed4ca3..8896a76820ee 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/joystick-1.7.0 b/metadata/md5-cache/games-util/joystick-1.7.0
deleted file mode 100644
index 98c7aa1ae5f5..000000000000
--- a/metadata/md5-cache/games-util/joystick-1.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install prepare
-DEPEND=sdl? ( media-libs/libsdl2:0[video] ) !<x11-libs/tslib-1.0-r2
-DESCRIPTION=joystick testing utilities
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/
-IUSE=sdl udev
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=sdl? ( media-libs/libsdl2:0[video] ) !<x11-libs/tslib-1.0-r2 udev? ( virtual/udev )
-SLOT=0
-SRC_URI=mirror://sourceforge/linuxconsole/files/linuxconsoletools-1.7.0.tar.bz2
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fb5b9b5fd349c8916245d92a33a7d255
diff --git a/metadata/md5-cache/games-util/xpadneo-0.9.1 b/metadata/md5-cache/games-util/xpadneo-0.9.1
index bc7793a41723..436466bbec5c 100644
--- a/metadata/md5-cache/games-util/xpadneo-0.9.1
+++ b/metadata/md5-cache/games-util/xpadneo-0.9.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/atar-axis/xpadneo/archive/v0.9.1.tar.gz -> xpadneo-0.9.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0bc9b2f7da9fc4e23b524a77f004fbfc
diff --git a/metadata/md5-cache/games-util/xpadneo-9999 b/metadata/md5-cache/games-util/xpadneo-9999
index 0a5063819bd8..09f780101b94 100644
--- a/metadata/md5-cache/games-util/xpadneo-9999
+++ b/metadata/md5-cache/games-util/xpadneo-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5b75b209c03ec22fe2e1777c245b6905
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 018f8373bef1..a681a6513be9 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/gconf-3.2.6-r5 b/metadata/md5-cache/gnome-base/gconf-3.2.6-r5
index 5d93d8c08546..aa2d24e384c7 100644
--- a/metadata/md5-cache/gnome-base/gconf-3.2.6-r5
+++ b/metadata/md5-cache/gnome-base/gconf-3.2.6-r5
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME configuration system and daemon
 EAPI=6
 HOMEPAGE=https://projects.gnome.org/gconf/
 IUSE=debug +introspection ldap policykit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x86-linux
 LICENSE=LGPL-2+
 RDEPEND=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] ) python_single_target_python3_10? ( dev-lang/python:3.10[xml] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-libs/glib-2.34.3: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(-)?] >=dev-libs/dbus-glib-0.100.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(-)?] >=sys-apps/dbus-1.6.18-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(-)?] >=dev-libs/libxml2-2.9.1-r4: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:= ) ldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) policykit? ( sys-auth/polkit:= )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=2
 SRC_URI=mirror://gnome/sources/GConf/3.2/GConf-3.2.6.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d47813591a6e3c57944123d8948aa53e
+_md5_=d09c98e9e8a24a162cf19778735ff651
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-40.4 b/metadata/md5-cache/gnome-base/gnome-desktop-40.4
index 5d075c549c7e..ae7249389f7c 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-40.4
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-40.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 ~riscv ~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 x11-libs/libxkbcommon 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/40/gnome-desktop-40.4.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=454b04080a04317465daf6a7df5753c9
+_md5_=0d32c842508c7fac4573bc32e0f6560f
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index afe2cd710b89..555bf2841dc5 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20210721 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20210721
new file mode 100644
index 000000000000..f56866d3a3b7
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20210721
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst
+DEPEND=dev-libs/glib:2
+DESCRIPTION=Control the blur effect on gnome-shell lock screen
+EAPI=7
+HOMEPAGE=https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-40
+SLOT=0
+SRC_URI=https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/archive/1dc40c2a9e3bfdf851c7726b041484c8663b28e9.tar.gz -> gnome-shell-extension-control-blur-effect-on-lock-screen-20210721.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1718db314b4a636df1a16dd419f2d913
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-0.20.0 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-0.20.0
new file mode 100644
index 000000000000..2eebe710731c
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-0.20.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=dev-libs/glib:2
+DESCRIPTION=Fork from the desktop-icons project, with several enhancements like Drag'n'Drop
+EAPI=7
+HOMEPAGE=https://gitlab.com/rastersoft/desktop-icons-ng
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38 >=gnome-base/nautilus-3.38
+SLOT=0
+SRC_URI=https://gitlab.com/rastersoft/desktop-icons-ng/uploads/093f01a7b52a77bccfc094f1b771cdac/ding-0.20.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fca60edeedf273ac3358a39e44628839
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-46 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-46
deleted file mode 100644
index ea443667336b..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-46
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.56.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 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=KDE Connect implementation for Gnome Shell
-EAPI=7
-HOMEPAGE=https://github.com/GSConnect/gnome-shell-extension-gsconnect
-IUSE=nautilus
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.68 =gnome-base/gnome-shell-40* gnome-base/gvfs gnome-extra/evolution-data-server || ( media-libs/libcanberra media-libs/gsound ) nautilus? ( dev-python/nautilus-python gnome-base/nautilus[introspection] )
-SLOT=0
-SRC_URI=https://github.com/GSConnect/gnome-shell-extension-gsconnect/archive/v46.tar.gz -> gnome-shell-extension-gsconnect-46.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=05a5e6b822782b466588c2c3bb586332
diff --git a/metadata/md5-cache/gnome-extra/libgsf-1.14.47 b/metadata/md5-cache/gnome-extra/libgsf-1.14.47
index 9a6cbe062f28..1acf15594097 100644
--- a/metadata/md5-cache/gnome-extra/libgsf-1.14.47
+++ b/metadata/md5-cache/gnome-extra/libgsf-1.14.47
@@ -4,10 +4,10 @@ DESCRIPTION=The GNOME Structured File Library
 EAPI=6
 HOMEPAGE=https://developer.gnome.org/gsf/
 IUSE=bzip2 gtk +introspection
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= )
 SLOT=0/114
 SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.47.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=13d88d3294c8e09b7eb04712f6457e82
+_md5_=11b431158cbb7673db1734dc8fd1039f
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index b0791a83e9ab..a9f84666ac90 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/gtk-4.2.1-r1 b/metadata/md5-cache/gui-libs/gtk-4.2.1-r1
index 405400c0fad8..39baf687eefb 100644
--- a/metadata/md5-cache/gui-libs/gtk-4.2.1-r1
+++ b/metadata/md5-cache/gui-libs/gtk-4.2.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=GTK is a multi-platform toolkit for creating graphical user interfac
 EAPI=7
 HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/
 IUSE=aqua broadway cloudprint colord cups examples ffmpeg gstreamer gtk-doc +introspection sysprof test vulkan wayland +X xinerama test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2+
 PDEPEND=gnome-base/librsvg >=x11-themes/adwaita-icon-theme-3.14
 RDEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.47.0[introspection?] >=media-libs/harfbuzz-0.9:= x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7 >=dev-libs/json-glib-1.0 ) colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.14.91 >=dev-libs/wayland-protocols-1.20 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-atk-2.5.3 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.3 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage xinerama? ( x11-libs/libXinerama ) ) >=dev-util/gtk-update-icon-cache-3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://gnome/sources/gtk/4.2/gtk-4.2.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=76592a521e7f8ab10e62aa53c05f35e6
+_md5_=b3fff45fa63cc48a0d9369c6ace8830d
diff --git a/metadata/md5-cache/gui-libs/wlroots-0.14.1 b/metadata/md5-cache/gui-libs/wlroots-0.14.1
new file mode 100644
index 000000000000..de4497b285a8
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/wlroots-0.14.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-libs/wayland-protocols-1.17 >=dev-util/meson-0.56.0 virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.19.0 >=dev-libs/wayland-protocols-1.17.0 media-libs/mesa[egl,gles2,gbm] sys-auth/seatd:= virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
+DESCRIPTION=Pluggable, composable, unopinionated modules for building a Wayland compositor
+EAPI=8
+HOMEPAGE=https://github.com/swaywm/wlroots
+IUSE=x11-backend X
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.19.0 >=dev-libs/wayland-protocols-1.17.0 media-libs/mesa[egl,gles2,gbm] sys-auth/seatd:= virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
+SLOT=0/14
+SRC_URI=https://github.com/swaywm/wlroots/archive/0.14.1.tar.gz -> wlroots-0.14.1.tar.gz
+_eclasses_=meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9283ed9ccec49015b6c864866795f534
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index f05622d2ba90..495a4155fad0 100644
--- a/metadata/md5-cache/gui-wm/Manifest.gz
+++ b/metadata/md5-cache/gui-wm/Manifest.gz
diff --git a/metadata/md5-cache/gui-wm/sway-1.6-r1 b/metadata/md5-cache/gui-wm/sway-1.6-r1
deleted file mode 100644
index 9608e3f8ed43..000000000000
--- a/metadata/md5-cache/gui-wm/sway-1.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-libs/wayland-protocols-1.14 >=dev-util/meson-0.53.0 virtual/pkgconfig man? ( >=app-text/scdoc-1.9.3 ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239[policykit] ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.13:=[elogind=,seatd=,systemd=,X=] <gui-libs/wlroots-0.14:=[elogind=,seatd=,systemd=,X=]
-DESCRIPTION=i3-compatible Wayland window manager
-EAPI=7
-HOMEPAGE=https://swaywm.org
-IUSE=elogind +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=MIT
-RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239[policykit] ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.13:=[elogind=,seatd=,systemd=,X=] <gui-libs/wlroots-0.14:=[elogind=,seatd=,systemd=,X=]
-REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind seatd systemd ) )
-SLOT=0
-SRC_URI=https://github.com/swaywm/sway/archive/1.6.tar.gz -> sway-1.6.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=07dedc3909fc180fe49311a6413e192b
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 8c365b247980..ad1b88879163 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/konsole-21.04.3-r1 b/metadata/md5-cache/kde-apps/konsole-21.04.3-r1
deleted file mode 100644
index 0767d7f6f087..000000000000
--- a/metadata/md5-cache/kde-apps/konsole-21.04.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 X? ( x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE's terminal emulator
-EAPI=7
-HOMEPAGE=https://apps.kde.org/konsole/ https://konsole.kde.org
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 X? ( x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.3/src/konsole-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d68d562b2bcf406fdf98e14df97d6c0e
diff --git a/metadata/md5-cache/kde-apps/konsole-21.04.3-r2 b/metadata/md5-cache/kde-apps/konsole-21.04.3-r2
new file mode 100644
index 000000000000..21a39cab5fa4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsole-21.04.3-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 X? ( x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE's terminal emulator
+EAPI=7
+HOMEPAGE=https://apps.kde.org/konsole/ https://konsole.kde.org
+IUSE=X test debug +handbook test
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 X? ( x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/21.04.3/src/konsole-21.04.3.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=855ff2408a79df21d6bc7726eed5da4d
diff --git a/metadata/md5-cache/kde-apps/konsole-21.08.0-r3 b/metadata/md5-cache/kde-apps/konsole-21.08.0-r3
deleted file mode 100644
index 066507a23753..000000000000
--- a/metadata/md5-cache/kde-apps/konsole-21.08.0-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.84.0:5 ) >=kde-frameworks/extra-cmake-modules-5.84.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/kdbusaddons-5.84.0:5 >=kde-frameworks/kguiaddons-5.84.0:5 >=kde-frameworks/kjobwidgets-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/knewstuff-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/knotifyconfig-5.84.0:5 >=kde-frameworks/kparts-5.84.0:5 >=kde-frameworks/kpty-5.84.0:5 >=kde-frameworks/kservice-5.84.0:5 >=kde-frameworks/ktextwidgets-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kwindowsystem-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 X? ( x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE's terminal emulator
-EAPI=7
-HOMEPAGE=https://apps.kde.org/konsole/ https://konsole.kde.org
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/kdbusaddons-5.84.0:5 >=kde-frameworks/kguiaddons-5.84.0:5 >=kde-frameworks/kjobwidgets-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/knewstuff-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/knotifyconfig-5.84.0:5 >=kde-frameworks/kparts-5.84.0:5 >=kde-frameworks/kpty-5.84.0:5 >=kde-frameworks/kservice-5.84.0:5 >=kde-frameworks/ktextwidgets-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kwindowsystem-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 X? ( x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.08.0/src/konsole-21.08.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=54864753610edfb247026c852494c271
diff --git a/metadata/md5-cache/kde-apps/konsole-21.08.0-r4 b/metadata/md5-cache/kde-apps/konsole-21.08.0-r4
new file mode 100644
index 000000000000..80046e0eb969
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsole-21.08.0-r4
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.84.0:5 ) >=kde-frameworks/extra-cmake-modules-5.84.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/kdbusaddons-5.84.0:5 >=kde-frameworks/kguiaddons-5.84.0:5 >=kde-frameworks/kjobwidgets-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/knewstuff-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/knotifyconfig-5.84.0:5 >=kde-frameworks/kparts-5.84.0:5 >=kde-frameworks/kpty-5.84.0:5 >=kde-frameworks/kservice-5.84.0:5 >=kde-frameworks/ktextwidgets-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kwindowsystem-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 X? ( x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE's terminal emulator
+EAPI=7
+HOMEPAGE=https://apps.kde.org/konsole/ https://konsole.kde.org
+IUSE=X test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/kdbusaddons-5.84.0:5 >=kde-frameworks/kguiaddons-5.84.0:5 >=kde-frameworks/kjobwidgets-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/knewstuff-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/knotifyconfig-5.84.0:5 >=kde-frameworks/kparts-5.84.0:5 >=kde-frameworks/kpty-5.84.0:5 >=kde-frameworks/kservice-5.84.0:5 >=kde-frameworks/ktextwidgets-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kwindowsystem-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 X? ( x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/21.08.0/src/konsole-21.08.0.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3ca1f98a6893dd6ac43f998e23b1c5b2
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index d20d748111cf..d7f23ae7fb05 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.85.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.85.0
index 51b012b71afa..4bdd264ee3c5 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.85.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.85.0
@@ -5,11 +5,11 @@ DESCRIPTION=Qt wrapper for Bluez 5 DBus API
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.85
 SRC_URI=mirror://kde/stable/frameworks/5.85/bluez-qt-5.85.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=776828e8a6916a3e0708f2fe0171d51d
+_md5_=73dd8f91e07b8329f9300bbfc2271313
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.85.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.85.0
index 63e640f05036..d0d6111e8b4f 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.85.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.85.0
@@ -5,11 +5,11 @@ DESCRIPTION=ModemManager bindings for Qt
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5/5.85
 SRC_URI=mirror://kde/stable/frameworks/5.85/modemmanager-qt-5.85.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=837a5b997b01de7326714f12109fc566
+_md5_=ac6b5251b438a83abcb8eae503115a33
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.85.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.85.0
index 7cd1b60e421d..0225e42239ec 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.85.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.85.0
@@ -5,11 +5,11 @@ DESCRIPTION=NetworkManager bindings for Qt
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=teamd debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] || ( >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.85
 SRC_URI=mirror://kde/stable/frameworks/5.85/networkmanager-qt-5.85.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1d280d82f03532c384f4ace21a0366ed
+_md5_=3ae95bc5b9a666f53e63f15b793bdcd9
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index aeda5f349730..053bd57d41dc 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.10.0 b/metadata/md5-cache/kde-misc/latte-dock-0.10.0
deleted file mode 100644
index 46a54ed465d2..000000000000
--- a/metadata/md5-cache/kde-misc/latte-dock-0.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[X] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5[X] x11-libs/libSM x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Elegant dock, based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://apps.kde.org/latte-dock/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[X] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5[X] x11-libs/libSM x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=0
-SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.10.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fb33eb0c5cb0271b6348e53e6bde0176
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.10.1 b/metadata/md5-cache/kde-misc/latte-dock-0.10.1
new file mode 100644
index 000000000000..2b1c0136696f
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/latte-dock-0.10.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[X] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5[X] x11-libs/libSM x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Elegant dock, based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://apps.kde.org/latte-dock/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[X] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5[X] x11-libs/libSM x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=0
+SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.10.1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=067b5dc7ff5b863e0f5fbb0af51972fa
diff --git a/metadata/md5-cache/kde-misc/tellico-3.4.1 b/metadata/md5-cache/kde-misc/tellico-3.4.1
new file mode 100644
index 000000000000..2bd25811196f
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/tellico-3.4.1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.64.0:5 ) >=kde-frameworks/extra-cmake-modules-5.64.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-qt/qtcharts:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/karchive:5 kde-frameworks/kcodecs:5 kde-frameworks/kcompletion:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kguiaddons:5 kde-frameworks/kiconthemes:5 kde-frameworks/kitemmodels:5 kde-frameworks/ki18n:5 kde-frameworks/kjobwidgets:5 kde-frameworks/kio:5 kde-frameworks/knewstuff:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwallet:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 kde-frameworks/solid:5 kde-frameworks/sonnet:5 bibtex? ( >=dev-perl/Text-BibTeX-0.780.0-r1 ) cddb? ( kde-apps/libkcddb:5 ) discid? ( dev-libs/libcdio:= ) pdf? ( app-text/poppler[qt5] ) scanner? ( kde-apps/libksane:5 ) semantic-desktop? ( kde-frameworks/kfilemetadata:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Collection manager based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://tellico-project.org/
+IUSE=bibtex cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-qt/qtcharts:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/karchive:5 kde-frameworks/kcodecs:5 kde-frameworks/kcompletion:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kguiaddons:5 kde-frameworks/kiconthemes:5 kde-frameworks/kitemmodels:5 kde-frameworks/ki18n:5 kde-frameworks/kjobwidgets:5 kde-frameworks/kio:5 kde-frameworks/knewstuff:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwallet:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 kde-frameworks/solid:5 kde-frameworks/sonnet:5 bibtex? ( >=dev-perl/Text-BibTeX-0.780.0-r1 ) cddb? ( kde-apps/libkcddb:5 ) discid? ( dev-libs/libcdio:= ) pdf? ( app-text/poppler[qt5] ) scanner? ( kde-apps/libksane:5 ) semantic-desktop? ( kde-frameworks/kfilemetadata:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=https://tellico-project.org/files/tellico-3.4.1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=62ab6763301186fcca7934522628f585
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index cdaf98535ef1..3de70d134e9c 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.22.4 b/metadata/md5-cache/kde-plasma/plasma-nm-5.22.4
index be7630593ba8..d57fe39c986c 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.22.4
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.22.4
@@ -5,11 +5,11 @@ DESCRIPTION=KDE Plasma applet for NetworkManager
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=modemmanager openconnect teamd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/networkmanager-qt-5.82.0:5[teamd=] >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.82.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-plasma/kde-cli-tools-5.22.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.22.4/plasma-nm-5.22.4.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=29e488db6662bbfaef9d79a0ed166d85
+_md5_=9cb208e842ef6d3745a801a108758cff
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index c516cac28093..6a80432ec412 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1-r2 b/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1-r2
index 37753a2a85c1..f1a6ef0e7070 100644
--- a/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1-r2
+++ b/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1-r2
@@ -3,10 +3,10 @@ DESCRIPTION=The Sendmail Filter API (Milter)
 EAPI=7
 HOMEPAGE=http://www.sendmail.org/
 IUSE=ipv6 poll
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=Sendmail
 RDEPEND=!<mail-mta/sendmail-8.16.1
 SLOT=0/1.0.2_p1
 SRC_URI=ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.16.1.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=333646dae6492edd1e3fbf5116a96323
+_md5_=bbaf952a85c3d290c87724fe1e1cfb1f
diff --git a/metadata/md5-cache/mail-filter/rspamd-2.6-r102 b/metadata/md5-cache/mail-filter/rspamd-2.6-r102
deleted file mode 100644
index 8d3790cc48d0..000000000000
--- a/metadata/md5-cache/mail-filter/rspamd-2.6-r102
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ragel virtual/pkgconfig dev-util/ninja dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) acct-group/rspamd acct-user/rspamd app-arch/zstd:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libsodium:= dev-libs/snowball-stemmer sys-apps/file blas? ( virtual/blas virtual/lapack ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc:= ) dev-libs/openssl:0=[-bindist(-)] pcre2? ( dev-libs/libpcre2:=[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] )
-DESCRIPTION=Rapid spam filtering system
-EAPI=7
-HOMEPAGE=https://rspamd.com https://github.com/rspamd/rspamd
-IUSE=blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) acct-group/rspamd acct-user/rspamd app-arch/zstd:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libsodium:= dev-libs/snowball-stemmer sys-apps/file blas? ( virtual/blas virtual/lapack ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc:= ) dev-libs/openssl:0=[-bindist(-)] pcre2? ( dev-libs/libpcre2:=[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) virtual/tmpfiles
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 ) jit? ( lua_single_target_luajit )
-SLOT=0
-SRC_URI=https://github.com/rspamd/rspamd/archive/2.6.tar.gz -> rspamd-2.6.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	8cdf449259063fc54bf347db93744d1f	lua-utils	af986d19619f43dc53862da0d25b9c2e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5dc463e4fd3d2406efe8a73e1fa77ecb
diff --git a/metadata/md5-cache/mail-filter/rspamd-3.0 b/metadata/md5-cache/mail-filter/rspamd-3.0
new file mode 100644
index 000000000000..4b54d89cc790
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/rspamd-3.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ragel virtual/pkgconfig dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) acct-group/rspamd acct-user/rspamd app-arch/zstd:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libfmt:= dev-libs/libsodium:= dev-libs/snowball-stemmer sys-apps/file blas? ( virtual/blas virtual/lapack ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc:= ) dev-libs/openssl:0=[-bindist(-)] pcre2? ( dev-libs/libpcre2:=[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] )
+DESCRIPTION=Rapid spam filtering system
+EAPI=7
+HOMEPAGE=https://rspamd.com https://github.com/rspamd/rspamd
+IUSE=blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) acct-group/rspamd acct-user/rspamd app-arch/zstd:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libfmt:= dev-libs/libsodium:= dev-libs/snowball-stemmer sys-apps/file blas? ( virtual/blas virtual/lapack ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc:= ) dev-libs/openssl:0=[-bindist(-)] pcre2? ( dev-libs/libpcre2:=[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) virtual/tmpfiles
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 ) jit? ( lua_single_target_luajit ) test? ( lua_single_target_luajit )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rspamd/rspamd/archive/3.0.tar.gz -> rspamd-3.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	8cdf449259063fc54bf347db93744d1f	lua-utils	af986d19619f43dc53862da0d25b9c2e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8b363f2d1444349c366013917649af0e
diff --git a/metadata/md5-cache/mail-filter/rspamd-9999 b/metadata/md5-cache/mail-filter/rspamd-9999
index d0b8d69ce49a..ddc9cf84f308 100644
--- a/metadata/md5-cache/mail-filter/rspamd-9999
+++ b/metadata/md5-cache/mail-filter/rspamd-9999
@@ -1,14 +1,15 @@
 BDEPEND=dev-util/ragel virtual/pkgconfig dev-util/ninja dev-util/cmake virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) acct-group/rspamd acct-user/rspamd app-arch/zstd:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libsodium:= dev-libs/snowball-stemmer sys-apps/file blas? ( virtual/blas virtual/lapack ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc:= ) dev-libs/openssl:0=[-bindist(-)] pcre2? ( dev-libs/libpcre2:=[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] )
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) acct-group/rspamd acct-user/rspamd app-arch/zstd:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libfmt:= dev-libs/libsodium:= dev-libs/snowball-stemmer sys-apps/file blas? ( virtual/blas virtual/lapack ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc:= ) dev-libs/openssl:0=[-bindist(-)] pcre2? ( dev-libs/libpcre2:=[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] )
 DESCRIPTION=Rapid spam filtering system
 EAPI=7
 HOMEPAGE=https://rspamd.com https://github.com/rspamd/rspamd
-IUSE=blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3
+IUSE=blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
 LICENSE=Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB
 PROPERTIES=live
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) acct-group/rspamd acct-user/rspamd app-arch/zstd:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libsodium:= dev-libs/snowball-stemmer sys-apps/file blas? ( virtual/blas virtual/lapack ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc:= ) dev-libs/openssl:0=[-bindist(-)] pcre2? ( dev-libs/libpcre2:=[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) virtual/tmpfiles
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 ) jit? ( lua_single_target_luajit )
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) acct-group/rspamd acct-user/rspamd app-arch/zstd:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libfmt:= dev-libs/libsodium:= dev-libs/snowball-stemmer sys-apps/file blas? ( virtual/blas virtual/lapack ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc:= ) dev-libs/openssl:0=[-bindist(-)] pcre2? ( dev-libs/libpcre2:=[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) virtual/tmpfiles
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) jit? ( lua_single_target_luajit ) test? ( lua_single_target_luajit )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	8cdf449259063fc54bf347db93744d1f	lua-utils	af986d19619f43dc53862da0d25b9c2e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=167f9a4c6d8a53b3e4d7bcd50f9145ca
+_md5_=43d24aaa1c5f2e85a4c840451721f843
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 2e137452e903..e1084bd684cb 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/sendmail-8.16.1-r1 b/metadata/md5-cache/mail-mta/sendmail-8.16.1-r1
index 6a67d0b3d4de..5e8717d7e677 100644
--- a/metadata/md5-cache/mail-mta/sendmail-8.16.1-r1
+++ b/metadata/md5-cache/mail-mta/sendmail-8.16.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Widely-used Mail Transport Agent (MTA)
 EAPI=7
 HOMEPAGE=https://www.sendmail.org/
 IUSE=ipv6 ldap mbox nis sasl sockets ssl tcpd
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=Sendmail GPL-2
 PDEPEND=!mbox? ( mail-filter/procmail )
 RDEPEND=acct-group/smmsp >=acct-user/smmsp-0-r2 net-mail/mailbase >=sys-libs/db-3.2:= ldap? ( net-nds/openldap ) nis? ( net-libs/libnsl:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) >=mail-filter/libmilter-1.0.2_p1-r1 !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/opensmtpd !mail-mta/postfix !mail-mta/qmail-ldap !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/vacation
 SLOT=0
 SRC_URI=ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.16.1.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6696291b23a150fd9845cb131d355955
+_md5_=0df830bf26fe6ebf17ee668e36235dd5
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 65896c7d3346..7a24c31a3428 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/noto-emoji-20210715 b/metadata/md5-cache/media-fonts/noto-emoji-20210715
index 020de71d0089..0ba4de7a605f 100644
--- a/metadata/md5-cache/media-fonts/noto-emoji-20210715
+++ b/metadata/md5-cache/media-fonts/noto-emoji-20210715
@@ -4,10 +4,10 @@ DESCRIPTION=Google Noto Emoji fonts
 EAPI=7
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji
 IUSE=buildfont X
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0 OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/googlefonts/noto-emoji/archive/c05b4b47c8250ccd232780cae46d66a8179e77ab.tar.gz -> noto-emoji-20210715.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	font	0667878c2b594871023dd1833d05996f	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=49b796fe508eac68481e793fde059509
+_md5_=16b9c6a802350ce9cf6f6e82217825d8
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index e12bfbc3da23..17e2c928240b 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/chafa-1.6.0 b/metadata/md5-cache/media-gfx/chafa-1.6.0
deleted file mode 100644
index 14c064153032..000000000000
--- a/metadata/md5-cache/media-gfx/chafa-1.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/glib:2 media-gfx/imagemagick:0= tools? ( >=media-libs/freetype-2.0.0 )
-DESCRIPTION=versatile and fast Unicode/ASCII/ANSI graphics renderer
-EAPI=7
-HOMEPAGE=https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa
-IUSE=+tools
-KEYWORDS=amd64 arm64 x86
-LICENSE=LGPL-3+
-RDEPEND=dev-libs/glib:2 media-gfx/imagemagick:0= tools? ( >=media-libs/freetype-2.0.0 )
-SLOT=0
-SRC_URI=https://hpjansson.org/chafa/releases/chafa-1.6.0.tar.xz
-_md5_=6c3828484f595999fb263dfe7ee58fd9
diff --git a/metadata/md5-cache/media-gfx/chafa-1.6.1 b/metadata/md5-cache/media-gfx/chafa-1.6.1
index 0e97f1ca5c59..522d95ad2fe4 100644
--- a/metadata/md5-cache/media-gfx/chafa-1.6.1
+++ b/metadata/md5-cache/media-gfx/chafa-1.6.1
@@ -5,9 +5,9 @@ DESCRIPTION=versatile and fast Unicode/ASCII/ANSI graphics renderer
 EAPI=8
 HOMEPAGE=https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa
 IUSE=+tools
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=LGPL-3+
 RDEPEND=dev-libs/glib:2 media-gfx/imagemagick:0= tools? ( >=media-libs/freetype-2.0.0 )
 SLOT=0
 SRC_URI=https://hpjansson.org/chafa/releases/chafa-1.6.1.tar.xz
-_md5_=7a871122153b7f978f0495bbd50ab6f7
+_md5_=a03e54ae020825c0c07b59a5cb79e494
diff --git a/metadata/md5-cache/media-gfx/darktable-3.6.0 b/metadata/md5-cache/media-gfx/darktable-3.6.0
index c9800bfd6c24..4f458c37eb58 100644
--- a/metadata/md5-cache/media-gfx/darktable-3.6.0
+++ b/metadata/md5-cache/media-gfx/darktable-3.6.0
@@ -5,7 +5,7 @@ DESCRIPTION=A virtual lighttable and darkroom for photographers
 EAPI=7
 HOMEPAGE=https://www.darktable.org/
 IUSE=avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet lto lua nls opencl openmp openexr test tools webp l10n_af l10n_de l10n_eo l10n_es l10n_fr l10n_he l10n_hu l10n_it l10n_nl l10n_pt-BR l10n_ru l10n_sl l10n_uk +lua_single_target_lua5-3
-KEYWORDS=~amd64 ~arm64 -x86
+KEYWORDS=amd64 ~arm64 -x86
 LICENSE=GPL-3 CC-BY-3.0
 RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 >=dev-libs/pugixml-1.8:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.22:3 x11-libs/pango avif? ( >=media-libs/libavif-0.8.2 ) colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gmic? ( media-gfx/gmic ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) opencl? ( virtual/opencl ) openexr? ( <media-libs/openexr-3.0.0:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-3.6.0/darktable-3.6.0.tar.xz doc? ( https://www.darktable.org/usermanual/3.6/en/darktable_user_manual.pdf -> darktable-usermanual-3.6.pdf )
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	8cdf449259063fc54bf347db93744d1f	lua-utils	af986d19619f43dc53862da0d25b9c2e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f6222f1157a751d30f3d81c9a3569ea8
+_md5_=f7a3ff420d1fbff4b08709f535376ba3
diff --git a/metadata/md5-cache/media-gfx/gmic-2.9.7 b/metadata/md5-cache/media-gfx/gmic-2.9.7
deleted file mode 100644
index d1cb1bd176f5..000000000000
--- a/metadata/md5-cache/media-gfx/gmic-2.9.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) gimp? ( dev-qt/linguist-tools ) krita? ( dev-qt/linguist-tools ) qt5? ( dev-qt/linguist-tools )
-DESCRIPTION=GREYC's Magic Image Converter
-EAPI=7
-HOMEPAGE=https://gmic.eu/ https://github.com/dtschump/gmic
-IUSE=cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib
-KEYWORDS=amd64 arm64 x86
-LICENSE=CeCILL-2 GPL-3
-RDEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) ffmpeg? ( media-video/ffmpeg:0= )
-REQUIRED_USE=gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
-SLOT=0
-SRC_URI=https://gmic.eu/files/source/gmic_2.9.7.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=86ddeb9ea8f0fad6ef2ef9e9484a625e
diff --git a/metadata/md5-cache/media-gfx/gmic-2.9.8 b/metadata/md5-cache/media-gfx/gmic-2.9.8
index a928ee5c7633..71cd3509b97d 100644
--- a/metadata/md5-cache/media-gfx/gmic-2.9.8
+++ b/metadata/md5-cache/media-gfx/gmic-2.9.8
@@ -5,11 +5,11 @@ DESCRIPTION=GREYC's Magic Image Converter
 EAPI=7
 HOMEPAGE=https://gmic.eu/ https://github.com/dtschump/gmic
 IUSE=cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=CeCILL-2 GPL-3
 RDEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) ffmpeg? ( media-video/ffmpeg:0= )
 REQUIRED_USE=gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
 SLOT=0
 SRC_URI=https://gmic.eu/files/source/gmic_2.9.8.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3b97fd98362d3a65b91036346bf1a2c5
+_md5_=86ddeb9ea8f0fad6ef2ef9e9484a625e
diff --git a/metadata/md5-cache/media-gfx/gpicview-0.2.5-r2 b/metadata/md5-cache/media-gfx/gpicview-0.2.5-r2
index 1dd545bddfce..338cec4ff74d 100644
--- a/metadata/md5-cache/media-gfx/gpicview-0.2.5-r2
+++ b/metadata/md5-cache/media-gfx/gpicview-0.2.5-r2
@@ -3,10 +3,10 @@ DEPEND=virtual/jpeg:0 x11-libs/gtk+:3 >=dev-util/intltool-0.40 sys-devel/gettext
 DESCRIPTION=A Simple and Fast Image Viewer for X
 EAPI=7
 HOMEPAGE=http://lxde.sourceforge.net/gpicview
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ~riscv x86
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/gpicview-0.2.5.tar.xz
 _eclasses_=xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9eb1b11b2dd1b991f29625d911475af6
+_md5_=07343a044ad2a9b5921679236f12b1c1
diff --git a/metadata/md5-cache/media-gfx/gthumb-3.10.4 b/metadata/md5-cache/media-gfx/gthumb-3.10.4
new file mode 100644
index 000000000000..3fca35e416ec
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gthumb-3.10.4
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/glib-utils dev-util/itstool sys-devel/bison sys-devel/flex >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.54.0:2 >=x11-libs/gtk+-3.16.0:3 exif? ( >=media-gfx/exiv2-0.21:= ) slideshow? ( >=media-libs/clutter-1.12.0:1.0 >=media-libs/clutter-gtk-1:1.0 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-gtk:1.0 ) raw? ( >=media-libs/libraw-0.14:= ) http? ( >=net-libs/libsoup-2.42.0:2.4 >=dev-libs/json-glib-0.15.0 >=net-libs/webkit-gtk-1.10.0:4 ) gnome-keyring? ( >=app-crypt/libsecret-0.11 ) cdr? ( >=app-cdr/brasero-3.2.0 ) svg? ( >=gnome-base/librsvg-2.34:2 ) webp? ( >=media-libs/libwebp-0.2.0:= ) lcms? ( >=media-libs/lcms-2.6:2 ) colord? ( >=x11-misc/colord-1.3 >=media-libs/lcms-2.6:2 ) sys-libs/zlib virtual/jpeg:0= tiff? ( media-libs/tiff:= ) media-libs/libpng:0= >=gnome-base/gsettings-desktop-schemas-0.1.4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Image viewer and browser for Gnome
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Gthumb
+IUSE=cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff webp
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.54.0:2 >=x11-libs/gtk+-3.16.0:3 exif? ( >=media-gfx/exiv2-0.21:= ) slideshow? ( >=media-libs/clutter-1.12.0:1.0 >=media-libs/clutter-gtk-1:1.0 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-gtk:1.0 ) raw? ( >=media-libs/libraw-0.14:= ) http? ( >=net-libs/libsoup-2.42.0:2.4 >=dev-libs/json-glib-0.15.0 >=net-libs/webkit-gtk-1.10.0:4 ) gnome-keyring? ( >=app-crypt/libsecret-0.11 ) cdr? ( >=app-cdr/brasero-3.2.0 ) svg? ( >=gnome-base/librsvg-2.34:2 ) webp? ( >=media-libs/libwebp-0.2.0:= ) lcms? ( >=media-libs/lcms-2.6:2 ) colord? ( >=x11-misc/colord-1.3 >=media-libs/lcms-2.6:2 ) sys-libs/zlib virtual/jpeg:0= tiff? ( media-libs/tiff:= ) media-libs/libpng:0= >=gnome-base/gsettings-desktop-schemas-0.1.4
+SLOT=0
+SRC_URI=mirror://gnome/sources/gthumb/3.10/gthumb-3.10.4.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a6ec45762be651c7e426d7b2d453cb33
diff --git a/metadata/md5-cache/media-gfx/hydrus-446 b/metadata/md5-cache/media-gfx/hydrus-446
deleted file mode 100644
index 33e6718d78f2..000000000000
--- a/metadata/md5-cache/media-gfx/hydrus-446
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cloudscraper[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] ) )
-DEFINED_PHASES=compile install postinst prepare setup test
-DESCRIPTION=A booru-like media organizer for the desktop
-EAPI=7
-HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
-IUSE=test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64
-LICENSE=WTFPL-2 CC-BY-2.5
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cloudscraper[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v446.tar.gz -> hydrus-446.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bf7984f9389f70281d288338c2f3e66b
diff --git a/metadata/md5-cache/media-gfx/hydrus-451 b/metadata/md5-cache/media-gfx/hydrus-451
new file mode 100644
index 000000000000..abf8d8fad0e8
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/hydrus-451
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cloudscraper[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] ) )
+DEFINED_PHASES=compile install postinst prepare setup test
+DESCRIPTION=A booru-like media organizer for the desktop
+EAPI=7
+HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
+IUSE=test python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=WTFPL-2 CC-BY-2.5
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cloudscraper[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v451.tar.gz -> hydrus-451.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bf7984f9389f70281d288338c2f3e66b
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.20 b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.20
new file mode 100644
index 000000000000..2e77ae06324c
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.20
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=7
+HOMEPAGE=https://www.imagemagick.org/
+IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+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=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
+RESTRICT=!test? ( test )
+SLOT=0/6.9.11-60
+SRC_URI=mirror://imagemagick/ImageMagick-6.9.12-20.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0829eaf775ae9235270afdf62a2f3db3
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.1.0.5 b/metadata/md5-cache/media-gfx/imagemagick-7.1.0.5
new file mode 100644
index 000000000000..e4e843199aff
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.1.0.5
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=7
+HOMEPAGE=https://www.imagemagick.org/
+IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
+RESTRICT=!test? ( test )
+SLOT=0/7.1.0-0
+SRC_URI=mirror://imagemagick/ImageMagick-7.1.0-5.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=98a788e6ec6294d3fba4f460511ca0a0
diff --git a/metadata/md5-cache/media-gfx/img2pdf-0.3.6 b/metadata/md5-cache/media-gfx/img2pdf-0.3.6
deleted file mode 100644
index b54c2a6a817e..000000000000
--- a/metadata/md5-cache/media-gfx/img2pdf-0.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pillow[python_targets_python3_8(-)?,tiff,zlib] ) test? ( dev-python/pillow[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Losslessly convert raster images to PDF
-EAPI=7
-HOMEPAGE=https://gitlab.mister-muffin.de/josch/img2pdf
-IUSE=test python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=dev-python/pillow[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/img2pdf/img2pdf-0.3.6.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0651f14b61b9008a0fd42dafe09b346e
diff --git a/metadata/md5-cache/media-gfx/img2pdf-0.4.0 b/metadata/md5-cache/media-gfx/img2pdf-0.4.0
deleted file mode 100644
index 0c300218e470..000000000000
--- a/metadata/md5-cache/media-gfx/img2pdf-0.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pikepdf[python_targets_python3_8(-)?] dev-python/pillow[python_targets_python3_8(-)?] gui? ( python_targets_python3_8? ( dev-lang/python:3.8[tk] ) ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Losslessly convert raster images to PDF
-EAPI=7
-HOMEPAGE=https://gitlab.mister-muffin.de/josch/img2pdf
-IUSE=gui test python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=dev-python/pikepdf[python_targets_python3_8(-)?] dev-python/pillow[python_targets_python3_8(-)?] gui? ( python_targets_python3_8? ( dev-lang/python:3.8[tk] ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/img2pdf/img2pdf-0.4.0.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d8f05edbf32b8ae4359b009c2ee19eac
diff --git a/metadata/md5-cache/media-gfx/img2pdf-0.4.1-r1 b/metadata/md5-cache/media-gfx/img2pdf-0.4.1-r1
new file mode 100644
index 000000000000..b5379b808cae
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/img2pdf-0.4.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-text/ghostscript-gpl app-text/mupdf app-text/poppler[cairo,png,tiff] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pdfrw[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[tiff,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/imagemagick[jpeg,jpeg2k,lcms,png,-q8,-q32,tiff] media-libs/exiftool media-libs/netpbm[jpeg] ) test? ( dev-python/pikepdf[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] gui? ( python_targets_python3_8? ( dev-lang/python:3.8[tk] ) python_targets_python3_9? ( dev-lang/python:3.9[tk] ) python_targets_python3_10? ( dev-lang/python:3.10[tk] ) ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Losslessly convert raster images to PDF
+EAPI=8
+HOMEPAGE=https://gitlab.mister-muffin.de/josch/img2pdf
+IUSE=gui test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=dev-python/pikepdf[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] gui? ( python_targets_python3_8? ( dev-lang/python:3.8[tk] ) python_targets_python3_9? ( dev-lang/python:3.9[tk] ) python_targets_python3_10? ( dev-lang/python:3.10[tk] ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/img2pdf/img2pdf-0.4.1.tar.gz https://dev.gentoo.org/~sbraz/img2pdf-0.4.1-imagemagick-7-tests.patch.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c674a169e3e947dd93dff1b927c513e7
diff --git a/metadata/md5-cache/media-gfx/imv-4.2.0 b/metadata/md5-cache/media-gfx/imv-4.2.0
deleted file mode 100644
index 1a807caffbb4..000000000000
--- a/metadata/md5-cache/media-gfx/imv-4.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/asciidoc wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.56.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/icu:= dev-libs/inih media-libs/libglvnd[X?] x11-libs/libxkbcommon[X?] x11-libs/pango X? ( x11-libs/libX11 x11-libs/libxcb:= ) freeimage? ( media-libs/freeimage ) gif? ( media-libs/libnsgif ) heif? ( media-libs/libheif:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) svg? ( >=gnome-base/librsvg-2.44 ) tiff? ( media-libs/tiff ) wayland? ( dev-libs/wayland ) !sys-apps/renameutils test? ( dev-util/cmocka ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Minimal image viewer designed for tiling window manager users
-EAPI=7
-HOMEPAGE=https://github.com/eXeC64/imv
-IUSE=+X +freeimage gif heif jpeg png svg test tiff wayland
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT-with-advertising
-RDEPEND=dev-libs/icu:= dev-libs/inih media-libs/libglvnd[X?] x11-libs/libxkbcommon[X?] x11-libs/pango X? ( x11-libs/libX11 x11-libs/libxcb:= ) freeimage? ( media-libs/freeimage ) gif? ( media-libs/libnsgif ) heif? ( media-libs/libheif:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) svg? ( >=gnome-base/librsvg-2.44 ) tiff? ( media-libs/tiff ) wayland? ( dev-libs/wayland ) !sys-apps/renameutils
-REQUIRED_USE=|| ( X wayland )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/eXeC64/imv/archive/v4.2.0.tar.gz -> imv-4.2.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=21c94aade5c737f090af4fc9489c8749
diff --git a/metadata/md5-cache/media-gfx/krita-4.4.8 b/metadata/md5-cache/media-gfx/krita-4.4.8
new file mode 100644
index 000000000000..565135c6eabf
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/krita-4.4.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/boost:= dev-libs/quazip:0= python_single_target_python3_8? ( dev-python/PyQt5[python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[python_targets_python3_9(-)] dev-python/sip:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] ) >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[-gles2-only] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXi color-management? ( =media-libs/opencolorio-1* ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= <media-libs/openexr-3.0.0:0= ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.15.2:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) vc? ( >=dev-libs/vc-1.1.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedom!
+EAPI=7
+HOMEPAGE=https://apps.kde.org/krita/ https://krita.org/en/
+IUSE=color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc test debug test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/boost:= dev-libs/quazip:0= python_single_target_python3_8? ( dev-python/PyQt5[python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[python_targets_python3_9(-)] dev-python/sip:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] ) >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[-gles2-only] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXi color-management? ( =media-libs/opencolorio-1* ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= <media-libs/openexr-3.0.0:0= ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.15.2:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/krita/4.4.8/krita-4.4.8.tar.gz https://dev.gentoo.org/~asturm/distfiles/krita-4.2.9-patchset.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9624b76c7cf248d7b0f147bf7b36e72c
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index d494f50f3bf1..2bdb6ed4dfa2 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/codec2-1.0.0 b/metadata/md5-cache/media-libs/codec2-1.0.0
index f2ada2c19ca2..273b39e54835 100644
--- a/metadata/md5-cache/media-libs/codec2-1.0.0
+++ b/metadata/md5-cache/media-libs/codec2-1.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Low bit rate speech codec
 EAPI=7
 HOMEPAGE=https://freedv.org/ https://www.rowetel.com/?page_id=452 https://github.com/drowe67/codec2
 IUSE=examples test 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 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2.1
 RESTRICT=test
 SLOT=0/1.0
 SRC_URI=https://github.com/drowe67/codec2/archive/v1.0.0.tar.gz -> codec2-1.0.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b7eac094f0f0dbbbb3df14778d2298a7
+_md5_=e2106d03e1e045385edeb59f9e8b84a9
diff --git a/metadata/md5-cache/media-libs/dumb-2.0.3 b/metadata/md5-cache/media-libs/dumb-2.0.3
index dc0d64737519..b541326ec5aa 100644
--- a/metadata/md5-cache/media-libs/dumb-2.0.3
+++ b/metadata/md5-cache/media-libs/dumb-2.0.3
@@ -5,10 +5,10 @@ DESCRIPTION=Module/tracker based music format parser and player library
 EAPI=7
 HOMEPAGE=https://github.com/kode54/dumb
 IUSE=allegro cpu_flags_x86_sse examples 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 ~arm64 ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=DUMB-0.9.3
 RDEPEND=allegro? ( media-libs/allegro: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(-)?] !media-libs/aldumb ) examples? ( >=dev-libs/argtable-2 media-libs/libsdl2[sound] )
 SLOT=0/2
 SRC_URI=https://github.com/kode54/dumb/archive/2.0.3.tar.gz -> dumb-2.0.3.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a77a7934c93bc9f1f6dce342603d9230
+_md5_=ba5fa995dace73205b67da59b5d4af75
diff --git a/metadata/md5-cache/media-libs/faac-1.30 b/metadata/md5-cache/media-libs/faac-1.30
index 0f8c8023e1d9..f9b888c95cf0 100644
--- a/metadata/md5-cache/media-libs/faac-1.30
+++ b/metadata/md5-cache/media-libs/faac-1.30
@@ -4,9 +4,9 @@ DESCRIPTION=Free MPEG-4 audio codecs by AudioCoding.com
 EAPI=7
 HOMEPAGE=https://www.audiocoding.com
 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1 MPEG-4
 SLOT=0
 SRC_URI=mirror://sourceforge/faac/faac-1_30.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=91b1c57d4f8240a43974e83cb0725185
+_md5_=38d7f40e3dc29c7a3e91033cffd0b135
diff --git a/metadata/md5-cache/media-libs/gavl-1.4.0-r2 b/metadata/md5-cache/media-libs/gavl-1.4.0-r2
index 19281f07c38c..00f45079bcf6 100644
--- a/metadata/md5-cache/media-libs/gavl-1.4.0-r2
+++ b/metadata/md5-cache/media-libs/gavl-1.4.0-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Library for handling uncompressed audio and video data
 EAPI=7
 HOMEPAGE=http://gmerlin.sourceforge.net
 IUSE=doc 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 ~hppa ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ~ppc64 ~riscv x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/gmerlin/gavl-1.4.0.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=211380375e6ab6ffb8fd981bb790256d
+_md5_=4d77252c17b966a271608b2598c66f07
diff --git a/metadata/md5-cache/media-libs/kvazaar-2.0.0 b/metadata/md5-cache/media-libs/kvazaar-2.0.0
index 25a044e31574..ddc05c53c6ab 100644
--- a/metadata/md5-cache/media-libs/kvazaar-2.0.0
+++ b/metadata/md5-cache/media-libs/kvazaar-2.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Open-source HEVC encoder
 EAPI=7
 HOMEPAGE=http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar
 IUSE=static-libs test 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 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1
 REQUIRED_USE=test? ( static-libs )
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://github.com/ultravideo/kvazaar/archive/v2.0.0.tar.gz -> kvazaar-2.0.0.tar.gz test? ( https://github.com/silentbicycle/greatest/archive/v1.2.1.tar.gz -> greatest-1.2.1.tar.gz )
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7d9bdb8600ea809472812c587efbb34a
+_md5_=4344bb91b8098db59f990e44c535661d
diff --git a/metadata/md5-cache/media-libs/leptonica-1.81.1 b/metadata/md5-cache/media-libs/leptonica-1.81.1
index a0a8026f50ec..496b371a4f4c 100644
--- a/metadata/md5-cache/media-libs/leptonica-1.81.1
+++ b/metadata/md5-cache/media-libs/leptonica-1.81.1
@@ -1,11 +1,11 @@
 BDEPEND=>=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=gif? ( >=media-libs/giflib-5.1.3:=[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(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) png? ( media-libs/libpng: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(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff: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(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( media-libs/tiff:0[zlib] )
+DEPEND=gif? ( >=media-libs/giflib-5.1.3:=[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(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) png? ( media-libs/libpng: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(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff: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(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( media-libs/tiff:0[jpeg,zlib] )
 DESCRIPTION=C library for image processing and analysis
 EAPI=7
 HOMEPAGE=http://www.leptonica.org/
 IUSE=gif jpeg jpeg2k png static-libs test tiff utils webp zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos
 LICENSE=Apache-2.0
 RDEPEND=gif? ( >=media-libs/giflib-5.1.3:=[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(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) png? ( media-libs/libpng: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(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff: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(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test? ( jpeg png tiff zlib )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/DanBloomberg/leptonica/releases/download/1.81.1/leptonica-1.81.1.tar.gz
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1357afb0a41317c4f4beab2c2e151682
+_md5_=744b8ee4724626c24ac88cc504e6d15f
diff --git a/metadata/md5-cache/media-libs/libbs2b-3.1.0-r2 b/metadata/md5-cache/media-libs/libbs2b-3.1.0-r2
index de9326c932bb..0f513fd2c9a7 100644
--- a/metadata/md5-cache/media-libs/libbs2b-3.1.0-r2
+++ b/metadata/md5-cache/media-libs/libbs2b-3.1.0-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Bauer stereophonic-to-binaural DSP library
 EAPI=7
 HOMEPAGE=http://bs2b.sourceforge.net/
 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 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=>=media-libs/libsndfile-1.0.25-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(-)?]
 SLOT=0
 SRC_URI=mirror://sourceforge/bs2b/libbs2b-3.1.0.tar.bz2
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3728ac6bc0b1ae291c0ea0d2922e50e4
+_md5_=f1ca4254ced41fc8a5a82caf3fa26365
diff --git a/metadata/md5-cache/media-libs/libdvdcss-1.4.3 b/metadata/md5-cache/media-libs/libdvdcss-1.4.3
index bc6fddf12c6d..11b76567eead 100644
--- a/metadata/md5-cache/media-libs/libdvdcss-1.4.3
+++ b/metadata/md5-cache/media-libs/libdvdcss-1.4.3
@@ -4,9 +4,9 @@ DESCRIPTION=A portable abstraction library for DVD decryption
 EAPI=7
 HOMEPAGE=https://www.videolan.org/developers/libdvdcss.html
 IUSE=doc 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=1.2
 SRC_URI=https://download.videolan.org/pub/libdvdcss/1.4.3/libdvdcss-1.4.3.tar.bz2
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=835f9ad87dacd626180878640aec1963
+_md5_=cc94d07cad971b826be61b30eb391a20
diff --git a/metadata/md5-cache/media-libs/libfreeaptx-0.1.1 b/metadata/md5-cache/media-libs/libfreeaptx-0.1.1
new file mode 100644
index 000000000000..491f69098571
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libfreeaptx-0.1.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Reverse-engineered aptX and aptX HD library (fork of libopenaptx)
+EAPI=7
+HOMEPAGE=https://github.com/iamthehorker/libfreeaptx
+IUSE=cpu_flags_x86_avx2
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=https://github.com/iamthehorker/libfreeaptx/archive/0.1.1.tar.gz -> libfreeaptx-0.1.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8e5d9732f4fd549206525adce52e9b40
diff --git a/metadata/md5-cache/media-libs/libfreeaptx-9999 b/metadata/md5-cache/media-libs/libfreeaptx-9999
new file mode 100644
index 000000000000..65fad43cb1ac
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libfreeaptx-9999
@@ -0,0 +1,11 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Reverse-engineered aptX and aptX HD library (fork of libopenaptx)
+EAPI=7
+HOMEPAGE=https://github.com/iamthehorker/libfreeaptx
+IUSE=cpu_flags_x86_avx2
+LICENSE=LGPL-2.1+
+PROPERTIES=live
+SLOT=0
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=479825e2d3fb87e035b36f685cdff8fb
diff --git a/metadata/md5-cache/media-libs/libglvnd-1.3.4 b/metadata/md5-cache/media-libs/libglvnd-1.3.4
new file mode 100644
index 000000000000..706b6fee2500
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libglvnd-1.3.4
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) test? ( X? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!media-libs/mesa[-libglvnd(+)] X? ( 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(-)?] ) X? ( x11-base/xorg-proto )
+DESCRIPTION=The GL Vendor-Neutral Dispatch library
+EAPI=7
+HOMEPAGE=https://gitlab.freedesktop.org/glvnd/libglvnd
+IUSE=test 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=!media-libs/mesa[-libglvnd(+)] X? ( 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(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v1.3.4/libglvnd-v1.3.4.tar.bz2 -> libglvnd-1.3.4.tar.bz2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=3952fc41d58eba8a4718bcd65e5bfda4
diff --git a/metadata/md5-cache/media-libs/libilbc-3.0.4 b/metadata/md5-cache/media-libs/libilbc-3.0.4
index 441b747303a3..373f43daf5eb 100644
--- a/metadata/md5-cache/media-libs/libilbc-3.0.4
+++ b/metadata/md5-cache/media-libs/libilbc-3.0.4
@@ -4,9 +4,9 @@ DESCRIPTION=Packaged version of iLBC codec from the WebRTC project
 EAPI=7
 HOMEPAGE=https://github.com/TimothyGu/libilbc
 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=amd64 arm arm64 ppc ppc64 ~sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 SLOT=0/3
 SRC_URI=https://github.com/TimothyGu/libilbc/releases/download/v3.0.4/libilbc-3.0.4.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b82ea11be6ee269b822438c88db8cf7d
+_md5_=48bed48879c932a34533d84d8bf45d5f
diff --git a/metadata/md5-cache/media-libs/libmatroska-1.6.3 b/metadata/md5-cache/media-libs/libmatroska-1.6.3
index 0f26980469c5..cc1537dfae5a 100644
--- a/metadata/md5-cache/media-libs/libmatroska-1.6.3
+++ b/metadata/md5-cache/media-libs/libmatroska-1.6.3
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libebml-1.4.2:=
 DESCRIPTION=Extensible multimedia container format based on EBML
 EAPI=7
 HOMEPAGE=https://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libebml-1.4.2:=
 SLOT=0/7
 SRC_URI=https://dl.matroska.org/downloads/libmatroska/libmatroska-1.6.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f82499f8c00e54dcc3f98a689d8434c8
+_md5_=398ff2edf934fb606885c26a82bf6e36
diff --git a/metadata/md5-cache/media-libs/libopenraw-0.1.3 b/metadata/md5-cache/media-libs/libopenraw-0.1.3
index f7c711b6ae80..3510f3f816ac 100644
--- a/metadata/md5-cache/media-libs/libopenraw-0.1.3
+++ b/metadata/md5-cache/media-libs/libopenraw-0.1.3
@@ -5,11 +5,11 @@ DESCRIPTION=RAW image formats decoding library
 EAPI=7
 HOMEPAGE=https://libopenraw.freedesktop.org/
 IUSE=gtk test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-libs/libxml2 virtual/jpeg:0 gtk? ( dev-libs/glib:2 >=x11-libs/gdk-pixbuf-2.24.0:2 )
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://libopenraw.freedesktop.org/download/libopenraw-0.1.3.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c2f7fb3e2eb2ee7768673f4bbf982653
+_md5_=b431018ea7e8f0d83cefcda97a653691
diff --git a/metadata/md5-cache/media-libs/libquicktime-1.2.4-r3 b/metadata/md5-cache/media-libs/libquicktime-1.2.4-r3
index 9e16e708e135..aa373e59334a 100644
--- a/metadata/md5-cache/media-libs/libquicktime-1.2.4-r3
+++ b/metadata/md5-cache/media-libs/libquicktime-1.2.4-r3
@@ -5,11 +5,11 @@ DESCRIPTION=An enhanced version of the quicktime4linux library
 EAPI=7
 HOMEPAGE=http://libquicktime.sourceforge.net/
 IUSE=aac alsa doc dv encode ffmpeg gtk jpeg lame cpu_flags_x86_mmx opengl png static-libs vorbis X x264 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 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/zlib >=virtual/libintl-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(-)?] aac? ( >=media-libs/faad2-2.7-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(-)?] encode? ( >=media-libs/faac-1.28-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(-)?] ) ) alsa? ( >=media-libs/alsa-lib-1.0.20 ) dv? ( >=media-libs/libdv-1.0.0-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(-)?] ) ffmpeg? ( >=media-video/ffmpeg-3.2.6: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(-)?] ) gtk? ( x11-libs/gtk+:2 ) jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) lame? ( >=media-sound/lame-3.99.5-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(-)?] ) opengl? ( virtual/opengl ) png? ( >=media-libs/libpng-1.6.10: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(-)?] ) vorbis? ( >=media-libs/libogg-1.3.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(-)?] >=media-libs/libvorbis-1.3.3-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(-)?] ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXt x11-libs/libXv ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=opengl? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/libquicktime/libquicktime-1.2.4.tar.gz
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4454c0d60af825d013497fce9d3492e4
+_md5_=6e564fe02c53773f90ddf85f30e50aee
diff --git a/metadata/md5-cache/media-libs/libsidplayfp-2.2.0 b/metadata/md5-cache/media-libs/libsidplayfp-2.2.0
deleted file mode 100644
index 3103d7e8e387..000000000000
--- a/metadata/md5-cache/media-libs/libsidplayfp-2.2.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Library for the sidplay2 fork with resid-fp
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/sidplay-residfp/
-IUSE=static-libs
-KEYWORDS=amd64 ~hppa x86
-LICENSE=GPL-2
-SLOT=0/6
-SRC_URI=mirror://sourceforge/sidplay-residfp/libsidplayfp/2.2/libsidplayfp-2.2.0.tar.gz
-_md5_=da0b4ffada610f8d0f929d3e12d2557c
diff --git a/metadata/md5-cache/media-libs/libsidplayfp-2.2.1 b/metadata/md5-cache/media-libs/libsidplayfp-2.2.1
index 4ab2dc52f848..d067e057258d 100644
--- a/metadata/md5-cache/media-libs/libsidplayfp-2.2.1
+++ b/metadata/md5-cache/media-libs/libsidplayfp-2.2.1
@@ -3,8 +3,8 @@ DESCRIPTION=Library for the sidplay2 fork with resid-fp
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/sidplay-residfp/
 IUSE=static-libs
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=amd64 ~hppa x86
 LICENSE=GPL-2
 SLOT=0/6
 SRC_URI=mirror://sourceforge/sidplay-residfp/libsidplayfp/2.2/libsidplayfp-2.2.1.tar.gz
-_md5_=1edbc44de8733789c524887657a2cf6a
+_md5_=da0b4ffada610f8d0f929d3e12d2557c
diff --git a/metadata/md5-cache/media-libs/libsoundtouch-2.3.0 b/metadata/md5-cache/media-libs/libsoundtouch-2.3.0
new file mode 100644
index 000000000000..f083964e1a76
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libsoundtouch-2.3.0
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig 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
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Audio processing library for changing tempo, pitch and playback rates
+EAPI=7
+HOMEPAGE=https://www.surina.net/soundtouch/ https://gitlab.com/soundtouch/soundtouch
+IUSE=cpu_flags_x86_sse openmp static-libs 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 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=LGPL-2.1
+SLOT=0/1
+SRC_URI=https://gitlab.com/soundtouch/soundtouch/-/archive/2.3.0/soundtouch-2.3.0.tar.bz2
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=06ce9b9bad4d40459f7cb8a3b521c77a
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.12 b/metadata/md5-cache/media-libs/lilv-0.24.12
index dfad6ddaa5b5..384b8cbf3746 100644
--- a/metadata/md5-cache/media-libs/lilv-0.24.12
+++ b/metadata/md5-cache/media-libs/lilv-0.24.12
@@ -5,7 +5,7 @@ DESCRIPTION=Library to make the use of LV2 plugins as simple as possible for app
 EAPI=7
 HOMEPAGE=http://drobilla.net/software/lilv/
 IUSE=doc +dyn-manifest static-libs test python_single_target_python3_8 python_single_target_python3_9 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 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=ISC
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/serd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/sord[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-libs/libsndfile media-libs/lv2[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-libs/sratom[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/lilv-0.24.12.tar.bz2
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
-_md5_=0249bf8f1485558945ab86c9e48579d5
+_md5_=b8c0ff4130143d07a30c1ded26bf2851
diff --git a/metadata/md5-cache/media-libs/lv2-1.18.2 b/metadata/md5-cache/media-libs/lv2-1.18.2
index 7274b19b2bc0..d0ff822fadb1 100644
--- a/metadata/md5-cache/media-libs/lv2-1.18.2
+++ b/metadata/md5-cache/media-libs/lv2-1.18.2
@@ -5,11 +5,11 @@ DESCRIPTION=A simple but extensible successor of LADSPA
 EAPI=7
 HOMEPAGE=https://lv2plug.in/
 IUSE=doc plugins python_single_target_python3_8 python_single_target_python3_9 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 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/rdflib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/rdflib[python_targets_python3_9(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://lv2plug.in/spec/lv2-1.18.2.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
-_md5_=78758fef8d8bb8aa0df52cee31f36c17
+_md5_=f9d7ba94e4a0c88c347e417ed3c23755
diff --git a/metadata/md5-cache/media-libs/munt-mt32emu-2.5.0 b/metadata/md5-cache/media-libs/munt-mt32emu-2.5.0
deleted file mode 100644
index dc8129b5a1fe..000000000000
--- a/metadata/md5-cache/media-libs/munt-mt32emu-2.5.0
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for emulating the Roland MT-32, CM-32L, CM-64 and LAPC-I
-EAPI=7
-HOMEPAGE=https://github.com/munt/munt
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://github.com/munt/munt/archive/libmt32emu_2_5_0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=be8ae507eb7be7028c5fde38ed8d10d9
diff --git a/metadata/md5-cache/media-libs/munt-mt32emu-2.5.3 b/metadata/md5-cache/media-libs/munt-mt32emu-2.5.3
new file mode 100644
index 000000000000..668ccb0a334c
--- /dev/null
+++ b/metadata/md5-cache/media-libs/munt-mt32emu-2.5.3
@@ -0,0 +1,11 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library for emulating the Roland MT-32, CM-32L, CM-64 and LAPC-I
+EAPI=7
+HOMEPAGE=https://github.com/munt/munt
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://github.com/munt/munt/archive/libmt32emu_2_5_3.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=be8ae507eb7be7028c5fde38ed8d10d9
diff --git a/metadata/md5-cache/media-libs/mutagen-1.45.1 b/metadata/md5-cache/media-libs/mutagen-1.45.1
index 6284c97fd4df..00162d47d0d0 100644
--- a/metadata/md5-cache/media-libs/mutagen-1.45.1
+++ b/metadata/md5-cache/media-libs/mutagen-1.45.1
@@ -4,7 +4,7 @@ DESCRIPTION=Audio metadata tag reader and writer implemented in pure Python
 EAPI=7
 HOMEPAGE=https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen/
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/quodlibet/mutagen/releases/download/release-1.45.1/mutagen-1.45.1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3e2fd12d2546252ca898c2ea02e4930e
+_md5_=cba8d913b3dd71fcdea6b3270dfd732b
diff --git a/metadata/md5-cache/media-libs/netpbm-10.86.22 b/metadata/md5-cache/media-libs/netpbm-10.86.22
index a0f8db551603..3fafd2d7d975 100644
--- a/metadata/md5-cache/media-libs/netpbm-10.86.22
+++ b/metadata/md5-cache/media-libs/netpbm-10.86.22
@@ -11,4 +11,4 @@ RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-lib
 SLOT=0
 SRC_URI=https://github.com/ceamac/netpbm-make-dist/releases/download/v10.86.22/netpbm-10.86.22.tar.xz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=80569c3d985ef772127c456647a6e01e
+_md5_=2010c227fd8582891b6c8d42846ffec4
diff --git a/metadata/md5-cache/media-libs/opencv-4.5.2-r1 b/metadata/md5-cache/media-libs/opencv-4.5.2-r1
index 092744dcc396..feb8405543b6 100644
--- a/metadata/md5-cache/media-libs/opencv-4.5.2-r1
+++ b/metadata/md5-cache/media-libs/opencv-4.5.2-r1
@@ -5,11 +5,11 @@ DESCRIPTION=A collection of algorithms and sample code for various computer visi
 EAPI=7
 HOMEPAGE=https://opencv.org
 IUSE=contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine cpu_flags_arm_neon cpu_flags_arm_vfpv3 cpu_flags_ppc_vsx cpu_flags_ppc_vsx3 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c cpu_flags_x86_fma3 cpu_flags_x86_popcnt cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/protobuf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype: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(-)?] media-libs/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg: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(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.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(-)?] media-libs/gst-plugins-base:1.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(-)?] ) gtk3? ( 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(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libdc1394:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.8:* ) 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(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) lapack? ( virtual/cblas virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( <media-libs/openexr-3.0.0: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(-)?] ) opengl? ( virtual/opengl[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/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) python? ( 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(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[opencl=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) threads? ( dev-cpp/tbb[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: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(-)?] ) v4l? ( >=media-libs/libv4l-0.8.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=cpu_flags_x86_avx2? ( cpu_flags_x86_f16c ) cpu_flags_x86_f16c? ( cpu_flags_x86_avx ) cuda? ( tesseract? ( opencl ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) contribovis? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) examples? ( contribdnn ) java? ( python ) opengl? ( qt5 ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) tesseract? ( contrib ) ?? ( gtk3 qt5 )
+REQUIRED_USE=cpu_flags_x86_avx2? ( cpu_flags_x86_f16c ) cpu_flags_x86_f16c? ( cpu_flags_x86_avx ) cuda? ( contrib tesseract? ( opencl ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) contribovis? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) examples? ( contribdnn ) java? ( python ) opengl? ( qt5 ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) tesseract? ( contrib ) ?? ( gtk3 qt5 )
 SLOT=0/4.5.2
 SRC_URI=https://github.com/opencv/opencv/archive/4.5.2.tar.gz -> opencv-4.5.2.tar.gz dnnsamples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> opencv-4.4.0_extdep.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/4.5.2.tar.gz -> opencv-4.5.2_contrib.tar.gz contribdnn? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	ac9fb9efa5413c5fb85a4203fe930e88	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7a544a5196f3367dfe22b9f19dc28025
+_md5_=6708dfdf72127e9112d14dd3900463b4
diff --git a/metadata/md5-cache/media-libs/openexr_ctl-1.0.1-r2 b/metadata/md5-cache/media-libs/openexr_ctl-1.0.1-r2
deleted file mode 100644
index 8314050775b8..000000000000
--- a/metadata/md5-cache/media-libs/openexr_ctl-1.0.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/ilmbase-2.0.1:= >=media-libs/openexr-2.0.1:= media-libs/ctl:= virtual/pkgconfig 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=OpenEXR CTL libraries
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/ampasctl
-IUSE=static-libs
-KEYWORDS=amd64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=AMPAS
-RDEPEND=>=media-libs/ilmbase-2.0.1:= >=media-libs/openexr-2.0.1:= media-libs/ctl:=
-SLOT=0
-SRC_URI=mirror://sourceforge/ampasctl/openexr_ctl-1.0.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0177238c5fba3621adb03e32c040df9d
diff --git a/metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0 b/metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0
index ad02f0df5ada..a378f6a589c6 100644
--- a/metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0
+++ b/metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0
@@ -5,10 +5,10 @@ DESCRIPTION=GStreamer backend for the Phonon multimedia library
 EAPI=7
 HOMEPAGE=https://community.kde.org/Phonon
 IUSE=alsa debug +network debug
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 >=media-libs/phonon-4.10.60 media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] virtual/opengl network? ( media-plugins/gst-plugins-soup:1.0 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/phonon-backend-gstreamer/4.10.0/phonon-backend-gstreamer-4.10.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=90f686d2377461b3779c561bbf665674
+_md5_=585b0d513d54a77c6f8fe2bd34d23568
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-0.11.3-r1 b/metadata/md5-cache/media-libs/phonon-vlc-0.11.3-r1
index 0983cc3e68a6..491385692c13 100644
--- a/metadata/md5-cache/media-libs/phonon-vlc-0.11.3-r1
+++ b/metadata/md5-cache/media-libs/phonon-vlc-0.11.3-r1
@@ -5,10 +5,10 @@ DESCRIPTION=VLC backend for the Phonon multimedia library
 EAPI=7
 HOMEPAGE=https://community.kde.org/Phonon
 IUSE=debug debug
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.11.0 media-video/vlc:=[dbus,ogg,vorbis(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/phonon-backend-vlc/0.11.3/phonon-backend-vlc-0.11.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=faf906514ebb9f87f77c76b4dafe8fe8
+_md5_=55d5d2fb6f1fff0a307589dfcef206d1
diff --git a/metadata/md5-cache/media-libs/rubberband-1.9.2 b/metadata/md5-cache/media-libs/rubberband-1.9.2
index 38f91f376534..6249fe9290e7 100644
--- a/metadata/md5-cache/media-libs/rubberband-1.9.2
+++ b/metadata/md5-cache/media-libs/rubberband-1.9.2
@@ -5,10 +5,10 @@ DESCRIPTION=An audio time-stretching and pitch-shifting library and utility prog
 EAPI=7
 HOMEPAGE=https://www.breakfastquay.com/rubberband/
 IUSE=ladspa jni static-libs +programs vamp 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 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.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(-)?] jni? ( >=virtual/jdk-1.8:* ) ladspa? ( media-libs/ladspa-sdk ) programs? ( media-libs/libsndfile ) vamp? ( media-libs/vamp-plugin-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(-)?] )
 SLOT=0
 SRC_URI=https://breakfastquay.com/files/releases/rubberband-1.9.2.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=61069213440ff15598d005ca7b40e4e5
+_md5_=d22eddb322c823bd36c6a0c69fc06f41
diff --git a/metadata/md5-cache/media-libs/sdl-gfx-2.0.26-r1 b/metadata/md5-cache/media-libs/sdl-gfx-2.0.26-r1
index be1f44d89f4f..05fdc356f00c 100644
--- a/metadata/md5-cache/media-libs/sdl-gfx-2.0.26-r1
+++ b/metadata/md5-cache/media-libs/sdl-gfx-2.0.26-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Graphics drawing primitives library for SDL
 EAPI=7
 HOMEPAGE=http://www.ferzkopp.net/joomla/content/view/19/14/
 IUSE=doc cpu_flags_x86_mmx 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl-1.2.15-r4[video,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/16
 SRC_URI=http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.26.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=37d63fd6194fa1c70b9755e034d51036
+_md5_=4a6cea5f415bd1e16fb18a16f1eabf07
diff --git a/metadata/md5-cache/media-libs/sratom-0.6.8 b/metadata/md5-cache/media-libs/sratom-0.6.8
index 35bbf7c9cc66..fe7b4b9afa2e 100644
--- a/metadata/md5-cache/media-libs/sratom-0.6.8
+++ b/metadata/md5-cache/media-libs/sratom-0.6.8
@@ -5,11 +5,11 @@ DESCRIPTION=Library for serialising LV2 atoms to/from RDF, particularly the Turt
 EAPI=7
 HOMEPAGE=http://drobilla.net/software/sratom/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=ISC
 RDEPEND=dev-libs/serd dev-libs/sord media-libs/lv2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/sratom-0.6.8.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
-_md5_=a037b3b25d5f3c6447338c96c6189bd2
+_md5_=b9a6b94388c32e6e8f58265c38405084
diff --git a/metadata/md5-cache/media-libs/svgalib-1.9.25-r8 b/metadata/md5-cache/media-libs/svgalib-1.9.25-r8
index 7efc2e42ec56..08a5a7f1d720 100644
--- a/metadata/md5-cache/media-libs/svgalib-1.9.25-r8
+++ b/metadata/md5-cache/media-libs/svgalib-1.9.25-r8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=http://www.arava.co.il/matan/svgalib/svgalib-1.9.25.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0a1469c20d656fc8c3b9587a616f4711
diff --git a/metadata/md5-cache/media-libs/tg_owt-0_pre20210626-r1 b/metadata/md5-cache/media-libs/tg_owt-0_pre20210626-r1
index 1173c4b92bd8..a7c60f0db7d3 100644
--- a/metadata/md5-cache/media-libs/tg_owt-0_pre20210626-r1
+++ b/metadata/md5-cache/media-libs/tg_owt-0_pre20210626-r1
@@ -11,4 +11,4 @@ RDEPEND=dev-cpp/abseil-cpp:=[cxx17(+)] dev-libs/libevent:= dev-libs/openssl:= de
 SLOT=0/20210626
 SRC_URI=https://github.com/desktop-app/tg_owt/archive/91d836dc84a16584c6ac52b36c04c0de504d9c34.tar.gz -> tg_owt-0_pre20210626.tar.gz https://archive.org/download/libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar/libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1fc391c17b35b3b7a298d1d627459051
+_md5_=4a41e537913aa5e0c26f4ce9fc31e2b3
diff --git a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.10 b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.10
index 60ef992094c1..5bba393face3 100644
--- a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.10
+++ b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.10
@@ -5,10 +5,10 @@ DESCRIPTION=Audio processing system for plugins to extract information from audi
 EAPI=7
 HOMEPAGE=https://www.vamp-plugins.org
 IUSE=doc 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 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=media-libs/libsndfile: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(-)?]
 SLOT=0
 SRC_URI=https://github.com/c4dm/vamp-plugin-sdk/archive/vamp-plugin-sdk-v2.10.tar.gz -> vamp-plugin-sdk-2.10.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a6f911c0b1e24383866e075cfd2175b3
+_md5_=d8c91ce36bf7b284a8d177ef8026ae60
diff --git a/metadata/md5-cache/media-libs/vidstab-1.1.0-r2 b/metadata/md5-cache/media-libs/vidstab-1.1.0-r2
index 6df9edabcd99..619dd380cef1 100644
--- a/metadata/md5-cache/media-libs/vidstab-1.1.0-r2
+++ b/metadata/md5-cache/media-libs/vidstab-1.1.0-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Video stabilization library
 EAPI=7
 HOMEPAGE=http://public.hronopik.de/vid.stab/
 IUSE=openmp cpu_flags_x86_sse2 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 ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/georgmartius/vid.stab/archive/v1.1.0.tar.gz -> vidstab-1.1.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=53b5956f78f26ca7c49f1fcc04b83d16
+_md5_=83dbd5ff7a9ea6a47d4b00f2afd3d08f
diff --git a/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.3 b/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.3
index 9b73ff7de0b1..7c42ee5342a9 100644
--- a/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.3
+++ b/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.3
@@ -3,9 +3,9 @@ DESCRIPTION=VisualOn AMR-WB encoder library
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/opencore-amr/
 IUSE=examples static-libs 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 ppc ppc64 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/vo-amrwbenc-0.1.3.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4901fb615426437f311982efe78c7160
+_md5_=0d0a76eee0f980bd14d38253825dcc28
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.11 b/metadata/md5-cache/media-libs/xine-lib-1.2.11
index 8c9e51bf1897..491f03b0133b 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.11
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.11
@@ -5,11 +5,11 @@ DESCRIPTION=Core libraries for Xine movie player
 EAPI=7
 HOMEPAGE=http://xine.sourceforge.net/
 IUSE=a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc nls
-KEYWORDS=amd64 arm64 ~hppa ppc ppc64 x86
+KEYWORDS=amd64 arm64 ~hppa ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:0= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:0=[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
 REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
 SLOT=1
 SRC_URI=mirror://sourceforge/xine/xine-lib-1.2.11.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=30e5180f6c7c9bbc1509d5c7cb1e47da
+_md5_=ee17e94e912b9d6d8a151bdd88afb4c2
diff --git a/metadata/md5-cache/media-libs/xvid-1.3.7 b/metadata/md5-cache/media-libs/xvid-1.3.7
index 3766237cbd2a..dcbd394e6afa 100644
--- a/metadata/md5-cache/media-libs/xvid-1.3.7
+++ b/metadata/md5-cache/media-libs/xvid-1.3.7
@@ -5,9 +5,9 @@ DESCRIPTION=High performance/quality MPEG-4 video de-/encoding solution
 EAPI=7
 HOMEPAGE=https://www.xvid.org/
 IUSE=elibc_FreeBSD examples pic +threads 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 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://downloads.xvid.com/downloads/xvidcore-1.3.7.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bdbfe0d02862f7e344a7c3abc7953269
+_md5_=ac850b3eed79a3ea68122bcd5e1b7986
diff --git a/metadata/md5-cache/media-libs/zimg-3.0.2 b/metadata/md5-cache/media-libs/zimg-3.0.2
index 900151315a7f..a5d2f8f12cf2 100644
--- a/metadata/md5-cache/media-libs/zimg-3.0.2
+++ b/metadata/md5-cache/media-libs/zimg-3.0.2
@@ -4,9 +4,9 @@ DESCRIPTION=Scaling, colorspace conversion, and dithering library
 EAPI=7
 HOMEPAGE=https://github.com/sekrit-twc/zimg
 IUSE=debug static-libs 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 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=WTFPL-2
 SLOT=0
 SRC_URI=https://github.com/sekrit-twc/zimg/archive/release-3.0.2.tar.gz -> zimg-3.0.2.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cb6241849ae9cd79b80b0ea9ce3ae025
+_md5_=fb76e221b5649e06d4100a36bdbd0478
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index ef242a1573b8..5cefc3686ded 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/frei0r-plugins-1.7.0 b/metadata/md5-cache/media-plugins/frei0r-plugins-1.7.0
index 9d0e1b9054cc..2ae59f293828 100644
--- a/metadata/md5-cache/media-plugins/frei0r-plugins-1.7.0
+++ b/metadata/md5-cache/media-plugins/frei0r-plugins-1.7.0
@@ -5,10 +5,10 @@ DESCRIPTION=A minimalistic plugin API for video effects
 EAPI=7
 HOMEPAGE=https://www.dyne.org/software/frei0r/
 IUSE=doc +facedetect +scale0tilt 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 ~hppa ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] facedetect? ( >=media-libs/opencv-2.3.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(-)?] ) scale0tilt? ( >=media-libs/gavl-1.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(-)?] )
 SLOT=0
 SRC_URI=https://files.dyne.org/frei0r/releases/frei0r-plugins-1.7.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=61241eac8762e90e616ede25915663a9
+_md5_=e910f159b3c705a456fd928d54e4d0ab
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.18.4
index ad33c9709c99..fd4d564f727e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.18.4
@@ -5,11 +5,11 @@ DESCRIPTION=Calculate Chromaprint fingerprint from audio files for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/chromaprint[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.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(-)?] >=media-libs/gstreamer-1.18:1.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(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=07e8334da2825dc1ae55f7f7a3c58550
+_md5_=6f117fd6418e997fd48a59cfd0f1e02c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.18.4
index 46f7879b5c43..b389e9242a2b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.18.4
@@ -5,11 +5,11 @@ DESCRIPTION=JPEG image encoder/decoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test 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 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jpeg-0-r2: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(-)?] >=dev-libs/glib-2.40.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(-)?] >=media-libs/gstreamer-1.18:1.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(-)?] >=media-libs/gst-plugins-good-1.18.4:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=825de4f049f36a8e15924c9399d852c1
+_md5_=a739fcc1036c7e02616eaa1295fab013
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-webrtc-1.16.3 b/metadata/md5-cache/media-plugins/gst-plugins-webrtc-1.16.3
index 260abfea048f..b855a514e910 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-webrtc-1.16.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-webrtc-1.16.3
@@ -4,11 +4,11 @@ DESCRIPTION=WebRTC plugins for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.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=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.16.3:1.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(-)?] >=media-libs/gst-plugins-bad-1.16.3:1.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(-)?] >=media-libs/webrtc-audio-processing-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(-)?] <media-libs/webrtc-audio-processing-0.4 >=net-libs/libnice-0.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.16.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.3.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=92ec8a16af251282c180e4e87e5b3105
+_md5_=9b3b6e836a3ab3494cd3d17eef6462cd
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.4.0 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.4.0
new file mode 100644
index 000000000000..86e6702ae701
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.4.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19*
+DESCRIPTION=Tvheadend Live TV and Radio PVR client addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.hts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-19*
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/8.4.0-Matrix.tar.gz -> kodi-pvr-hts-8.4.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0274b4aa1c101f5bdf26f9c0adc9830c
diff --git a/metadata/md5-cache/media-plugins/live-2021.05.22 b/metadata/md5-cache/media-plugins/live-2021.05.22
index 00d55bcbc739..6f54ab31ff5a 100644
--- a/metadata/md5-cache/media-plugins/live-2021.05.22
+++ b/metadata/md5-cache/media-plugins/live-2021.05.22
@@ -5,10 +5,10 @@ DESCRIPTION=Libraries for standards-based RTP/RTCP/RTSP multimedia streaming
 EAPI=7
 HOMEPAGE=http://www.live555.com/
 IUSE=ssl
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( dev-libs/openssl:0= )
 SLOT=0/9
 SRC_URI=http://www.live555.com/liveMedia/public/live.2021.05.22.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c95e91ce4b58894bbdc727df2d68d4db
+_md5_=51dd154dbb1ec2ff94bc6b08c193c1ef
diff --git a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r4 b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r4
index 662b1b5cb659..389f924d228c 100644
--- a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r4
+++ b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r4
@@ -4,10 +4,10 @@ DEPEND=dev-libs/libgcrypt:= dev-libs/boost:=[threads(+)] media-video/vdr media-t
 DESCRIPTION=VDR Plugin: Inform about incoming phone-calls and use the fritz!box phonebook
 EAPI=7
 HOMEPAGE=https://github.com/jowi24/vdr-fritz
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libgcrypt:= dev-libs/boost:=[threads(+)] media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/jowi24/vdr-fritz/releases/download/1.5.3/vdr-fritzbox-1.5.3.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ecdc1ac5b1b6ae79fb54ac4d505f8197
+_md5_=1f6f689ba01250fdd521060eee0b049b
diff --git a/metadata/md5-cache/media-plugins/zam-plugins-3.14-r1 b/metadata/md5-cache/media-plugins/zam-plugins-3.14-r1
index fce21a88a8b2..6b190af5b111 100644
--- a/metadata/md5-cache/media-plugins/zam-plugins-3.14-r1
+++ b/metadata/md5-cache/media-plugins/zam-plugins-3.14-r1
@@ -5,9 +5,9 @@ DESCRIPTION=Collection of LV2/LADSPA/VST/JACK audio plugins for high quality pro
 EAPI=8
 HOMEPAGE=http://www.zamaudio.com/ https://github.com/zamaudio/zam-plugins
 IUSE=jack opengl
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+
 RDEPEND=media-libs/ladspa-sdk media-libs/liblo media-libs/libsamplerate media-libs/libsndfile media-libs/lv2 media-libs/zita-convolver sci-libs/fftw:3.0 x11-libs/libX11 jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[X] x11-libs/cairo[X] )
 SLOT=0
 SRC_URI=https://github.com/zamaudio/zam-plugins/archive/refs/tags/3.14.tar.gz -> zam-plugins-3.14.tar.gz https://github.com/DISTRHO/DPF/archive/9243625aacb9fb8dd9fe4bd479b227149eb37959.tar.gz -> DPF-9243625aacb9fb8dd9fe4bd479b227149eb37959.tar.gz
-_md5_=43b3993fed3f5ec887fc6cd49e61f2d0
+_md5_=72b2289edeb3d0ad8fac023dc3ee3fe1
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 406031e3d671..331dc0ce8ac5 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/jack2-1.9.18 b/metadata/md5-cache/media-sound/jack2-1.9.18
deleted file mode 100644
index aca2738dc3a4..000000000000
--- a/metadata/md5-cache/media-sound/jack2-1.9.18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= 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(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-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(-)?] ) ieee1394? ( media-libs/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:* ) opus? ( media-libs/opus[custom-modes,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=Jackdmp jack implemention for multi-processor machine
-EAPI=7
-HOMEPAGE=https://jackaudio.org/
-IUSE=alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile python_single_target_python3_8 python_single_target_python3_9 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=GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= 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(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-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(-)?] ) ieee1394? ( media-libs/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:* ) opus? ( media-libs/opus[custom-modes,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? ( python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit:0
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( classic dbus )
-SLOT=2
-SRC_URI=https://github.com/jackaudio/jack2/archive/v1.9.18/v1.9.18.tar.gz -> jack2-1.9.18.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
-_md5_=eaf91c4f4ec7514673057b0211d591c6
diff --git a/metadata/md5-cache/media-sound/jack2-1.9.19 b/metadata/md5-cache/media-sound/jack2-1.9.19
index 82b43115e0f2..5a85716eb49c 100644
--- a/metadata/md5-cache/media-sound/jack2-1.9.19
+++ b/metadata/md5-cache/media-sound/jack2-1.9.19
@@ -5,11 +5,11 @@ DESCRIPTION=Jackdmp jack implemention for multi-processor machine
 EAPI=7
 HOMEPAGE=https://jackaudio.org/
 IUSE=alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_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
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= 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(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-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(-)?] ) ieee1394? ( media-libs/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:* ) opus? ( media-libs/opus[custom-modes,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? ( python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] ) ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit:0
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( classic dbus )
 SLOT=2
 SRC_URI=https://github.com/jackaudio/jack2/archive/v1.9.19/v1.9.19.tar.gz -> jack2-1.9.19.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
-_md5_=5d32cdae5567a73322f0f51a5ff19a98
+_md5_=12976fb1faebcff477d8ead4fe41736a
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.8.5 b/metadata/md5-cache/media-sound/pulseeffects-4.8.5
deleted file mode 100644
index d6187255a215..000000000000
--- a/metadata/md5-cache/media-sound/pulseeffects-4.8.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=sys-devel/gcc-7.3.0 dev-util/itstool media-libs/libsamplerate virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=!media-sound/easyeffects >=dev-libs/boost-1.72:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.20:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.5:1.0 >=media-libs/gst-plugins-good-1.12.5:1.0 >=media-libs/gst-plugins-bad-1.12.5:1.0 >=media-plugins/gst-plugins-ladspa-1.12.5:1.0 >=media-plugins/gst-plugins-lv2-1.12.5:1.0 >=media-plugins/gst-plugins-pulse-1.12.5:1.0 >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 ) calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) dev-libs/appstream-glib sys-devel/gettext
-DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
-EAPI=7
-HOMEPAGE=https://github.com/wwmm/easyeffects/tree/pulseaudio-legacy
-IUSE=bs2b calf rubberband
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=!media-sound/easyeffects >=dev-libs/boost-1.72:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.20:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.5:1.0 >=media-libs/gst-plugins-good-1.12.5:1.0 >=media-libs/gst-plugins-bad-1.12.5:1.0 >=media-plugins/gst-plugins-ladspa-1.12.5:1.0 >=media-plugins/gst-plugins-lv2-1.12.5:1.0 >=media-plugins/gst-plugins-pulse-1.12.5:1.0 >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 ) calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband )
-SLOT=0
-SRC_URI=https://github.com/wwmm/easyeffects/archive/v4.8.5.tar.gz -> pulseeffects-4.8.5.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=14397167861662b32e2f6323f2433b37
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.8.5-r1 b/metadata/md5-cache/media-sound/pulseeffects-4.8.5-r1
index f2077533e024..6da13c8a732b 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-4.8.5-r1
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.8.5-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects fo
 EAPI=7
 HOMEPAGE=https://github.com/wwmm/easyeffects/tree/pulseaudio-legacy
 IUSE=bs2b calf rnnoise rubberband webrtc zamaudio
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=!media-sound/easyeffects >=dev-libs/boost-1.72:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=media-libs/gstreamer-1.12.5:1.0 media-libs/gst-plugins-base >=media-libs/gst-plugins-bad-1.12.5:1.0 media-libs/libebur128 media-libs/libsndfile >=media-libs/lilv-0.24.2-r1 >=media-libs/zita-convolver-3.0.0 media-sound/pulseaudio >=x11-libs/gtk+-3.20:3 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 ) rnnoise? ( media-libs/rnnoise ) gnome-extra/yelp >=media-libs/gst-plugins-good-1.12.5:1.0 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-plugins/gst-plugins-ladspa-1.12.5:1.0 >=media-plugins/gst-plugins-lv2-1.12.5:1.0 >=media-plugins/gst-plugins-pulse-1.12.5:1.0 sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) rubberband? ( media-libs/rubberband[ladspa] ) webrtc? ( media-plugins/gst-plugins-webrtc ) zamaudio? ( media-plugins/zam-plugins )
 SLOT=0
 SRC_URI=https://github.com/wwmm/easyeffects/archive/v4.8.5.tar.gz -> pulseeffects-4.8.5.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7eefbbe9040f89d37d59807718ec5ab9
+_md5_=ac94166cb4e49aa6c99f14781d95c9d4
diff --git a/metadata/md5-cache/media-sound/rosegarden-21.06 b/metadata/md5-cache/media-sound/rosegarden-21.06
deleted file mode 100644
index e9c0620d7807..000000000000
--- a/metadata/md5-cache/media-sound/rosegarden-21.06
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib:= >=media-libs/dssi-1.0.0:= media-libs/ladspa-sdk:= media-libs/liblo:= media-libs/liblrdf:= media-libs/libsamplerate:= media-libs/libsndfile:= sci-libs/fftw:3.0 sys-libs/zlib:= virtual/jack x11-libs/libSM:= lirc? ( app-misc/lirc:= ) dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=MIDI and audio sequencer and notation editor
-EAPI=7
-HOMEPAGE=https://www.rosegardenmusic.com/
-IUSE=lirc test
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib:= >=media-libs/dssi-1.0.0:= media-libs/ladspa-sdk:= media-libs/liblo:= media-libs/liblrdf:= media-libs/libsamplerate:= media-libs/libsndfile:= sci-libs/fftw:3.0 sys-libs/zlib:= virtual/jack x11-libs/libSM:= lirc? ( app-misc/lirc:= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/rosegarden/rosegarden-21.06.tar.bz2
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=01313cd8e0d87dbb7c045e75be6806c9
diff --git a/metadata/md5-cache/media-sound/rosegarden-21.06.1 b/metadata/md5-cache/media-sound/rosegarden-21.06.1
index 4cc463394c07..b8f70b0e7085 100644
--- a/metadata/md5-cache/media-sound/rosegarden-21.06.1
+++ b/metadata/md5-cache/media-sound/rosegarden-21.06.1
@@ -5,11 +5,11 @@ DESCRIPTION=MIDI and audio sequencer and notation editor
 EAPI=7
 HOMEPAGE=https://www.rosegardenmusic.com/
 IUSE=lirc test
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib:= >=media-libs/dssi-1.0.0:= media-libs/ladspa-sdk:= media-libs/liblo:= media-libs/liblrdf:= media-libs/libsamplerate:= media-libs/libsndfile:= sci-libs/fftw:3.0 sys-libs/zlib:= virtual/jack x11-libs/libSM:= lirc? ( app-misc/lirc:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/rosegarden/rosegarden-21.06.1.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ea4cd95492a4e6d9d89c18ed0a7f75dc
+_md5_=01313cd8e0d87dbb7c045e75be6806c9
diff --git a/metadata/md5-cache/media-sound/tapestrea-0.1.0.5-r1 b/metadata/md5-cache/media-sound/tapestrea-0.1.0.5-r1
deleted file mode 100644
index 220483a6f888..000000000000
--- a/metadata/md5-cache/media-sound/tapestrea-0.1.0.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
-DEFINED_PHASES=compile install prepare setup
-DEPEND=jack? ( media-sound/jack-audio-connection-kit:0 ) alsa? ( >=media-libs/alsa-lib-0.9:0 ) media-libs/libsndfile:0 media-libs/freeglut:0 virtual/opengl:0 virtual/glu:0 x11-libs/gtk+:2
-DESCRIPTION=Expressive Synthesis, Transformation, Rendering of Environmental Audio
-EAPI=7
-HOMEPAGE=http://taps.cs.princeton.edu/
-IUSE=+alsa doc jack oss
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=jack? ( media-sound/jack-audio-connection-kit:0 ) alsa? ( >=media-libs/alsa-lib-0.9:0 ) media-libs/libsndfile:0 media-libs/freeglut:0 virtual/opengl:0 virtual/glu:0 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://taps.cs.princeton.edu/release/files/tapestrea-0.1.0.5.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=68a82d9daec770444003c5979e550f62
diff --git a/metadata/md5-cache/media-sound/wildmidi-0.4.4 b/metadata/md5-cache/media-sound/wildmidi-0.4.4
index 0273fe97868e..123e3c11b73f 100644
--- a/metadata/md5-cache/media-sound/wildmidi-0.4.4
+++ b/metadata/md5-cache/media-sound/wildmidi-0.4.4
@@ -5,11 +5,11 @@ DESCRIPTION=MIDI processing library and player using the GUS patch set
 EAPI=7
 HOMEPAGE=http://www.mindwerks.net/projects/wildmidi/
 IUSE=+alsa openal oss +player
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~hppa ppc ppc64 x86
 LICENSE=GPL-3+ LGPL-3+
 RDEPEND=player? ( alsa? ( media-libs/alsa-lib ) openal? ( media-libs/openal ) ) media-sound/timidity-freepats
 REQUIRED_USE=player? ( ^^ ( alsa oss openal ) )
 SLOT=0
 SRC_URI=https://github.com/Mindwerks/wildmidi/archive/wildmidi-0.4.4.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fea1503057c26ae90b93ebe316913fef
+_md5_=dd366c28b7b9829f26ee6c46ddf91edc
diff --git a/metadata/md5-cache/media-sound/yoshimi-2.1.0 b/metadata/md5-cache/media-sound/yoshimi-2.1.0
new file mode 100644
index 000000000000..e825f7b2d9c6
--- /dev/null
+++ b/metadata/md5-cache/media-sound/yoshimi-2.1.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/mxml media-libs/alsa-lib media-libs/fontconfig media-libs/libsndfile sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/jack x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Software synthesizer based on ZynAddSubFX
+EAPI=7
+HOMEPAGE=https://yoshimi.github.io/
+IUSE=+lv2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/mxml media-libs/alsa-lib media-libs/fontconfig media-libs/libsndfile sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/jack x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
+SLOT=0
+SRC_URI=https://github.com/Yoshimi/yoshimi/archive/2.1.0.tar.gz -> yoshimi-2.1.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d6d8d72fb74aff722e469e3b26334866
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index a565066c32e6..fa9a08fdac62 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.23.6.4881 b/metadata/md5-cache/media-tv/plex-media-server-1.23.6.4881
deleted file mode 100644
index 0173f77b6f03..000000000000
--- a/metadata/md5-cache/media-tv/plex-media-server-1.23.6.4881
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst unpack
-DEPEND=acct-group/plex acct-user/plex
-DESCRIPTION=Free media library that is intended for use with a plex client
-EAPI=7
-HOMEPAGE=https://www.plex.tv/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=Plex
-RDEPEND=acct-group/plex acct-user/plex
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server-new/1.23.6.4881-e2e58f321/debian/plexmediaserver_1.23.6.4881-e2e58f321_amd64.deb ) x86? ( https://downloads.plex.tv/plex-media-server-new/1.23.6.4881-e2e58f321/debian/plexmediaserver_1.23.6.4881-e2e58f321_i386.deb )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=55966d15b8188372dc112a4cbc452fe6
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.24.1.4931 b/metadata/md5-cache/media-tv/plex-media-server-1.24.1.4931
new file mode 100644
index 000000000000..7f794c2dbf32
--- /dev/null
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.24.1.4931
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst unpack
+DEPEND=acct-group/plex acct-user/plex
+DESCRIPTION=Free media library that is intended for use with a plex client
+EAPI=7
+HOMEPAGE=https://www.plex.tv/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Plex
+RDEPEND=acct-group/plex acct-user/plex
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server-new/1.24.1.4931-1a38e63c6/debian/plexmediaserver_1.24.1.4931-1a38e63c6_amd64.deb ) x86? ( https://downloads.plex.tv/plex-media-server-new/1.24.1.4931-1a38e63c6/debian/plexmediaserver_1.24.1.4931-1a38e63c6_i386.deb )
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=68f5879693fb7058f941cc36ede24df1
diff --git a/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r5 b/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r5
index 2778edfb773f..707660a4478c 100644
--- a/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r5
+++ b/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-firmware/tt-s2-6400-firmware kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://bitbucket.org/powARman/v4l-dvb-saa716x/get/83f3bfd93a95.tar.bz2 -> v4l-dvb-saa716x-0.0.1_p20160322.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a54bc9832ce6317f14386111b6aef4b8
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 1b4f4046ab3e..eb1d7c8e0592 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/cheese-3.38.0-r1 b/metadata/md5-cache/media-video/cheese-3.38.0-r1
new file mode 100644
index 000000000000..e56fdbeda665
--- /dev/null
+++ b/metadata/md5-cache/media-video/cheese-3.38.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=gtk-doc? ( dev-util/gtk-doc ) dev-libs/libxslt app-text/docbook-xml-dtd:4.3 dev-util/itstool dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto test? ( x11-libs/libXtst ) || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) app-arch/xz-utils >=dev-util/meson-0.56.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=>=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?] dev-util/desktop-file-utils x11-misc/shared-mime-info
+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
+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_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=01f8556e6ba792a5c0e072a703bf9bbc
diff --git a/metadata/md5-cache/media-video/droidcam-1.8.0 b/metadata/md5-cache/media-video/droidcam-1.8.0
index 6bf8c9a3e612..6bf231cb8de3 100644
--- a/metadata/md5-cache/media-video/droidcam-1.8.0
+++ b/metadata/md5-cache/media-video/droidcam-1.8.0
@@ -11,5 +11,5 @@ RDEPEND=app-pda/libplist app-pda/libusbmuxd dev-libs/glib dev-libs/libappindicat
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dev47apps/droidcam/archive/v1.8.0.tar.gz -> droidcam-1.8.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f215efaa3953b91e0e4f07b50662cd1c
diff --git a/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.2 b/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.2
index 338453cfbe18..06b5bf089d35 100644
--- a/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.2
+++ b/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.2
@@ -5,7 +5,7 @@ DESCRIPTION=Lightweight video thumbnailer that can be used by file managers
 EAPI=7
 HOMEPAGE=https://github.com/dirkvdb/ffmpegthumbnailer
 IUSE=gnome gtk jpeg png test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=gtk? ( dev-libs/glib:2= ) jpeg? ( virtual/jpeg:0= ) >=media-video/ffmpeg-2.7:0= png? ( media-libs/libpng:0= )
 REQUIRED_USE=gnome? ( gtk ) test? ( png jpeg )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/2.2.2/ffmpegthumbnailer-2.2.2.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e8943bf134ef6848bd5941c4fb41ab19
+_md5_=0f26f88026db9b93b859b64ca83251d1
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-57.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-57.0.0
index 042b07883db3..09f21b3b9a54 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-57.0.0
+++ b/metadata/md5-cache/media-video/mkvtoolnix-57.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Tools to create, alter, and inspect Matroska files
 EAPI=7
 HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix
 IUSE=dbus debug dvd nls pch qt5 test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.60:= >=dev-libs/libebml-1.4.0:= >=dev-libs/libfmt-6.1.0:= dev-libs/libpcre2:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib dvd? ( media-libs/libdvdread:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-57.0.0.tar.xz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0f5fb98f8eda1d55061ee1406700f134
+_md5_=923305a83c81c0fdc38c6fcc3475480d
diff --git a/metadata/md5-cache/media-video/oxine-0.7.1-r3 b/metadata/md5-cache/media-video/oxine-0.7.1-r3
deleted file mode 100644
index 2cac3f6978ba..000000000000
--- a/metadata/md5-cache/media-video/oxine-0.7.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/libcdio media-libs/xine-lib[v4l?,X,imagemagick] curl? ( net-misc/curl ) dvb? ( media-libs/xine-lib[v4l] ) joystick? ( media-libs/libjsw ) jpeg? ( media-gfx/imagemagick media-libs/netpbm[jpeg,zlib] media-video/mjpegtools ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl sys-devel/gettext ) png? ( media-gfx/imagemagick media-libs/netpbm[png,zlib] media-video/mjpegtools ) X? ( x11-libs/libXext x11-libs/libX11 ) virtual/pkgconfig
-DESCRIPTION=OSD frontend for Xine
-EAPI=6
-HOMEPAGE=http://oxine.sourceforge.net/
-IUSE=curl debug dvb exif joystick jpeg lirc nls png v4l X
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libcdio media-libs/xine-lib[v4l?,X,imagemagick] curl? ( net-misc/curl ) dvb? ( media-libs/xine-lib[v4l] ) joystick? ( media-libs/libjsw ) jpeg? ( media-gfx/imagemagick media-libs/netpbm[jpeg,zlib] media-video/mjpegtools ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl sys-devel/gettext ) png? ( media-gfx/imagemagick media-libs/netpbm[png,zlib] media-video/mjpegtools ) X? ( x11-libs/libXext x11-libs/libX11 ) sys-apps/util-linux
-SLOT=0
-SRC_URI=mirror://sourceforge/oxine/oxine-0.7.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=182712a7d4a65bedbdf7d3de17c0b7f8
diff --git a/metadata/md5-cache/media-video/oxine-0.7.1-r4 b/metadata/md5-cache/media-video/oxine-0.7.1-r4
new file mode 100644
index 000000000000..8320c2b3cab0
--- /dev/null
+++ b/metadata/md5-cache/media-video/oxine-0.7.1-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/libcdio media-libs/xine-lib[v4l?,X,imagemagick] virtual/libcrypt:= curl? ( net-misc/curl ) dvb? ( media-libs/xine-lib[v4l] ) joystick? ( media-libs/libjsw ) jpeg? ( media-gfx/imagemagick media-libs/netpbm[jpeg,zlib] media-video/mjpegtools ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl sys-devel/gettext ) png? ( media-gfx/imagemagick media-libs/netpbm[png,zlib] media-video/mjpegtools ) X? ( x11-libs/libXext x11-libs/libX11 ) virtual/pkgconfig
+DESCRIPTION=OSD frontend for Xine
+EAPI=6
+HOMEPAGE=http://oxine.sourceforge.net/
+IUSE=curl debug dvb exif joystick jpeg lirc nls png v4l X
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libcdio media-libs/xine-lib[v4l?,X,imagemagick] virtual/libcrypt:= curl? ( net-misc/curl ) dvb? ( media-libs/xine-lib[v4l] ) joystick? ( media-libs/libjsw ) jpeg? ( media-gfx/imagemagick media-libs/netpbm[jpeg,zlib] media-video/mjpegtools ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl sys-devel/gettext ) png? ( media-gfx/imagemagick media-libs/netpbm[png,zlib] media-video/mjpegtools ) X? ( x11-libs/libXext x11-libs/libX11 ) sys-apps/util-linux
+SLOT=0
+SRC_URI=mirror://sourceforge/oxine/oxine-0.7.1.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=75d6a2ebccea3175385de97f86d07e00
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.33 b/metadata/md5-cache/media-video/pipewire-0.3.33
new file mode 100644
index 000000000000..c43e4068ec4f
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.33
@@ -0,0 +1,16 @@
+BDEPEND=app-doc/xmltoman virtual/pkgconfig || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=acct-group/audio media-libs/alsa-lib 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(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[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/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[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/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-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(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+DESCRIPTION=Multimedia processing graphs
+EAPI=7
+HOMEPAGE=https://pipewire.org/
+IUSE=bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l 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 ~riscv ~x86
+LICENSE=MIT LGPL-2.1+ GPL-2
+RDEPEND=acct-group/audio media-libs/alsa-lib 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(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[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/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[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/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-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(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+REQUIRED_USE=jack-sdk? ( !jack-client )
+RESTRICT=!test? ( test )
+SLOT=0/0.3
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.33/pipewire-0.3.33.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490
+_md5_=e619c1b3c761cb3a8dbf7bf89a20f762
diff --git a/metadata/md5-cache/media-video/pipewire-9999 b/metadata/md5-cache/media-video/pipewire-9999
index 7ad69663b8f3..4c5a4c9c9fee 100644
--- a/metadata/md5-cache/media-video/pipewire-9999
+++ b/metadata/md5-cache/media-video/pipewire-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=jack-sdk? ( !jack-client )
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490
-_md5_=8c61e3b60c33387a178d651f46fc40f6
+_md5_=97a84b24d4d3b853fa79814746a5d809
diff --git a/metadata/md5-cache/media-video/qmplay2-21.06.07-r2 b/metadata/md5-cache/media-video/qmplay2-21.06.07-r2
new file mode 100644
index 000000000000..14f657803be5
--- /dev/null
+++ b/metadata/md5-cache/media-video/qmplay2-21.06.07-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 media-libs/taglib ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] x11-libs/libva[drm,opengl] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A Qt-based video player, which can play most formats and codecs
+EAPI=7
+HOMEPAGE=https://github.com/zaps166/QMPlay2
+IUSE=avdevice +audiofilters +alsa cdio cuvid dbus extensions gme inputs libass modplug notifications opengl pipewire portaudio pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 media-libs/taglib ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] x11-libs/libva[drm,opengl] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
+REQUIRED_USE=audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) shaders? ( vulkan )
+SLOT=0
+SRC_URI=https://github.com/zaps166/QMPlay2/releases/download/21.06.07/QMPlay2-src-21.06.07.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9d7be265836770f1365156d19ebbffbc
diff --git a/metadata/md5-cache/media-video/qmplay2-9999 b/metadata/md5-cache/media-video/qmplay2-9999
index 66c8db8a447b..0ef7f30f6377 100644
--- a/metadata/md5-cache/media-video/qmplay2-9999
+++ b/metadata/md5-cache/media-video/qmplay2-9999
@@ -11,4 +11,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 m
 REQUIRED_USE=audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) extensions? ( dbus ) shaders? ( vulkan )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a138106c514968865f63835ee3041402
+_md5_=66a7e8e8e0664718ca7ebf58198c746e
diff --git a/metadata/md5-cache/media-video/v4l2loopback-0.12.5-r1 b/metadata/md5-cache/media-video/v4l2loopback-0.12.5-r1
index 6575e00647fd..3208b2a55b4f 100644
--- a/metadata/md5-cache/media-video/v4l2loopback-0.12.5-r1
+++ b/metadata/md5-cache/media-video/v4l2loopback-0.12.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/umlaeute/v4l2loopback/archive/v0.12.5.tar.gz -> v4l2loopback-0.12.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=02b5be053888965f1a563550b8dbc2b8
diff --git a/metadata/md5-cache/media-video/v4l2loopback-9999 b/metadata/md5-cache/media-video/v4l2loopback-9999
index d48fb71ca2f1..769eb04b5d54 100644
--- a/metadata/md5-cache/media-video/v4l2loopback-9999
+++ b/metadata/md5-cache/media-video/v4l2loopback-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a6ecaa2e45e1b12c27631cea813a6698
diff --git a/metadata/md5-cache/media-video/vcdimager-2.0.1 b/metadata/md5-cache/media-video/vcdimager-2.0.1
index 33880b056f9a..da313807ab8b 100644
--- a/metadata/md5-cache/media-video/vcdimager-2.0.1
+++ b/metadata/md5-cache/media-video/vcdimager-2.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=GNU VCDimager
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/vcdimager/
 IUSE=static-libs +xml 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 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libcdio-2.0.0:0=[-minimal,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt xml? ( dev-libs/libxml2:2 )
 SLOT=0
 SRC_URI=mirror://gnu/vcdimager/vcdimager-2.0.1.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f901d6eac59cb2472eab66648fbeded3
+_md5_=ef041ede9a588905f3ca26ef795abe78
diff --git a/metadata/md5-cache/media-video/vlc-3.0.14-r6 b/metadata/md5-cache/media-video/vlc-3.0.14-r6
index 23a248f02d2f..5ad262de13cb 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.14-r6
+++ b/metadata/md5-cache/media-video/vlc-3.0.14-r6
@@ -5,7 +5,7 @@ DESCRIPTION=Media player and framework with support for most multimedia files an
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +lua_single_target_lua5-1 test
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 -sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 -sparc x86
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5-9
 SRC_URI=https://code.videolan.org/videolan/vlc-3.0/-/archive/3.0.14/vlc-3.0-3.0.14.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	8cdf449259063fc54bf347db93744d1f	lua-utils	af986d19619f43dc53862da0d25b9c2e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=47ddb26eefc00b4dabaa1fc5b35ff11a
+_md5_=f6a39f63dd338d0cf7fca0ba9fc1d04b
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index fde7c0fc2766..ba90ce8e0a3a 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/cacti-1.2.17 b/metadata/md5-cache/net-analyzer/cacti-1.2.17
index ae4d04c951ae..02b2d36be983 100644
--- a/metadata/md5-cache/net-analyzer/cacti-1.2.17
+++ b/metadata/md5-cache/net-analyzer/cacti-1.2.17
@@ -4,10 +4,10 @@ DESCRIPTION=Cacti is a complete frontend to rrdtool
 EAPI=7
 HOMEPAGE=https://www.cacti.net/
 IUSE=snmp doc vhosts
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[cli,mysql,pdo,session,sockets,xml] dev-php/adodb net-analyzer/rrdtool[graph] virtual/cron snmp? ( >=net-analyzer/net-snmp-5.2.0 ) >=app-admin/webapp-config-1.50.15
 SLOT=1.2.17
 SRC_URI=https://www.cacti.net/downloads/cacti-1.2.17.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=1d965f7b50cf7f380fbf20e41e901527
+_md5_=8ceb8d864857e27600aa67c72c0e3e95
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.17 b/metadata/md5-cache/net-analyzer/cacti-spine-1.2.17
index 1b8731aadca8..75b4632b6e06 100644
--- a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.17
+++ b/metadata/md5-cache/net-analyzer/cacti-spine-1.2.17
@@ -4,10 +4,10 @@ DEPEND=dev-libs/openssl:0= net-analyzer/net-snmp:= dev-db/mysql-connector-c:0=
 DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
 EAPI=7
 HOMEPAGE=https://cacti.net/spine_info.php
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/openssl:0= net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= >net-analyzer/cacti-0.8.8
 SLOT=0
 SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.2.17.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f6e235434edbd758505f4d2896040eb5
+_md5_=4bf614edd1b8fb37bc0a0c60d836afc0
diff --git a/metadata/md5-cache/net-analyzer/suricata-6.0.3 b/metadata/md5-cache/net-analyzer/suricata-6.0.3
index 1fe0d970a4ce..4d60a6919e62 100644
--- a/metadata/md5-cache/net-analyzer/suricata-6.0.3
+++ b/metadata/md5-cache/net-analyzer/suricata-6.0.3
@@ -5,7 +5,7 @@ DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring en
 EAPI=7
 HOMEPAGE=https://suricata.io/
 IUSE=+af-packet bpf control-socket cuda debug +detection geoip hardened lua lz4 nflog +nfqueue redis systemd test kernel_linux lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) >=net-libs/libhtp-0.5.38 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) virtual/tmpfiles
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) bpf? ( af-packet ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://www.openinfosecfoundation.org/download/suricata-6.0.3.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	8cdf449259063fc54bf347db93744d1f	lua-utils	af986d19619f43dc53862da0d25b9c2e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7ad08051277d9305741123aecf593c9a
+_md5_=8fe246b9bd17fdda2ff4ffc054a3eb1e
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index bc1ba9eac841..24118dcbf33a 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430 b/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430
index 15a352d4e5a8..9e90cb45c0eb 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430
+++ b/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430
@@ -12,5 +12,5 @@ RDEPEND=!libtomcrypt? ( dev-libs/openssl:0= ) libtomcrypt? ( dev-libs/libtomcryp
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) valgrind? ( debug )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/accel-ppp-1.12.0_p20210430.tar.bz2
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	lua-single	8cdf449259063fc54bf347db93744d1f	lua-utils	af986d19619f43dc53862da0d25b9c2e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	lua-single	8cdf449259063fc54bf347db93744d1f	lua-utils	af986d19619f43dc53862da0d25b9c2e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=aef4e5fb05bdef9f66608ed0ee59ecc5
diff --git a/metadata/md5-cache/net-dialup/accel-ppp-9999 b/metadata/md5-cache/net-dialup/accel-ppp-9999
index 7f6862387118..738024967f81 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-9999
+++ b/metadata/md5-cache/net-dialup/accel-ppp-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=!libtomcrypt? ( dev-libs/openssl:0= ) libtomcrypt? ( dev-libs/libtomcrypt:0= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) postgres? ( dev-db/postgresql:* ) snmp? ( net-analyzer/net-snmp ) dev-libs/libpcre kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) valgrind? ( debug )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	lua-single	8cdf449259063fc54bf347db93744d1f	lua-utils	af986d19619f43dc53862da0d25b9c2e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	lua-single	8cdf449259063fc54bf347db93744d1f	lua-utils	af986d19619f43dc53862da0d25b9c2e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3dbd579a08de4016eec7369a579625e1
diff --git a/metadata/md5-cache/net-dialup/freeradius-client-1.1.7-r1 b/metadata/md5-cache/net-dialup/freeradius-client-1.1.7-r1
deleted file mode 100644
index a8d17e58c256..000000000000
--- a/metadata/md5-cache/net-dialup/freeradius-client-1.1.7-r1
+++ /dev/null
@@ -1,14 +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
-DEFINED_PHASES=configure install prepare
-DEPEND=!net-dialup/radiusclient-ng
-DESCRIPTION=FreeRADIUS Client framework
-EAPI=7
-HOMEPAGE=https://wiki.freeradius.org/project/Radiusclient
-IUSE=scp shadow static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=BSD
-RDEPEND=!net-dialup/radiusclient-ng
-SLOT=0
-SRC_URI=ftp://ftp.freeradius.org/pub/freeradius/freeradius-client-1.1.7.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=972b851ccfa5ab6b35977ee90582a7ac
diff --git a/metadata/md5-cache/net-dialup/freeradius-client-1.1.7-r2 b/metadata/md5-cache/net-dialup/freeradius-client-1.1.7-r2
new file mode 100644
index 000000000000..443166e56239
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/freeradius-client-1.1.7-r2
@@ -0,0 +1,14 @@
+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
+DEFINED_PHASES=configure install prepare
+DEPEND=!net-dialup/radiusclient-ng virtual/libcrypt:=
+DESCRIPTION=FreeRADIUS Client framework
+EAPI=7
+HOMEPAGE=https://wiki.freeradius.org/project/Radiusclient
+IUSE=scp shadow static-libs
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+LICENSE=BSD
+RDEPEND=!net-dialup/radiusclient-ng virtual/libcrypt:=
+SLOT=0
+SRC_URI=ftp://ftp.freeradius.org/pub/freeradius/freeradius-client-1.1.7.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2848628d5fe26148df49b8fa260eeb7f
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 57f1f3c4be51..5db20f6c856e 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/unbound-1.13.2 b/metadata/md5-cache/net-dns/unbound-1.13.2
new file mode 100644
index 000000000000..acb83cb5393a
--- /dev/null
+++ b/metadata/md5-cache/net-dns/unbound-1.13.2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig 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=compile configure install postinst prepare setup test
+DEPEND=acct-group/unbound acct-user/unbound >=dev-libs/expat-2.1.0-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(-)?] >=dev-libs/libevent-2.0.21: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(-)?] >=dev-libs/openssl-1.0.1h-r2: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(-)?] dnscrypt? ( dev-libs/libsodium:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-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(-)?] ) ecdsa? ( dev-libs/openssl:0[-bindist(-)] ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( 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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) redis? ( dev-libs/hiredis:= ) python? ( dev-lang/swig ) test? ( net-dns/ldns-utils[examples] dev-util/splint app-text/wdiff ) systemd? ( sys-apps/systemd )
+DESCRIPTION=A validating, recursive and caching DNS resolver
+EAPI=8
+HOMEPAGE=https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/
+IUSE=debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=BSD GPL-2
+RDEPEND=acct-group/unbound acct-user/unbound >=dev-libs/expat-2.1.0-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(-)?] >=dev-libs/libevent-2.0.21: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(-)?] >=dev-libs/openssl-1.0.1h-r2: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(-)?] dnscrypt? ( dev-libs/libsodium:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-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(-)?] ) ecdsa? ( dev-libs/openssl:0[-bindist(-)] ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( 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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=!test? ( test )
+SLOT=0/8
+SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.13.2.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5ceb47af3ae5b092b51637e1f0530378
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 3cb5c714775c..10a837e2ece8 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/ebtables-2.0.11-r3 b/metadata/md5-cache/net-firewall/ebtables-2.0.11-r3
index 68e5ccf3057b..51e10ffb98ec 100644
--- a/metadata/md5-cache/net-firewall/ebtables-2.0.11-r3
+++ b/metadata/md5-cache/net-firewall/ebtables-2.0.11-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Controls Ethernet frame filtering on a Linux bridge, MAC NAT and bro
 EAPI=7
 HOMEPAGE=https://ebtables.netfilter.org/
 IUSE=+perl static
-KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-iptables-20200508 perl? ( dev-lang/perl ) net-misc/ethertypes
 SLOT=0
 SRC_URI=http://ftp.netfilter.org/pub/ebtables/ebtables-2.0.11.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=948d1a4a3b684e65e41077f57f0f2372
+_md5_=3905415e15b687b43d97dac36c81a6e6
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.9.3-r1 b/metadata/md5-cache/net-firewall/firewalld-0.9.3-r1
index e7a8c6c00712..3495869295ba 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.9.3-r1
+++ b/metadata/md5-cache/net-firewall/firewalld-0.9.3-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A firewall daemon with D-BUS interface providing a dynamic firewall
 EAPI=7
 HOMEPAGE=http://www.firewalld.org/
 IUSE=gui +nftables +iptables kernel_linux python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=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] ) !!net-firewall/gshield nftables? ( net-firewall/nftables[python,json] ) iptables? ( net-firewall/iptables[ipv6] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/decorator[python_targets_python3_8(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/decorator[python_targets_python3_9(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/firewalld/firewalld/archive/v0.9.3.tar.gz -> firewalld-0.9.3.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=213c94b88124e17fd5a1b7c6ebd6225f
+_md5_=ce140c2c7ff69534eaf5f71a019e8d13
diff --git a/metadata/md5-cache/net-firewall/ipset-7.11-r1 b/metadata/md5-cache/net-firewall/ipset-7.11-r1
index 00daee20ed79..9010620fabfe 100644
--- a/metadata/md5-cache/net-firewall/ipset-7.11-r1
+++ b/metadata/md5-cache/net-firewall/ipset-7.11-r1
@@ -5,10 +5,10 @@ DESCRIPTION=IPset tool for iptables, successor to ippool
 EAPI=7
 HOMEPAGE=https://ipset.netfilter.org/
 IUSE=kernel_linux kernel_linux kernel_linux dist-kernel modules
-KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl:= modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://ipset.netfilter.org/ipset-7.11.tar.bz2
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4760feb68b48d34123092b6239aefa2f
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fd251eec5abf386451d7cb839fc131de
diff --git a/metadata/md5-cache/net-firewall/ipset-7.15 b/metadata/md5-cache/net-firewall/ipset-7.15
new file mode 100644
index 000000000000..f33a9aae84f3
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/ipset-7.15
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig 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=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl:= modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=IPset tool for iptables, successor to ippool
+EAPI=7
+HOMEPAGE=https://ipset.netfilter.org/
+IUSE=kernel_linux kernel_linux kernel_linux dist-kernel modules
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl:= modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
+SLOT=0
+SRC_URI=https://ipset.netfilter.org/ipset-7.15.tar.bz2
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8b05bb81c5b368657fbfd25eb459d7a6
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-2.6 b/metadata/md5-cache/net-firewall/ipt_netflow-2.6
index c953f7f82f00..ec6948fea516 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.6
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-2.6
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/aabc/ipt-netflow/archive/v2.6.tar.gz -> ipt_netflow-2.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=89b0918337a2a84b07332ac17c770527
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-9999 b/metadata/md5-cache/net-firewall/ipt_netflow-9999
index 52b1a2eae57c..ce6bb414d380 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-9999
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=49f9591580f69903667cee4ce153bde7
diff --git a/metadata/md5-cache/net-firewall/nftables-1.0.0 b/metadata/md5-cache/net-firewall/nftables-1.0.0
new file mode 100644
index 000000000000..75976a5fb661
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/nftables-1.0.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-text/asciidoc >=app-text/docbook2X-0.8.8-r4 ) virtual/pkgconfig 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=compile configure install postinst prepare setup
+DEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.0:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) readline? ( sys-libs/readline:0= ) xtables? ( >=net-firewall/iptables-1.6.1 )
+DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
+EAPI=7
+HOMEPAGE=https://netfilter.org/projects/nftables/
+IUSE=debug doc +gmp json libedit +modern-kernel python +readline static-libs xtables kernel_linux python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.0:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) readline? ( sys-libs/readline:0= ) xtables? ( >=net-firewall/iptables-1.6.1 )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) libedit? ( !readline )
+SLOT=0/1
+SRC_URI=https://netfilter.org/projects/nftables/files/nftables-1.0.0.tar.bz2
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9f94c8569f50d57081c7d452dbcc21f4
diff --git a/metadata/md5-cache/net-firewall/nftables-9999 b/metadata/md5-cache/net-firewall/nftables-9999
index b9b93100b950..b5cfeef63344 100644
--- a/metadata/md5-cache/net-firewall/nftables-9999
+++ b/metadata/md5-cache/net-firewall/nftables-9999
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/bison sys-devel/flex doc? ( app-text/asciidoc >=app-text/docbook2X-0.8.8-r4 ) virtual/pkgconfig 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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.1.9:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) readline? ( sys-libs/readline:0= ) xtables? ( >=net-firewall/iptables-1.6.1 )
+DEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.0:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) readline? ( sys-libs/readline:0= ) xtables? ( >=net-firewall/iptables-1.6.1 )
 DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
 EAPI=7
 HOMEPAGE=https://netfilter.org/projects/nftables/
 IUSE=debug doc +gmp json libedit +modern-kernel python +readline static-libs xtables kernel_linux python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.1.9:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) readline? ( sys-libs/readline:0= ) xtables? ( >=net-firewall/iptables-1.6.1 )
+RDEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.0:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) readline? ( sys-libs/readline:0= ) xtables? ( >=net-firewall/iptables-1.6.1 )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) libedit? ( !readline )
 SLOT=0/1
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=011b1e251dc7134cfd4ce097d678b7dc
+_md5_=9f94c8569f50d57081c7d452dbcc21f4
diff --git a/metadata/md5-cache/net-firewall/rtsp-conntrack-5.3 b/metadata/md5-cache/net-firewall/rtsp-conntrack-5.3
index 217f68352387..f002d33fde14 100644
--- a/metadata/md5-cache/net-firewall/rtsp-conntrack-5.3
+++ b/metadata/md5-cache/net-firewall/rtsp-conntrack-5.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/maru-sama/rtsp-linux/archive/5.3.tar.gz -> rtsp-conntrack-5.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fcadb9d967f4d32041f708bee83655ae
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.13 b/metadata/md5-cache/net-firewall/xtables-addons-3.13
index 04b514d6d102..22957d32ec4f 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.13
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Net-CIDR-Lite dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://inai.de/files/xtables-addons/xtables-addons-3.13.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bfc52e2192755aacf546455ca8e360c9
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.18 b/metadata/md5-cache/net-firewall/xtables-addons-3.18
index 4816ac161017..55631099be4c 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.18
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Net-CIDR-Lite dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://inai.de/files/xtables-addons/xtables-addons-3.18.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ed99e5010d70e6e5446bbd39e13b3919
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index aa18680e3d26..d929a1c5d597 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/cifs-utils-6.11 b/metadata/md5-cache/net-fs/cifs-utils-6.11
deleted file mode 100644
index 3ebad1476c2c..000000000000
--- a/metadata/md5-cache/net-fs/cifs-utils-6.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/docutils 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
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=!net-fs/mount-cifs sys-apps/keyutils:= ads? ( sys-libs/talloc virtual/krb5 ) caps? ( sys-libs/libcap-ng ) pam? ( sys-libs/pam )
-DESCRIPTION=Tools for Managing Linux CIFS Client Filesystems
-EAPI=7
-HOMEPAGE=https://wiki.samba.org/index.php/LinuxCIFS_utils
-IUSE=+acl +ads +caps creds pam systemd kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux
-LICENSE=GPL-3
-PDEPEND=acl? ( >=net-fs/samba-4.0.0_alpha1 )
-RDEPEND=!net-fs/mount-cifs sys-apps/keyutils:= ads? ( sys-libs/talloc virtual/krb5 ) caps? ( sys-libs/libcap-ng ) pam? ( sys-libs/pam )
-REQUIRED_USE=acl? ( ads )
-SLOT=0
-SRC_URI=https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-6.11.tar.bz2
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=225ef0bc010017fc2bb2aaf2b13fbf6b
diff --git a/metadata/md5-cache/net-fs/cifs-utils-6.13-r1 b/metadata/md5-cache/net-fs/cifs-utils-6.13-r1
index 57b019d54f32..00ab4617c9d8 100644
--- a/metadata/md5-cache/net-fs/cifs-utils-6.13-r1
+++ b/metadata/md5-cache/net-fs/cifs-utils-6.13-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Tools for Managing Linux CIFS Client Filesystems
 EAPI=7
 HOMEPAGE=https://wiki.samba.org/index.php/LinuxCIFS_utils
 IUSE=+acl +ads +caps creds pam systemd kernel_linux python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
 LICENSE=GPL-3
 PDEPEND=acl? ( >=net-fs/samba-4.0.0_alpha1 )
 RDEPEND=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] ) !net-fs/mount-cifs sys-apps/keyutils:= ads? ( sys-libs/talloc virtual/krb5 ) caps? ( sys-libs/libcap-ng ) pam? ( sys-libs/pam )
@@ -13,4 +13,4 @@ REQUIRED_USE=acl? ( ads ) ^^ ( python_single_target_python3_8 python_single_targ
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-6.13.tar.bz2 https://dev.gentoo.org/~polynomial-c/cifs-utils-6.13-kerberos_mount_regression_fix.patch.xz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=50a5974f520a7c73f06ea829f5f58e60
+_md5_=66482a021f8e2d499e34af14da9bc492
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.7.3 b/metadata/md5-cache/net-fs/cvmfs-2.7.3
deleted file mode 100644
index 4d39a5feefbb..000000000000
--- a/metadata/md5-cache/net-fs/cvmfs-2.7.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile config configure install prepare setup test
-DEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= dev-libs/leveldb:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= virtual/pkgconfig doc? ( app-doc/doxygen[dot] )
-DESCRIPTION=HTTP read-only file system for distributing software
-EAPI=7
-HOMEPAGE=https://cernvm.cern.ch/fs/
-IUSE=doc server kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= dev-libs/leveldb:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= app-admin/sudo net-fs/autofs
-SLOT=0
-SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.7.3/source.tar.gz -> cvmfs-2.7.3.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=18161a6aeb1e42293bb91404dcb019c6
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.7.3-r1 b/metadata/md5-cache/net-fs/cvmfs-2.7.3-r1
new file mode 100644
index 000000000000..cd30aa962b7c
--- /dev/null
+++ b/metadata/md5-cache/net-fs/cvmfs-2.7.3-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile config configure install prepare setup test
+DEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= <dev-libs/leveldb-1.23:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= virtual/pkgconfig doc? ( app-doc/doxygen[dot] )
+DESCRIPTION=HTTP read-only file system for distributing software
+EAPI=7
+HOMEPAGE=https://cernvm.cern.ch/fs/
+IUSE=doc server kernel_linux
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= <dev-libs/leveldb-1.23:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= app-admin/sudo net-fs/autofs
+SLOT=0
+SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.7.3/source.tar.gz -> cvmfs-2.7.3.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=efb90daebb1b214c94d13016ce22e160
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.8.1 b/metadata/md5-cache/net-fs/cvmfs-2.8.1
deleted file mode 100644
index 3fd04b985900..000000000000
--- a/metadata/md5-cache/net-fs/cvmfs-2.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile config configure install prepare setup test
-DEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= dev-libs/leveldb:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= virtual/pkgconfig
-DESCRIPTION=HTTP read-only file system for distributing software
-EAPI=7
-HOMEPAGE=https://cernvm.cern.ch/fs/
-IUSE=server kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= dev-libs/leveldb:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= app-admin/sudo net-fs/autofs
-SLOT=0
-SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.8.1/source.tar.gz -> cvmfs-2.8.1.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=35ca3f571befe5270fcbc0adf80ed672
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.8.1-r1 b/metadata/md5-cache/net-fs/cvmfs-2.8.1-r1
new file mode 100644
index 000000000000..5471895a33b4
--- /dev/null
+++ b/metadata/md5-cache/net-fs/cvmfs-2.8.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile config configure install prepare setup test
+DEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= <dev-libs/leveldb-1.23:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= virtual/pkgconfig
+DESCRIPTION=HTTP read-only file system for distributing software
+EAPI=7
+HOMEPAGE=https://cernvm.cern.ch/fs/
+IUSE=server kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= <dev-libs/leveldb-1.23:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= app-admin/sudo net-fs/autofs
+SLOT=0
+SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.8.1/source.tar.gz -> cvmfs-2.8.1.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=66452b728fba67b0818cf1db8d18e93c
diff --git a/metadata/md5-cache/net-fs/openafs-1.8.7 b/metadata/md5-cache/net-fs/openafs-1.8.7
index a07bc1193071..7aecfc5f7160 100644
--- a/metadata/md5-cache/net-fs/openafs-1.8.7
+++ b/metadata/md5-cache/net-fs/openafs-1.8.7
@@ -5,10 +5,10 @@ DESCRIPTION=The OpenAFS distributed file system
 EAPI=7
 HOMEPAGE=https://www.openafs.org/
 IUSE=apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write kernel_linux kernel_linux dist-kernel modules
-KEYWORDS=amd64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 -riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=IBM BSD openafs-krb5-a APSL-2
 RDEPEND=!net-fs/openafs-kernel virtual/libintl amd64? ( tsm? ( app-backup/tsm ) ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 ) fuse? ( sys-fs/fuse:0= ) kauth? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://openafs.org/dl/openafs/1.8.7/openafs-1.8.7-src.tar.bz2 https://openafs.org/dl/openafs/1.8.7/openafs-1.8.7-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20210116.tar.xz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=508237a0ef8b0699fc1c97b29ec7e404
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=68eb8364c85a0732d770855a425dc2d2
diff --git a/metadata/md5-cache/net-fs/samba-4.14.7 b/metadata/md5-cache/net-fs/samba-4.14.7
new file mode 100644
index 000000000000..cb312d545702
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.14.7
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.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(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.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(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.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(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[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/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( !riscv? ( sys-libs/libunwind:= ) ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=7
+HOMEPAGE=https://samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.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(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.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(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.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(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[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/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( !riscv? ( sys-libs/libunwind:= ) ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) ntvfs? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.14.7.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c584a5e306ac47ae820f7d975eeee93d
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 761be5885741..f5766f61480d 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/ftpbase-0.01-r4 b/metadata/md5-cache/net-ftp/ftpbase-0.01-r4
deleted file mode 100644
index 449e26484809..000000000000
--- a/metadata/md5-cache/net-ftp/ftpbase-0.01-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=pam? ( sys-libs/pam ) !<net-ftp/proftpd-1.2.10-r6 !<net-ftp/pure-ftpd-1.0.20-r2 !<net-ftp/vsftpd-2.0.3-r1
-DESCRIPTION=FTP layout package
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=pam
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=acct-group/ftp acct-user/ftp
-SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f64ebf4c0d3ddc588b47cb22a3f7406a
diff --git a/metadata/md5-cache/net-ftp/ftpbase-0.01-r5 b/metadata/md5-cache/net-ftp/ftpbase-0.01-r5
index ef4c3b62b6c6..c9242afa4943 100644
--- a/metadata/md5-cache/net-ftp/ftpbase-0.01-r5
+++ b/metadata/md5-cache/net-ftp/ftpbase-0.01-r5
@@ -4,9 +4,9 @@ DESCRIPTION=File Transfer Protocol (FTP) base layout
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=pam zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=acct-group/ftp acct-user/ftp
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=da0bd27a323bc2ea502d49002bedc499
+_md5_=67515f24f25a9c2f763b4997cc823aa7
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 007de9d1ae7f..98b94997f49e 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/minbif-1.0.5-r3 b/metadata/md5-cache/net-im/minbif-1.0.5-r3
deleted file mode 100644
index 755237777b7a..000000000000
--- a/metadata/md5-cache/net-im/minbif-1.0.5-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=acct-group/minbif acct-user/minbif net-im/pidgin gnutls? ( net-libs/gnutls ) imlib? ( media-libs/imlib2 ) libcaca? ( media-libs/imlib2 media-libs/libcaca ) pam? ( sys-libs/pam )
-DESCRIPTION=IRC gateway to IM networks
-EAPI=7
-HOMEPAGE=https://symlink.me/projects/minbif/wiki/
-IUSE=gnutls +imlib +libcaca pam xinetd
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=acct-group/minbif acct-user/minbif net-im/pidgin gnutls? ( net-libs/gnutls ) imlib? ( media-libs/imlib2 ) libcaca? ( media-libs/imlib2 media-libs/libcaca ) pam? ( sys-libs/pam ) virtual/logger xinetd? ( sys-apps/xinetd )
-REQUIRED_USE=libcaca? ( imlib )
-SLOT=0
-SRC_URI=https://symlink.me/attachments/download/148/minbif-1.0.5.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=17f09c591de819b5b86f3b9c662036b1
diff --git a/metadata/md5-cache/net-im/prosody-0.11.10 b/metadata/md5-cache/net-im/prosody-0.11.10
index 121c8a16cad1..094892306e83 100644
--- a/metadata/md5-cache/net-im/prosody-0.11.10
+++ b/metadata/md5-cache/net-im/prosody-0.11.10
@@ -5,7 +5,7 @@ DESCRIPTION=Prosody is a modern XMPP communication server
 EAPI=7
 HOMEPAGE=https://prosody.im/
 IUSE=icu +idn +libevent mysql postgres selinux +sqlite +ssl test +zlib lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3
-KEYWORDS=amd64 arm ~arm64 ~x86
+KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=lua_single_target_luajit? ( dev-lua/luaexpat[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luaexpat[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luaexpat[lua_targets_lua5-3(-)] ) lua_single_target_luajit? ( dev-lua/luafilesystem[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luafilesystem[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luafilesystem[lua_targets_lua5-3(-)] ) lua_single_target_luajit? ( dev-lua/luasocket[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luasocket[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luasocket[lua_targets_lua5-3(-)] ) net-im/jabber-base icu? ( dev-libs/icu:= ) idn? ( net-dns/libidn:= ) libevent? ( lua_single_target_luajit? ( dev-lua/luaevent[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luaevent[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luaevent[lua_targets_lua5-3(-)] ) ) dev-libs/openssl:0= lua_single_target_lua5-1? ( lua_single_target_luajit? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) ) mysql? ( lua_single_target_luajit? ( dev-lua/luadbi[mysql,lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luadbi[mysql,lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[mysql,lua_targets_lua5-3(-)] ) ) postgres? ( lua_single_target_luajit? ( dev-lua/luadbi[postgres,lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luadbi[postgres,lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[postgres,lua_targets_lua5-3(-)] ) ) sqlite? ( lua_single_target_luajit? ( dev-lua/luadbi[sqlite,lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luadbi[sqlite,lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[sqlite,lua_targets_lua5-3(-)] ) ) ssl? ( lua_single_target_luajit? ( dev-lua/luasec[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luasec[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luasec[lua_targets_lua5-3(-)] ) ) zlib? ( lua_single_target_luajit? ( dev-lua/lua-zlib[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lua-zlib[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lua-zlib[lua_targets_lua5-3(-)] ) ) lua_single_target_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated(+)] ) selinux? ( sec-policy/selinux-jabber ) virtual/tmpfiles
 REQUIRED_USE=^^ ( icu idn ) ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://prosody.im/downloads/source/prosody-0.11.10.tar.gz
 _eclasses_=lua-single	8cdf449259063fc54bf347db93744d1f	lua-utils	af986d19619f43dc53862da0d25b9c2e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5f350304fd7296939a8eb875d812f45c
+_md5_=b74cf38946f766d2c421a812272592ea
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-5.13.0 b/metadata/md5-cache/net-im/signal-desktop-bin-5.13.0
deleted file mode 100644
index 16d1c1301129..000000000000
--- a/metadata/md5-cache/net-im/signal-desktop-bin-5.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
-EAPI=7
-HOMEPAGE=https://signal.org/ https://github.com/signalapp/Signal-Desktop
-IUSE=+sound
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
-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/gdk-pixbuf x11-libs/cairo x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxshmfence 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_5.13.0_amd64.deb
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e715e69f732d3fd9a6c58536297f7100
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-5.14.0 b/metadata/md5-cache/net-im/signal-desktop-bin-5.14.0
new file mode 100644
index 000000000000..19c1bf3f8633
--- /dev/null
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-5.14.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
+EAPI=7
+HOMEPAGE=https://signal.org/ https://github.com/signalapp/Signal-Desktop
+IUSE=+sound
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
+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/gdk-pixbuf x11-libs/cairo x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxshmfence 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_5.14.0_amd64.deb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e715e69f732d3fd9a6c58536297f7100
diff --git a/metadata/md5-cache/net-im/toxic-0.10.0-r1 b/metadata/md5-cache/net-im/toxic-0.10.0-r1
deleted file mode 100644
index 9fd83c6768f5..000000000000
--- a/metadata/md5-cache/net-im/toxic-0.10.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/libconfig:= net-libs/tox:= net-misc/curl sys-libs/ncurses:= audio-notify? ( media-libs/freealut media-libs/openal ) notification? ( x11-libs/libnotify ) debug? ( llvm? ( sys-devel/llvm:* ) ) python? ( 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] ) ) qrcode? ( media-gfx/qrencode:= png? ( media-libs/libpng ) ) sound? ( media-libs/openal net-libs/tox:=[av] ) X? ( x11-base/xorg-proto x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A curses-based client for Tox
-EAPI=7
-HOMEPAGE=https://github.com/JFreegman/toxic
-IUSE=+audio-notify debug doc llvm notification png python qrcode +sound +video +X python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/libconfig:= net-libs/tox:= net-misc/curl sys-libs/ncurses:= audio-notify? ( media-libs/freealut media-libs/openal ) notification? ( x11-libs/libnotify ) debug? ( llvm? ( sys-devel/llvm:* ) ) python? ( 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] ) ) qrcode? ( media-gfx/qrencode:= png? ( media-libs/libpng ) ) sound? ( media-libs/openal net-libs/tox:=[av] ) X? ( x11-base/xorg-proto x11-libs/libX11 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) video? ( sound X )
-SLOT=0
-SRC_URI=https://github.com/JFreegman/toxic/archive/v0.10.0.tar.gz -> toxic-0.10.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3a524c375a5635a4ffe7f22fbdbff8a3
diff --git a/metadata/md5-cache/net-im/toxic-0.10.1 b/metadata/md5-cache/net-im/toxic-0.10.1
deleted file mode 100644
index 42e3a79a8e55..000000000000
--- a/metadata/md5-cache/net-im/toxic-0.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/libconfig:= net-libs/tox:= net-misc/curl sys-libs/ncurses:= audio-notify? ( media-libs/freealut media-libs/openal ) notification? ( x11-libs/libnotify ) debug? ( llvm? ( sys-devel/llvm:* ) ) python? ( 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] ) ) qrcode? ( media-gfx/qrencode:= png? ( media-libs/libpng ) ) sound? ( media-libs/openal net-libs/tox:=[av] ) X? ( x11-base/xorg-proto x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A curses-based client for Tox
-EAPI=7
-HOMEPAGE=https://github.com/JFreegman/toxic
-IUSE=+audio-notify debug doc llvm notification png python qrcode +sound +video +X python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/libconfig:= net-libs/tox:= net-misc/curl sys-libs/ncurses:= audio-notify? ( media-libs/freealut media-libs/openal ) notification? ( x11-libs/libnotify ) debug? ( llvm? ( sys-devel/llvm:* ) ) python? ( 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] ) ) qrcode? ( media-gfx/qrencode:= png? ( media-libs/libpng ) ) sound? ( media-libs/openal net-libs/tox:=[av] ) X? ( x11-base/xorg-proto x11-libs/libX11 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) video? ( sound X )
-SLOT=0
-SRC_URI=https://github.com/JFreegman/toxic/archive/v0.10.1.tar.gz -> toxic-0.10.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=87921a0497f5a46addd76f89023707cc
diff --git a/metadata/md5-cache/net-im/toxic-0.10.1-r1 b/metadata/md5-cache/net-im/toxic-0.10.1-r1
new file mode 100644
index 000000000000..74ba69802f2c
--- /dev/null
+++ b/metadata/md5-cache/net-im/toxic-0.10.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libconfig
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=net-libs/tox:= net-misc/curl sys-libs/ncurses:= sys-kernel/linux-headers audio-notify? ( media-libs/freealut media-libs/openal ) notification? ( x11-libs/libnotify ) debug? ( llvm? ( sys-devel/llvm:* ) ) python? ( 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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) qrcode? ( media-gfx/qrencode:= png? ( media-libs/libpng ) ) sound? ( media-libs/openal net-libs/tox:=[av] ) X? ( x11-base/xorg-proto x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A curses-based client for Tox
+EAPI=7
+HOMEPAGE=https://github.com/JFreegman/toxic
+IUSE=+audio-notify debug doc llvm notification png python qrcode +sound +video +X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=net-libs/tox:= net-misc/curl sys-libs/ncurses:= sys-kernel/linux-headers audio-notify? ( media-libs/freealut media-libs/openal ) notification? ( x11-libs/libnotify ) debug? ( llvm? ( sys-devel/llvm:* ) ) python? ( 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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) qrcode? ( media-gfx/qrencode:= png? ( media-libs/libpng ) ) sound? ( media-libs/openal net-libs/tox:=[av] ) X? ( x11-base/xorg-proto x11-libs/libX11 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) video? ( sound X )
+SLOT=0
+SRC_URI=https://github.com/JFreegman/toxic/archive/v0.10.1.tar.gz -> toxic-0.10.1.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=15651175bdaedc24af738f8520449987
diff --git a/metadata/md5-cache/net-im/toxic-0.11.1 b/metadata/md5-cache/net-im/toxic-0.11.1
new file mode 100644
index 000000000000..ba74b6ae5793
--- /dev/null
+++ b/metadata/md5-cache/net-im/toxic-0.11.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libconfig:= virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=net-libs/tox:= net-misc/curl sys-kernel/linux-headers sys-libs/ncurses:= audio-notify? ( media-libs/freealut media-libs/openal ) notification? ( x11-libs/libnotify ) debug? ( llvm? ( sys-devel/llvm:* ) ) python? ( 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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) qrcode? ( media-gfx/qrencode:= png? ( media-libs/libpng ) ) sound? ( media-libs/openal net-libs/tox:=[av] ) X? ( x11-base/xorg-proto x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A curses-based client for Tox
+EAPI=7
+HOMEPAGE=https://github.com/JFreegman/toxic
+IUSE=+audio-notify debug games llvm notification png python qrcode +sound +video +X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=net-libs/tox:= net-misc/curl sys-kernel/linux-headers sys-libs/ncurses:= audio-notify? ( media-libs/freealut media-libs/openal ) notification? ( x11-libs/libnotify ) debug? ( llvm? ( sys-devel/llvm:* ) ) python? ( 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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) qrcode? ( media-gfx/qrencode:= png? ( media-libs/libpng ) ) sound? ( media-libs/openal net-libs/tox:=[av] ) X? ( x11-base/xorg-proto x11-libs/libX11 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) video? ( sound X )
+SLOT=0
+SRC_URI=https://github.com/JFreegman/toxic/archive/v0.11.1.tar.gz -> toxic-0.11.1.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8761d426a28755fabf4131c0eaa3ac0e
diff --git a/metadata/md5-cache/net-im/toxic-0.8.3-r2 b/metadata/md5-cache/net-im/toxic-0.8.3-r2
deleted file mode 100644
index 7a76a9abaad9..000000000000
--- a/metadata/md5-cache/net-im/toxic-0.8.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/libconfig:= >=net-libs/tox-0.2.8:= net-misc/curl sys-libs/ncurses:= notification? ( x11-libs/libnotify ) python? ( 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] ) ) qrcode? ( media-gfx/qrencode:= ) sound? ( media-libs/freealut media-libs/openal net-libs/tox:=[av] ) video? ( media-libs/libvpx:= net-libs/tox:=[av] x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A curses-based client for Tox
-EAPI=7
-HOMEPAGE=https://github.com/JFreegman/toxic
-IUSE=notification python qrcode +sound +video +X python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/libconfig:= >=net-libs/tox-0.2.8:= net-misc/curl sys-libs/ncurses:= notification? ( x11-libs/libnotify ) python? ( 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] ) ) qrcode? ( media-gfx/qrencode:= ) sound? ( media-libs/freealut media-libs/openal net-libs/tox:=[av] ) video? ( media-libs/libvpx:= net-libs/tox:=[av] x11-libs/libX11 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=0
-SRC_URI=https://github.com/JFreegman/toxic/archive/v0.8.3.tar.gz -> toxic-0.8.3.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0f66c8b9ad50e26f016db50820bdc2bd
diff --git a/metadata/md5-cache/net-im/toxic-0.8.3-r3 b/metadata/md5-cache/net-im/toxic-0.8.3-r3
new file mode 100644
index 000000000000..b115a8d509e6
--- /dev/null
+++ b/metadata/md5-cache/net-im/toxic-0.8.3-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libconfig
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=net-libs/tox:= net-misc/curl sys-libs/ncurses:= sys-kernel/linux-headers notification? ( x11-libs/libnotify ) python? ( 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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) qrcode? ( media-gfx/qrencode:= ) sound? ( media-libs/freealut media-libs/openal net-libs/tox:=[av] ) video? ( media-libs/libvpx:= net-libs/tox:=[av] x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A curses-based client for Tox
+EAPI=7
+HOMEPAGE=https://github.com/JFreegman/toxic
+IUSE=notification python qrcode +sound +video +X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+
+RDEPEND=net-libs/tox:= net-misc/curl sys-libs/ncurses:= sys-kernel/linux-headers notification? ( x11-libs/libnotify ) python? ( 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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) qrcode? ( media-gfx/qrencode:= ) sound? ( media-libs/freealut media-libs/openal net-libs/tox:=[av] ) video? ( media-libs/libvpx:= net-libs/tox:=[av] x11-libs/libX11 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+SLOT=0
+SRC_URI=https://github.com/JFreegman/toxic/archive/v0.8.3.tar.gz -> toxic-0.8.3.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bb6c8a4fb60f6ec1ade236c639ebef47
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 4ec5880d9658..ba8fde90e461 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/quasselgrep-0_p20200830 b/metadata/md5-cache/net-irc/quasselgrep-0_p20200830
index fc99bc42d068..7d7d6d1db821 100644
--- a/metadata/md5-cache/net-irc/quasselgrep-0_p20200830
+++ b/metadata/md5-cache/net-irc/quasselgrep-0_p20200830
@@ -1,14 +1,14 @@
 BDEPEND=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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Tool for searching quassel logs from the commandline
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/fish-face/quasselgrep
 IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+RDEPEND=dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( 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	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4111fb5aa48c2d2c2eef8b1665b4fe9c
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=33373316a7744dbb6652c53f7c6467ab
diff --git a/metadata/md5-cache/net-irc/znc-1.8.1 b/metadata/md5-cache/net-irc/znc-1.8.1
deleted file mode 100644
index 1deefe3bccce..000000000000
--- a/metadata/md5-cache/net-irc/znc-1.8.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) perl? ( >=dev-lang/swig-3.0.0 >=dev-lang/perl-5.10 ) python? ( >=dev-lang/swig-3.0.0 >=dev-lang/perl-5.10 ) test? ( 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/qtnetwork:5 ) dev-util/ninja dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst prepare setup test
-DEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( 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] ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= )
-DESCRIPTION=An advanced IRC Bouncer
-EAPI=7
-HOMEPAGE=https://znc.in
-IUSE=+ipv6 +icu nls perl python +ssl sasl tcl test +zlib python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 arm arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( 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] ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= ) acct-user/znc acct-group/znc
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) icu )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://znc.in/releases/archive/znc-1.8.1.tar.gz test? ( https://github.com/google/googletest/archive/1.8.1.tar.gz -> gtest-1.8.1.tar.gz )
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a9d03c594d450aecc32ed8be429718a3
diff --git a/metadata/md5-cache/net-irc/znc-1.8.2-r1 b/metadata/md5-cache/net-irc/znc-1.8.2-r1
new file mode 100644
index 000000000000..78c482c33ecc
--- /dev/null
+++ b/metadata/md5-cache/net-irc/znc-1.8.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) perl? ( >=dev-lang/swig-3.0.0 >=dev-lang/perl-5.10 ) python? ( >=dev-lang/swig-3.0.0 >=dev-lang/perl-5.10 ) test? ( 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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-qt/qtnetwork:5 ) dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst prepare setup test
+DEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( 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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= )
+DESCRIPTION=An advanced IRC Bouncer
+EAPI=7
+HOMEPAGE=https://znc.in
+IUSE=+ipv6 +icu nls perl python +ssl sasl tcl test +zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( 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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= ) acct-user/znc acct-group/znc
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) icu )
+RESTRICT=!test? ( test )
+SLOT=0/1.8.2
+SRC_URI=https://znc.in/releases/archive/znc-1.8.2.tar.gz test? ( https://github.com/google/googletest/archive/1.8.1.tar.gz -> gtest-1.8.1.tar.gz )
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=091560d9f8599c364583ad0def0f0ba5
diff --git a/metadata/md5-cache/net-irc/znc-9999 b/metadata/md5-cache/net-irc/znc-9999
index f375cb5062f2..ee64b1d15077 100644
--- a/metadata/md5-cache/net-irc/znc-9999
+++ b/metadata/md5-cache/net-irc/znc-9999
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) perl? ( >=dev-lang/swig-3.0.0 >=dev-lang/perl-5.10 ) python? ( >=dev-lang/swig-3.0.0 >=dev-lang/perl-5.10 ) test? ( 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/qtnetwork:5 ) dev-util/ninja dev-util/cmake virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) perl? ( >=dev-lang/swig-3.0.0 >=dev-lang/perl-5.10 ) python? ( >=dev-lang/swig-3.0.0 >=dev-lang/perl-5.10 ) test? ( 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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-qt/qtnetwork:5 ) dev-util/ninja dev-util/cmake virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( 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] ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= )
+DEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( 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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= )
 DESCRIPTION=An advanced IRC Bouncer
 EAPI=7
 HOMEPAGE=https://znc.in
-IUSE=+ipv6 +icu nls perl python +ssl sasl tcl test +zlib python_single_target_python3_8 python_single_target_python3_9
+IUSE=+ipv6 +icu nls perl python +ssl sasl tcl test +zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( 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] ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= ) acct-user/znc acct-group/znc
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) icu )
+RDEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( 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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= ) acct-user/znc acct-group/znc
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) icu )
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6674637acddc7e0fac179d40a6f93179
+_md5_=8b9bd8f2c7dea74e9c65fb4eb39a1934
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index c1347bb2e6e4..0633708b4359 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/gupnp-1.3.0 b/metadata/md5-cache/net-libs/gupnp-1.3.0
deleted file mode 100644
index 6d5a1b289d9a..000000000000
--- a/metadata/md5-cache/net-libs/gupnp-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 ) dev-libs/libxslt app-text/docbook-xsl-stylesheets virtual/pkgconfig !connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) >=net-libs/gssdp-1.3.0:0[vala] net-libs/libsoup:2.4[vala] ) app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=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] ) python_single_target_python3_10? ( dev-lang/python:3.10[xml] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-libs/glib-2.66: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(-)?] >=net-libs/gssdp-1.3.0:0=[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(-)?] >=net-libs/libsoup-2.48.0:2.4[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(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/util-linux-2.24.1-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(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=An object-oriented framework for creating UPnP devs and control points
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp
-IUSE=connman gtk-doc +introspection kernel_linux networkmanager 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 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=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] ) python_single_target_python3_10? ( dev-lang/python:3.10[xml] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-libs/glib-2.66: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(-)?] >=net-libs/gssdp-1.3.0:0=[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(-)?] >=net-libs/libsoup-2.48.0:2.4[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(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/util-linux-2.24.1-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(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ?? ( connman networkmanager )
-SLOT=0/1.2-0
-SRC_URI=mirror://gnome/sources/gupnp/1.3/gupnp-1.3.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6f93312a2ddaafe0d6cc54111b0ab5e0
diff --git a/metadata/md5-cache/net-libs/libaxc-0.3.5 b/metadata/md5-cache/net-libs/libaxc-0.3.5
new file mode 100644
index 000000000000..6c6fbddce958
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libaxc-0.3.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-db/sqlite dev-libs/glib dev-libs/libgcrypt net-libs/libsignal-protocol-c virtual/pkgconfig test? ( dev-util/cmocka )
+DESCRIPTION=Client library for libsignal-protocol-c
+EAPI=7
+HOMEPAGE=https://github.com/gkdr/axc
+IUSE=static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-db/sqlite dev-libs/glib dev-libs/libgcrypt net-libs/libsignal-protocol-c
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gkdr/axc/archive/v0.3.5.tar.gz -> libaxc-0.3.5.tar.gz
+_md5_=a563c0d7118337f3ac108f2fe9cb4f15
diff --git a/metadata/md5-cache/net-libs/libhtp-0.5.38 b/metadata/md5-cache/net-libs/libhtp-0.5.38
index aa310669b4b9..565d791b7872 100644
--- a/metadata/md5-cache/net-libs/libhtp-0.5.38
+++ b/metadata/md5-cache/net-libs/libhtp-0.5.38
@@ -5,10 +5,10 @@ DESCRIPTION=security-aware parser for the HTTP protocol and the related bits and
 EAPI=7
 HOMEPAGE=https://github.com/OISF/libhtp
 IUSE=debug static-libs 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 ~mips ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~riscv ~x86
 LICENSE=BSD
 RDEPEND=sys-libs/zlib[static-libs?]
 SLOT=0
 SRC_URI=https://github.com/OISF/libhtp/archive/0.5.38.tar.gz -> libhtp-0.5.38.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=13381798b9dde3991d5ff8d153df2031
+_md5_=698396894c688195f43101a3e31c56f4
diff --git a/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1 b/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
index 4ac79dc5a124..c3364e7b4789 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
+++ b/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
@@ -5,10 +5,10 @@ DESCRIPTION=Interface to packets that have been logged by the kernel packet filt
 EAPI=7
 HOMEPAGE=https://www.netfilter.org/projects/libnetfilter_log/
 IUSE=kernel_linux
-KEYWORDS=amd64 ~ia64 ppc ~sparc x86
+KEYWORDS=amd64 ~ia64 ppc ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-1.0.1.tar.bz2
 _eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=561359652e01bae0e15f068833b4ba9b
+_md5_=1dfe1a057a61a49db3549049fcd7767c
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
index 2f3e018507b2..60339c575d1f 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
@@ -5,10 +5,10 @@ DESCRIPTION=API to packets that have been queued by the kernel packet filter
 EAPI=7
 HOMEPAGE=https://www.netfilter.org/projects/libnetfilter_queue/
 IUSE=doc static-libs kernel_linux
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-0.0.41
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.5.tar.bz2
 _eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58406b46ac65c20ea9050b282d733c7e
+_md5_=44730bb10f32d6b1acfb5ed7e7bf5204
diff --git a/metadata/md5-cache/net-libs/libquotient-0.6.8 b/metadata/md5-cache/net-libs/libquotient-0.6.8
new file mode 100644
index 000000000000..852c97fa1bae
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libquotient-0.6.8
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5
+DESCRIPTION=Qt5-based SDK to develop applications for Matrix
+EAPI=7
+HOMEPAGE=https://github.com/quotient-im/libQuotient
+KEYWORDS=~amd64 ~ppc64
+LICENSE=LGPL-2+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5
+SLOT=0
+SRC_URI=https://github.com/quotient-im/libQuotient/archive/0.6.8.tar.gz -> libquotient-0.6.8.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=164d7a4e421df2c9bbedf3b084f56848
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.16.11 b/metadata/md5-cache/net-libs/mbedtls-2.16.11
index 9a255817ff29..a5279e301bb9 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.16.11
+++ b/metadata/md5-cache/net-libs/mbedtls-2.16.11
@@ -5,11 +5,11 @@ DESCRIPTION=Cryptographic library for embedded systems
 EAPI=7
 HOMEPAGE=https://tls.mbed.org/
 IUSE=cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=programs? ( dev-libs/openssl:0= ) zlib? ( >=sys-libs/zlib-1.2.8-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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/3.12.0
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.16.11.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0f4ba52b6c13084b7b41dfb1fb4a9a43
+_md5_=820e5ec7be4d05be7a3b4f8fba59627f
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.27.0-r1 b/metadata/md5-cache/net-libs/mbedtls-2.27.0-r1
index ad3f401dfcde..613d58380b2b 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.27.0-r1
+++ b/metadata/md5-cache/net-libs/mbedtls-2.27.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Cryptographic library for embedded systems
 EAPI=7
 HOMEPAGE=https://tls.mbed.org/
 IUSE=cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=programs? ( dev-libs/openssl:0= ) zlib? ( >=sys-libs/zlib-1.2.8-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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/7.13.1
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.27.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fb170461341676a5e556b7acc087387e
+_md5_=69c83ac8ddbffb58d6b5a0c7bebbccf9
diff --git a/metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0 b/metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0
index 090edd0174af..d6f602a32402 100644
--- a/metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0
+++ b/metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 >=dev-qt/qtdbus-5.12.3:5 net-im/telepathy-logger net-libs/telepathy-glib net-libs/telepathy-qt[qt5(+)] sys-apps/dbus dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
 DESCRIPTION=Qt bindings for the Telepathy logger
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 >=dev-qt/qtdbus-5.12
 SLOT=5
 SRC_URI=mirror://kde/stable/telepathy-logger-qt/17.09/src/telepathy-logger-qt-17.09.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7d91cc9194f7ec0e321cc7125f203545
+_md5_=6cf95c41ce9f9b57604df6456f226143
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 63b6aaf91961..9d34de9d83d8 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/popa3d-1.0.2-r1 b/metadata/md5-cache/net-mail/popa3d-1.0.2-r1
deleted file mode 100644
index 9362631eeff7..000000000000
--- a/metadata/md5-cache/net-mail/popa3d-1.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=acct-group/popa3d acct-user/popa3d pam? ( >=sys-libs/pam-0.72 >=net-mail/mailbase-0.00-r8[pam] )
-DESCRIPTION=A security oriented POP3 server
-EAPI=7
-HOMEPAGE=http://www.openwall.com/popa3d/
-IUSE=pam mbox +maildir
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=Openwall
-RDEPEND=acct-group/popa3d acct-user/popa3d pam? ( >=sys-libs/pam-0.72 >=net-mail/mailbase-0.00-r8[pam] )
-REQUIRED_USE=^^ ( maildir mbox )
-SLOT=0
-SRC_URI=http://www.openwall.com/popa3d/popa3d-1.0.2.tar.gz mirror://gentoo/popa3d-0.6.3-vname-2.diff.gz maildir? ( mirror://gentoo/popa3d-0.5.9-maildir-2.diff.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=66e980a91a46fb7b5fd62aa147bc9d15
diff --git a/metadata/md5-cache/net-mail/popa3d-1.0.2-r2 b/metadata/md5-cache/net-mail/popa3d-1.0.2-r2
new file mode 100644
index 000000000000..b101f3b2e7f0
--- /dev/null
+++ b/metadata/md5-cache/net-mail/popa3d-1.0.2-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=acct-group/popa3d acct-user/popa3d virtual/libcrypt:= pam? ( >=sys-libs/pam-0.72 >=net-mail/mailbase-0.00-r8[pam] )
+DESCRIPTION=A security oriented POP3 server
+EAPI=7
+HOMEPAGE=http://www.openwall.com/popa3d/
+IUSE=pam mbox +maildir
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=Openwall
+RDEPEND=acct-group/popa3d acct-user/popa3d virtual/libcrypt:= pam? ( >=sys-libs/pam-0.72 >=net-mail/mailbase-0.00-r8[pam] )
+REQUIRED_USE=^^ ( maildir mbox )
+SLOT=0
+SRC_URI=http://www.openwall.com/popa3d/popa3d-1.0.2.tar.gz mirror://gentoo/popa3d-0.6.3-vname-2.diff.gz maildir? ( mirror://gentoo/popa3d-0.5.9-maildir-2.diff.gz )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f84bc276debf253095049632df5ba132
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1 b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
deleted file mode 100644
index 5c6f2d3f859b..000000000000
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
+++ /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
-DEFINED_PHASES=configure install postinst prepare prerm setup
-DEPEND=net-mail/autorespond >=net-mail/vpopmail-5.4.33 virtual/qmail maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A web interface for managing a qmail system with virtual domains
-EAPI=7
-HOMEPAGE=http://www.inter7.com/qmailadmin.html
-IUSE=maildrop vhosts
-KEYWORDS=amd64 arm ~hppa ~ia64 ppc ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=net-mail/autorespond >=net-mail/vpopmail-5.4.33 virtual/qmail maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=app-admin/webapp-config-1.50.15
-RESTRICT=userpriv
-SLOT=0
-SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.15.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	qmail	bb4cafddcb746376d78d98bfacfc4d62	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	webapp	cd327e73cdb307ceb80dcca6b8ad8b52	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cb3a7b5c544cbdf5e1ac765484443ca5
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r2 b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r2
new file mode 100644
index 000000000000..da05c3fd293a
--- /dev/null
+++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r2
@@ -0,0 +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
+DEFINED_PHASES=configure install postinst prepare prerm setup
+DEPEND=net-mail/autorespond >=net-mail/vpopmail-5.4.33 virtual/libcrypt:= virtual/qmail maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A web interface for managing a qmail system with virtual domains
+EAPI=7
+HOMEPAGE=http://www.inter7.com/qmailadmin.html
+IUSE=maildrop vhosts
+KEYWORDS=amd64 arm ~hppa ~ia64 ppc ~s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=net-mail/autorespond >=net-mail/vpopmail-5.4.33 virtual/libcrypt:= virtual/qmail maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=app-admin/webapp-config-1.50.15
+RESTRICT=userpriv
+SLOT=0
+SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.15.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	qmail	bb4cafddcb746376d78d98bfacfc4d62	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	webapp	cd327e73cdb307ceb80dcca6b8ad8b52	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3b2959035ed34b9e73e3420bb23c52ca
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.16 b/metadata/md5-cache/net-mail/qmailadmin-1.2.16
deleted file mode 100644
index 88131812fe9a..000000000000
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.16
+++ /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
-DEFINED_PHASES=configure install postinst prepare prerm setup
-DEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A web interface for managing a qmail system with virtual domains
-EAPI=7
-HOMEPAGE=http://www.inter7.com/qmailadmin.html
-IUSE=maildrop vhosts
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=app-admin/webapp-config-1.50.15
-RESTRICT=userpriv
-SLOT=0
-SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.16.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	qmail	bb4cafddcb746376d78d98bfacfc4d62	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	webapp	cd327e73cdb307ceb80dcca6b8ad8b52	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=31b7ab39df18f5b45beb478e21027c1e
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.16-r1 b/metadata/md5-cache/net-mail/qmailadmin-1.2.16-r1
new file mode 100644
index 000000000000..0e2e8e55d5b2
--- /dev/null
+++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.16-r1
@@ -0,0 +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
+DEFINED_PHASES=configure install postinst prepare prerm setup
+DEPEND=virtual/libcrypt:= virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A web interface for managing a qmail system with virtual domains
+EAPI=7
+HOMEPAGE=http://www.inter7.com/qmailadmin.html
+IUSE=maildrop vhosts
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/libcrypt:= virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=app-admin/webapp-config-1.50.15
+RESTRICT=userpriv
+SLOT=0
+SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.16.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	qmail	bb4cafddcb746376d78d98bfacfc4d62	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	webapp	cd327e73cdb307ceb80dcca6b8ad8b52	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7c0d4c338679d261e318f71cba0dd4f9
diff --git a/metadata/md5-cache/net-mail/vchkuser-0.4 b/metadata/md5-cache/net-mail/vchkuser-0.4
deleted file mode 100644
index 43e65a2ee1c3..000000000000
--- a/metadata/md5-cache/net-mail/vchkuser-0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=net-mail/vpopmail || ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] ) 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=qmail-spp plugin to check recipient existance with vpopmail
-EAPI=6
-HOMEPAGE=https://github.com/hollow/vchkuser
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/hollow/vchkuser/tarball/v0.4 -> vchkuser-0.4.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	qmail	bb4cafddcb746376d78d98bfacfc4d62	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=755014e3a95090323c2d540ce2e773d2
diff --git a/metadata/md5-cache/net-mail/vchkuser-0.4-r1 b/metadata/md5-cache/net-mail/vchkuser-0.4-r1
new file mode 100644
index 000000000000..34eb3be09cd9
--- /dev/null
+++ b/metadata/md5-cache/net-mail/vchkuser-0.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libpcre net-mail/vpopmail virtual/libcrypt:= || ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] ) 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=qmail-spp plugin to check recipient existance with vpopmail
+EAPI=6
+HOMEPAGE=https://github.com/hollow/vchkuser
+IUSE=debug
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-libs/libpcre net-mail/vpopmail virtual/libcrypt:= || ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] )
+SLOT=0
+SRC_URI=https://github.com/hollow/vchkuser/tarball/v0.4 -> vchkuser-0.4.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	qmail	bb4cafddcb746376d78d98bfacfc4d62	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e6d344cf9b9019ad9e33d83595e279ee
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r7 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r7
deleted file mode 100644
index 76e861c35bac..000000000000
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r7
+++ /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
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=acct-group/vpopmail acct-user/vpopmail virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) spamassassin? ( mail-filter/spamassassin )
-DESCRIPTION=Collection of programs to manage virtual email on Qmail servers
-EAPI=7
-HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
-IUSE=clearpasswd ipalias maildrop mysql postgres spamassassin
-KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=acct-group/vpopmail acct-user/vpopmail virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) spamassassin? ( mail-filter/spamassassin )
-REQUIRED_USE=mysql? ( !postgres )
-SLOT=0
-SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	qmail	bb4cafddcb746376d78d98bfacfc4d62	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e8a6f0fa6da65b17a0f91484a7203fc1
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r9 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r9
new file mode 100644
index 000000000000..42464906656d
--- /dev/null
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r9
@@ -0,0 +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
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=acct-group/vpopmail acct-user/vpopmail virtual/libcrypt:= virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) spamassassin? ( mail-filter/spamassassin )
+DESCRIPTION=Collection of programs to manage virtual email on Qmail servers
+EAPI=7
+HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
+IUSE=clearpasswd ipalias maildrop mysql postgres spamassassin
+KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=acct-group/vpopmail acct-user/vpopmail virtual/libcrypt:= virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) spamassassin? ( mail-filter/spamassassin )
+REQUIRED_USE=mysql? ( !postgres )
+SLOT=0
+SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	qmail	bb4cafddcb746376d78d98bfacfc4d62	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4520c38d45f07860b8764a5d056b0896
diff --git a/metadata/md5-cache/net-mail/vqadmin-2.3.7 b/metadata/md5-cache/net-mail/vqadmin-2.3.7
deleted file mode 100644
index c415424d5925..000000000000
--- a/metadata/md5-cache/net-mail/vqadmin-2.3.7
+++ /dev/null
@@ -1,14 +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
-DEFINED_PHASES=configure install postinst prepare prerm setup
-DEPEND=virtual/qmail >=net-mail/vpopmail-5.3 >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A web based control pannel to manage Virtual Qmail Domains
-EAPI=7
-HOMEPAGE=http://www.inter7.com/index.php?page=vqadmin
-IUSE=vhosts
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/qmailadmin >=app-admin/webapp-config-1.50.15
-SLOT=0
-SRC_URI=http://www.inter7.com/vqadmin/vqadmin-2.3.7.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	qmail	bb4cafddcb746376d78d98bfacfc4d62	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	webapp	cd327e73cdb307ceb80dcca6b8ad8b52	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ed2f0816bf4df9b4ee5d277a2642a685
diff --git a/metadata/md5-cache/net-mail/vqadmin-2.3.7-r1 b/metadata/md5-cache/net-mail/vqadmin-2.3.7-r1
new file mode 100644
index 000000000000..52a7c43de4a0
--- /dev/null
+++ b/metadata/md5-cache/net-mail/vqadmin-2.3.7-r1
@@ -0,0 +1,14 @@
+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
+DEFINED_PHASES=configure install postinst prepare prerm setup
+DEPEND=virtual/libcrypt:= virtual/qmail >=net-mail/vpopmail-5.3 >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A web based control pannel to manage Virtual Qmail Domains
+EAPI=7
+HOMEPAGE=http://www.inter7.com/index.php?page=vqadmin
+IUSE=vhosts
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/libcrypt:= virtual/qmail >=net-mail/vpopmail-5.3 net-mail/qmailadmin >=app-admin/webapp-config-1.50.15
+SLOT=0
+SRC_URI=http://www.inter7.com/vqadmin/vqadmin-2.3.7.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	qmail	bb4cafddcb746376d78d98bfacfc4d62	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	webapp	cd327e73cdb307ceb80dcca6b8ad8b52	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4322f6d20ec8378914b8d8bbe5ed2d50
diff --git a/metadata/md5-cache/net-misc/AQtion-2.2.7-r1 b/metadata/md5-cache/net-misc/AQtion-2.2.7-r1
index 5e86aa89d173..f3bf37a7ef45 100644
--- a/metadata/md5-cache/net-misc/AQtion-2.2.7-r1
+++ b/metadata/md5-cache/net-misc/AQtion-2.2.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/Aquantia/AQtion/archive/e024a859ea828ced78db310328db90dbedea837a.tar.gz -> AQtion-2.2.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fe8a3f9578194afaea21839a2352ec04
diff --git a/metadata/md5-cache/net-misc/AQtion-2.3.1-r1 b/metadata/md5-cache/net-misc/AQtion-2.3.1-r1
index 88e7407d4ff2..6859ba1c4415 100644
--- a/metadata/md5-cache/net-misc/AQtion-2.3.1-r1
+++ b/metadata/md5-cache/net-misc/AQtion-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/Aquantia/AQtion/archive/3c2a2a3abe3df6cb0c985a49cea9a359a83e3f75.tar.gz -> AQtion-2.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a58ce367c3719cef16fd1694636e5633
diff --git a/metadata/md5-cache/net-misc/AQtion-2.3.4-r1 b/metadata/md5-cache/net-misc/AQtion-2.3.4-r1
index 3343eeaa6126..ebcbdd3c4359 100644
--- a/metadata/md5-cache/net-misc/AQtion-2.3.4-r1
+++ b/metadata/md5-cache/net-misc/AQtion-2.3.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/Aquantia/AQtion/archive/3b96f1b5f29d844151bc2dc38443de7a9a2f0cf3.tar.gz -> AQtion-2.3.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0ce0697dce2e19b7d6f6d33e7eef3874
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 323708a4f4a5..1022563824b1 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-3.6.3_p1-r1 b/metadata/md5-cache/net-misc/apt-cacher-ng-3.6.3_p1-r1
deleted file mode 100644
index 6769b1eaa00b..000000000000
--- a/metadata/md5-cache/net-misc/apt-cacher-ng-3.6.3_p1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=acct-user/apt-cacher-ng acct-group/apt-cacher-ng app-arch/bzip2 dev-libs/libevent:=[threads] dev-libs/openssl:0= sys-libs/zlib fuse? ( sys-fs/fuse:0 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers )
-DESCRIPTION=Yet another caching HTTP proxy for Debian/Ubuntu software packages
-EAPI=7
-HOMEPAGE=https://www.unix-ag.uni-kl.de/~bloch/acng/ https://packages.qa.debian.org/a/apt-cacher-ng.html
-IUSE=doc fuse systemd tcpd
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-4 ZLIB public-domain
-RDEPEND=acct-user/apt-cacher-ng acct-group/apt-cacher-ng app-arch/bzip2 dev-libs/libevent:=[threads] dev-libs/openssl:0= sys-libs/zlib fuse? ( sys-fs/fuse:0 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) dev-lang/perl
-SLOT=0
-SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.6.3.orig.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0d3ad4704fee3ae22d2e5fba1db68756
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-3.6.3_p1-r2 b/metadata/md5-cache/net-misc/apt-cacher-ng-3.6.3_p1-r2
new file mode 100644
index 000000000000..05851f5c14ab
--- /dev/null
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-3.6.3_p1-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=acct-user/apt-cacher-ng acct-group/apt-cacher-ng app-arch/bzip2 dev-libs/libevent:=[threads] dev-libs/openssl:0= sys-libs/zlib fuse? ( sys-fs/fuse:0 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers )
+DESCRIPTION=Yet another caching HTTP proxy for Debian/Ubuntu software packages
+EAPI=7
+HOMEPAGE=https://www.unix-ag.uni-kl.de/~bloch/acng/ https://packages.qa.debian.org/a/apt-cacher-ng.html
+IUSE=doc fuse systemd tcpd
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-4 ZLIB public-domain
+RDEPEND=acct-user/apt-cacher-ng acct-group/apt-cacher-ng app-arch/bzip2 dev-libs/libevent:=[threads] dev-libs/openssl:0= sys-libs/zlib fuse? ( sys-fs/fuse:0 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) dev-lang/perl virtual/tmpfiles
+SLOT=0
+SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.6.3.orig.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=dc37b6c8f059c61d9b8f96167e3f65bc
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-9999 b/metadata/md5-cache/net-misc/apt-cacher-ng-9999
index 81dbf2b35581..ea265e04c85f 100644
--- a/metadata/md5-cache/net-misc/apt-cacher-ng-9999
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-9999
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=acct-user/apt-cacher-ng acct-group/apt-cacher-ng app-arch/bzip2 dev-libs/libevent:=[threads] dev-libs/openssl:0= sys-libs/zlib fuse? ( sys-fs/fuse:0 ) tcpd? ( sys-apps/tcp-wrappers )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=acct-user/apt-cacher-ng acct-group/apt-cacher-ng app-arch/bzip2 dev-libs/libevent:=[threads] dev-libs/openssl:0= sys-libs/zlib fuse? ( sys-fs/fuse:0 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers )
 DESCRIPTION=Yet another caching HTTP proxy for Debian/Ubuntu software packages
 EAPI=7
 HOMEPAGE=https://www.unix-ag.uni-kl.de/~bloch/acng/ https://packages.qa.debian.org/a/apt-cacher-ng.html
-IUSE=doc fuse tcpd
+IUSE=doc fuse systemd tcpd
 LICENSE=BSD-4 ZLIB public-domain
 PROPERTIES=live
-RDEPEND=acct-user/apt-cacher-ng acct-group/apt-cacher-ng app-arch/bzip2 dev-libs/libevent:=[threads] dev-libs/openssl:0= sys-libs/zlib fuse? ( sys-fs/fuse:0 ) tcpd? ( sys-apps/tcp-wrappers ) dev-lang/perl
+RDEPEND=acct-user/apt-cacher-ng acct-group/apt-cacher-ng app-arch/bzip2 dev-libs/libevent:=[threads] dev-libs/openssl:0= sys-libs/zlib fuse? ( sys-fs/fuse:0 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) dev-lang/perl virtual/tmpfiles
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7184743937cbdbe13c9589d627b4d313
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=03c3a4c9fd14764d0ec9dc509368f6f2
diff --git a/metadata/md5-cache/net-misc/aria2-1.36.0 b/metadata/md5-cache/net-misc/aria2-1.36.0
new file mode 100644
index 000000000000..58f335624147
--- /dev/null
+++ b/metadata/md5-cache/net-misc/aria2-1.36.0
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=sys-libs/zlib:0= adns? ( >=net-dns/c-ares-1.5.0:0= ) jemalloc? ( dev-libs/jemalloc ) libuv? ( >=dev-libs/libuv-1.13:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= nettle? ( >=dev-libs/nettle-2.4:0= bittorrent? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) !gnutls? ( dev-libs/openssl:0= ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0= bittorrent? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) test? ( >=dev-util/cppunit-1.12.0:0 )
+DESCRIPTION=A download utility with segmented downloading with BitTorrent support
+EAPI=8
+HOMEPAGE=https://aria2.github.io/
+IUSE=adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+-with-openssl-exception
+RDEPEND=sys-libs/zlib:0= adns? ( >=net-dns/c-ares-1.5.0:0= ) jemalloc? ( dev-libs/jemalloc ) libuv? ( >=dev-libs/libuv-1.13:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= nettle? ( >=dev-libs/nettle-2.4:0= bittorrent? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) !gnutls? ( dev-libs/openssl:0= ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0= bittorrent? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) nls? ( virtual/libiconv virtual/libintl ) scripts? ( dev-lang/ruby )
+REQUIRED_USE=?? ( jemalloc tcmalloc ) metalink? ( xmlrpc )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aria2/aria2/releases/download/release-1.36.0/aria2-1.36.0.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c71479f75a59978c90fa3174df74dc1a
diff --git a/metadata/md5-cache/net-misc/chrony-4.1-r1 b/metadata/md5-cache/net-misc/chrony-4.1-r1
index 1246445b6ace..ae2534f65555 100644
--- a/metadata/md5-cache/net-misc/chrony-4.1-r1
+++ b/metadata/md5-cache/net-misc/chrony-4.1-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=sechash? ( || ( nettle nss libtomcrypt ) ) nettle? ( !nss ) nss? (
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/chrony/chrony-4.1.tar.gz verify-sig? ( https://download.tuxfamily.org/chrony/chrony-4.1-tar-gz-asc.txt -> chrony-4.1.tar.gz.asc )
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=10772ddd82b7cb040189cd1f40b3e882
+_md5_=872b5da74d87f9a6026e84e9699862f2
diff --git a/metadata/md5-cache/net-misc/chrony-9999 b/metadata/md5-cache/net-misc/chrony-9999
index 49ef0ea50bf0..847ca55d1b01 100644
--- a/metadata/md5-cache/net-misc/chrony-9999
+++ b/metadata/md5-cache/net-misc/chrony-9999
@@ -11,4 +11,4 @@ RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-li
 REQUIRED_USE=sechash? ( || ( nettle nss libtomcrypt ) ) nettle? ( !nss ) nss? ( !nettle ) libtomcrypt? ( !nettle !nss ) !sechash? ( !nss ) !sechash? ( !nts? ( !nettle ) ) html
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c86838bf30f4042e0ba2c42b2a5de51b
+_md5_=0d789d020a5866827286297983027f7f
diff --git a/metadata/md5-cache/net-misc/curl-7.78.0-r1 b/metadata/md5-cache/net-misc/curl-7.78.0-r1
index dab2f4d7caf2..bed815fdcb3a 100644
--- a/metadata/md5-cache/net-misc/curl-7.78.0-r1
+++ b/metadata/md5-cache/net-misc/curl-7.78.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A Client that groks URLs
 EAPI=7
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=curl
 RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.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(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares: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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.78.0.tar.xz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=afdce7a5e17aaae184736ad5420245d2
+_md5_=a1b4b7f471457787f20d30a8ce8640be
diff --git a/metadata/md5-cache/net-misc/curl-7.78.0-r2 b/metadata/md5-cache/net-misc/curl-7.78.0-r2
new file mode 100644
index 000000000000..25db1cba7d42
--- /dev/null
+++ b/metadata/md5-cache/net-misc/curl-7.78.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) 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
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.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(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares: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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] zstd? ( app-arch/zstd:=[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=A Client that groks URLs
+EAPI=7
+HOMEPAGE=https://curl.haxx.se/
+IUSE=adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss ntlm +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=curl
+RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.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(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares: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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://curl.haxx.se/download/curl-7.78.0.tar.xz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a0e26cc7d7c3544be572c3f7a6149be2
diff --git a/metadata/md5-cache/net-misc/dahdi-3.1.0-r2 b/metadata/md5-cache/net-misc/dahdi-3.1.0-r2
index 58262dbade41..05cd842c5a7a 100644
--- a/metadata/md5-cache/net-misc/dahdi-3.1.0-r2
+++ b/metadata/md5-cache/net-misc/dahdi-3.1.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-3.1.0.tar.gz https://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.14.tar.gz https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=49db885ea4657a53aacd20481a8f34cc
diff --git a/metadata/md5-cache/net-misc/dahdi-3.1.0-r3 b/metadata/md5-cache/net-misc/dahdi-3.1.0-r3
index 58469a9d64ca..c7cd30f2a494 100644
--- a/metadata/md5-cache/net-misc/dahdi-3.1.0-r3
+++ b/metadata/md5-cache/net-misc/dahdi-3.1.0-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-3.1.0.tar.gz https://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.14.tar.gz https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7f0788193898d9132d7236320522e8a5
diff --git a/metadata/md5-cache/net-misc/ena-driver-2.0.3-r1 b/metadata/md5-cache/net-misc/ena-driver-2.0.3-r1
index 062b0999af91..4f873831e395 100644
--- a/metadata/md5-cache/net-misc/ena-driver-2.0.3-r1
+++ b/metadata/md5-cache/net-misc/ena-driver-2.0.3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/amzn/amzn-drivers/archive/ena_linux_2.0.3.zip -> ena-driver-2.0.3-linux.zip
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=383b1881c2307159ca0b350a22a09a07
diff --git a/metadata/md5-cache/net-misc/ena-driver-2.2.3-r1 b/metadata/md5-cache/net-misc/ena-driver-2.2.3-r1
index 37caec0d1275..cede4c1573f1 100644
--- a/metadata/md5-cache/net-misc/ena-driver-2.2.3-r1
+++ b/metadata/md5-cache/net-misc/ena-driver-2.2.3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/amzn/amzn-drivers/archive/ena_linux_2.2.3.tar.gz -> ena-driver-2.2.3-linux.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a5ed861bfe8533ae6ad66d6a0cbb02f8
diff --git a/metadata/md5-cache/net-misc/frr-8.0 b/metadata/md5-cache/net-misc/frr-8.0
new file mode 100644
index 000000000000..42c126547d15
--- /dev/null
+++ b/metadata/md5-cache/net-misc/frr-8.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/clippy-8.0 sys-devel/flex virtual/yacc doc? ( dev-python/sphinx ) 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=compile configure install prepare setup
+DEPEND=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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) acct-user/frr dev-libs/json-c:0= >=net-libs/libyang-2.0.0 sys-libs/libcap sys-libs/readline:0= virtual/libcrypt:= grpc? ( net-libs/grpc:= ) nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) rpki? ( >=net-libs/rtrlib-0.6.3[ssh] ) snmp? ( net-analyzer/net-snmp:= ) test? ( python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pytest[python_targets_python3_10(-)] ) )
+DESCRIPTION=The FRRouting Protocol Suite
+EAPI=7
+HOMEPAGE=https://frrouting.org/
+IUSE=doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) acct-user/frr dev-libs/json-c:0= >=net-libs/libyang-2.0.0 sys-libs/libcap sys-libs/readline:0= virtual/libcrypt:= grpc? ( net-libs/grpc:= ) nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) rpki? ( >=net-libs/rtrlib-0.6.3[ssh] ) snmp? ( net-analyzer/net-snmp:= ) python_single_target_python3_8? ( dev-python/ipaddr[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/ipaddr[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/ipaddr[python_targets_python3_10(-)] ) !net-misc/quagga
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/FRRouting/frr/archive/frr-8.0.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=55151f3a1ab761ca4a4ae0440d0f5a57
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.2.0 b/metadata/md5-cache/net-misc/miniupnpd-2.2.0
deleted file mode 100644
index d6dee88186f9..000000000000
--- a/metadata/md5-cache/net-misc/miniupnpd-2.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-apps/lsb-release verify-sig? ( app-crypt/openpgp-keys-miniupnp ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst unpack
-DEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
-DESCRIPTION=MiniUPnP IGD Daemon
-EAPI=7
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=+leasefile igd2 ipv6 nftables pcp-peer portinuse strict verify-sig
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.2.0.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpd-2.2.0.tar.gz.sig )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=f6d96e5020680ff508f9d28051bcfc51
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.2.1 b/metadata/md5-cache/net-misc/miniupnpd-2.2.1
deleted file mode 100644
index ea7e20b4b4b9..000000000000
--- a/metadata/md5-cache/net-misc/miniupnpd-2.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-apps/lsb-release verify-sig? ( app-crypt/openpgp-keys-miniupnp ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst unpack
-DEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
-DESCRIPTION=MiniUPnP IGD Daemon
-EAPI=7
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=+leasefile igd2 ipv6 nftables pcp-peer portinuse strict verify-sig
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.2.1.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpd-2.2.1.tar.gz.sig )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=f6d96e5020680ff508f9d28051bcfc51
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.2.3 b/metadata/md5-cache/net-misc/miniupnpd-2.2.3
new file mode 100644
index 000000000000..08c22ca286a1
--- /dev/null
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.2.3
@@ -0,0 +1,14 @@
+BDEPEND=sys-apps/lsb-release verify-sig? ( app-crypt/openpgp-keys-miniupnp ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
+DESCRIPTION=MiniUPnP IGD Daemon
+EAPI=8
+HOMEPAGE=http://miniupnp.free.fr/
+IUSE=+leasefile igd2 ipv6 nftables pcp-peer portinuse strict verify-sig
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
+SLOT=0
+SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.2.3.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpd-2.2.3.tar.gz.sig )
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=90d642c064679758e32b5884847979cb
diff --git a/metadata/md5-cache/net-misc/netkit-talk-0.17-r6 b/metadata/md5-cache/net-misc/netkit-talk-0.17-r6
deleted file mode 100644
index f7f8ade0d99f..000000000000
--- a/metadata/md5-cache/net-misc/netkit-talk-0.17-r6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2:= virtual/pkgconfig
-DESCRIPTION=Netkit - talkd
-EAPI=5
-HOMEPAGE=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
-IUSE=ipv6
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=>=sys-libs/ncurses-5.2:= virtual/inetd
-SLOT=0
-SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-ntalk-0.17.tar.gz
-_eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bd57ec1a61c9d88f7906be6dfb3a095b
diff --git a/metadata/md5-cache/net-misc/netkit-talk-0.17-r7 b/metadata/md5-cache/net-misc/netkit-talk-0.17-r7
new file mode 100644
index 000000000000..12adbb5573e4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/netkit-talk-0.17-r7
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=sys-libs/ncurses-5.2:=
+DESCRIPTION=Netkit - talkd
+EAPI=7
+HOMEPAGE=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
+IUSE=ipv6
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=>=sys-libs/ncurses-5.2:= virtual/inetd
+SLOT=0
+SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-ntalk-0.17.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cb4a092b348965f63dfa99d1c1f33ecd
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.30.4 b/metadata/md5-cache/net-misc/networkmanager-1.30.4
deleted file mode 100644
index 2fadb103c88b..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.30.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=dev-libs/glib-2.40: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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) >=sys-kernel/linux-headers-3.18 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test 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 ~ia64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.40: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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
-REQUIRED_USE=bluetooth? ( modemmanager ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) || ( nss gnutls ) ?? ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.30/NetworkManager-1.30.4.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=de2b92ae0570dd39c94cad4457310fb7
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.10 b/metadata/md5-cache/net-misc/networkmanager-1.32.10
new file mode 100644
index 000000000000..ed43d4b42f64
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-1.32.10
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) test? ( >=dev-libs/jansson-2.7 || ( ( dev-lang/python:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40: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.10.3:= ) selinux? ( sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7 >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( sys-libs/readline:0= >=dev-libs/newt-0.52.15 ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[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=A set of co-operative tools that make networking simple and straightforward
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux psl lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40: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.10.3:= ) selinux? ( sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7 >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( sys-libs/readline:0= >=dev-libs/newt-0.52.15 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
+REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) ^^ ( gnutls nss ) ?? ( elogind systemd ) ?? ( dhclient dhcpcd ) ?? ( syslog systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager/1.32/NetworkManager-1.32.10.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ca863981523aa08f2e76ffc39bd0c732
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.2 b/metadata/md5-cache/net-misc/networkmanager-1.32.2
deleted file mode 100644
index 13aa8f281bc0..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.32.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=dev-libs/glib-2.40: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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) >=sys-kernel/linux-headers-3.18 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.40: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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
-REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) || ( nss gnutls ) ?? ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.32/NetworkManager-1.32.2.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c173e2a7ee8792e0d9976f27841f6936
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.6 b/metadata/md5-cache/net-misc/networkmanager-1.32.6
deleted file mode 100644
index 29e5a4ba668a..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.32.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=dev-libs/glib-2.40: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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) >=sys-kernel/linux-headers-3.18 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.40: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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
-REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) || ( nss gnutls ) ?? ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.32/NetworkManager-1.32.6.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c173e2a7ee8792e0d9976f27841f6936
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.14.1 b/metadata/md5-cache/net-misc/openvswitch-2.14.1
index 003d1c9dcdd0..0ab7267cb974 100644
--- a/metadata/md5-cache/net-misc/openvswitch-2.14.1
+++ b/metadata/md5-cache/net-misc/openvswitch-2.14.1
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python3_8? ( dev-lang/python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.14.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=45c204259f53d9aaf2c1426a5c722bdd
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.15.0 b/metadata/md5-cache/net-misc/openvswitch-2.15.0
index b0186398bce6..3d3197e61cdc 100644
--- a/metadata/md5-cache/net-misc/openvswitch-2.15.0
+++ b/metadata/md5-cache/net-misc/openvswitch-2.15.0
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python3_8? ( dev-lang/python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.15.0.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=64395503faf8c187dfdcc993daecd4c2
diff --git a/metadata/md5-cache/net-misc/r8168-8.048.03-r1 b/metadata/md5-cache/net-misc/r8168-8.048.03-r1
index a947c15950a8..98de3bd3e4d0 100644
--- a/metadata/md5-cache/net-misc/r8168-8.048.03-r1
+++ b/metadata/md5-cache/net-misc/r8168-8.048.03-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/r8168/r8168-8.048.03.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e9d01bab9d3678d05e9ff3ddc40fa9f1
diff --git a/metadata/md5-cache/net-misc/r8168-8.049.02 b/metadata/md5-cache/net-misc/r8168-8.049.02
index fdb3437fdddd..e03051d401c3 100644
--- a/metadata/md5-cache/net-misc/r8168-8.049.02
+++ b/metadata/md5-cache/net-misc/r8168-8.049.02
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/r8168/r8168-8.049.02.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1688eb51187a1b3c8fd8d9070c79eadf
diff --git a/metadata/md5-cache/net-misc/r8168-8.049.02-r1 b/metadata/md5-cache/net-misc/r8168-8.049.02-r1
index 831e6ea031e6..f99aa5585026 100644
--- a/metadata/md5-cache/net-misc/r8168-8.049.02-r1
+++ b/metadata/md5-cache/net-misc/r8168-8.049.02-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/r8168/r8168-8.049.02.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f1172b305e7905b766b74d0f77bc570f
diff --git a/metadata/md5-cache/net-misc/realtek-r8152-2.14.0 b/metadata/md5-cache/net-misc/realtek-r8152-2.14.0
index 0cf3b75e2b58..cb44bfe45317 100644
--- a/metadata/md5-cache/net-misc/realtek-r8152-2.14.0
+++ b/metadata/md5-cache/net-misc/realtek-r8152-2.14.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/slashbeast/realtek-r8152/archive/v2.14.0.tar.gz -> realtek-r8152-2.14.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9c60705b9948b0d32a672c73c0704b59
diff --git a/metadata/md5-cache/net-misc/realtek-r8152-2.15.0 b/metadata/md5-cache/net-misc/realtek-r8152-2.15.0
index 5a8971537b3c..e32e0c7e69ea 100644
--- a/metadata/md5-cache/net-misc/realtek-r8152-2.15.0
+++ b/metadata/md5-cache/net-misc/realtek-r8152-2.15.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/slashbeast/realtek-r8152/archive/v2.15.0.tar.gz -> realtek-r8152-2.15.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=60aea47cbadec51c798366e9fadf9060
diff --git a/metadata/md5-cache/net-misc/sslh-1.22b b/metadata/md5-cache/net-misc/sslh-1.22b
new file mode 100644
index 000000000000..3990b4f87c5d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/sslh-1.22b
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=caps? ( sys-libs/libcap ) dev-libs/libpcre2:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:= dev-lang/perl
+DESCRIPTION=Port multiplexer - accept both HTTPS and SSH connections on the same port
+EAPI=7
+HOMEPAGE=https://www.rutschle.net/tech/sslh/README.html
+IUSE=caps systemd tcpd
+KEYWORDS=~amd64 ~arm ~m68k ~mips ~s390 ~x86
+LICENSE=GPL-2
+RDEPEND=caps? ( sys-libs/libcap ) dev-libs/libpcre2:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/yrutschle/sslh/archive/v1.22b.tar.gz -> sslh-1.22b.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=53cf3a82260fdb0674bab5da3c5976de
diff --git a/metadata/md5-cache/net-misc/usbip-4.13-r1 b/metadata/md5-cache/net-misc/usbip-4.13-r1
index 45ed0d9d0f6f..00a167669308 100644
--- a/metadata/md5-cache/net-misc/usbip-4.13-r1
+++ b/metadata/md5-cache/net-misc/usbip-4.13-r1
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org/
 IUSE=tcpd symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtual/libudev tcpd? ( sys-apps/tcp-wrappers ) !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 )
+RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtual/libudev tcpd? ( sys-apps/tcp-wrappers ) !build? ( app-arch/cpio 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=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.13.tar.xz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	kernel-2	6b17cdaee897466001a472284e0421c8	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d8cd139f4cd66e96ed87d0eb695bde3
diff --git a/metadata/md5-cache/net-misc/wget-1.21.1 b/metadata/md5-cache/net-misc/wget-1.21.1
index 507de206fe49..008718bebfad 100644
--- a/metadata/md5-cache/net-misc/wget-1.21.1
+++ b/metadata/md5-cache/net-misc/wget-1.21.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.21.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e51bb3892b085f377306cb428c2c09d9
+_md5_=ce0bb7cb428eaab6a8722c3d9834b48f
diff --git a/metadata/md5-cache/net-misc/yt-dlp-2021.8.10 b/metadata/md5-cache/net-misc/yt-dlp-2021.8.10
new file mode 100644
index 000000000000..774f0b940f09
--- /dev/null
+++ b/metadata/md5-cache/net-misc/yt-dlp-2021.8.10
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/mutagen[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websockets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-video/ffmpeg >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A youtube-dl fork with additional features and fixes
+EAPI=7
+HOMEPAGE=https://github.com/yt-dlp/yt-dlp
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=public-domain
+RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/mutagen[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websockets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-video/ffmpeg python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/y/yt-dlp/yt-dlp-2021.8.10.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1b7084643ac644b7ace98198021d65e6
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 835ddd6c0b27..05a1de2c5d6e 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/energi3-3.1.0 b/metadata/md5-cache/net-p2p/energi3-3.1.0
index 96a1b528e29c..6a1a4a250f70 100644
--- a/metadata/md5-cache/net-p2p/energi3-3.1.0
+++ b/metadata/md5-cache/net-p2p/energi3-3.1.0
@@ -10,4 +10,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/energicryptocurrency/energi3/archive/refs/tags/v3.1.0.tar.gz -> energi3-3.1.0.tar.gz
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5ba7ca77e462f65ea1f93966004c182f
+_md5_=55bf469fb678a729fd3bcb69d58773d7
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index c8463cb8f078..50d80f80e49f 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/gutenprint-5.3.4-r2 b/metadata/md5-cache/net-print/gutenprint-5.3.4-r2
index 8c8a6a95dacb..1c10f37883c7 100644
--- a/metadata/md5-cache/net-print/gutenprint-5.3.4-r2
+++ b/metadata/md5-cache/net-print/gutenprint-5.3.4-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Ghostscript and cups printer drivers
 EAPI=7
 HOMEPAGE=http://gutenprint.sourceforge.net
 IUSE=cups gimp gtk nls readline ppds static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl cups? ( >=net-print/cups-1.1.14 ) gimp? ( media-gfx/gimp:0/2 x11-libs/gtk+:2 ) gtk? ( x11-libs/gtk+:2 ) readline? ( sys-libs/readline:0= )
 REQUIRED_USE=gimp? ( gtk )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/gimp-print/gutenprint-5.3.4.tar.xz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9d894a25ce273b4b57fa2665decc9e6f
+_md5_=d021530b96ce5d14066b8f99c28933ce
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 569234b39607..4ec11a7ee769 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.24 b/metadata/md5-cache/net-proxy/haproxy-2.0.24
index c5f261838646..d3adbb6e9e16 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.24
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.24
@@ -5,11 +5,11 @@ DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
 IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3 kernel_linux
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ppc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.0
 SRC_URI=http://haproxy.1wt.eu/download/2.0/src/haproxy-2.0.24.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	8cdf449259063fc54bf347db93744d1f	lua-utils	af986d19619f43dc53862da0d25b9c2e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e412af4ec490882c7dc5a77bef38d2f2
+_md5_=d95dee1f1c33caf76f1910d13036ee2a
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.16 b/metadata/md5-cache/net-proxy/haproxy-2.2.16
index 20d9e1aad0fb..77d5db84ddf2 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.16
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.16
@@ -5,11 +5,11 @@ DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
 IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3 kernel_linux
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ppc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.2
 SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.16.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	8cdf449259063fc54bf347db93744d1f	lua-utils	af986d19619f43dc53862da0d25b9c2e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e412af4ec490882c7dc5a77bef38d2f2
+_md5_=d95dee1f1c33caf76f1910d13036ee2a
diff --git a/metadata/md5-cache/net-voip/Manifest.gz b/metadata/md5-cache/net-voip/Manifest.gz
index ff52ca3d7f15..3983668d74e4 100644
--- a/metadata/md5-cache/net-voip/Manifest.gz
+++ b/metadata/md5-cache/net-voip/Manifest.gz
diff --git a/metadata/md5-cache/net-voip/sipvicious-0.3.4 b/metadata/md5-cache/net-voip/sipvicious-0.3.4
new file mode 100644
index 000000000000..2fe615177104
--- /dev/null
+++ b/metadata/md5-cache/net-voip/sipvicious-0.3.4
@@ -0,0 +1,14 @@
+BDEPEND=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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) 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(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=SIPVicious is a SIP security package
+EAPI=8
+HOMEPAGE=https://github.com/EnableSecurity/sipvicious/wiki
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_8? ( dev-python/dnspython[python_targets_python3_8(-)] dev-python/reportlab[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dnspython[python_targets_python3_9(-)] dev-python/reportlab[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dnspython[python_targets_python3_10(-)] dev-python/reportlab[python_targets_python3_10(-)] ) 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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/EnableSecurity/sipvicious/archive/v0.3.4.tar.gz -> sipvicious-0.3.4.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=98b2db6babcffd8f10497a2a6f04a200
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 35ad636a73f8..bf1c06d31654 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/libreswan-3.32-r5 b/metadata/md5-cache/net-vpn/libreswan-3.32-r5
deleted file mode 100644
index 5628e868e9bf..000000000000
--- a/metadata/md5-cache/net-vpn/libreswan-3.32-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
-DESCRIPTION=IPsec implementation for Linux, fork of Openswan
-EAPI=7
-HOMEPAGE=https://libreswan.org/
-IUSE=caps curl dnssec ldap pam seccomp selinux systemd test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec ) virtual/tmpfiles
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.libreswan.org/libreswan-3.32.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=01a9d57f7ca9b57edf181db8df43c8ab
diff --git a/metadata/md5-cache/net-vpn/libreswan-4.2-r2 b/metadata/md5-cache/net-vpn/libreswan-4.2-r2
deleted file mode 100644
index d40e76e0b7f9..000000000000
--- a/metadata/md5-cache/net-vpn/libreswan-4.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
-DESCRIPTION=IPsec implementation for Linux, fork of Openswan
-EAPI=7
-HOMEPAGE=https://libreswan.org/
-IUSE=caps curl dnssec ldap networkmanager pam seccomp selinux systemd test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec ) virtual/tmpfiles
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.libreswan.org/libreswan-4.2.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=15d0afe674e81a448d26b2a71b88c779
diff --git a/metadata/md5-cache/net-vpn/libreswan-4.5 b/metadata/md5-cache/net-vpn/libreswan-4.5
new file mode 100644
index 000000000000..dc297345c0dd
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/libreswan-4.5
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
+DESCRIPTION=IPsec implementation for Linux, fork of Openswan
+EAPI=7
+HOMEPAGE=https://libreswan.org/
+IUSE=caps curl dnssec ldap networkmanager pam seccomp selinux systemd test
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 BSD-4 RSA DES
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec ) virtual/tmpfiles
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.libreswan.org/libreswan-4.5.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=36395fc3be976df0e51822df9526c52d
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.6-r1 b/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.6-r1
index bd5f32ce0bb7..ad97ae5acef3 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.6-r1
+++ b/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.6-r1
@@ -5,10 +5,10 @@ DESCRIPTION=NetworkManager OpenConnect plugin
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk
-KEYWORDS=amd64 arm arm64 ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 >=net-vpn/openconnect-3.02:= gtk? ( >=app-crypt/gcr-3.4:= >=app-crypt/libsecret-0.18 >=x11-libs/gtk+-3.4:3 ) acct-group/nm-openconnect acct-user/nm-openconnect
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openconnect/1.2/NetworkManager-openconnect-1.2.6.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cacdb83a7ae86225cbd0ac069cec27b9
+_md5_=e9b2e3bd7d61e346598d4f9a6ad80cd5
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.5.9-r1 b/metadata/md5-cache/net-vpn/tor-0.4.5.9-r1
deleted file mode 100644
index 922262eea446..000000000000
--- a/metadata/md5-cache/net-vpn/tor-0.4.5.9-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=verify-sig? ( app-crypt/openpgp-keys-tor ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install unpack
-DEPEND=dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd )
-DESCRIPTION=Anonymizing overlay network for TCP
-EAPI=7
-HOMEPAGE=http://www.torproject.org/
-IUSE=caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd verify-sig
-KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 x86 ~ppc-macos
-LICENSE=BSD GPL-2
-RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.torproject.org/dist/tor-0.4.5.9.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.5.9.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.5.9.tar.gz.asc )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7a4f3a3eba188f095eae3d1928ffe7f4
diff --git a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210606 b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210606
index fbe6eb26602a..4251dd9800ee 100644
--- a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210606
+++ b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210606
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=module? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20210606.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50125427e4d052d0666f6f50dc2c2d03
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index f62b0c09d8ef..a8ce7fa2c1c7 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r6 b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r6
index 8c04d28a4aa5..2b021f475d5a 100644
--- a/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r6
+++ b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r6
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=mirror
 SLOT=0
 SRC_URI=x86? ( https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz ) amd64? ( https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz ) https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_6.30.223.271.txt -> README-broadcom-sta-6.30.223.271.txt
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2da30aceccc2acac0c0561d6212d9728
diff --git a/metadata/md5-cache/net-wireless/iwd-1.17 b/metadata/md5-cache/net-wireless/iwd-1.17
new file mode 100644
index 000000000000..773a822af758
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/iwd-1.17
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup unpack
+DEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.43
+DESCRIPTION=Wireless daemon for linux
+EAPI=7
+HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
+IUSE=+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 standalone systemd kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.43 net-wireless/wireless-regdb crda? ( net-wireless/crda ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-1.17.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5444a72cd4571feffe29d202e3e46e5a
diff --git a/metadata/md5-cache/net-wireless/unifi-6.4.47 b/metadata/md5-cache/net-wireless/unifi-6.4.47
deleted file mode 100644
index 7d65fc16621a..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-6.4.47
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
-EAPI=7
-HOMEPAGE=https://www.ubnt.com
-IUSE=systemd
-KEYWORDS=~amd64
-LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
-RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/6.4
-SRC_URI=https://dl.ui.com/unifi/6.4.47-8c13da2a29/UniFi.unix.zip -> unifi-6.4.47.zip
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b22b1c05b5219408c7c0f2de94c487f3
diff --git a/metadata/md5-cache/net-wireless/unifi-6.4.51 b/metadata/md5-cache/net-wireless/unifi-6.4.51
new file mode 100644
index 000000000000..83cc5f20b3e7
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-6.4.51
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=7
+HOMEPAGE=https://www.ubnt.com
+IUSE=systemd
+KEYWORDS=~amd64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/6.4
+SRC_URI=https://dl.ui.com/unifi/6.4.51-56f5e9d9a5/UniFi.unix.zip -> unifi-6.4.51.zip
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58fdb634d3954514ae7971cc074ffdc7
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 67ca65a6840b..6739be6faa79 100644
--- a/metadata/md5-cache/sci-biology/Manifest.gz
+++ b/metadata/md5-cache/sci-biology/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/mrbayes-3.1.2-r2 b/metadata/md5-cache/sci-biology/mrbayes-3.1.2-r2
index 93f28bb858af..e0583c8b4612 100644
--- a/metadata/md5-cache/sci-biology/mrbayes-3.1.2-r2
+++ b/metadata/md5-cache/sci-biology/mrbayes-3.1.2-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses:0= mpi? ( virtual/mpi ) readline? ( sys-libs/readline:0= )
+DEPEND=sys-libs/ncurses:= mpi? ( virtual/mpi ) readline? ( sys-libs/readline:= )
 DESCRIPTION=Bayesian Inference of Phylogeny
-EAPI=5
+EAPI=8
 HOMEPAGE=http://mrbayes.csit.fsu.edu/
 IUSE=debug mpi readline
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= mpi? ( virtual/mpi ) readline? ( sys-libs/readline:0= )
+RDEPEND=sys-libs/ncurses:= mpi? ( virtual/mpi ) readline? ( sys-libs/readline:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/mrbayes/mrbayes-3.1.2.tar.gz
-_eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c97a54ea522e76af98a9b4e7e29e79cc
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=934b64005f56b5809a9cbbdf69aab63b
diff --git a/metadata/md5-cache/sci-biology/plink-1.90_pre140514 b/metadata/md5-cache/sci-biology/plink-1.90_pre140514
index 4b0c15f37118..f9630e2f016b 100644
--- a/metadata/md5-cache/sci-biology/plink-1.90_pre140514
+++ b/metadata/md5-cache/sci-biology/plink-1.90_pre140514
@@ -1,7 +1,8 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/zlib virtual/cblas virtual/lapack app-arch/unzip virtual/pkgconfig
+DEPEND=sys-libs/zlib virtual/cblas virtual/lapack
 DESCRIPTION=Whole genome association analysis toolset
-EAPI=5
+EAPI=8
 HOMEPAGE=http://pngu.mgh.harvard.edu/~purcell/plink/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -9,4 +10,4 @@ RDEPEND=sys-libs/zlib virtual/cblas virtual/lapack
 SLOT=0
 SRC_URI=http://pngu.mgh.harvard.edu/~purcell/static/bin/plink140514/plink_src.zip -> plink-1.90_pre140514.zip
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e1f50da3f99cd26238e4ef37a7de379a
+_md5_=e839f5daef081dde4b2d3e0417010738
diff --git a/metadata/md5-cache/sci-biology/velvet-1.2.10 b/metadata/md5-cache/sci-biology/velvet-1.2.10
index eec750f367f6..6f71b25cdea9 100644
--- a/metadata/md5-cache/sci-biology/velvet-1.2.10
+++ b/metadata/md5-cache/sci-biology/velvet-1.2.10
@@ -1,12 +1,12 @@
+BDEPEND=doc? ( virtual/latex-base )
 DEFINED_PHASES=compile install prepare test
-DEPEND=doc? ( virtual/latex-base )
 DESCRIPTION=A sequence assembler for very short reads
-EAPI=5
+EAPI=8
 HOMEPAGE=https://www.ebi.ac.uk/~zerbino/velvet/
 IUSE=doc openmp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.ebi.ac.uk/~zerbino/velvet/velvet_1.2.10.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b07b48444158719f00b415b6f8b8e6a1
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f48eb0348a1ac91d41dde22d3ced2ea1
diff --git a/metadata/md5-cache/sci-biology/wise-2.4.0_alpha b/metadata/md5-cache/sci-biology/wise-2.4.0_alpha
deleted file mode 100644
index 173af71c9d6d..000000000000
--- a/metadata/md5-cache/sci-biology/wise-2.4.0_alpha
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=~sci-biology/hmmer-2.3.2 app-shells/tcsh dev-lang/perl virtual/latex-base
-DESCRIPTION=Intelligent algorithms for DNA searches
-EAPI=5
-HOMEPAGE=http://www.ebi.ac.uk/Wise2/
-IUSE=doc static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=~sci-biology/hmmer-2.3.2
-SLOT=0
-SRC_URI=ftp://ftp.ebi.ac.uk/pub/software/wise2/wise2.4.0alpha.tar.gz https://dev.gentoo.org/~mgorny/dist/wise-2.4.0_alpha-patchset.tar.bz2
-_eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=d5566134a062c60e1c2223a1b1283862
diff --git a/metadata/md5-cache/sci-biology/wise-2.4.0_alpha-r1 b/metadata/md5-cache/sci-biology/wise-2.4.0_alpha-r1
new file mode 100644
index 000000000000..31ec4dfd8d82
--- /dev/null
+++ b/metadata/md5-cache/sci-biology/wise-2.4.0_alpha-r1
@@ -0,0 +1,14 @@
+BDEPEND=app-shells/tcsh dev-lang/perl virtual/latex-base
+DEFINED_PHASES=compile install prepare test
+DEPEND=~sci-biology/hmmer-2.3.2
+DESCRIPTION=Intelligent algorithms for DNA searches
+EAPI=8
+HOMEPAGE=http://www.ebi.ac.uk/Wise2/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=~sci-biology/hmmer-2.3.2
+SLOT=0
+SRC_URI=ftp://ftp.ebi.ac.uk/pub/software/wise2/wise2.4.0alpha.tar.gz https://dev.gentoo.org/~mgorny/dist/wise-2.4.0_alpha-patchset.tar.bz2
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=34f9a1f8b8f239e402200b9b5cb4f3cc
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index e2627006a75d..cb2e908745a2 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.2 b/metadata/md5-cache/sci-chemistry/gromacs-2021.2
index 89cc5b8e3223..5adcf96b48a5 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.2
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.2
@@ -1,4 +1,4 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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] ) !sci-chemistry/gmxapi virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake 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] )
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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] ) !sci-chemistry/gmxapi virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake 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] )
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
@@ -6,10 +6,10 @@ HOMEPAGE=http://www.gromacs.org/
 IUSE=X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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] ) !sci-chemistry/gmxapi 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] )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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] ) !sci-chemistry/gmxapi 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=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/2021.2
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2021.2.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2021.2.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2021.2.tar.gz )
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fc0196d0135a3f3e71aa966ca07c27fd
+_md5_=5e6d6bcda4b41887475cdba7e89c0a03
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
index 93366a880de5..93e2340cec51 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
@@ -1,4 +1,4 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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] ) !sci-chemistry/gmxapi virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake 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-vcs/git-1.8.2.1[curl]
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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] ) !sci-chemistry/gmxapi virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake 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-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.gromacs.org/
 IUSE=X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 PROPERTIES=live
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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] ) !sci-chemistry/gmxapi 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] )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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] ) !sci-chemistry/gmxapi 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=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/2021.9999
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ad50020b4cfc68902965d5038f8595e9
+_md5_=51ff5bfd02d9afe75f75c9e2345bbc03
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-9999 b/metadata/md5-cache/sci-chemistry/gromacs-9999
index 51e5e925314d..7b937499f765 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-9999
@@ -1,4 +1,4 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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] ) !sci-chemistry/gmxapi virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake 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-vcs/git-1.8.2.1[curl]
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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] ) !sci-chemistry/gmxapi virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake 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-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.gromacs.org/
 IUSE=X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 PROPERTIES=live
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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] ) !sci-chemistry/gmxapi 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] )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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] ) !sci-chemistry/gmxapi 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=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ad50020b4cfc68902965d5038f8595e9
+_md5_=51ff5bfd02d9afe75f75c9e2345bbc03
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 87232c0b3bc0..9370d878f551 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/drawtiming-0.7.1-r2 b/metadata/md5-cache/sci-electronics/drawtiming-0.7.1-r2
deleted file mode 100644
index bc0c435599d3..000000000000
--- a/metadata/md5-cache/sci-electronics/drawtiming-0.7.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-gfx/imagemagick[cxx] 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=Command line tool for drawing timing diagrams
-EAPI=5
-HOMEPAGE=http://drawtiming.sourceforge.net/index.html
-IUSE=examples
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-gfx/imagemagick[cxx]
-SLOT=0
-SRC_URI=mirror://sourceforge/drawtiming/drawtiming-0.7.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d0d662c20fb477dd49ffcc1810618379
diff --git a/metadata/md5-cache/sci-electronics/eagle-7.7.0-r1 b/metadata/md5-cache/sci-electronics/eagle-7.7.0-r1
index e47021d9c820..4515c7426e6d 100644
--- a/metadata/md5-cache/sci-electronics/eagle-7.7.0-r1
+++ b/metadata/md5-cache/sci-electronics/eagle-7.7.0-r1
@@ -3,11 +3,11 @@ DESCRIPTION=CadSoft EAGLE schematic and printed circuit board (PCB) layout edito
 EAPI=6
 HOMEPAGE=http://www.cadsoft.de
 IUSE=doc
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* ~amd64 x86
 LICENSE=cadsoft-2
 RDEPEND=sys-libs/glibc || ( <dev-libs/openssl-1.1 dev-libs/openssl-compat:1.0.0 ) >=sys-libs/zlib-1.2.8-r1 >=media-libs/freetype-2.5.0.1 >=media-libs/fontconfig-2.10.92 x11-libs/libXext x11-libs/libX11 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXrandr-1.4.2 >=x11-libs/libXcursor-1.1.14 >=x11-libs/libXi-1.7.2 net-print/cups x11-libs/libxcb
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=x86? ( ftp://ftp.cadsoft.de/eagle/program/7.7/eagle-lin32-7.7.0.run ) amd64? ( ftp://ftp.cadsoft.de/eagle/program/7.7/eagle-lin64-7.7.0.run )
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f66b0b87c7ca585a399209603a1bc627
+_md5_=2770a2f5152b8804d4c43faffd22c5a5
diff --git a/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1 b/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1
index 891ec0ebd605..3529df0e3016 100644
--- a/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1
+++ b/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1
@@ -1,10 +1,11 @@
-DEFINED_PHASES=install postinst postrm preinst
+DEFINED_PHASES=postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Creates an "Electronics" desktop menu
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.gpleda.org/
 KEYWORDS=amd64 ~arm64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://geda.seul.org/dist/electronics-menu-1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=de797f73f3ff0661ba4588dee7230d97
+_eclasses_=xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d669465fd76a8295b989a71080d7b244
diff --git a/metadata/md5-cache/sci-electronics/gsmc-1.1-r2 b/metadata/md5-cache/sci-electronics/gsmc-1.1-r2
index fb2c2171481d..670a384c5dba 100644
--- a/metadata/md5-cache/sci-electronics/gsmc-1.1-r2
+++ b/metadata/md5-cache/sci-electronics/gsmc-1.1-r2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig 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
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 virtual/pkgconfig 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=dev-libs/glib:2 x11-libs/gtk+:2
 DESCRIPTION=A GTK program for doing Smith Chart calculations
-EAPI=5
+EAPI=8
 HOMEPAGE=https://www.qsl.net/ik5nax/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://www.qsl.net/ik5nax/gsmc-1.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6ccd22517b8dd8febe7e94bf20d56157
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b391ef55f689e8bea0bd538788d5d55a
diff --git a/metadata/md5-cache/sci-electronics/irsim-9.7.93 b/metadata/md5-cache/sci-electronics/irsim-9.7.93
index 109c90e4137e..84711248ccc6 100644
--- a/metadata/md5-cache/sci-electronics/irsim-9.7.93
+++ b/metadata/md5-cache/sci-electronics/irsim-9.7.93
@@ -1,12 +1,12 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-lang/tcl:0 dev-lang/tk:0 app-shells/tcsh
+BDEPEND=app-shells/tcsh
+DEFINED_PHASES=configure postinst
+DEPEND=dev-lang/tcl:= dev-lang/tk:=
 DESCRIPTION=IRSIM is a "switch-level" simulator
-EAPI=5
+EAPI=8
 HOMEPAGE=http://opencircuitdesign.com/irsim/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-lang/tcl:0 dev-lang/tk:0
+RDEPEND=dev-lang/tcl:= dev-lang/tk:=
 SLOT=0
 SRC_URI=http://opencircuitdesign.com/irsim/archive/irsim-9.7.93.tgz
-_eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=081be0fd84e88f58ef0293f13be6f4be
+_md5_=dc979061c7f5a90bece0990b8d6960c6
diff --git a/metadata/md5-cache/sci-electronics/petrify-4.2-r1 b/metadata/md5-cache/sci-electronics/petrify-4.2-r1
index 1a97152f5437..08f444a57ed3 100644
--- a/metadata/md5-cache/sci-electronics/petrify-4.2-r1
+++ b/metadata/md5-cache/sci-electronics/petrify-4.2-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install
 DESCRIPTION=Synthesize Petri nets into asynchronous circuits
-EAPI=5
+EAPI=8
 HOMEPAGE=http://www.lsi.upc.edu/~jordicf/petrify/
 KEYWORDS=~amd64 ~x86
 LICENSE=Old-MIT
@@ -8,4 +8,4 @@ RDEPEND=media-gfx/graphviz
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://www.lsi.upc.edu/~jordicf/petrify/distrib/petrify-4.2-linux.tgz
-_md5_=96d1d92012656948498aad0b4820a616
+_md5_=89f5e2b404701ced0649acfc5d43672f
diff --git a/metadata/md5-cache/sci-electronics/splat-1.4.2 b/metadata/md5-cache/sci-electronics/splat-1.4.2
index 79e39425e328..86ce5a23e9f6 100644
--- a/metadata/md5-cache/sci-electronics/splat-1.4.2
+++ b/metadata/md5-cache/sci-electronics/splat-1.4.2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=sys-libs/zlib app-arch/bzip2
+DEFINED_PHASES=compile configure install postinst
+DEPEND=app-arch/bzip2 sys-libs/zlib
 DESCRIPTION=RF Signal Propagation, Loss, And Terrain analysis tool
-EAPI=5
+EAPI=8
 HOMEPAGE=https://www.qsl.net/kd2bd/splat.html
 IUSE=doc hires l10n_es
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib app-arch/bzip2
+RDEPEND=app-arch/bzip2 sys-libs/zlib
 SLOT=0
 SRC_URI=https://www.qsl.net/kd2bd/splat-1.4.2.tar.bz2
-_eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=45997c7be7bd20450e806b6118bd0378
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=883673e56c0c6b57bf54b087620961b2
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 9e95df1fd500..a963f845d9d1 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.23-r2 b/metadata/md5-cache/sci-geosciences/gpsd-3.23-r2
index 73b7a9d1f86a..96bcf668d8ca 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.23-r2
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.23-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/29
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.23.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490
-_md5_=57016cc6122be0d53392e625102188e0
+_md5_=0f7ddbe0afe6c607d411e8c4d51d4048
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-9999 b/metadata/md5-cache/sci-geosciences/gpsd-9999
index 65a99ce46cf7..44905f5f40ad 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-9999
+++ b/metadata/md5-cache/sci-geosciences/gpsd-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gps
 RESTRICT=!test? ( test )
 SLOT=0/29
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490
-_md5_=57016cc6122be0d53392e625102188e0
+_md5_=0f7ddbe0afe6c607d411e8c4d51d4048
diff --git a/metadata/md5-cache/sci-geosciences/gshhs-data-2.2.0 b/metadata/md5-cache/sci-geosciences/gshhs-data-2.2.0
index a5301168f0df..c04caa5965d0 100644
--- a/metadata/md5-cache/sci-geosciences/gshhs-data-2.2.0
+++ b/metadata/md5-cache/sci-geosciences/gshhs-data-2.2.0
@@ -1,9 +1,10 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install
 DESCRIPTION=Global Self-consistent, Hierarchical, High-resolution Shoreline programs data
-EAPI=5
+EAPI=8
 HOMEPAGE=https://www.ngdc.noaa.gov/mgg/shorelines/gshhs.html
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.ngdc.noaa.gov/mgg/shorelines/data/gshhg/oldversions/version2.2.0/gshhs+wdbii_2.2.0.zip
-_md5_=8672c8085eebd5fb2d0c0b564615d454
+_md5_=ce42a0ae75762526cdebc99c784d11ad
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 6099dbcc48f7..ecae5a22c9c3 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.3-r1 b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.3-r1
index 7fff98bbc4a9..a338efac7aa7 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.3-r1
+++ b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/gpib !<sci-libs/linux-gpib-4.2.0_rc1 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.3.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c8498b92847c4cc16977e7532d55d320
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.4 b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.4
index 3cdda9d8dad5..16e9be97d5fe 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.4
+++ b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/gpib !<sci-libs/linux-gpib-4.2.0_rc1 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.3.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c8498b92847c4cc16977e7532d55d320
diff --git a/metadata/md5-cache/sci-libs/med-4.1.0 b/metadata/md5-cache/sci-libs/med-4.1.0
index 63128f4fc53d..edeaea86e42c 100644
--- a/metadata/md5-cache/sci-libs/med-4.1.0
+++ b/metadata/md5-cache/sci-libs/med-4.1.0
@@ -1,16 +1,16 @@
 BDEPEND=python? ( >=dev-lang/swig-3.0.8 ) dev-util/ninja dev-util/cmake fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!sci-libs/libmed dev-lang/tk:0= >=sci-libs/hdf5-1.10.2:=[fortran?,mpi?] mpi? ( virtual/mpi[fortran?] ) python? ( 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] ) ) fortran? ( virtual/fortran )
+DEPEND=!sci-libs/libmed dev-lang/tk:0= >=sci-libs/hdf5-1.10.2:=[fortran?,mpi?] mpi? ( virtual/mpi[fortran?] ) python? ( 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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) fortran? ( virtual/fortran )
 DESCRIPTION=A library to store and exchange meshed data or computation results
 EAPI=7
 HOMEPAGE=https://www.salome-platform.org/user-section/about/med
-IUSE=doc fortran mpi python test python_single_target_python3_8 python_single_target_python3_9
+IUSE=doc fortran mpi python test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=!sci-libs/libmed dev-lang/tk:0= >=sci-libs/hdf5-1.10.2:=[fortran?,mpi?] mpi? ( virtual/mpi[fortran?] ) python? ( 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] ) ) fortran? ( virtual/fortran )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RDEPEND=!sci-libs/libmed dev-lang/tk:0= >=sci-libs/hdf5-1.10.2:=[fortran?,mpi?] mpi? ( virtual/mpi[fortran?] ) python? ( 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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) fortran? ( virtual/fortran )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=!test? ( test ) python? ( test )
 SLOT=0
 SRC_URI=https://files.salome-platform.org/Salome/other/med-4.1.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=407587f4df2eff9329ade7913d778f1f
+_md5_=1d68d1384c1782ca06becf29d7e7198a
diff --git a/metadata/md5-cache/sci-libs/profnet-1.0.22 b/metadata/md5-cache/sci-libs/profnet-1.0.22
index ce510641cf3e..97904c24730e 100644
--- a/metadata/md5-cache/sci-libs/profnet-1.0.22
+++ b/metadata/md5-cache/sci-libs/profnet-1.0.22
@@ -1,12 +1,13 @@
+BDEPEND=virtual/fortran
 DEFINED_PHASES=compile install prepare setup
 DEPEND=sys-libs/libunwind virtual/fortran
 DESCRIPTION=Neural network architecture for profacc
-EAPI=5
+EAPI=7
 HOMEPAGE=https://rostlab.org/
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=sys-libs/libunwind virtual/fortran
 SLOT=0
 SRC_URI=ftp://rostlab.org/profnet/profnet-1.0.22.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4d06a5fe4ea8a7a7441e0480e42be2ce
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f834a04846b6e67dd20071db145f11e7
diff --git a/metadata/md5-cache/sci-libs/profphd-utils-1.0.10-r1 b/metadata/md5-cache/sci-libs/profphd-utils-1.0.10-r1
index 7e02a0b32985..5aec4e15d5b1 100644
--- a/metadata/md5-cache/sci-libs/profphd-utils-1.0.10-r1
+++ b/metadata/md5-cache/sci-libs/profphd-utils-1.0.10-r1
@@ -1,12 +1,13 @@
+BDEPEND=dev-lang/perl virtual/fortran
 DEFINED_PHASES=compile install setup
-DEPEND=dev-lang/perl virtual/fortran
+DEPEND=virtual/fortran
 DESCRIPTION=Additional utils for profphd
-EAPI=5
+EAPI=8
 HOMEPAGE=https://rostlab.org/
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=ftp://rostlab.org/profphd-utils/profphd-utils-1.0.10.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f9f3c7e90a136f97769099889576bdfe
+_eclasses_=fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=428e4f0fb5dae339936e0195cc7ccec7
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 7af7e1389028..696f45b8d5c7 100644
--- a/metadata/md5-cache/sci-misc/Manifest.gz
+++ b/metadata/md5-cache/sci-misc/Manifest.gz
diff --git a/metadata/md5-cache/sci-misc/tango-9.2.5a b/metadata/md5-cache/sci-misc/tango-9.2.5a
deleted file mode 100644
index fd5b3fa38243..000000000000
--- a/metadata/md5-cache/sci-misc/tango-9.2.5a
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=net-misc/omniORB mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) dbserver? ( mariadb? ( dev-db/mariadb:*[server] ) !mariadb? ( >=virtual/mysql-5.6[server] ) ) java? ( virtual/jdk:* ) zeromq? ( net-libs/zeromq )
-DEFINED_PHASES=configure
-DEPEND=net-misc/omniORB mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) dbserver? ( mariadb? ( dev-db/mariadb:*[server] ) !mariadb? ( >=virtual/mysql-5.6[server] ) ) java? ( virtual/jdk:* ) zeromq? ( net-libs/zeromq )
-DESCRIPTION=Tango is an Open Source solution for SCADA and DCS
-EAPI=7
-HOMEPAGE=https://www.tango-controls.org/
-IUSE=+dbserver java +mariadb +zeromq
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-misc/omniORB mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) dbserver? ( mariadb? ( dev-db/mariadb:*[server] ) !mariadb? ( >=virtual/mysql-5.6[server] ) ) java? ( virtual/jdk:* ) zeromq? ( net-libs/zeromq )
-SLOT=0
-SRC_URI=mirror://sourceforge/tango-cs/tango-9.2.5a.tar.gz
-_md5_=247c407221e2f0973a366bbbb70074a2
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 11bd580f65d4..5739f265f3b0 100644
--- a/metadata/md5-cache/sci-physics/Manifest.gz
+++ b/metadata/md5-cache/sci-physics/Manifest.gz
diff --git a/metadata/md5-cache/sci-physics/geant-4.10.7-r2 b/metadata/md5-cache/sci-physics/geant-4.10.7-r2
deleted file mode 100644
index 65b491541258..000000000000
--- a/metadata/md5-cache/sci-physics/geant-4.10.7-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Toolkit for simulation of passage of particles through matter
-EAPI=7
-HOMEPAGE=https://geant4.web.cern.ch/
-IUSE=c++11 c++14 +c++17 +data dawn doc examples freetype gdml geant3 hdf5 inventor motif opengl qt5 raytracerx static-libs threads vrml
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=geant4
-RDEPEND=dev-libs/expat >=sci-physics/clhep-2.4.4.0:2=[threads?] data? ( ~sci-physics/geant-data-4.10.7 ) dawn? ( media-gfx/dawn ) doc? ( =app-doc/geant-docs-4.10.7* ) gdml? ( dev-libs/xerces-c ) hdf5? ( sci-libs/hdf5[threads?] ) inventor? ( media-libs/SoXt ) motif? ( x11-libs/motif:0 ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qt3d:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
-REQUIRED_USE=^^ ( c++11 c++14 c++17 ) inventor? ( opengl ) motif? ( opengl ) qt5? ( opengl )
-SLOT=4
-SRC_URI=https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=64cd6bbc7930ab224b401dfc05f5fe11
diff --git a/metadata/md5-cache/sci-physics/geant-4.10.7-r3 b/metadata/md5-cache/sci-physics/geant-4.10.7-r3
new file mode 100644
index 000000000000..892a4faae969
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/geant-4.10.7-r3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Toolkit for simulation of passage of particles through matter
+EAPI=7
+HOMEPAGE=https://geant4.web.cern.ch/
+IUSE=c++11 c++14 +c++17 +data dawn doc examples freetype gdml geant3 hdf5 inventor motif opengl qt5 raytracerx static-libs threads vrml
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=geant4
+RDEPEND=dev-libs/expat >=sci-physics/clhep-2.4.4.0:2=[threads?] data? ( ~sci-physics/geant-data-4.10.7 ) dawn? ( media-gfx/dawn ) doc? ( =app-doc/geant-docs-4.10.7* ) gdml? ( dev-libs/xerces-c ) hdf5? ( sci-libs/hdf5[threads?] ) inventor? ( media-libs/SoXt ) motif? ( x11-libs/motif:0 ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qt3d:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
+REQUIRED_USE=^^ ( c++11 c++14 c++17 ) inventor? ( opengl ) motif? ( opengl ) qt5? ( opengl )
+SLOT=4
+SRC_URI=https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f626574962a0a31e340a5dd7a79e358a
diff --git a/metadata/md5-cache/sci-physics/geant-4.10.7.1-r2 b/metadata/md5-cache/sci-physics/geant-4.10.7.1-r2
deleted file mode 100644
index 932fd2a2200d..000000000000
--- a/metadata/md5-cache/sci-physics/geant-4.10.7.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Toolkit for simulation of passage of particles through matter
-EAPI=7
-HOMEPAGE=https://geant4.web.cern.ch/
-IUSE=c++11 c++14 +c++17 +data dawn doc examples freetype gdml geant3 hdf5 inventor motif opengl qt5 raytracerx static-libs threads vrml
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=geant4
-RDEPEND=dev-libs/expat >=sci-physics/clhep-2.4.4.0:2=[threads?] data? ( ~sci-physics/geant-data-4.10.7.1 ) dawn? ( media-gfx/dawn ) doc? ( =app-doc/geant-docs-4.10.7* ) gdml? ( dev-libs/xerces-c ) hdf5? ( sci-libs/hdf5[threads?] ) inventor? ( media-libs/SoXt ) motif? ( x11-libs/motif:0 ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qt3d:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
-REQUIRED_USE=^^ ( c++11 c++14 c++17 ) inventor? ( opengl ) motif? ( opengl ) qt5? ( opengl )
-SLOT=4
-SRC_URI=https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.p01.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=64cd6bbc7930ab224b401dfc05f5fe11
diff --git a/metadata/md5-cache/sci-physics/geant-4.10.7.1-r3 b/metadata/md5-cache/sci-physics/geant-4.10.7.1-r3
new file mode 100644
index 000000000000..33d4bb19558a
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/geant-4.10.7.1-r3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Toolkit for simulation of passage of particles through matter
+EAPI=7
+HOMEPAGE=https://geant4.web.cern.ch/
+IUSE=c++11 c++14 +c++17 +data dawn doc examples freetype gdml geant3 hdf5 inventor motif opengl qt5 raytracerx static-libs threads vrml
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=geant4
+RDEPEND=dev-libs/expat >=sci-physics/clhep-2.4.4.0:2=[threads?] data? ( ~sci-physics/geant-data-4.10.7.1 ) dawn? ( media-gfx/dawn ) doc? ( =app-doc/geant-docs-4.10.7* ) gdml? ( dev-libs/xerces-c ) hdf5? ( sci-libs/hdf5[threads?] ) inventor? ( media-libs/SoXt ) motif? ( x11-libs/motif:0 ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qt3d:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
+REQUIRED_USE=^^ ( c++11 c++14 c++17 ) inventor? ( opengl ) motif? ( opengl ) qt5? ( opengl )
+SLOT=4
+SRC_URI=https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.p01.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f626574962a0a31e340a5dd7a79e358a
diff --git a/metadata/md5-cache/sci-physics/geant-4.10.7.2-r2 b/metadata/md5-cache/sci-physics/geant-4.10.7.2-r2
deleted file mode 100644
index 031711c8d70b..000000000000
--- a/metadata/md5-cache/sci-physics/geant-4.10.7.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Toolkit for simulation of passage of particles through matter
-EAPI=7
-HOMEPAGE=https://geant4.web.cern.ch/
-IUSE=c++11 c++14 +c++17 +data dawn doc examples freetype gdml geant3 hdf5 inventor motif opengl qt5 raytracerx static-libs threads vrml
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=geant4
-RDEPEND=dev-libs/expat >=sci-physics/clhep-2.4.4.0:2=[threads?] data? ( ~sci-physics/geant-data-4.10.7.1 ) dawn? ( media-gfx/dawn ) doc? ( =app-doc/geant-docs-4.10.7* ) gdml? ( dev-libs/xerces-c ) hdf5? ( sci-libs/hdf5[threads?] ) inventor? ( media-libs/SoXt ) motif? ( x11-libs/motif:0 ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qt3d:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
-REQUIRED_USE=^^ ( c++11 c++14 c++17 ) inventor? ( opengl ) motif? ( opengl ) qt5? ( opengl )
-SLOT=4
-SRC_URI=https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.p02.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a8281cfec246c5f5d6db821fc5c0731c
diff --git a/metadata/md5-cache/sci-physics/geant-4.10.7.2-r3 b/metadata/md5-cache/sci-physics/geant-4.10.7.2-r3
new file mode 100644
index 000000000000..e1beecf9b026
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/geant-4.10.7.2-r3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Toolkit for simulation of passage of particles through matter
+EAPI=7
+HOMEPAGE=https://geant4.web.cern.ch/
+IUSE=c++11 c++14 +c++17 +data dawn doc examples freetype gdml geant3 hdf5 inventor motif opengl qt5 raytracerx static-libs threads vrml
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=geant4
+RDEPEND=dev-libs/expat >=sci-physics/clhep-2.4.4.0:2=[threads?] data? ( ~sci-physics/geant-data-4.10.7.1 ) dawn? ( media-gfx/dawn ) doc? ( =app-doc/geant-docs-4.10.7* ) gdml? ( dev-libs/xerces-c ) hdf5? ( sci-libs/hdf5[threads?] ) inventor? ( media-libs/SoXt ) motif? ( x11-libs/motif:0 ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qt3d:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
+REQUIRED_USE=^^ ( c++11 c++14 c++17 ) inventor? ( opengl ) motif? ( opengl ) qt5? ( opengl )
+SLOT=4
+SRC_URI=https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.p02.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=55c1dd742b6928517ab97edad55cf345
diff --git a/metadata/md5-cache/sci-physics/geant-4.11.0_beta1-r1 b/metadata/md5-cache/sci-physics/geant-4.11.0_beta1-r1
deleted file mode 100644
index 66bbafc14c29..000000000000
--- a/metadata/md5-cache/sci-physics/geant-4.11.0_beta1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Toolkit for simulation of passage of particles through matter
-EAPI=7
-HOMEPAGE=https://geant4.web.cern.ch/
-IUSE=+c++17 c++20 +data dawn doc examples freetype gdml geant3 hdf5 inventor motif opengl qt5 raytracerx static-libs threads vrml
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=geant4
-RDEPEND=dev-libs/expat >=sci-physics/clhep-2.4.4.2:2=[threads?] data? ( ~sci-physics/geant-data-4.11.0_beta1 ) dawn? ( media-gfx/dawn ) doc? ( app-doc/geant-docs ) gdml? ( dev-libs/xerces-c ) hdf5? ( sci-libs/hdf5[threads?] ) inventor? ( media-libs/SoXt ) motif? ( x11-libs/motif:0 ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qt3d:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
-REQUIRED_USE=^^ ( c++17 c++20 ) inventor? ( opengl ) motif? ( opengl ) qt5? ( opengl )
-SLOT=4
-SRC_URI=https://geant4-data.web.cern.ch/geant4-data/releases/geant4.11.00.b01.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7d4be815f258f464074e6cd854040133
diff --git a/metadata/md5-cache/sci-physics/geant-4.11.0_beta1-r2 b/metadata/md5-cache/sci-physics/geant-4.11.0_beta1-r2
new file mode 100644
index 000000000000..467cb790a947
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/geant-4.11.0_beta1-r2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Toolkit for simulation of passage of particles through matter
+EAPI=7
+HOMEPAGE=https://geant4.web.cern.ch/
+IUSE=+c++17 c++20 +data dawn doc examples freetype gdml geant3 hdf5 inventor motif opengl qt5 raytracerx static-libs threads vrml
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=geant4
+RDEPEND=dev-libs/expat >=sci-physics/clhep-2.4.4.2:2=[threads?] data? ( ~sci-physics/geant-data-4.11.0_beta1 ) dawn? ( media-gfx/dawn ) doc? ( app-doc/geant-docs ) gdml? ( dev-libs/xerces-c ) hdf5? ( sci-libs/hdf5[threads?] ) inventor? ( media-libs/SoXt ) motif? ( x11-libs/motif:0 ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qt3d:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
+REQUIRED_USE=^^ ( c++17 c++20 ) inventor? ( opengl ) motif? ( opengl ) qt5? ( opengl )
+SLOT=4
+SRC_URI=https://geant4-data.web.cern.ch/geant4-data/releases/geant4.11.00.b01.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3d49cc23f95e80c7aa42174007294206
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index a8fe95909a93..be6c79d68b91 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/bubblewrap-0.5.0 b/metadata/md5-cache/sys-apps/bubblewrap-0.5.0
new file mode 100644
index 000000000000..97c1e66e8bff
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/bubblewrap-0.5.0
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig
+DEFINED_PHASES=configure setup
+DEPEND=sys-libs/libseccomp sys-libs/libcap selinux? ( >=sys-libs/libselinux-2.1.9 )
+DESCRIPTION=Unprivileged sandboxing tool, namespaces-powered chroot-like solution
+EAPI=7
+HOMEPAGE=https://github.com/containers/bubblewrap/
+IUSE=selinux +suid kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=sys-libs/libseccomp sys-libs/libcap selinux? ( >=sys-libs/libselinux-2.1.9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/bubblewrap/releases/download/v0.5.0/bubblewrap-0.5.0.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ae7cccbf740e4f11f765c2c71b585fd4
diff --git a/metadata/md5-cache/sys-apps/findutils-4.8.0 b/metadata/md5-cache/sys-apps/findutils-4.8.0
index 86c9ae23284d..0fe546b74821 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.8.0
+++ b/metadata/md5-cache/sys-apps/findutils-4.8.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/findutils/findutils-4.8.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7385114ecc85c20311293334ff46f3a3
+_md5_=beebf512035fe32f1ed6606f174221cf
diff --git a/metadata/md5-cache/sys-apps/frandom-1.1-r1 b/metadata/md5-cache/sys-apps/frandom-1.1-r1
index 2025966a021d..490d2aa5c3f7 100644
--- a/metadata/md5-cache/sys-apps/frandom-1.1-r1
+++ b/metadata/md5-cache/sys-apps/frandom-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/frandom//frandom-1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=540ce3a8f3e440e10b912cf9e4444d66
diff --git a/metadata/md5-cache/sys-apps/help2man-1.48.5 b/metadata/md5-cache/sys-apps/help2man-1.48.5
new file mode 100644
index 000000000000..17296b45304a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/help2man-1.48.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-lang/perl nls? ( dev-perl/Locale-gettext )
+DESCRIPTION=GNU utility to convert program --help output to a man page
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/help2man/
+IUSE=nls
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl nls? ( dev-perl/Locale-gettext )
+SLOT=0
+SRC_URI=mirror://gnu/help2man/help2man-1.48.5.tar.xz
+_md5_=b76541bc022c0a02cdbebcd1b1057d60
diff --git a/metadata/md5-cache/sys-apps/openrc-0.43.5 b/metadata/md5-cache/sys-apps/openrc-0.43.5
index ebc02869f342..5068bd10dcf0 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.43.5
+++ b/metadata/md5-cache/sys-apps/openrc-0.43.5
@@ -4,11 +4,11 @@ DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
 EAPI=7
 HOMEPAGE=https://github.com/openrc/openrc/
 IUSE=audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils unicode
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD-2
 PDEPEND=netifrc? ( net-misc/netifrc )
 RDEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc !<sys-process/procps-3.3.9-r2 selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 bash? ( app-shells/bash ) !prefix? ( sysv-utils? ( !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) virtual/tmpfiles ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
 SLOT=0
 SRC_URI=https://github.com/openrc/openrc/archive/0.43.5.tar.gz -> openrc-0.43.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ea4b7fcb6f3f2b7262a4b3d3c3754c9f
+_md5_=7d54f7b1572795f54fd057ed7391cd04
diff --git a/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r3 b/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r3
index 500a4edf6017..6ea9b6240475 100644
--- a/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r3
+++ b/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r3
@@ -10,4 +10,4 @@ RDEPEND=sys-apps/kmod[tools]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/pcmciautils/pcmciautils_018.orig.tar.gz mirror://debian/pool/main/p/pcmciautils/pcmciautils_018-8.debian.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dfd454d69ab591814550103a22162abe
+_md5_=d6779884f59b0a3fdfb675c03f5e13a2
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.11.6-r1 b/metadata/md5-cache/sys-apps/pkgcore-0.11.6-r1
deleted file mode 100644
index 8f372416177c..000000000000
--- a/metadata/md5-cache/sys-apps/pkgcore-0.11.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=a framework for package management
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.11.6.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c225002ed7bc1be6cbd22f7741ab8ed5
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.11.8-r3 b/metadata/md5-cache/sys-apps/pkgcore-0.11.8-r3
deleted file mode 100644
index fd8501f08614..000000000000
--- a/metadata/md5-cache/sys-apps/pkgcore-0.11.8-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=a framework for package management
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.11.8.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3eba43efd9a4df4ffc5892c21c016fcc
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.12.0 b/metadata/md5-cache/sys-apps/pkgcore-0.12.0
deleted file mode 100644
index 8fe4e961074f..000000000000
--- a/metadata/md5-cache/sys-apps/pkgcore-0.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=a framework for package management
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.12.0.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3eba43efd9a4df4ffc5892c21c016fcc
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.12.1-r1 b/metadata/md5-cache/sys-apps/pkgcore-0.12.1-r1
deleted file mode 100644
index 09a2aaea7eb8..000000000000
--- a/metadata/md5-cache/sys-apps/pkgcore-0.12.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) test? ( >=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=a framework for package management
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.12.1.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=83e34840b2caf75b5afbb61058324dcc
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.12.2 b/metadata/md5-cache/sys-apps/pkgcore-0.12.2
deleted file mode 100644
index 2b62f2f7d5e4..000000000000
--- a/metadata/md5-cache/sys-apps/pkgcore-0.12.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) test? ( >=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=a framework for package management
-EAPI=8
-HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.12.2.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=72a68a246454720ff489cdc880aa373c
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.12.3 b/metadata/md5-cache/sys-apps/pkgcore-0.12.3
deleted file mode 100644
index 865ce3e2a99c..000000000000
--- a/metadata/md5-cache/sys-apps/pkgcore-0.12.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) test? ( >=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=a framework for package management
-EAPI=8
-HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.12.3.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=72a68a246454720ff489cdc880aa373c
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.12.4 b/metadata/md5-cache/sys-apps/pkgcore-0.12.4
index f529b4e2e04b..3f54c86cf727 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-0.12.4
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.12.4
@@ -4,7 +4,7 @@ DESCRIPTION=a framework for package management
 EAPI=8
 HOMEPAGE=https://github.com/pkgcore/pkgcore
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD MIT
 RDEPEND=>=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.12.4.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f18c16390b8f56a6fc618bd88585265f
+_md5_=950b68dd30640c1b013244cbf91631d3
diff --git a/metadata/md5-cache/sys-apps/plocate-1.1.10 b/metadata/md5-cache/sys-apps/plocate-1.1.10
new file mode 100644
index 000000000000..4eed433884a1
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/plocate-1.1.10
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=acct-group/locate app-arch/zstd:= io-uring? ( sys-libs/liburing:= ) !sys-apps/mlocate
+DESCRIPTION=Posting locate is a much faster locate
+EAPI=7
+HOMEPAGE=https://plocate.sesse.net/
+IUSE=+io-uring kernel_linux
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-2 GPL-2+
+RDEPEND=acct-group/locate app-arch/zstd:= io-uring? ( sys-libs/liburing:= ) !sys-apps/mlocate
+SLOT=0
+SRC_URI=https://plocate.sesse.net/download/plocate-1.1.10.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7950ca49ebec360b72cc1f15d51d080f
diff --git a/metadata/md5-cache/sys-apps/ripgrep-all-0.9.6 b/metadata/md5-cache/sys-apps/ripgrep-all-0.9.6
deleted file mode 100644
index 0e8c2daa8cf0..000000000000
--- a/metadata/md5-cache/sys-apps/ripgrep-all-0.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=app-text/pandoc app-text/poppler sys-apps/ripgrep media-video/ffmpeg
-DESCRIPTION=Like ripgrep, but also search in PDFs, E-Books, Office documents, archives, etc.
-EAPI=7
-HOMEPAGE=https://github.com/phiresky/ripgrep-all
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3+ Apache-2.0 BSD-2 ISC MIT ZLIB
-RDEPEND=app-text/pandoc app-text/poppler sys-apps/ripgrep media-video/ffmpeg
-SLOT=0
-SRC_URI=https://github.com/phiresky/ripgrep-all/archive/v0.9.6.tar.gz -> ripgrep-all-0.9.6.tar.gz https://crates.io/api/v1/crates/addr2line/0.12.0/download -> addr2line-0.12.0.crate 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.10/download -> aho-corasick-0.7.10.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/arrayref/0.3.6/download -> arrayref-0.3.6.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.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/backtrace/0.3.48/download -> backtrace-0.3.48.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/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bzip2/0.3.3/download -> bzip2-0.3.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.8+1.0.8/download -> bzip2-sys-0.1.8+1.0.8.crate https://crates.io/api/v1/crates/cachedir/0.1.1/download -> cachedir-0.1.1.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/chrono/0.4.11/download -> chrono-0.4.11.crate https://crates.io/api/v1/crates/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam/0.7.3/download -> crossbeam-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.2/download -> crossbeam-channel-0.4.2.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.2.1/download -> crossbeam-queue-0.2.1.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/encoding_rs/0.8.23/download -> encoding_rs-0.8.23.crate https://crates.io/api/v1/crates/encoding_rs_io/0.1.7/download -> encoding_rs_io-0.1.7.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/exitfailure/0.5.1/download -> exitfailure-0.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/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/filetime/0.2.10/download -> filetime-0.2.10.crate https://crates.io/api/v1/crates/fixedbitset/0.1.9/download -> fixedbitset-0.1.9.crate https://crates.io/api/v1/crates/flate2/1.0.14/download -> flate2-1.0.14.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.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/generic-array/0.12.3/download -> generic-array-0.12.3.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gimli/0.21.0/download -> gimli-0.21.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.13/download -> hermit-abi-0.1.13.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.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/libsqlite3-sys/0.18.0/download -> libsqlite3-sys-0.18.0.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/lmdb-rkv/0.14.0/download -> lmdb-rkv-0.14.0.crate https://crates.io/api/v1/crates/lmdb-rkv-sys/0.11.0/download -> lmdb-rkv-sys-0.11.0.crate https://crates.io/api/v1/crates/lock_api/0.2.0/download -> lock_api-0.2.0.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/lru-cache/0.1.2/download -> lru-cache-0.1.2.crate https://crates.io/api/v1/crates/lzma-sys/0.1.16/download -> lzma-sys-0.1.16.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/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memoffset/0.5.4/download -> memoffset-0.5.4.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.6/download -> miniz_oxide-0.3.6.crate https://crates.io/api/v1/crates/nom/2.2.1/download -> nom-2.2.1.crate https://crates.io/api/v1/crates/num/0.2.1/download -> num-0.2.1.crate https://crates.io/api/v1/crates/num-complex/0.2.4/download -> num-complex-0.2.4.crate https://crates.io/api/v1/crates/num-integer/0.1.42/download -> num-integer-0.1.42.crate https://crates.io/api/v1/crates/num-iter/0.1.40/download -> num-iter-0.1.40.crate https://crates.io/api/v1/crates/num-rational/0.2.4/download -> num-rational-0.2.4.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/object/0.19.0/download -> object-0.19.0.crate https://crates.io/api/v1/crates/ordered-float/1.0.2/download -> ordered-float-1.0.2.crate https://crates.io/api/v1/crates/ordermap/0.3.5/download -> ordermap-0.3.5.crate https://crates.io/api/v1/crates/parking_lot/0.8.0/download -> parking_lot-0.8.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.5.0/download -> parking_lot_core-0.5.0.crate https://crates.io/api/v1/crates/paste/0.1.12/download -> paste-0.1.12.crate https://crates.io/api/v1/crates/paste-impl/0.1.12/download -> paste-impl-0.1.12.crate https://crates.io/api/v1/crates/path-clean/0.1.0/download -> path-clean-0.1.0.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/petgraph/0.4.13/download -> petgraph-0.4.13.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.8/download -> ppv-lite86-0.2.8.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.2/download -> proc-macro-error-1.0.2.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.2/download -> proc-macro-error-attr-1.0.2.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.15/download -> proc-macro-hack-0.5.15.crate https://crates.io/api/v1/crates/proc-macro2/1.0.13/download -> proc-macro2-1.0.13.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/1.0.6/download -> quote-1.0.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/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.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/rkv/0.10.4/download -> rkv-0.10.4.crate https://crates.io/api/v1/crates/rusqlite/0.23.1/download -> rusqlite-0.23.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.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.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.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/size_format/1.0.2/download -> size_format-1.0.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.4.0/download -> smallvec-1.4.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.14/download -> structopt-0.3.14.crate https://crates.io/api/v1/crates/structopt-derive/0.4.7/download -> structopt-derive-0.4.7.crate https://crates.io/api/v1/crates/syn/1.0.22/download -> syn-1.0.22.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/synstructure/0.12.3/download -> synstructure-0.12.3.crate https://crates.io/api/v1/crates/tar/0.4.26/download -> tar-0.4.26.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.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/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tree_magic_fork/0.2.2/download -> tree_magic_fork-0.2.2.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.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.12/download -> unicode-normalization-0.1.12.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.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/url/2.1.1/download -> url-2.1.1.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.8/download -> vcpkg-0.2.8.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.9.1/download -> version_check-0.9.1.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/winapi/0.3.8/download -> winapi-0.3.8.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/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/xz2/0.1.6/download -> xz2-0.1.6.crate https://crates.io/api/v1/crates/zip/0.5.5/download -> zip-0.5.5.crate https://crates.io/api/v1/crates/zstd/0.5.1+zstd.1.4.4/download -> zstd-0.5.1+zstd.1.4.4.crate https://crates.io/api/v1/crates/zstd-safe/2.0.3+zstd.1.4.4/download -> zstd-safe-2.0.3+zstd.1.4.4.crate https://crates.io/api/v1/crates/zstd-sys/1.4.15+zstd.1.4.4/download -> zstd-sys-1.4.15+zstd.1.4.4.crate
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fdc24212f10d521ec9c8456b620a79be
diff --git a/metadata/md5-cache/sys-apps/ripgrep-all-0.9.6-r1 b/metadata/md5-cache/sys-apps/ripgrep-all-0.9.6-r1
new file mode 100644
index 000000000000..fc8006566e22
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ripgrep-all-0.9.6-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install postinst test unpack
+DEPEND=app-arch/xz-utils sys-apps/ripgrep
+DESCRIPTION=Like ripgrep, but also search in PDFs, E-Books, Office documents, archives, etc.
+EAPI=7
+HOMEPAGE=https://github.com/phiresky/ripgrep-all
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3+ Apache-2.0 BSD-2 ISC MIT ZLIB
+RDEPEND=app-arch/xz-utils sys-apps/ripgrep
+SLOT=0
+SRC_URI=https://github.com/phiresky/ripgrep-all/archive/v0.9.6.tar.gz -> ripgrep-all-0.9.6.tar.gz https://crates.io/api/v1/crates/addr2line/0.12.0/download -> addr2line-0.12.0.crate 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.10/download -> aho-corasick-0.7.10.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/arrayref/0.3.6/download -> arrayref-0.3.6.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.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/backtrace/0.3.48/download -> backtrace-0.3.48.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/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bzip2/0.3.3/download -> bzip2-0.3.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.8+1.0.8/download -> bzip2-sys-0.1.8+1.0.8.crate https://crates.io/api/v1/crates/cachedir/0.1.1/download -> cachedir-0.1.1.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/chrono/0.4.11/download -> chrono-0.4.11.crate https://crates.io/api/v1/crates/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam/0.7.3/download -> crossbeam-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.2/download -> crossbeam-channel-0.4.2.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.2.1/download -> crossbeam-queue-0.2.1.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/encoding_rs/0.8.23/download -> encoding_rs-0.8.23.crate https://crates.io/api/v1/crates/encoding_rs_io/0.1.7/download -> encoding_rs_io-0.1.7.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/exitfailure/0.5.1/download -> exitfailure-0.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/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/filetime/0.2.10/download -> filetime-0.2.10.crate https://crates.io/api/v1/crates/fixedbitset/0.1.9/download -> fixedbitset-0.1.9.crate https://crates.io/api/v1/crates/flate2/1.0.14/download -> flate2-1.0.14.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.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/generic-array/0.12.3/download -> generic-array-0.12.3.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gimli/0.21.0/download -> gimli-0.21.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.13/download -> hermit-abi-0.1.13.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.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/libsqlite3-sys/0.18.0/download -> libsqlite3-sys-0.18.0.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/lmdb-rkv/0.14.0/download -> lmdb-rkv-0.14.0.crate https://crates.io/api/v1/crates/lmdb-rkv-sys/0.11.0/download -> lmdb-rkv-sys-0.11.0.crate https://crates.io/api/v1/crates/lock_api/0.2.0/download -> lock_api-0.2.0.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/lru-cache/0.1.2/download -> lru-cache-0.1.2.crate https://crates.io/api/v1/crates/lzma-sys/0.1.16/download -> lzma-sys-0.1.16.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/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memoffset/0.5.4/download -> memoffset-0.5.4.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.6/download -> miniz_oxide-0.3.6.crate https://crates.io/api/v1/crates/nom/2.2.1/download -> nom-2.2.1.crate https://crates.io/api/v1/crates/num/0.2.1/download -> num-0.2.1.crate https://crates.io/api/v1/crates/num-complex/0.2.4/download -> num-complex-0.2.4.crate https://crates.io/api/v1/crates/num-integer/0.1.42/download -> num-integer-0.1.42.crate https://crates.io/api/v1/crates/num-iter/0.1.40/download -> num-iter-0.1.40.crate https://crates.io/api/v1/crates/num-rational/0.2.4/download -> num-rational-0.2.4.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/object/0.19.0/download -> object-0.19.0.crate https://crates.io/api/v1/crates/ordered-float/1.0.2/download -> ordered-float-1.0.2.crate https://crates.io/api/v1/crates/ordermap/0.3.5/download -> ordermap-0.3.5.crate https://crates.io/api/v1/crates/parking_lot/0.8.0/download -> parking_lot-0.8.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.5.0/download -> parking_lot_core-0.5.0.crate https://crates.io/api/v1/crates/paste/0.1.12/download -> paste-0.1.12.crate https://crates.io/api/v1/crates/paste-impl/0.1.12/download -> paste-impl-0.1.12.crate https://crates.io/api/v1/crates/path-clean/0.1.0/download -> path-clean-0.1.0.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/petgraph/0.4.13/download -> petgraph-0.4.13.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.8/download -> ppv-lite86-0.2.8.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.2/download -> proc-macro-error-1.0.2.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.2/download -> proc-macro-error-attr-1.0.2.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.15/download -> proc-macro-hack-0.5.15.crate https://crates.io/api/v1/crates/proc-macro2/1.0.13/download -> proc-macro2-1.0.13.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/1.0.6/download -> quote-1.0.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/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.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/rkv/0.10.4/download -> rkv-0.10.4.crate https://crates.io/api/v1/crates/rusqlite/0.23.1/download -> rusqlite-0.23.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.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.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.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/size_format/1.0.2/download -> size_format-1.0.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.4.0/download -> smallvec-1.4.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.14/download -> structopt-0.3.14.crate https://crates.io/api/v1/crates/structopt-derive/0.4.7/download -> structopt-derive-0.4.7.crate https://crates.io/api/v1/crates/syn/1.0.22/download -> syn-1.0.22.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/synstructure/0.12.3/download -> synstructure-0.12.3.crate https://crates.io/api/v1/crates/tar/0.4.26/download -> tar-0.4.26.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.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/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tree_magic_fork/0.2.2/download -> tree_magic_fork-0.2.2.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.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.12/download -> unicode-normalization-0.1.12.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.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/url/2.1.1/download -> url-2.1.1.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.8/download -> vcpkg-0.2.8.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.9.1/download -> version_check-0.9.1.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/winapi/0.3.8/download -> winapi-0.3.8.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/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/xz2/0.1.6/download -> xz2-0.1.6.crate https://crates.io/api/v1/crates/zip/0.5.5/download -> zip-0.5.5.crate https://crates.io/api/v1/crates/zstd/0.5.1+zstd.1.4.4/download -> zstd-0.5.1+zstd.1.4.4.crate https://crates.io/api/v1/crates/zstd-safe/2.0.3+zstd.1.4.4/download -> zstd-safe-2.0.3+zstd.1.4.4.crate https://crates.io/api/v1/crates/zstd-sys/1.4.15+zstd.1.4.4/download -> zstd-sys-1.4.15+zstd.1.4.4.crate
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=aa8dc71d27263f2e8a7b584bd7ecf7c3
diff --git a/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r4 b/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r4
index 2d95bd4e3d8b..31744085b2bf 100644
--- a/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r4
+++ b/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r4
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=bindist fetch mirror
 SLOT=0
 SRC_URI=sum_driver_V1.6.0_20151201.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0554c7bd099776e712f0c99fa89b640f
diff --git a/metadata/md5-cache/sys-apps/systemd-tmpfiles-249.2 b/metadata/md5-cache/sys-apps/systemd-tmpfiles-249.2
index cecc2f225ad2..c5082ddaf848 100644
--- a/metadata/md5-cache/sys-apps/systemd-tmpfiles-249.2
+++ b/metadata/md5-cache/sys-apps/systemd-tmpfiles-249.2
@@ -5,11 +5,11 @@ DESCRIPTION=Creates, deletes and cleans up volatile and temporary files and dire
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=selinux test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT public-domain
 RDEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= ) !sys-apps/opentmpfiles !sys-apps/systemd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v249.2.tar.gz -> systemd-stable-249.2.tar.gz elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-249.1-r1.tar.xz https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-249.1-r1.tar.xz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b3df0431578c256006d579fa9c080773
+_md5_=882883569466cc33426b5f3552461d70
diff --git a/metadata/md5-cache/sys-apps/usbguard-1.0.0-r3 b/metadata/md5-cache/sys-apps/usbguard-1.0.0-r3
deleted file mode 100644
index ceece330ba46..000000000000
--- a/metadata/md5-cache/sys-apps/usbguard-1.0.0-r3
+++ /dev/null
@@ -1,16 +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
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) umockdev? ( dev-util/umockdev ) app-text/asciidoc dev-cpp/catch:1 dbus? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gdbus-codegen )
-DESCRIPTION=Daemon protecting your computer against BadUSB
-EAPI=7
-HOMEPAGE=https://github.com/USBGuard/usbguard
-IUSE=dbus ldap policykit static-libs systemd test umockdev
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) umockdev? ( dev-util/umockdev ) virtual/udev
-REQUIRED_USE=policykit? ( dbus ) test? ( static-libs )
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://github.com/USBGuard/usbguard/releases/download/usbguard-1.0.0/usbguard-1.0.0.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=55daa8f4365ad9c89216c4969ef4a0d1
diff --git a/metadata/md5-cache/sys-apps/usbguard-1.0.0-r4 b/metadata/md5-cache/sys-apps/usbguard-1.0.0-r4
new file mode 100644
index 000000000000..9c8cdb2b759f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/usbguard-1.0.0-r4
@@ -0,0 +1,16 @@
+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
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) umockdev? ( dev-util/umockdev ) app-text/asciidoc dev-cpp/catch:1 dbus? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gdbus-codegen )
+DESCRIPTION=Daemon protecting your computer against BadUSB
+EAPI=7
+HOMEPAGE=https://github.com/USBGuard/usbguard
+IUSE=dbus ldap policykit static-libs systemd test umockdev
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) umockdev? ( dev-util/umockdev ) virtual/udev
+REQUIRED_USE=policykit? ( dbus ) test? ( static-libs )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://github.com/USBGuard/usbguard/releases/download/usbguard-1.0.0/usbguard-1.0.0.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=47a61c6c522c91e64bdd6d714dde9c42
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.8.0 b/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.8.0
index 6f4ffc5f88ee..7fb6464b8947 100644
--- a/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.8.0
+++ b/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.8.0
@@ -5,10 +5,10 @@ DESCRIPTION=portal backend implementation that is using GTK+ and various pieces
 EAPI=7
 HOMEPAGE=https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal-gtk
 IUSE=wayland X
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 gnome-base/gnome-desktop:3= media-libs/fontconfig sys-apps/dbus >=sys-apps/xdg-desktop-portal-1.7 x11-libs/cairo[X?] x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?,X?]
 SLOT=0
 SRC_URI=https://github.com/flatpak/xdg-desktop-portal-gtk/releases/download/1.8.0/xdg-desktop-portal-gtk-1.8.0.tar.xz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b302575977c5b6f14a176b49e3d91cd2
+_md5_=7a85f2e93d1206e2e99100c55ef6ade7
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 3e659d8fc1d2..9013bd8426c5 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-8.5-r1 b/metadata/md5-cache/sys-cluster/glusterfs-8.5-r1
index ebe15617bdeb..725b058599ef 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-8.5-r1
+++ b/metadata/md5-cache/sys-cluster/glusterfs-8.5-r1
@@ -5,7 +5,7 @@ DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
 EAPI=7
 HOMEPAGE=https://www.gluster.org/ https://github.com/gluster/glusterfs/
 IUSE=debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml 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-2 LGPL-3+ )
 RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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] ) ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) dev-libs/openssl:=[-bindist(-)] virtual/tmpfiles
 REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) xml ) ipv6? ( libtirpc )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/8
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/8/8.5/glusterfs-8.5.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2ef8140c954803e2d984d0cb39edbd19
+_md5_=0e36e848b663fbf55b7d6dc732101102
diff --git a/metadata/md5-cache/sys-cluster/hpx-1.7.0 b/metadata/md5-cache/sys-cluster/hpx-1.7.0
deleted file mode 100644
index 9a2eeee49393..000000000000
--- a/metadata/md5-cache/sys-cluster/hpx-1.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-cpp/asio dev-libs/boost:= sys-apps/hwloc sys-libs/zlib jemalloc? ( dev-libs/jemalloc ) mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
-DESCRIPTION=C++ runtime system for parallel and distributed applications
-EAPI=7
-HOMEPAGE=https://stellar.cct.lsu.edu/tag/hpx/
-IUSE=examples jemalloc mpi papi +perftools tbb python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Boost-1.0
-RDEPEND=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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-cpp/asio dev-libs/boost:= sys-apps/hwloc sys-libs/zlib jemalloc? ( dev-libs/jemalloc ) mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ?? ( jemalloc perftools tbb )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/STEllAR-GROUP/hpx/archive/1.7.0.tar.gz -> hpx-1.7.0.tar.gz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b8f67e4cc103e10b74fb666cf13aa647
diff --git a/metadata/md5-cache/sys-cluster/hpx-1.7.1 b/metadata/md5-cache/sys-cluster/hpx-1.7.1
new file mode 100644
index 000000000000..e7d47ad1cde0
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/hpx-1.7.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-cpp/asio dev-libs/boost:= sys-apps/hwloc sys-libs/zlib jemalloc? ( dev-libs/jemalloc ) mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
+DESCRIPTION=C++ runtime system for parallel and distributed applications
+EAPI=7
+HOMEPAGE=https://stellar.cct.lsu.edu/tag/hpx/
+IUSE=examples jemalloc mpi papi +perftools tbb python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Boost-1.0
+RDEPEND=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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-cpp/asio dev-libs/boost:= sys-apps/hwloc sys-libs/zlib jemalloc? ( dev-libs/jemalloc ) mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ?? ( jemalloc perftools tbb )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/STEllAR-GROUP/hpx/archive/1.7.1.tar.gz -> hpx-1.7.1.tar.gz
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b8f67e4cc103e10b74fb666cf13aa647
diff --git a/metadata/md5-cache/sys-cluster/knem-1.1.3-r2 b/metadata/md5-cache/sys-cluster/knem-1.1.3-r2
index 717bee711b92..13bb2216d03e 100644
--- a/metadata/md5-cache/sys-cluster/knem-1.1.3-r2
+++ b/metadata/md5-cache/sys-cluster/knem-1.1.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=High-Performance Intra-Node MPI Communication
 EAPI=6
 HOMEPAGE=http://knem.gforge.inria.fr/
 IUSE=debug modules kernel_linux kernel_linux dist-kernel kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-apps/hwloc sys-apps/kmod[tools] kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=http://gforge.inria.fr/frs/download.php/37186/knem-1.1.3.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7a9ac2ed09c8329ecbd18306dbd95bd2
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=187abcc725dad1fc9b8c30b7b271fbc1
diff --git a/metadata/md5-cache/sys-cluster/knem-9999 b/metadata/md5-cache/sys-cluster/knem-9999
index cf1c10956753..a22c71aef5f9 100644
--- a/metadata/md5-cache/sys-cluster/knem-9999
+++ b/metadata/md5-cache/sys-cluster/knem-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 PROPERTIES=live
 RDEPEND=sys-apps/hwloc sys-apps/kmod[tools] kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a622f266083559ed52e869609cd8746f
diff --git a/metadata/md5-cache/sys-cluster/lustre-2.13.0-r1 b/metadata/md5-cache/sys-cluster/lustre-2.13.0-r1
index b4c17ee0919f..3fc47d17abea 100644
--- a/metadata/md5-cache/sys-cluster/lustre-2.13.0-r1
+++ b/metadata/md5-cache/sys-cluster/lustre-2.13.0-r1
@@ -11,5 +11,5 @@ RDEPEND=virtual/awk dlc? ( dev-libs/libyaml ) readline? ( sys-libs/readline:0 )
 REQUIRED_USE=client? ( modules ) server? ( modules )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~alexxy/distfiles/lustre-2.13.0.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=18a9fabd1e957b97fcb12d130a74d48f
diff --git a/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1 b/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1
index 552f6fb18def..0e03cd0162c2 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1
+++ b/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1
@@ -1,15 +1,15 @@
 BDEPEND=fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl: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(-)?] >=sys-apps/hwloc-2.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(-)?] >=sys-libs/zlib-1.2.8-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(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl: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(-)?] >=sys-apps/hwloc-2.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(-)?] >=sys-libs/zlib-1.2.8-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(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) ) java? ( >=virtual/jdk-1.8:* ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=7
 HOMEPAGE=https://www.open-mpi.org
 IUSE=cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java 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 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl: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(-)?] >=sys-apps/hwloc-2.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(-)?] >=sys-libs/zlib-1.2.8-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(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl: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(-)?] >=sys-apps/hwloc-2.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(-)?] >=sys-libs/zlib-1.2.8-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(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) ) java? ( >=virtual/jre-1.8:* ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-4.0.5.tar.bz2
 _eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	ac9fb9efa5413c5fb85a4203fe930e88	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=be2c39df6c4fea7d38cbea90c84f72d3
+_md5_=f1b2b2ef6a45b70d20a98615f29ab41a
diff --git a/metadata/md5-cache/sys-fabric/Manifest.gz b/metadata/md5-cache/sys-fabric/Manifest.gz
index ebd3222d4bec..38f33e169b49 100644
--- a/metadata/md5-cache/sys-fabric/Manifest.gz
+++ b/metadata/md5-cache/sys-fabric/Manifest.gz
diff --git a/metadata/md5-cache/sys-fabric/infinipath-psm-3.2 b/metadata/md5-cache/sys-fabric/infinipath-psm-3.2
index 82301414c21d..6ebe620db267 100644
--- a/metadata/md5-cache/sys-fabric/infinipath-psm-3.2
+++ b/metadata/md5-cache/sys-fabric/infinipath-psm-3.2
@@ -3,10 +3,10 @@ DEPEND=sys-fabric/libibverbs:3.12 virtual/pkgconfig app-arch/rpm2targz virtual/p
 DESCRIPTION=OpenIB userspace driver for the PathScale InfiniBand HCAs
 EAPI=5
 HOMEPAGE=https://www.openfabrics.org/
-KEYWORDS=amd64 x86 ~amd64-linux
+KEYWORDS=amd64 -riscv x86 ~amd64-linux
 LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/infinipath-psm:0 !sys-fabric/infinipath-psm:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	openib	3d0dc1527acde9f7cd7c6749dee4cd3d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d81539a52a8705bda7a4d3216c99cf73
+_md5_=2e581cbfd0ff962064778bda72351117
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 3cfc0d3c6929..337abda05d19 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/copyfs-1.0.1-r1 b/metadata/md5-cache/sys-fs/copyfs-1.0.1-r1
index 7e8bcf6830d0..64465e0f307e 100644
--- a/metadata/md5-cache/sys-fs/copyfs-1.0.1-r1
+++ b/metadata/md5-cache/sys-fs/copyfs-1.0.1-r1
@@ -1,5 +1,5 @@
 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
-DEFINED_PHASES=compile configure prepare
+DEFINED_PHASES=compile install prepare
 DEPEND=>=sys-fs/fuse-2.0:0 sys-apps/attr
 DESCRIPTION=fuse-based filesystem for maintaining configuration files
 EAPI=7
@@ -10,4 +10,4 @@ RDEPEND=>=sys-fs/fuse-2.0:0
 SLOT=0
 SRC_URI=https://boklm.eu/copyfs/copyfs-1.0.1.tar.bz2
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a833d045c7759c4366318b9ebe97f5e1
+_md5_=3a37d73a39b088e11b13aa676204df30
diff --git a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5 b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
index 0170a3c6bca2..7285c83e8d40 100644
--- a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
+++ b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
@@ -5,10 +5,10 @@ DESCRIPTION=Device-mapper RAID tool and library
 EAPI=7
 HOMEPAGE=https://people.redhat.com/~heinzm/sw/dmraid/
 IUSE=intel_led led mini static kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-fs/lvm2-2.02.45
 SLOT=0
 SRC_URI=https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ce4450ee1946bdfe29ea4b816b1b215d
+_md5_=e7c02d7bf32eee5f572a38ecab5b3832
diff --git a/metadata/md5-cache/sys-fs/loop-aes-3.7s b/metadata/md5-cache/sys-fs/loop-aes-3.7s
index f25406171531..c08cc873ab84 100644
--- a/metadata/md5-cache/sys-fs/loop-aes-3.7s
+++ b/metadata/md5-cache/sys-fs/loop-aes-3.7s
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.7s.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3a06e04b520e3eb79bd9c9b708a76648
diff --git a/metadata/md5-cache/sys-fs/loop-aes-3.7t b/metadata/md5-cache/sys-fs/loop-aes-3.7t
index dd4f5844f6f2..394e8f75c808 100644
--- a/metadata/md5-cache/sys-fs/loop-aes-3.7t
+++ b/metadata/md5-cache/sys-fs/loop-aes-3.7t
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.7t.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=44498b1c65f6316c7bae423452563c72
diff --git a/metadata/md5-cache/sys-fs/lxcfs-4.0.8 b/metadata/md5-cache/sys-fs/lxcfs-4.0.8
deleted file mode 100644
index e67f4415ee6b..000000000000
--- a/metadata/md5-cache/sys-fs/lxcfs-4.0.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/help2man verify-sig? ( app-crypt/openpgp-keys-linuxcontainers ) 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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install prepare test unpack
-DEPEND=dev-libs/glib:2 sys-fs/fuse:3
-DESCRIPTION=FUSE filesystem for LXC
-EAPI=7
-HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/
-IUSE=verify-sig
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/glib:2 sys-fs/fuse:3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxcfs/lxcfs-4.0.8.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/lxcfs-4.0.8.tar.gz.asc )
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=12f2c9b78bcfd176b833d805f4c4f3f7
diff --git a/metadata/md5-cache/sys-fs/udev-249-r2 b/metadata/md5-cache/sys-fs/udev-249-r2
index ea35c1a57ae4..dce48cfaa284 100644
--- a/metadata/md5-cache/sys-fs/udev-249-r2
+++ b/metadata/md5-cache/sys-fs/udev-249-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace de
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=acl +kmod selinux static-libs test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-34
 RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v249/systemd-249.tar.gz elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-249.1-r1.tar.xz https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-249.1-r1.tar.xz )
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=91630fe3b480057c1539719f0b50cd6d
+_md5_=78ca07a9d545cd226c1c025d6378d0ff
diff --git a/metadata/md5-cache/sys-fs/vhba-20200106-r1 b/metadata/md5-cache/sys-fs/vhba-20200106-r1
index de2582940b38..8eeab79fd423 100644
--- a/metadata/md5-cache/sys-fs/vhba-20200106-r1
+++ b/metadata/md5-cache/sys-fs/vhba-20200106-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/udev kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/vhba-module/vhba-module-20200106.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cd6f7c22f3a1666b639f42fd657c108a
diff --git a/metadata/md5-cache/sys-fs/vhba-20210418 b/metadata/md5-cache/sys-fs/vhba-20210418
index 8824e2aada48..c34ba3aa238c 100644
--- a/metadata/md5-cache/sys-fs/vhba-20210418
+++ b/metadata/md5-cache/sys-fs/vhba-20210418
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/udev kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/vhba-module/vhba-module-20210418.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d18f19fb882ce03976b8ff903de46f3e
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index 3c39c1f39617..1ce50d55c2b9 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -11,5 +11,5 @@ RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-li
 REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) python? ( !minimal ) test-suite? ( !minimal )
 RESTRICT=test
 SLOT=0/5
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=463c8a23291ddf488f1740c9b5b4a4c2
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.8.6 b/metadata/md5-cache/sys-fs/zfs-kmod-0.8.6
index 208b83ff4223..0d9c90ada4b6 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.8.6
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.8.6
@@ -12,5 +12,5 @@ RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virt
 RESTRICT=debug? ( strip ) test
 SLOT=0/0.8.6
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-0.8.6/zfs-0.8.6.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=59915daf56cbc3338d7bbe7a51f1d857
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.5 b/metadata/md5-cache/sys-fs/zfs-kmod-2.0.5
index b7a89ae9ff8a..465e61029116 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.5
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.0.5
@@ -12,5 +12,5 @@ RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virt
 RESTRICT=debug? ( strip ) test
 SLOT=0/2.0.5
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.tar.gz.asc )
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=affb4b2f85f7ad4e38c451baaca9544c
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.0 b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.0
index 73d4df65831e..5c1785b00b8b 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.0
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.0
@@ -12,5 +12,5 @@ RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virt
 RESTRICT=debug? ( strip ) test
 SLOT=0/2.1.0
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz.asc )
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7596401acf2d8d8a87e6e86707c9b555
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-9999 b/metadata/md5-cache/sys-fs/zfs-kmod-9999
index e17d0ea30264..cea0f0457f15 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-9999
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 RESTRICT=debug? ( strip ) test
 SLOT=0/9999
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7596401acf2d8d8a87e6e86707c9b555
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index b6bbc012bc34..e52c76269f50 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
deleted file mode 100644
index eb7dd88fcd1d..000000000000
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=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 install postinst postrm preinst prerm pretend test
-DESCRIPTION=Precompiled Vanilla Kernel (Kernel Ready-to-Eat [KRE])
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/User:Fearedbliss
-IUSE=+initramfs test
-KEYWORDS=-* amd64
-LICENSE=GPL-2
-RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=strip test
-SLOT=4.14.178-FC.01
-SRC_URI=https://xyinn.org/gentoo/kernels/4.14.178-FC.01/kernel-4.14.178-FC.01.tar.xz
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7cba610edaaca4b1ab671a5b00f17fb5
diff --git a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
deleted file mode 100644
index 637046f60fb6..000000000000
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=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 install postinst postrm preinst prerm pretend test
-DESCRIPTION=Precompiled Vanilla Kernel (Kernel Ready-to-Eat [KRE])
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/User:Fearedbliss
-IUSE=+initramfs test
-KEYWORDS=-* amd64
-LICENSE=GPL-2
-RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=strip test
-SLOT=5.4.51-FB.01
-SRC_URI=https://xyinn.org/gentoo/kernels/5.4.51-FB.01/kernel-5.4.51-FB.01.tar.xz
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8170537a4890872f8e6fe40afe25e141
diff --git a/metadata/md5-cache/sys-kernel/cryptodev-1.11 b/metadata/md5-cache/sys-kernel/cryptodev-1.11
index 538b8f76596e..c3ad41f53039 100644
--- a/metadata/md5-cache/sys-kernel/cryptodev-1.11
+++ b/metadata/md5-cache/sys-kernel/cryptodev-1.11
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cryptodev-linux/cryptodev-linux/archive/cryptodev-linux-1.11.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=196f68d751106c3912e66af73e531658
diff --git a/metadata/md5-cache/sys-kernel/cryptodev-1.12 b/metadata/md5-cache/sys-kernel/cryptodev-1.12
index 838ebda847be..38991e4dece3 100644
--- a/metadata/md5-cache/sys-kernel/cryptodev-1.12
+++ b/metadata/md5-cache/sys-kernel/cryptodev-1.12
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cryptodev-linux/cryptodev-linux/archive/cryptodev-linux-1.12.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b62f3fa76164a74d1cd4c4cb69d65b91
diff --git a/metadata/md5-cache/sys-kernel/cryptodev-9999 b/metadata/md5-cache/sys-kernel/cryptodev-9999
index d81526061bf1..3b2794e33b89 100644
--- a/metadata/md5-cache/sys-kernel/cryptodev-9999
+++ b/metadata/md5-cache/sys-kernel/cryptodev-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a63ac6e762c33048f8484829a3e757ea
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.240 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.240
index 2ae41461e00c..1ba663182b19 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.240
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.240
@@ -6,9 +6,9 @@ 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 )
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.14.240
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-250.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-250.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-250.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-250.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-250.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-250.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-250.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-250.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-250.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a2154edd07ed438d7a6c0236d010c333
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.243 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.243
index 6cfb5ee4b897..75eb732868d0 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.243
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.243
@@ -6,9 +6,9 @@ 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 )
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.14.243
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-253.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-253.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-253.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-253.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-253.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-253.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-253.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-253.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-253.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cdec5da213f83c1303ae2d6989cdfae7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.244 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.244
index 965c0344097e..46a9c7af7868 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.244
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.244
@@ -6,9 +6,9 @@ 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 )
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.14.244
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-254.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-254.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-254.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-254.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-254.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-254.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-254.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-254.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-254.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8f47389d424eb89f7c6c5f9a485144a9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.198 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.198
index 53f3fbe0d6c6..f56743c9e185 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.198
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.198
@@ -6,9 +6,9 @@ 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 )
+RDEPEND=!build? ( app-arch/cpio 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.198
 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-197.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-197.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-197.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-197.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-197.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-197.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-197.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-197.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-197.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d54a834c057192918c8fefe50bc40c9d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.203 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.203
index 1f7a51b3ec2f..50f0d9442316 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.203
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.203
@@ -6,9 +6,9 @@ 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 )
+RDEPEND=!build? ( app-arch/cpio 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.203
 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-202.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-202.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-202.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-202.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-202.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-202.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-202.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-202.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-202.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8a90366e880797536639a5483d5bf141
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.204 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.204
index ddfbb417bf28..0d639004e818 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.204
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.204
@@ -6,9 +6,9 @@ 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 )
+RDEPEND=!build? ( app-arch/cpio 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.204
 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-203.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-203.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-203.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-203.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-203.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-203.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-203.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-203.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-203.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea6ad4b19b04b6947897611aa63b1d0a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.276 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.276
index 3497cb05c94e..e09a9823cccd 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.276
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.276
@@ -6,9 +6,9 @@ HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.4.276
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-278.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-278.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-278.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-278.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-278.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-278.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-278.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-278.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-278.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=269c8fb5cb60ef54cfbb20cdb7d3bc23
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.280 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.280
index b90df3019615..6e75a7a6388d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.280
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.280
@@ -6,9 +6,9 @@ HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.4.280
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-282.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-282.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-282.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-282.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-282.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-282.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-282.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-282.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-282.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17c1159cdca305210a7f578d6a6df513
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.281 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.281
index bec763a2e21a..1a804efb1ff2 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.281
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.281
@@ -6,9 +6,9 @@ HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.4.281
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-283.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-283.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-283.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-283.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-283.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-283.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-283.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-283.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-283.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b782a06393bf7bc466a66ed3ffcac152
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.276 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.276
index 0924d748431c..83400425781c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.276
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.276
@@ -6,9 +6,9 @@ HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.9.276
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-280.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-280.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-280.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-280.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-280.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-280.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-280.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-280.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-280.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=654326db145b8d2066bb60a2217502de
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.279 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.279
index 43fe3c6da58d..27ef9c3ee70d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.279
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.279
@@ -6,9 +6,9 @@ HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.9.279
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-283.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-283.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-283.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-283.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-283.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-283.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-283.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-283.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-283.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b782a06393bf7bc466a66ed3ffcac152
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.280 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.280
index 6963d2685a80..9ce6b5b20a40 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.280
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.280
@@ -6,9 +6,9 @@ HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.9.280
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-284.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-284.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-284.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-284.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-284.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-284.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-284.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-284.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-284.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f4636ec454bc0f31060c0ef5cf45db32
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.52 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.52
index e80ce36fd3fd..b6434915d42e 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.52
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.52
@@ -6,9 +6,9 @@ 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 )
+RDEPEND=!build? ( app-arch/cpio 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.52
 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-58.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-58.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-58.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-58.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-58.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-58.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-58.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-58.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-58.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=00646fa96c765a7ca65a793d8b350406
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.58 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.58
index d9146e4c12af..fc9900ac08ab 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.58
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.58
@@ -6,9 +6,9 @@ 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 )
+RDEPEND=!build? ( app-arch/cpio 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.58
 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-64.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-64.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-64.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-64.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-64.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-64.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-64.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-64.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-64.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9ee25a40a8f5582e9a77218b4d506d5b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.59 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.59
index b25a7e892ad1..47ddcd04a75b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.59
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.59
@@ -6,9 +6,9 @@ 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 )
+RDEPEND=!build? ( app-arch/cpio 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.59
 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-65.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-65.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-65.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-65.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-65.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-65.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-65.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-65.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-65.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a05f75cf2bc9be664c3174d0321884fa
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.60 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.60
index 4d6a7817e6cc..fa4de38f992f 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.60
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.60
@@ -6,9 +6,9 @@ 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 )
+RDEPEND=!build? ( app-arch/cpio 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.60
 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-66.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-66.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-66.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-66.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-66.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-66.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-66.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-66.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-66.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=75ef7f7be9517411c47bda11d60fde1e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.10 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.10
index 4ed0b9dd47c9..633ca788acf1 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.10
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.10
@@ -6,9 +6,9 @@ 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 )
+RDEPEND=!build? ( app-arch/cpio 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.13.10
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-12.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-12.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-12.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-12.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-12.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-12.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-12.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-12.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-12.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0e8aedd0d018d5ebdcd162767fb0a18d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.11 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.11
index 058fbf6c9cf9..8b3a3c09c8a0 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.11
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.11
@@ -6,9 +6,9 @@ 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 )
+RDEPEND=!build? ( app-arch/cpio 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.13.11
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-13.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-13.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-13.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-13.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-13.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-13.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-13.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-13.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-13.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e62af13ea39d9fb98db97c7224997c6a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.12 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.12
index 46a5e0fb5deb..467831e9c161 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.12
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.12
@@ -6,9 +6,9 @@ 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 )
+RDEPEND=!build? ( app-arch/cpio 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.13.12
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-14.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-14.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-14.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-14.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-14.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-14.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-14.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-14.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-14.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b82b37fd0fecf0aa01e24f337d118731
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.134 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.134
index 58c701f7afbc..cb6d50e0d21c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.134
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.134
@@ -6,9 +6,9 @@ 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 )
+RDEPEND=!build? ( app-arch/cpio 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.134
 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-138.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-138.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-138.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-138.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-138.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-138.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-138.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-138.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-138.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0c2b070e80c92ae778f31223963a6eed
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.140 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.140
index 8f9ed9e744ae..c7b747093053 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.140
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.140
@@ -6,9 +6,9 @@ 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 )
+RDEPEND=!build? ( app-arch/cpio 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.140
 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-144.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-144.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-144.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-144.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-144.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-144.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-144.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-144.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-144.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bfbed9388b8ad5163e5986ddbf2cf903
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.141 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.141
index 7b8bc4b0699a..eadabb7f47dd 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.141
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.141
@@ -6,9 +6,9 @@ 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 )
+RDEPEND=!build? ( app-arch/cpio 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.141
 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-145.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-145.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-145.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-145.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-145.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-145.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-145.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-145.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-145.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=be27156bd815fd17b2be0cf33dbac4c0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.142 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.142
index d65de38545f9..429770e8718c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.142
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.142
@@ -6,9 +6,9 @@ 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 )
+RDEPEND=!build? ( app-arch/cpio 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.142
 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-146.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-146.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-146.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-146.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-146.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-146.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-146.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-146.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-146.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c476954095a24bd1c171e0eded04d7fd
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.14_rc1 b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc1
index 08a84fb73e3f..ebc865e9acb2 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.14_rc1
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc1
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.kernel.org
 IUSE=symlink build
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 )
+RDEPEND=!build? ( app-arch/cpio 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.14_rc1
 SRC_URI=https://git.kernel.org/torvalds/p/v5.14-rc1/v5.13 -> patch-5.14-rc1.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=53474533be23ddd0f4c25b64a5a50405
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.14_rc2 b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc2
index d54f4a6845fb..aee652f7b6e1 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.14_rc2
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc2
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.kernel.org
 IUSE=symlink build
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 )
+RDEPEND=!build? ( app-arch/cpio 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.14_rc2
 SRC_URI=https://git.kernel.org/torvalds/p/v5.14-rc2/v5.13 -> patch-5.14-rc2.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=53474533be23ddd0f4c25b64a5a50405
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.14_rc3 b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc3
index 6b4ca0511373..db99ef0b5e36 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.14_rc3
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc3
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.kernel.org
 IUSE=symlink build
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 )
+RDEPEND=!build? ( app-arch/cpio 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.14_rc3
 SRC_URI=https://git.kernel.org/torvalds/p/v5.14-rc3/v5.13 -> patch-5.14-rc3.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=53474533be23ddd0f4c25b64a5a50405
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.14_rc4 b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc4
index 41faf4ab64dc..86e0ef020489 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.14_rc4
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc4
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.kernel.org
 IUSE=symlink build
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 )
+RDEPEND=!build? ( app-arch/cpio 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.14_rc4
 SRC_URI=https://git.kernel.org/torvalds/p/v5.14-rc4/v5.13 -> patch-5.14-rc4.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=53474533be23ddd0f4c25b64a5a50405
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.14_rc5 b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc5
index 72d3db4a8b2d..67c57c5453dd 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.14_rc5
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc5
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.kernel.org
 IUSE=symlink build
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 )
+RDEPEND=!build? ( app-arch/cpio 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.14_rc5
 SRC_URI=https://git.kernel.org/torvalds/p/v5.14-rc5/v5.13 -> patch-5.14-rc5.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=53474533be23ddd0f4c25b64a5a50405
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.14_rc6 b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc6
index bd4110c7f7b4..28178f20d7f7 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.14_rc6
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc6
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.kernel.org
 IUSE=symlink build
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 )
+RDEPEND=!build? ( app-arch/cpio 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.14_rc6
 SRC_URI=https://git.kernel.org/torvalds/p/v5.14-rc6/v5.13 -> patch-5.14-rc6.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=53474533be23ddd0f4c25b64a5a50405
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.14_rc7 b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc7
new file mode 100644
index 000000000000..b329441b2b57
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc7
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=7
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio 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.14_rc7
+SRC_URI=https://git.kernel.org/torvalds/p/v5.14-rc7/v5.13 -> patch-5.14-rc7.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=53474533be23ddd0f4c25b64a5a50405
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.6.3-r1 b/metadata/md5-cache/sys-kernel/kpatch-0.6.3-r1
index 14f5b7cc59ee..9bbef5af93d5 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-0.6.3-r1
+++ b/metadata/md5-cache/sys-kernel/kpatch-0.6.3-r1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils ker
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dynup/kpatch/archive/v0.6.3.tar.gz -> kpatch-0.6.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=de1732dc40cfe36c0695f5fb4462229f
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.7.1-r1 b/metadata/md5-cache/sys-kernel/kpatch-0.7.1-r1
index ad0246e5a6e8..8dab4b6e6191 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-0.7.1-r1
+++ b/metadata/md5-cache/sys-kernel/kpatch-0.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/pesign sys-libs/zlib sys-apps/pciutils kernel_linux? ( sys-app
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dynup/kpatch/archive/v0.7.1.tar.gz -> kpatch-0.7.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6f376bf5b90ee3fb2c99d88d3d421e56
diff --git a/metadata/md5-cache/sys-kernel/kpatch-9999 b/metadata/md5-cache/sys-kernel/kpatch-9999
index 7defbb9e60ce..7c94afd2ca53 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-9999
+++ b/metadata/md5-cache/sys-kernel/kpatch-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-crypt/pesign sys-libs/zlib sys-apps/pciutils kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a25433b28f077894415b8b4d5562f956
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.18 b/metadata/md5-cache/sys-kernel/linux-headers-3.18
index 3023ac55621b..7dec8dd9d92c 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.18
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.18.tar.xz mirror://gentoo/gentoo-headers-3.18-1.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a3cceb0baa1fed5fcf441163c3d03fa0
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1 b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
index 1d8271d3909d..2afde238cfc0 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.14.tar.xz mirror://gentoo/gentoo-headers-4.14-1.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c10177e2a073bb1bff06485b98ab4fb7
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.19 b/metadata/md5-cache/sys-kernel/linux-headers-4.19
index 98010896bf32..95388df577f2 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.19
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.19.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.19.tar.xz mirror://gentoo/gentoo-headers-4.19-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.19-1.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f94fe07d7b0d149023b365c0c9fe057
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.4 b/metadata/md5-cache/sys-kernel/linux-headers-4.4
index aec530dc0446..69e85b0a8728 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.4
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.4.tar.xz mirror://gentoo/gentoo-headers-4.4-1.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c10177e2a073bb1bff06485b98ab4fb7
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.9 b/metadata/md5-cache/sys-kernel/linux-headers-4.9
index 1eadc839ff5a..30402fcc09b2 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.9
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.9.tar.xz mirror://gentoo/gentoo-headers-4.9-1.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8509ec7db12dfecf2382d994c36199f5
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.10 b/metadata/md5-cache/sys-kernel/linux-headers-5.10
index 0f3081ec6162..8997ca92be3b 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.10
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz mirror://gentoo/gentoo-headers-5.10-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.10-1.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=edea2cbdd96ccb0747d400a7b3963c4c
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.11 b/metadata/md5-cache/sys-kernel/linux-headers-5.11
index 35b1473ed0eb..efaaaf07143b 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.11
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz mirror://gentoo/gentoo-headers-5.11-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.11-1.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eea262901a4c15f69ce7b322dfe70a96
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.12 b/metadata/md5-cache/sys-kernel/linux-headers-5.12
index a3340f560a1d..a27ad80ebb80 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.12
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz mirror://gentoo/gentoo-headers-5.12-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.12-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c7314057f325faaa27ebef28d8b5a600
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.13 b/metadata/md5-cache/sys-kernel/linux-headers-5.13
index aeb84e6dc900..2da3f68b8b6a 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.13
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~soap/distfiles/gentoo-headers-5.13-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ff18c1904a399c31c898965c53ddb2ef
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1 b/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
index 08a9b7010ff2..2793defa3665 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz mirror://gentoo/gentoo-headers-5.4-2.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.4-2.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=96bc6a851eeb0c4dc18c4e5bec7561d4
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.9 b/metadata/md5-cache/sys-kernel/linux-headers-5.9
index fb63fa6eb32e..2cbcc4fe20a4 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.9
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz mirror://gentoo/gentoo-headers-5.9-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.9-1.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eea262901a4c15f69ce7b322dfe70a96
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.14.243 b/metadata/md5-cache/sys-kernel/mips-sources-4.14.243
index f737af864cfd..16b11bd5c244 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.14.243
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.14.243
@@ -6,9 +6,9 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:MIPS
 IUSE=experimental ip27 ip28 ip30 symlink symlink build
 KEYWORDS=-* ~mips
 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 )
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.14.243
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.243.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~kumba/distfiles/mipsgit-4.14.0-20180128.diff.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-4.14.0-patches-v3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=11c0f48d06e8a9512d551b35d0c9dbf5
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.19.203 b/metadata/md5-cache/sys-kernel/mips-sources-4.19.203
index 224f91093d09..8b917abd50f3 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.19.203
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.19.203
@@ -6,9 +6,9 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:MIPS
 IUSE=experimental ip27 ip28 ip30 symlink symlink build
 KEYWORDS=-* ~mips
 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 )
+RDEPEND=!build? ( app-arch/cpio 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.203
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.203.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-4.19.0-patches-v3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=938b165af698e6c68f65224be6f8da8d
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-5.4.140 b/metadata/md5-cache/sys-kernel/mips-sources-5.4.140
index eb58a939f77f..ca7938e3598e 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-5.4.140
+++ b/metadata/md5-cache/sys-kernel/mips-sources-5.4.140
@@ -6,9 +6,9 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:MIPS
 IUSE=experimental ip27 ip28 ip30 symlink symlink build
 KEYWORDS=-* ~mips
 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 )
+RDEPEND=!build? ( app-arch/cpio 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.140
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.140.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-5.4-patches-v6.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cb2918ff83ee65304291e81fd076b631
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p8 b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p8
index c9d6a9df9877..35fa46c62f20 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p8
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p8
@@ -6,9 +6,9 @@ HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gen
 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 )
+RDEPEND=!build? ( app-arch/cpio 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_p8
 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-pf8.diff -> pf-sources-5.11_p8.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	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b0ab021a3784308f684f27c417054f8
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p6 b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p6
index 2a3e7a2326a6..9be1c20c9f90 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p6
@@ -6,9 +6,9 @@ HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gen
 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 )
+RDEPEND=!build? ( app-arch/cpio 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.12_p6
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.12...v5.12-pf6.diff -> pf-sources-5.12_p6.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.extras.tar.xz https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5020_BMQ-and-PDS-io-scheduler-v5.12-r1.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/1510_fs-enable-link-security-restrictions-by-default.patch -> 1510_fs-enable-link-security-restrictions-by-default-5.12.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5022_BMQ-and-PDS-compilation-fix.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=74d012e6b1e9108b5fd69c56d9c2055c
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.13_p2 b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p2
index 6cac0c246402..3c13570ac720 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.13_p2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p2
@@ -6,9 +6,9 @@ HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gen
 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 )
+RDEPEND=!build? ( app-arch/cpio 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.13_p2
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.13...v5.13-pf2.diff -> pf-sources-5.13_p2.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.13-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.13-1.extras.tar.xz https://gitlab.com/alfredchen/projectc/-/raw/master/5.13/prjc_v5.13-r1.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4996c8507f1b78e3dd06822d09187a2e
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.13_p3 b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p3
index f6b7efe217bf..5a5f4fc059c5 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.13_p3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p3
@@ -6,9 +6,9 @@ HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gen
 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 )
+RDEPEND=!build? ( app-arch/cpio 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.13_p3
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.13...v5.13-pf3.diff -> pf-sources-5.13_p3.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.13-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.13-1.extras.tar.xz https://gitlab.com/alfredchen/projectc/-/raw/master/5.13/prjc_v5.13-r1.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4996c8507f1b78e3dd06822d09187a2e
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.13_p4 b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p4
index dba672acc9ab..6707b9ee7176 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.13_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p4
@@ -6,9 +6,9 @@ HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gen
 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 )
+RDEPEND=!build? ( app-arch/cpio 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.13_p4
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.13...v5.13-pf4.diff -> pf-sources-5.13_p4.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.13-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.13-1.extras.tar.xz https://gitlab.com/alfredchen/projectc/-/raw/master/5.13/prjc_v5.13-r2.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d30e47c7dbf8d23ff213240bc4f7f363
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.13_p5 b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p5
index 3ca534a4eba6..8916cce8e9b2 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.13_p5
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p5
@@ -6,9 +6,9 @@ HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gen
 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 )
+RDEPEND=!build? ( app-arch/cpio 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.13_p5
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.13...v5.13-pf5.diff -> pf-sources-5.13_p5.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.13-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.13-1.extras.tar.xz https://gitlab.com/alfredchen/projectc/-/raw/master/5.13/prjc_v5.13-r2.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d30e47c7dbf8d23ff213240bc4f7f363
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.13_p6 b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p6
new file mode 100644
index 000000000000..3c185481ad28
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p6
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=7
+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? ( app-arch/cpio 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.13_p6
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.13...v5.13-pf6.diff -> pf-sources-5.13_p6.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.13-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.13-1.extras.tar.xz https://gitlab.com/alfredchen/projectc/-/raw/master/5.13/prjc_v5.13-r3.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=469d2a912d5d94bd737f8731ad7190e8
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
index 7badeb95f472..7dfd69926db5 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
@@ -6,8 +6,8 @@ HOMEPAGE=https://github.com/raspberrypi/linux
 IUSE=symlink build
 LICENSE=GPL-2
 PROPERTIES=live
-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 )
+RDEPEND=!build? ( app-arch/cpio 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.9999
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8dcf97f6c79d5b87810786fcf985d174
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201
index e73edcb48d7c..2e22a62ce31e 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/raspberrypi/linux
 IUSE=symlink build
 KEYWORDS=~arm ~arm64
 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 )
+RDEPEND=!build? ( app-arch/cpio 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.11_p20210201
 SRC_URI=https://github.com/raspberrypi/linux/archive/raspberrypi-kernel_1.20210201-1.tar.gz -> linux-5.10.11_p20210201-raspberrypi.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d0380caac1d34c67e6098390a73074bf
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1
index 8fbdb7b534cb..098d36c0863d 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/raspberrypi/linux
 IUSE=symlink build
 KEYWORDS=~arm ~arm64
 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 )
+RDEPEND=!build? ( app-arch/cpio 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.79_p20201201-r1
 SRC_URI=https://github.com/raspberrypi/linux/archive/raspberrypi-kernel_1.20201201-1.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ba6316e29200e170550333f6501eded
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
index a4309e5e2fb7..70a470c25153 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
@@ -6,8 +6,8 @@ HOMEPAGE=https://github.com/raspberrypi/linux
 IUSE=symlink build
 LICENSE=GPL-2
 PROPERTIES=live
-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 )
+RDEPEND=!build? ( app-arch/cpio 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.9999
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8dcf97f6c79d5b87810786fcf985d174
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.226_p109 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.226_p109
deleted file mode 100644
index 4bcd74090d58..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.226_p109
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.14 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.14.226_p109
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.226.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/patch-4.14.226-rt109.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.226-rt109.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.239_p119 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.239_p119
deleted file mode 100644
index 0d6542ec490f..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.239_p119
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.14 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.14.239_p119
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.239.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/patch-4.14.239-rt119.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.239-rt119.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.244_p121 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.244_p121
new file mode 100644
index 000000000000..ea9f5b17df16
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.244_p121
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full Linux 4.14 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=8
+HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start
+IUSE=symlink build
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.14.244_p121
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.244.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/patch-4.14.244-rt121.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.244-rt121.patch.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=939d5ceab20777d27949a4a02fd902fe
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.188_p77 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.188_p77
deleted file mode 100644
index eb741b7095f0..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.188_p77
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.19 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-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.188_p77
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.188.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.188-rt77.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.188-rt77.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.196_p83 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.196_p83
deleted file mode 100644
index 0acf4bbc0e11..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.196_p83
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.19 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-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.196_p83
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.196.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.196-rt83.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.196-rt83.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.199_p86 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.199_p86
new file mode 100644
index 000000000000..2487e5bd096d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.199_p86
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full Linux 4.19 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=8
+HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start
+IUSE=symlink build
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio 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.199_p86
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.199.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.199-rt86.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.199-rt86.patch.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=939d5ceab20777d27949a4a02fd902fe
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.267_p221 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.267_p221
deleted file mode 100644
index 3bbba7a08fff..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.267_p221
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.4 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.4.267_p221
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.267.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.267-rt221.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.267-rt221.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.270_p222 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.270_p222
deleted file mode 100644
index 664ab67e2034..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.270_p222
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.4 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.4.270_p222
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.270.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.270-rt222.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.270-rt222.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.277_p224 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.277_p224
new file mode 100644
index 000000000000..3b115af89371
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.277_p224
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full Linux 4.4 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start
+IUSE=symlink build
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.4.277_p224
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.277.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.277-rt224.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.277-rt224.patch.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.263_p177 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.263_p177
deleted file mode 100644
index f8db37396f5c..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.263_p177
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.9 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.9.263_p177
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.263.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.263-rt177.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.263-rt177.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.275_p184 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.275_p184
deleted file mode 100644
index ecb84d244422..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.275_p184
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.9 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.9.275_p184
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.275.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.275-rt184.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.275-rt184.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.280_p186 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.280_p186
new file mode 100644
index 000000000000..cc412dca1f2d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.280_p186
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full Linux 4.9 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=8
+HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start
+IUSE=symlink build
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.9.280_p186
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.280.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.280-rt186.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.280-rt186.patch.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=939d5ceab20777d27949a4a02fd902fe
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.10.30_p37 b/metadata/md5-cache/sys-kernel/rt-sources-5.10.30_p37
deleted file mode 100644
index e8c9521dfc24..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.10.30_p37
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 5.10 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-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_p37
-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 deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-5.10 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-check -> deblob-check-5.10 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/patch-5.10.30-rt37.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patch-5.10.30-rt37.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=30e10915a43e18095020124626754a13
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.10.47_p46 b/metadata/md5-cache/sys-kernel/rt-sources-5.10.47_p46
deleted file mode 100644
index a45bfad80dc0..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.10.47_p46
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 5.10 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-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.47_p46
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.47.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-5.10 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-check -> deblob-check-5.10 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/patch-5.10.47-rt46.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patch-5.10.47-rt46.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=30e10915a43e18095020124626754a13
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.10.59_p51 b/metadata/md5-cache/sys-kernel/rt-sources-5.10.59_p51
new file mode 100644
index 000000000000..aed7d8967c4f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.10.59_p51
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed ) deblob? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full Linux 5.10 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=8
+HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio 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.59_p51
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.59.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-5.10 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-check -> deblob-check-5.10 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/patch-5.10.59-rt51.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patch-5.10.59-rt51.patch.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f959e41d66cccf8119a231eb363d4252
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.11.4_p11 b/metadata/md5-cache/sys-kernel/rt-sources-5.11.4_p11
index 22440827a486..299e69cb4a0c 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.11.4_p11
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.11.4_p11
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) )
 DESCRIPTION=Full Linux 5.11 kernel sources with the CONFIG_PREEMPT_RT patch
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
 IUSE=symlink build deblob
 KEYWORDS=~amd64 ~arm64
 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 )
+RDEPEND=!build? ( app-arch/cpio 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.4_p11
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.11.4.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.11-gnu/deblob-5.11 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.11-gnu/deblob-check -> deblob-check-5.11 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.11/patch-5.11.4-rt11.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.11/older/patch-5.11.4-rt11.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=30e10915a43e18095020124626754a13
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.4.109_p56 b/metadata/md5-cache/sys-kernel/rt-sources-5.4.109_p56
deleted file mode 100644
index 25ea95127f0f..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.4.109_p56
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 5.4 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-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.109_p56
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.109.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-5.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-check -> deblob-check-5.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/patch-5.4.109-rt56.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.109-rt56.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=30e10915a43e18095020124626754a13
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.4.129_p61 b/metadata/md5-cache/sys-kernel/rt-sources-5.4.129_p61
deleted file mode 100644
index fdb7c90eba7a..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.4.129_p61
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 5.4 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-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.129_p61
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.129.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-5.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-check -> deblob-check-5.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/patch-5.4.129-rt61.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.129-rt61.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=30e10915a43e18095020124626754a13
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.4.138_p62 b/metadata/md5-cache/sys-kernel/rt-sources-5.4.138_p62
new file mode 100644
index 000000000000..25450fd61cf9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.4.138_p62
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full Linux 5.4 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=8
+HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start
+IUSE=symlink build
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio 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.138_p62
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.138.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/patch-5.4.138-rt62.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.138-rt62.patch.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dcc317ad76e0141597b0a8e37c26a477
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.244 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.244
index c765dc5f634a..90529c26e93b 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.244
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.244
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org
 IUSE=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 )
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.14.244
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.244.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.204 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.204
index 94f8659f706f..71bd7b585c1a 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.204
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.204
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org
 IUSE=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 )
+RDEPEND=!build? ( app-arch/cpio 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.204
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.204.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.281 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.281
index c415b1c02303..e1773fab2d1c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.281
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.281
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org
 IUSE=symlink build
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.4.281
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.281.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.280 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.280
index 5d218de560fe..83b761f455f3 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.280
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.280
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org
 IUSE=symlink build
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.9.280
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.280.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.60 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.60
index 396b833a2e04..5d649d54c119 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.60
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.60
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org
 IUSE=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 )
+RDEPEND=!build? ( app-arch/cpio 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.60
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.60.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.12.18 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.12.18
index cbe7dd7c5a1a..0fecd065611c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.12.18
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.12.18
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org
 IUSE=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 )
+RDEPEND=!build? ( app-arch/cpio 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.12.18
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.12.18.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.12 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.12
index ddee11a19f16..802d48d4b065 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.12
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.12
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org
 IUSE=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 )
+RDEPEND=!build? ( app-arch/cpio 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.13.12
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.13.12.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.142 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.142
index 6c4b8e1ed9ed..5c78bb4806e1 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.142
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.142
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org
 IUSE=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 )
+RDEPEND=!build? ( app-arch/cpio 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.142
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.142.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-5.13.10 b/metadata/md5-cache/sys-kernel/zen-sources-5.13.10
index 8ff34c7f92f7..b52ef166cee1 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-5.13.10
+++ b/metadata/md5-cache/sys-kernel/zen-sources-5.13.10
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/zen-kernel
 IUSE=symlink build
 KEYWORDS=~amd64 ~arm64 ~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 )
+RDEPEND=!build? ( app-arch/cpio 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.13.10
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.13.10-zen1/v5.13.10-zen1.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c86a82cb0f0b0b280706f7fed7ef56f2	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=da0dd23ad5043a93d3550594985c9521
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index f9291de87629..24b2a755fa9d 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.25 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.25
index dc5dbc8b2619..62c9ec6fdec1 100644
--- a/metadata/md5-cache/sys-libs/libxcrypt-4.4.25
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.25
@@ -5,7 +5,7 @@ DESCRIPTION=Extended crypt library for descrypt, md5crypt, bcrypt, and others
 EAPI=7
 HOMEPAGE=https://github.com/besser82/libxcrypt
 IUSE=+compat split-usr +static-libs system test 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+ public-domain BSD BSD-2
 RDEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] !sys-libs/glibc[crypt(+)] ) !sys-libs/musl )
 REQUIRED_USE=split-usr? ( system )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-libs/libxcrypt/libxcrypt-4.4.25-autotools.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=784de514471bf1aa5b570bb19055da0e
+_md5_=f94c62a9821b6d5a5e0faededc60df61
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 45f717342a47..48779cdd4274 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/acpi_call-1.2.1 b/metadata/md5-cache/sys-power/acpi_call-1.2.1
index 17eea8b4ae1f..40fee08d6f85 100644
--- a/metadata/md5-cache/sys-power/acpi_call-1.2.1
+++ b/metadata/md5-cache/sys-power/acpi_call-1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/nix-community/acpi_call/archive/v1.2.1.tar.gz -> acpi_call-1.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e4f3be2e569e2cfda93d31b17f79a323
diff --git a/metadata/md5-cache/sys-power/acpi_call-9999 b/metadata/md5-cache/sys-power/acpi_call-9999
index d3be2a4ca3f7..c47f2e3c3e1e 100644
--- a/metadata/md5-cache/sys-power/acpi_call-9999
+++ b/metadata/md5-cache/sys-power/acpi_call-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=44f3263fe4c9b633d47006925fbb1dbf
diff --git a/metadata/md5-cache/sys-power/bbswitch-0.8-r5 b/metadata/md5-cache/sys-power/bbswitch-0.8-r5
index 81c74b397e2c..8796ef7c7120 100644
--- a/metadata/md5-cache/sys-power/bbswitch-0.8-r5
+++ b/metadata/md5-cache/sys-power/bbswitch-0.8-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/Bumblebee-Project/bbswitch/archive/v0.8.tar.gz -> bbswitch-0.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=473e659045fac1b41d7769ad40195579
diff --git a/metadata/md5-cache/sys-power/bbswitch-0.8_p20200526 b/metadata/md5-cache/sys-power/bbswitch-0.8_p20200526
index c298e6dad2a4..24dc9eb90c91 100644
--- a/metadata/md5-cache/sys-power/bbswitch-0.8_p20200526
+++ b/metadata/md5-cache/sys-power/bbswitch-0.8_p20200526
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/Bumblebee-Project/bbswitch/archive/ddbd243638c7bc2baecf43a78aff46cdc12e9b2e.tar.gz -> bbswitch-0.8_p20200526.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8ccdbf62c0054a7eaf09de8b1e3c618b
diff --git a/metadata/md5-cache/sys-power/bbswitch-9999 b/metadata/md5-cache/sys-power/bbswitch-9999
index 1daf7891a2b0..341678af6eae 100644
--- a/metadata/md5-cache/sys-power/bbswitch-9999
+++ b/metadata/md5-cache/sys-power/bbswitch-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8ccdbf62c0054a7eaf09de8b1e3c618b
diff --git a/metadata/md5-cache/sys-power/tuxedo-cc-wmi-0.1.4-r1 b/metadata/md5-cache/sys-power/tuxedo-cc-wmi-0.1.4-r1
index 4825dac7566c..e6e142cad4c1 100644
--- a/metadata/md5-cache/sys-power/tuxedo-cc-wmi-0.1.4-r1
+++ b/metadata/md5-cache/sys-power/tuxedo-cc-wmi-0.1.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/tuxedocomputers/tuxedo-cc-wmi/archive/v0.1.4.tar.gz -> tuxedo-cc-wmi-0.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3e3bd07426308af786957898aa17e828
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 2ba225b9fc6d..517b77ca3bfa 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/glances-3.2.2 b/metadata/md5-cache/sys-process/glances-3.2.2
index cfd96bab08b0..862f7b0d9ed3 100644
--- a/metadata/md5-cache/sys-process/glances-3.2.2
+++ b/metadata/md5-cache/sys-process/glances-3.2.2
@@ -4,7 +4,7 @@ DESCRIPTION=CLI curses based monitoring tool
 EAPI=7
 HOMEPAGE=https://github.com/nicolargo/glances
 IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=dev-python/defusedxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/future[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/glances/archive/v3.2.2.tar.gz -> glances-3.2.2.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ed062f011c9a0d78d63a49e79fa8655b
+_md5_=b0ae988ab1096aba162824d75705a3c5
diff --git a/metadata/md5-cache/sys-process/parallel-20210422-r1 b/metadata/md5-cache/sys-process/parallel-20210422-r1
deleted file mode 100644
index a6e772efe892..000000000000
--- a/metadata/md5-cache/sys-process/parallel-20210422-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=verify-sig? ( >=app-crypt/openpgp-keys-oletange-20210423 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure unpack
-DEPEND=dev-lang/perl:= dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/
-IUSE=verify-sig
-KEYWORDS=amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl:= dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-SLOT=0
-SRC_URI=mirror://gnu/parallel/parallel-20210422.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20210422.tar.bz2.sig )
-_eclasses_=verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=3eeec0abafe0ba941377b6aa307fc2c7
diff --git a/metadata/md5-cache/sys-process/parallel-20210522 b/metadata/md5-cache/sys-process/parallel-20210522
deleted file mode 100644
index fc463efb62a4..000000000000
--- a/metadata/md5-cache/sys-process/parallel-20210522
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=verify-sig? ( >=app-crypt/openpgp-keys-oletange-20210423 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure unpack
-DEPEND=dev-lang/perl:= dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/
-IUSE=verify-sig
-KEYWORDS=amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl:= dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-SLOT=0
-SRC_URI=mirror://gnu/parallel/parallel-20210522.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20210522.tar.bz2.sig )
-_eclasses_=verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=3eeec0abafe0ba941377b6aa307fc2c7
diff --git a/metadata/md5-cache/sys-process/parallel-20210722 b/metadata/md5-cache/sys-process/parallel-20210722
index 28b2f190391c..37544e28f290 100644
--- a/metadata/md5-cache/sys-process/parallel-20210722
+++ b/metadata/md5-cache/sys-process/parallel-20210722
@@ -5,10 +5,10 @@ DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote mac
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/
 IUSE=verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl:= dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20210722.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20210722.tar.bz2.sig )
 _eclasses_=verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=e2c517a534bc5d79f22bbb7e5ccb5599
+_md5_=3eeec0abafe0ba941377b6aa307fc2c7
diff --git a/metadata/md5-cache/sys-process/parallel-20210822 b/metadata/md5-cache/sys-process/parallel-20210822
new file mode 100644
index 000000000000..28e5ca64399e
--- /dev/null
+++ b/metadata/md5-cache/sys-process/parallel-20210822
@@ -0,0 +1,14 @@
+BDEPEND=verify-sig? ( >=app-crypt/openpgp-keys-oletange-20210423 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure unpack
+DEPEND=dev-lang/perl:= dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
+DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/
+IUSE=verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=dev-lang/perl:= dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
+SLOT=0
+SRC_URI=mirror://gnu/parallel/parallel-20210822.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20210822.tar.bz2.sig )
+_eclasses_=verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=e2c517a534bc5d79f22bbb7e5ccb5599
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index c8a95bb040bb..96d8bfce3a89 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/httpd-basic-0-r2 b/metadata/md5-cache/virtual/httpd-basic-0-r2
deleted file mode 100644
index d095e809cdd0..000000000000
--- a/metadata/md5-cache/virtual/httpd-basic-0-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for static HTML-enabled webservers
-EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( www-servers/apache www-servers/lighttpd www-servers/boa www-servers/bozohttpd www-servers/cherokee www-servers/fnord www-servers/hiawatha www-servers/monkeyd www-servers/nginx www-servers/resin www-servers/thttpd www-servers/tomcat )
-SLOT=0
-_md5_=28949a0e8b4a9f5909ebc6bf4c6214d9
diff --git a/metadata/md5-cache/virtual/httpd-basic-0-r3 b/metadata/md5-cache/virtual/httpd-basic-0-r3
new file mode 100644
index 000000000000..a4440e49f21b
--- /dev/null
+++ b/metadata/md5-cache/virtual/httpd-basic-0-r3
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for static HTML-enabled webservers
+EAPI=7
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=|| ( www-servers/apache www-servers/lighttpd www-servers/boa www-servers/bozohttpd www-servers/cherokee www-servers/fnord www-servers/hiawatha www-servers/monkeyd www-servers/nginx www-servers/thttpd www-servers/tomcat )
+SLOT=0
+_md5_=26e5f8f60b0956336fbce80f96ae109f
diff --git a/metadata/md5-cache/virtual/httpd-cgi-0-r2 b/metadata/md5-cache/virtual/httpd-cgi-0-r2
deleted file mode 100644
index dabfed048e76..000000000000
--- a/metadata/md5-cache/virtual/httpd-cgi-0-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for CGI-enabled webservers
-EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( www-servers/apache www-servers/lighttpd www-servers/boa www-servers/bozohttpd www-servers/cherokee www-servers/fnord www-servers/hiawatha www-servers/monkeyd www-servers/nginx www-servers/resin www-servers/thttpd www-servers/tomcat )
-SLOT=0
-_md5_=f8a24e8752b60019d74d43ae74b75e2c
diff --git a/metadata/md5-cache/virtual/httpd-cgi-0-r3 b/metadata/md5-cache/virtual/httpd-cgi-0-r3
new file mode 100644
index 000000000000..0107aa2d54e5
--- /dev/null
+++ b/metadata/md5-cache/virtual/httpd-cgi-0-r3
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for CGI-enabled webservers
+EAPI=7
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=|| ( www-servers/apache www-servers/lighttpd www-servers/boa www-servers/bozohttpd www-servers/cherokee www-servers/fnord www-servers/hiawatha www-servers/monkeyd www-servers/nginx www-servers/thttpd www-servers/tomcat )
+SLOT=0
+_md5_=35e910343af9e43299c82f43aad36012
diff --git a/metadata/md5-cache/virtual/httpd-fastcgi-0-r1 b/metadata/md5-cache/virtual/httpd-fastcgi-0-r1
deleted file mode 100644
index ddc28300fb65..000000000000
--- a/metadata/md5-cache/virtual/httpd-fastcgi-0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for FastCGI-enabled webservers
-EAPI=7
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-RDEPEND=|| ( www-apache/mod_fcgid www-servers/lighttpd www-servers/bozohttpd www-servers/nginx www-servers/resin www-servers/cherokee )
-SLOT=0
-_md5_=84efea829289a8cf6c7b38132a36b1b0
diff --git a/metadata/md5-cache/virtual/httpd-fastcgi-0-r2 b/metadata/md5-cache/virtual/httpd-fastcgi-0-r2
new file mode 100644
index 000000000000..67468330a9fd
--- /dev/null
+++ b/metadata/md5-cache/virtual/httpd-fastcgi-0-r2
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for FastCGI-enabled webservers
+EAPI=7
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+RDEPEND=|| ( www-apache/mod_fcgid www-servers/lighttpd www-servers/bozohttpd www-servers/nginx www-servers/cherokee )
+SLOT=0
+_md5_=bb49e71ba8aecbf9c3cf236b076ea50b
diff --git a/metadata/md5-cache/virtual/linux-sources-3-r5 b/metadata/md5-cache/virtual/linux-sources-3-r5
deleted file mode 100644
index c4c0a8ffbe5b..000000000000
--- a/metadata/md5-cache/virtual/linux-sources-3-r5
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Linux kernel sources
-EAPI=7
-IUSE=firmware
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-RDEPEND=firmware? ( sys-kernel/linux-firmware ) || ( sys-kernel/gentoo-sources sys-kernel/vanilla-sources sys-kernel/git-sources sys-kernel/mips-sources sys-kernel/pf-sources sys-kernel/rt-sources sys-kernel/zen-sources sys-kernel/raspberrypi-sources sys-kernel/gentoo-kernel sys-kernel/gentoo-kernel-bin sys-kernel/vanilla-kernel sys-kernel/bliss-kernel-bin )
-SLOT=0
-_md5_=40defcf8729b24ad2fc4d2641bd713f0
diff --git a/metadata/md5-cache/virtual/linux-sources-3-r6 b/metadata/md5-cache/virtual/linux-sources-3-r6
new file mode 100644
index 000000000000..5ffc1367c544
--- /dev/null
+++ b/metadata/md5-cache/virtual/linux-sources-3-r6
@@ -0,0 +1,8 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Linux kernel sources
+EAPI=7
+IUSE=firmware
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+RDEPEND=firmware? ( sys-kernel/linux-firmware ) || ( sys-kernel/gentoo-sources sys-kernel/vanilla-sources sys-kernel/git-sources sys-kernel/mips-sources sys-kernel/pf-sources sys-kernel/rt-sources sys-kernel/zen-sources sys-kernel/raspberrypi-sources sys-kernel/gentoo-kernel sys-kernel/gentoo-kernel-bin sys-kernel/vanilla-kernel )
+SLOT=0
+_md5_=bfc9ccb0554b5d44ef99355ba1a8cb80
diff --git a/metadata/md5-cache/virtual/tmpfiles-0-r1 b/metadata/md5-cache/virtual/tmpfiles-0-r1
index 1eeb3764f426..04d9cc0d36b3 100644
--- a/metadata/md5-cache/virtual/tmpfiles-0-r1
+++ b/metadata/md5-cache/virtual/tmpfiles-0-r1
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to select between different tmpfiles.d handlers
 EAPI=7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( sys-apps/systemd-tmpfiles sys-apps/opentmpfiles sys-apps/systemd )
+RDEPEND=!prefix-guest? ( || ( sys-apps/systemd-tmpfiles sys-apps/opentmpfiles sys-apps/systemd ) )
 SLOT=0
-_md5_=4e01519d30cca2269c19af6eb9e6a590
+_md5_=3e0e9e734c81359140048cf4b4454227
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 4c19958bc5a8..b04f8851ee83 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/phpsysinfo-3.3.2 b/metadata/md5-cache/www-apps/phpsysinfo-3.3.2
deleted file mode 100644
index a670a138af4d..000000000000
--- a/metadata/md5-cache/www-apps/phpsysinfo-3.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A customizable PHP script that displays information about your system nicely
-EAPI=7
-HOMEPAGE=https://rk4an.github.com/phpsysinfo/
-IUSE=vhosts
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-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	30ce9dec2b8943338c9b015bd32bac6a	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=d4b49d9907e83f8d052045ac8ad5a9f9
diff --git a/metadata/md5-cache/www-apps/phpsysinfo-3.3.4 b/metadata/md5-cache/www-apps/phpsysinfo-3.3.4
index 09693afbbf9b..1d51c9964b2c 100644
--- a/metadata/md5-cache/www-apps/phpsysinfo-3.3.4
+++ b/metadata/md5-cache/www-apps/phpsysinfo-3.3.4
@@ -4,10 +4,10 @@ DESCRIPTION=A customizable PHP script that displays information about your syste
 EAPI=7
 HOMEPAGE=https://rk4an.github.com/phpsysinfo/
 IUSE=vhosts
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~hppa ppc ppc64 x86
 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.4
 SRC_URI=https://github.com/rk4an/phpsysinfo/archive/v3.3.4.tar.gz -> phpsysinfo-3.3.4.tar.gz
 _eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=daec0c467f1c75b277048b12aa25d652
+_md5_=a0c6cfb5ac01590ac7f38a1ac4f88cb0
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index adfe4c76311f..c34188767ee3 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-93.0.4577.51 b/metadata/md5-cache/www-client/chromium-93.0.4577.51
deleted file mode 100644
index b425c521ec8b..000000000000
--- a/metadata/md5-cache/www-client/chromium-93.0.4577.51
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) || ( ( dev-lang/python:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 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-2.11.0:= >=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:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= 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/libxcb:= x11-libs/libxshmfence:= 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:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.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 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-2.11.0:= >=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:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= 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/libxcb:= x11-libs/libxshmfence:= 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:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
-REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-93.0.4577.51.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-93-patchset-6/chromium-93-patchset-6.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-92-glibc-2.33-patch.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=05f908b7492dcbc72200b55bcdf22c87
diff --git a/metadata/md5-cache/www-client/chromium-93.0.4577.58 b/metadata/md5-cache/www-client/chromium-93.0.4577.58
new file mode 100644
index 000000000000..721b20cfccee
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-93.0.4577.58
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) || ( ( dev-lang/python:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 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-2.11.0:= >=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:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= 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/libxcb:= x11-libs/libxshmfence:= 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:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.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 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-2.11.0:= >=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:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= 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/libxcb:= x11-libs/libxshmfence:= 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:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-93.0.4577.58.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-93-patchset-6/chromium-93-patchset-6.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-92-glibc-2.33-patch.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=05f908b7492dcbc72200b55bcdf22c87
diff --git a/metadata/md5-cache/www-client/firefox-78.12.0 b/metadata/md5-cache/www-client/firefox-78.12.0
deleted file mode 100644
index 9dde89700f8e..000000000000
--- a/metadata/md5-cache/www-client/firefox-78.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.21.0 virtual/pkgconfig >=virtual/rust-1.41.0 || ( ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) 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 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Firefox Web Browser
-EAPI=7
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux pgo
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland ) wifi? ( dbus )
-SLOT=0/esr78
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/source/firefox-78.12.0esr.source.tar.xz -> firefox-78.12.0esr.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-15.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ach.xpi -> firefox-78.12.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/af.xpi -> firefox-78.12.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/an.xpi -> firefox-78.12.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ar.xpi -> firefox-78.12.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ast.xpi -> firefox-78.12.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/az.xpi -> firefox-78.12.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/be.xpi -> firefox-78.12.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/bg.xpi -> firefox-78.12.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/bn.xpi -> firefox-78.12.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/br.xpi -> firefox-78.12.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/bs.xpi -> firefox-78.12.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-78.12.0esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ca.xpi -> firefox-78.12.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/cak.xpi -> firefox-78.12.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/cs.xpi -> firefox-78.12.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/cy.xpi -> firefox-78.12.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/da.xpi -> firefox-78.12.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/de.xpi -> firefox-78.12.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-78.12.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/el.xpi -> firefox-78.12.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-78.12.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-78.12.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/eo.xpi -> firefox-78.12.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-78.12.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-78.12.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-78.12.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-78.12.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/et.xpi -> firefox-78.12.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/eu.xpi -> firefox-78.12.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fa.xpi -> firefox-78.12.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ff.xpi -> firefox-78.12.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fi.xpi -> firefox-78.12.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fr.xpi -> firefox-78.12.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-78.12.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-78.12.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gd.xpi -> firefox-78.12.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gl.xpi -> firefox-78.12.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gn.xpi -> firefox-78.12.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-78.12.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/he.xpi -> firefox-78.12.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-78.12.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hr.xpi -> firefox-78.12.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-78.12.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hu.xpi -> firefox-78.12.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-78.12.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ia.xpi -> firefox-78.12.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/id.xpi -> firefox-78.12.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/is.xpi -> firefox-78.12.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/it.xpi -> firefox-78.12.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ja.xpi -> firefox-78.12.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ka.xpi -> firefox-78.12.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/kab.xpi -> firefox-78.12.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/kk.xpi -> firefox-78.12.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/km.xpi -> firefox-78.12.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/kn.xpi -> firefox-78.12.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ko.xpi -> firefox-78.12.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/lij.xpi -> firefox-78.12.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/lt.xpi -> firefox-78.12.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/lv.xpi -> firefox-78.12.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/mk.xpi -> firefox-78.12.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/mr.xpi -> firefox-78.12.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ms.xpi -> firefox-78.12.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/my.xpi -> firefox-78.12.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-78.12.0esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-78.12.0esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/nl.xpi -> firefox-78.12.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-78.12.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/oc.xpi -> firefox-78.12.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-78.12.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pl.xpi -> firefox-78.12.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-78.12.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-78.12.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/rm.xpi -> firefox-78.12.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ro.xpi -> firefox-78.12.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ru.xpi -> firefox-78.12.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/si.xpi -> firefox-78.12.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sk.xpi -> firefox-78.12.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sl.xpi -> firefox-78.12.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/son.xpi -> firefox-78.12.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sq.xpi -> firefox-78.12.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sr.xpi -> firefox-78.12.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-78.12.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ta.xpi -> firefox-78.12.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/te.xpi -> firefox-78.12.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/th.xpi -> firefox-78.12.0esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/tl.xpi -> firefox-78.12.0esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/tr.xpi -> firefox-78.12.0esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/trs.xpi -> firefox-78.12.0esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/uk.xpi -> firefox-78.12.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ur.xpi -> firefox-78.12.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/uz.xpi -> firefox-78.12.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/vi.xpi -> firefox-78.12.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/xh.xpi -> firefox-78.12.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-78.12.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-78.12.0esr-zh-TW.xpi )
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=59001da5b2cc242aa7b5ce37265da2d2
diff --git a/metadata/md5-cache/www-client/firefox-90.0.2 b/metadata/md5-cache/www-client/firefox-90.0.2
deleted file mode 100644
index fbfd6bf108b5..000000000000
--- a/metadata/md5-cache/www-client/firefox-90.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.19.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.47.0 || ( ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) 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 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.66 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.7.4:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Firefox Web Browser
-EAPI=7
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_szl l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.66 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.7.4:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
-SLOT=0/90
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/90.0.2/source/firefox-90.0.2.source.tar.xz -> firefox-90.0.2.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-90-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-90-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-90-patches-01.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ach.xpi -> firefox-90.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/af.xpi -> firefox-90.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/an.xpi -> firefox-90.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ar.xpi -> firefox-90.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ast.xpi -> firefox-90.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/az.xpi -> firefox-90.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/be.xpi -> firefox-90.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/bg.xpi -> firefox-90.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/bn.xpi -> firefox-90.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/br.xpi -> firefox-90.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/bs.xpi -> firefox-90.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-90.0.2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ca.xpi -> firefox-90.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/cak.xpi -> firefox-90.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/cs.xpi -> firefox-90.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/cy.xpi -> firefox-90.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/da.xpi -> firefox-90.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/de.xpi -> firefox-90.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-90.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/el.xpi -> firefox-90.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-90.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-90.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/eo.xpi -> firefox-90.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-90.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-90.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-90.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-90.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/et.xpi -> firefox-90.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/eu.xpi -> firefox-90.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fa.xpi -> firefox-90.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ff.xpi -> firefox-90.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fi.xpi -> firefox-90.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fr.xpi -> firefox-90.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-90.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-90.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gd.xpi -> firefox-90.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gl.xpi -> firefox-90.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gn.xpi -> firefox-90.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-90.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/he.xpi -> firefox-90.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-90.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hr.xpi -> firefox-90.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-90.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hu.xpi -> firefox-90.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-90.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ia.xpi -> firefox-90.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/id.xpi -> firefox-90.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/is.xpi -> firefox-90.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/it.xpi -> firefox-90.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ja.xpi -> firefox-90.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ka.xpi -> firefox-90.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/kab.xpi -> firefox-90.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/kk.xpi -> firefox-90.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/km.xpi -> firefox-90.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/kn.xpi -> firefox-90.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ko.xpi -> firefox-90.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/lij.xpi -> firefox-90.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/lt.xpi -> firefox-90.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/lv.xpi -> firefox-90.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/mk.xpi -> firefox-90.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/mr.xpi -> firefox-90.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ms.xpi -> firefox-90.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/my.xpi -> firefox-90.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-90.0.2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-90.0.2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/nl.xpi -> firefox-90.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-90.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/oc.xpi -> firefox-90.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-90.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pl.xpi -> firefox-90.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-90.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-90.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/rm.xpi -> firefox-90.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ro.xpi -> firefox-90.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ru.xpi -> firefox-90.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/si.xpi -> firefox-90.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sk.xpi -> firefox-90.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sl.xpi -> firefox-90.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/son.xpi -> firefox-90.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sq.xpi -> firefox-90.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sr.xpi -> firefox-90.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-90.0.2-sv-SE.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/szl.xpi -> firefox-90.0.2-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ta.xpi -> firefox-90.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/te.xpi -> firefox-90.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/th.xpi -> firefox-90.0.2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/tl.xpi -> firefox-90.0.2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/tr.xpi -> firefox-90.0.2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/trs.xpi -> firefox-90.0.2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/uk.xpi -> firefox-90.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ur.xpi -> firefox-90.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/uz.xpi -> firefox-90.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/vi.xpi -> firefox-90.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/xh.xpi -> firefox-90.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-90.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-90.0.2-zh-TW.xpi )
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=48d7f3319df476e70f6327eae6f06f60
diff --git a/metadata/md5-cache/www-client/firefox-91.0 b/metadata/md5-cache/www-client/firefox-91.0
deleted file mode 100644
index 41ff3174cc57..000000000000
--- a/metadata/md5-cache/www-client/firefox-91.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10[ncurses,sqlite,ssl] dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.19.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.51.0 || ( ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) 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 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.68 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Firefox Web Browser
-EAPI=7
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_szl l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.68 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
-SLOT=0/91
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/91.0/source/firefox-91.0.source.tar.xz -> firefox-91.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-91-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-91-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-91-patches-01.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ach.xpi -> firefox-91.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/af.xpi -> firefox-91.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/an.xpi -> firefox-91.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ar.xpi -> firefox-91.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ast.xpi -> firefox-91.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/az.xpi -> firefox-91.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/be.xpi -> firefox-91.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/bg.xpi -> firefox-91.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/bn.xpi -> firefox-91.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/br.xpi -> firefox-91.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/bs.xpi -> firefox-91.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-91.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ca.xpi -> firefox-91.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/cak.xpi -> firefox-91.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/cs.xpi -> firefox-91.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/cy.xpi -> firefox-91.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/da.xpi -> firefox-91.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/de.xpi -> firefox-91.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/dsb.xpi -> firefox-91.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/el.xpi -> firefox-91.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/en-CA.xpi -> firefox-91.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/en-GB.xpi -> firefox-91.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/eo.xpi -> firefox-91.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/es-AR.xpi -> firefox-91.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/es-CL.xpi -> firefox-91.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/es-ES.xpi -> firefox-91.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/es-MX.xpi -> firefox-91.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/et.xpi -> firefox-91.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/eu.xpi -> firefox-91.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/fa.xpi -> firefox-91.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ff.xpi -> firefox-91.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/fi.xpi -> firefox-91.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/fr.xpi -> firefox-91.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-91.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-91.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/gd.xpi -> firefox-91.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/gl.xpi -> firefox-91.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/gn.xpi -> firefox-91.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-91.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/he.xpi -> firefox-91.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-91.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/hr.xpi -> firefox-91.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/hsb.xpi -> firefox-91.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/hu.xpi -> firefox-91.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-91.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ia.xpi -> firefox-91.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/id.xpi -> firefox-91.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/is.xpi -> firefox-91.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/it.xpi -> firefox-91.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ja.xpi -> firefox-91.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ka.xpi -> firefox-91.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/kab.xpi -> firefox-91.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/kk.xpi -> firefox-91.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/km.xpi -> firefox-91.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/kn.xpi -> firefox-91.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ko.xpi -> firefox-91.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/lij.xpi -> firefox-91.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/lt.xpi -> firefox-91.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/lv.xpi -> firefox-91.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/mk.xpi -> firefox-91.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/mr.xpi -> firefox-91.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ms.xpi -> firefox-91.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/my.xpi -> firefox-91.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-91.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-91.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/nl.xpi -> firefox-91.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-91.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/oc.xpi -> firefox-91.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-91.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/pl.xpi -> firefox-91.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-91.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-91.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/rm.xpi -> firefox-91.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ro.xpi -> firefox-91.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ru.xpi -> firefox-91.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/si.xpi -> firefox-91.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/sk.xpi -> firefox-91.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/sl.xpi -> firefox-91.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/son.xpi -> firefox-91.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/sq.xpi -> firefox-91.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/sr.xpi -> firefox-91.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-91.0-sv-SE.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/szl.xpi -> firefox-91.0-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ta.xpi -> firefox-91.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/te.xpi -> firefox-91.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/th.xpi -> firefox-91.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/tl.xpi -> firefox-91.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/tr.xpi -> firefox-91.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/trs.xpi -> firefox-91.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/uk.xpi -> firefox-91.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ur.xpi -> firefox-91.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/uz.xpi -> firefox-91.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/vi.xpi -> firefox-91.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/xh.xpi -> firefox-91.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-91.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-91.0-zh-TW.xpi )
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8f3a308b0573889ef243c9d5516c0273
diff --git a/metadata/md5-cache/www-client/firefox-91.0.2 b/metadata/md5-cache/www-client/firefox-91.0.2
new file mode 100644
index 000000000000..555539fea32c
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-91.0.2
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10[ncurses,sqlite,ssl] dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.19.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.51.0 || ( ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) 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 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.68 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Firefox Web Browser
+EAPI=7
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sco l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_szl l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.68 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
+SLOT=0/91
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/91.0.2/source/firefox-91.0.2.source.tar.xz -> firefox-91.0.2.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-91-patches-03.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-91-patches-03.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-91-patches-03.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ach.xpi -> firefox-91.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/af.xpi -> firefox-91.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/an.xpi -> firefox-91.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ar.xpi -> firefox-91.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ast.xpi -> firefox-91.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/az.xpi -> firefox-91.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/be.xpi -> firefox-91.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/bg.xpi -> firefox-91.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/bn.xpi -> firefox-91.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/br.xpi -> firefox-91.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/bs.xpi -> firefox-91.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-91.0.2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ca.xpi -> firefox-91.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/cak.xpi -> firefox-91.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/cs.xpi -> firefox-91.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/cy.xpi -> firefox-91.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/da.xpi -> firefox-91.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/de.xpi -> firefox-91.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-91.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/el.xpi -> firefox-91.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-91.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-91.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/eo.xpi -> firefox-91.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-91.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-91.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-91.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-91.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/et.xpi -> firefox-91.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/eu.xpi -> firefox-91.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/fa.xpi -> firefox-91.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ff.xpi -> firefox-91.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/fi.xpi -> firefox-91.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/fr.xpi -> firefox-91.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-91.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-91.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/gd.xpi -> firefox-91.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/gl.xpi -> firefox-91.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/gn.xpi -> firefox-91.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-91.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/he.xpi -> firefox-91.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-91.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/hr.xpi -> firefox-91.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-91.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/hu.xpi -> firefox-91.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-91.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ia.xpi -> firefox-91.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/id.xpi -> firefox-91.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/is.xpi -> firefox-91.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/it.xpi -> firefox-91.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ja.xpi -> firefox-91.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ka.xpi -> firefox-91.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/kab.xpi -> firefox-91.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/kk.xpi -> firefox-91.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/km.xpi -> firefox-91.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/kn.xpi -> firefox-91.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ko.xpi -> firefox-91.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/lij.xpi -> firefox-91.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/lt.xpi -> firefox-91.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/lv.xpi -> firefox-91.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/mk.xpi -> firefox-91.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/mr.xpi -> firefox-91.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ms.xpi -> firefox-91.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/my.xpi -> firefox-91.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-91.0.2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-91.0.2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/nl.xpi -> firefox-91.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-91.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/oc.xpi -> firefox-91.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-91.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/pl.xpi -> firefox-91.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-91.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-91.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/rm.xpi -> firefox-91.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ro.xpi -> firefox-91.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ru.xpi -> firefox-91.0.2-ru.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/sco.xpi -> firefox-91.0.2-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/si.xpi -> firefox-91.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/sk.xpi -> firefox-91.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/sl.xpi -> firefox-91.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/son.xpi -> firefox-91.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/sq.xpi -> firefox-91.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/sr.xpi -> firefox-91.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-91.0.2-sv-SE.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/szl.xpi -> firefox-91.0.2-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ta.xpi -> firefox-91.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/te.xpi -> firefox-91.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/th.xpi -> firefox-91.0.2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/tl.xpi -> firefox-91.0.2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/tr.xpi -> firefox-91.0.2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/trs.xpi -> firefox-91.0.2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/uk.xpi -> firefox-91.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ur.xpi -> firefox-91.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/uz.xpi -> firefox-91.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/vi.xpi -> firefox-91.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/xh.xpi -> firefox-91.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-91.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-91.0.2-zh-TW.xpi )
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=40da21501c8b6abd9279cc6f92251620
diff --git a/metadata/md5-cache/www-client/firefox-bin-90.0.2 b/metadata/md5-cache/www-client/firefox-bin-90.0.2
deleted file mode 100644
index 8f70b99fd3ca..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-90.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Firefox Web Browser
-EAPI=7
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.11:3[wayland?] 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 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip
-SLOT=0/90
-SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/en-US/firefox-90.0.2.tar.bz2 -> firefox-bin_x86_64-90.0.2.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/en-US/firefox-90.0.2.tar.bz2 -> firefox-bin_i686-90.0.2.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ach.xpi -> firefox-90.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/af.xpi -> firefox-90.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/an.xpi -> firefox-90.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ar.xpi -> firefox-90.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ast.xpi -> firefox-90.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/az.xpi -> firefox-90.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/be.xpi -> firefox-90.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/bg.xpi -> firefox-90.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/bn.xpi -> firefox-90.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/br.xpi -> firefox-90.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/bs.xpi -> firefox-90.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-90.0.2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ca.xpi -> firefox-90.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/cak.xpi -> firefox-90.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/cs.xpi -> firefox-90.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/cy.xpi -> firefox-90.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/da.xpi -> firefox-90.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/de.xpi -> firefox-90.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-90.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/el.xpi -> firefox-90.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-90.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-90.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/eo.xpi -> firefox-90.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-90.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-90.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-90.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-90.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/et.xpi -> firefox-90.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/eu.xpi -> firefox-90.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fa.xpi -> firefox-90.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ff.xpi -> firefox-90.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fi.xpi -> firefox-90.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fr.xpi -> firefox-90.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-90.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-90.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gd.xpi -> firefox-90.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gl.xpi -> firefox-90.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gn.xpi -> firefox-90.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-90.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/he.xpi -> firefox-90.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-90.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hr.xpi -> firefox-90.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-90.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hu.xpi -> firefox-90.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-90.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ia.xpi -> firefox-90.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/id.xpi -> firefox-90.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/is.xpi -> firefox-90.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/it.xpi -> firefox-90.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ja.xpi -> firefox-90.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ka.xpi -> firefox-90.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/kab.xpi -> firefox-90.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/kk.xpi -> firefox-90.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/km.xpi -> firefox-90.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/kn.xpi -> firefox-90.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ko.xpi -> firefox-90.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/lij.xpi -> firefox-90.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/lt.xpi -> firefox-90.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/lv.xpi -> firefox-90.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/mk.xpi -> firefox-90.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/mr.xpi -> firefox-90.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ms.xpi -> firefox-90.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/my.xpi -> firefox-90.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-90.0.2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-90.0.2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/nl.xpi -> firefox-90.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-90.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/oc.xpi -> firefox-90.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-90.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pl.xpi -> firefox-90.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-90.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-90.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/rm.xpi -> firefox-90.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ro.xpi -> firefox-90.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ru.xpi -> firefox-90.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/si.xpi -> firefox-90.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sk.xpi -> firefox-90.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sl.xpi -> firefox-90.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/son.xpi -> firefox-90.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sq.xpi -> firefox-90.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sr.xpi -> firefox-90.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-90.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ta.xpi -> firefox-90.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/te.xpi -> firefox-90.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/th.xpi -> firefox-90.0.2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/tl.xpi -> firefox-90.0.2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/tr.xpi -> firefox-90.0.2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/trs.xpi -> firefox-90.0.2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/uk.xpi -> firefox-90.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ur.xpi -> firefox-90.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/uz.xpi -> firefox-90.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/vi.xpi -> firefox-90.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/xh.xpi -> firefox-90.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-90.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-90.0.2-zh-TW.xpi )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f68f15ff882e834c193324b7804bf863
diff --git a/metadata/md5-cache/www-client/firefox-bin-91.0 b/metadata/md5-cache/www-client/firefox-bin-91.0
deleted file mode 100644
index 591bb61f3b66..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-91.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Firefox Web Browser
-EAPI=7
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.11:3[wayland?] 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 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip
-SLOT=0/91
-SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/en-US/firefox-91.0.tar.bz2 -> firefox-bin_x86_64-91.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/en-US/firefox-91.0.tar.bz2 -> firefox-bin_i686-91.0.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ach.xpi -> firefox-91.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/af.xpi -> firefox-91.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/an.xpi -> firefox-91.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ar.xpi -> firefox-91.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ast.xpi -> firefox-91.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/az.xpi -> firefox-91.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/be.xpi -> firefox-91.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/bg.xpi -> firefox-91.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/bn.xpi -> firefox-91.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/br.xpi -> firefox-91.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/bs.xpi -> firefox-91.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-91.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ca.xpi -> firefox-91.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/cak.xpi -> firefox-91.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/cs.xpi -> firefox-91.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/cy.xpi -> firefox-91.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/da.xpi -> firefox-91.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/de.xpi -> firefox-91.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/dsb.xpi -> firefox-91.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/el.xpi -> firefox-91.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/en-CA.xpi -> firefox-91.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/en-GB.xpi -> firefox-91.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/eo.xpi -> firefox-91.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/es-AR.xpi -> firefox-91.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/es-CL.xpi -> firefox-91.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/es-ES.xpi -> firefox-91.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/es-MX.xpi -> firefox-91.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/et.xpi -> firefox-91.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/eu.xpi -> firefox-91.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/fa.xpi -> firefox-91.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ff.xpi -> firefox-91.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/fi.xpi -> firefox-91.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/fr.xpi -> firefox-91.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-91.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-91.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/gd.xpi -> firefox-91.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/gl.xpi -> firefox-91.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/gn.xpi -> firefox-91.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-91.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/he.xpi -> firefox-91.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-91.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/hr.xpi -> firefox-91.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/hsb.xpi -> firefox-91.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/hu.xpi -> firefox-91.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-91.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ia.xpi -> firefox-91.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/id.xpi -> firefox-91.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/is.xpi -> firefox-91.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/it.xpi -> firefox-91.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ja.xpi -> firefox-91.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ka.xpi -> firefox-91.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/kab.xpi -> firefox-91.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/kk.xpi -> firefox-91.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/km.xpi -> firefox-91.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/kn.xpi -> firefox-91.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ko.xpi -> firefox-91.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/lij.xpi -> firefox-91.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/lt.xpi -> firefox-91.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/lv.xpi -> firefox-91.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/mk.xpi -> firefox-91.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/mr.xpi -> firefox-91.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ms.xpi -> firefox-91.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/my.xpi -> firefox-91.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-91.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-91.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/nl.xpi -> firefox-91.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-91.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/oc.xpi -> firefox-91.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-91.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/pl.xpi -> firefox-91.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-91.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-91.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/rm.xpi -> firefox-91.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ro.xpi -> firefox-91.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ru.xpi -> firefox-91.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/si.xpi -> firefox-91.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/sk.xpi -> firefox-91.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/sl.xpi -> firefox-91.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/son.xpi -> firefox-91.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/sq.xpi -> firefox-91.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/sr.xpi -> firefox-91.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-91.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ta.xpi -> firefox-91.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/te.xpi -> firefox-91.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/th.xpi -> firefox-91.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/tl.xpi -> firefox-91.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/tr.xpi -> firefox-91.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/trs.xpi -> firefox-91.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/uk.xpi -> firefox-91.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/ur.xpi -> firefox-91.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/uz.xpi -> firefox-91.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/vi.xpi -> firefox-91.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/xh.xpi -> firefox-91.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-91.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-91.0-zh-TW.xpi )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0307d91e949d0c334f3784c46a14102e
diff --git a/metadata/md5-cache/www-client/firefox-bin-91.0.2 b/metadata/md5-cache/www-client/firefox-bin-91.0.2
new file mode 100644
index 000000000000..de357aa26352
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-91.0.2
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Firefox Web Browser
+EAPI=7
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.11:3[wayland?] 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 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip
+SLOT=0/91
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/en-US/firefox-91.0.2.tar.bz2 -> firefox-bin_x86_64-91.0.2.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/en-US/firefox-91.0.2.tar.bz2 -> firefox-bin_i686-91.0.2.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ach.xpi -> firefox-91.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/af.xpi -> firefox-91.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/an.xpi -> firefox-91.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ar.xpi -> firefox-91.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ast.xpi -> firefox-91.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/az.xpi -> firefox-91.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/be.xpi -> firefox-91.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/bg.xpi -> firefox-91.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/bn.xpi -> firefox-91.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/br.xpi -> firefox-91.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/bs.xpi -> firefox-91.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-91.0.2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ca.xpi -> firefox-91.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/cak.xpi -> firefox-91.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/cs.xpi -> firefox-91.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/cy.xpi -> firefox-91.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/da.xpi -> firefox-91.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/de.xpi -> firefox-91.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-91.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/el.xpi -> firefox-91.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-91.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-91.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/eo.xpi -> firefox-91.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-91.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-91.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-91.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-91.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/et.xpi -> firefox-91.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/eu.xpi -> firefox-91.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/fa.xpi -> firefox-91.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ff.xpi -> firefox-91.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/fi.xpi -> firefox-91.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/fr.xpi -> firefox-91.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-91.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-91.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/gd.xpi -> firefox-91.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/gl.xpi -> firefox-91.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/gn.xpi -> firefox-91.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-91.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/he.xpi -> firefox-91.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-91.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/hr.xpi -> firefox-91.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-91.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/hu.xpi -> firefox-91.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-91.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ia.xpi -> firefox-91.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/id.xpi -> firefox-91.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/is.xpi -> firefox-91.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/it.xpi -> firefox-91.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ja.xpi -> firefox-91.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ka.xpi -> firefox-91.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/kab.xpi -> firefox-91.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/kk.xpi -> firefox-91.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/km.xpi -> firefox-91.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/kn.xpi -> firefox-91.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ko.xpi -> firefox-91.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/lij.xpi -> firefox-91.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/lt.xpi -> firefox-91.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/lv.xpi -> firefox-91.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/mk.xpi -> firefox-91.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/mr.xpi -> firefox-91.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ms.xpi -> firefox-91.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/my.xpi -> firefox-91.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-91.0.2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-91.0.2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/nl.xpi -> firefox-91.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-91.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/oc.xpi -> firefox-91.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-91.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/pl.xpi -> firefox-91.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-91.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-91.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/rm.xpi -> firefox-91.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ro.xpi -> firefox-91.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ru.xpi -> firefox-91.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/si.xpi -> firefox-91.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/sk.xpi -> firefox-91.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/sl.xpi -> firefox-91.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/son.xpi -> firefox-91.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/sq.xpi -> firefox-91.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/sr.xpi -> firefox-91.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-91.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ta.xpi -> firefox-91.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/te.xpi -> firefox-91.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/th.xpi -> firefox-91.0.2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/tl.xpi -> firefox-91.0.2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/tr.xpi -> firefox-91.0.2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/trs.xpi -> firefox-91.0.2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/uk.xpi -> firefox-91.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ur.xpi -> firefox-91.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/uz.xpi -> firefox-91.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/vi.xpi -> firefox-91.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/xh.xpi -> firefox-91.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-91.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-91.0.2-zh-TW.xpi )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0307d91e949d0c334f3784c46a14102e
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-93.0.4577.51 b/metadata/md5-cache/www-client/google-chrome-beta-93.0.4577.51
deleted file mode 100644
index 12c06c1ffbb3..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-93.0.4577.51
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Google
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-IUSE=selinux kernel_linux +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
-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-misc/curl 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_93.0.4577.51-1_amd64.deb
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=737deb7996e08ef81d69d2897d29dfb2
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-93.0.4577.58 b/metadata/md5-cache/www-client/google-chrome-beta-93.0.4577.58
new file mode 100644
index 000000000000..df7c82cd11ec
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-93.0.4577.58
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The web browser from Google
+EAPI=7
+HOMEPAGE=https://www.google.com/chrome
+IUSE=selinux kernel_linux +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
+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-misc/curl 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_93.0.4577.58-1_amd64.deb
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=737deb7996e08ef81d69d2897d29dfb2
diff --git a/metadata/md5-cache/www-client/opera-78.0.4093.147 b/metadata/md5-cache/www-client/opera-78.0.4093.147
deleted file mode 100644
index 3411ec2c7d21..000000000000
--- a/metadata/md5-cache/www-client/opera-78.0.4093.147
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +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
-LICENSE=OPERA-2018
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera/desktop/78.0.4093.147/linux/opera-stable_78.0.4093.147_amd64.deb https://download2.operacdn.com/pub/opera/desktop/78.0.4093.147/linux/opera-stable_78.0.4093.147_amd64.deb https://download3.operacdn.com/pub/opera/desktop/78.0.4093.147/linux/opera-stable_78.0.4093.147_amd64.deb https://download4.operacdn.com/pub/opera/desktop/78.0.4093.147/linux/opera-stable_78.0.4093.147_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-92.0.4515.20.tar.xz )
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=be9c63a7ae0f771aff65c416a49a09b3
diff --git a/metadata/md5-cache/www-client/opera-78.0.4093.184 b/metadata/md5-cache/www-client/opera-78.0.4093.184
new file mode 100644
index 000000000000..d0a6fd39a430
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-78.0.4093.184
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +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
+LICENSE=OPERA-2018
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera/desktop/78.0.4093.184/linux/opera-stable_78.0.4093.184_amd64.deb https://download2.operacdn.com/pub/opera/desktop/78.0.4093.184/linux/opera-stable_78.0.4093.184_amd64.deb https://download3.operacdn.com/pub/opera/desktop/78.0.4093.184/linux/opera-stable_78.0.4093.184_amd64.deb https://download4.operacdn.com/pub/opera/desktop/78.0.4093.184/linux/opera-stable_78.0.4093.184_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-92.0.4515.20.tar.xz )
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=be9c63a7ae0f771aff65c416a49a09b3
diff --git a/metadata/md5-cache/www-client/opera-developer-79.0.4135.0 b/metadata/md5-cache/www-client/opera-developer-79.0.4135.0
deleted file mode 100644
index 7da02ad9292e..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-79.0.4135.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +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
-LICENSE=OPERA-2018
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-developer/79.0.4135.0/linux/opera-developer_79.0.4135.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/79.0.4135.0/linux/opera-developer_79.0.4135.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/79.0.4135.0/linux/opera-developer_79.0.4135.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/79.0.4135.0/linux/opera-developer_79.0.4135.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-93.0.4573.0.tar.xz )
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e39d64062f349fbd8030808b2b2f7462
diff --git a/metadata/md5-cache/www-client/opera-developer-80.0.4157.0 b/metadata/md5-cache/www-client/opera-developer-80.0.4157.0
new file mode 100644
index 000000000000..ae83583116c3
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-80.0.4157.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +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
+LICENSE=OPERA-2018
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera-developer/80.0.4157.0/linux/opera-developer_80.0.4157.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/80.0.4157.0/linux/opera-developer_80.0.4157.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/80.0.4157.0/linux/opera-developer_80.0.4157.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/80.0.4157.0/linux/opera-developer_80.0.4157.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-94.0.4603.0.tar.xz )
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=64fba8444dd4203467e427324f000de1
diff --git a/metadata/md5-cache/www-client/vivaldi-4.1.2369.11 b/metadata/md5-cache/www-client/vivaldi-4.1.2369.11
deleted file mode 100644
index 549c22b93796..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-4.1.2369.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64 ~arm ~arm64
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver 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/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.1.2369.11-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.1.2369.11-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.1.2369.11-1_arm64.deb )
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=85d450b4be07e6001b151344ae41d3bf
diff --git a/metadata/md5-cache/www-client/vivaldi-4.1.2369.18 b/metadata/md5-cache/www-client/vivaldi-4.1.2369.18
index ce0835c37a76..e76952bcbbe8 100644
--- a/metadata/md5-cache/www-client/vivaldi-4.1.2369.18
+++ b/metadata/md5-cache/www-client/vivaldi-4.1.2369.18
@@ -4,11 +4,11 @@ DESCRIPTION=A browser for our friends
 EAPI=7
 HOMEPAGE=https://vivaldi.com/
 IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver 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/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.1.2369.18-1_amd64.deb )
 _eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c41ed06d6e2f86724269abe1d4c35477
+_md5_=7c6a46f6d336f06d18f88bdc5fabe0b1
diff --git a/metadata/md5-cache/www-client/vivaldi-4.1.2369.21 b/metadata/md5-cache/www-client/vivaldi-4.1.2369.21
new file mode 100644
index 000000000000..d81210d891d2
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-4.1.2369.21
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver 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/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.1.2369.21-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.1.2369.21-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.1.2369.21-1_arm64.deb )
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fc270c831d5e47c6c0ab6a96b1a0e98a
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2367.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2367.3
deleted file mode 100644
index 729a772f719f..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2367.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver 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/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2367.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2367.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2367.3-1_arm64.deb )
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fc270c831d5e47c6c0ab6a96b1a0e98a
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-4.2.2392.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-4.2.2392.3
new file mode 100644
index 000000000000..ef51a6e0f345
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-4.2.2392.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver 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/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.2.2392.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.2.2392.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.2.2392.3-1_arm64.deb )
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fc270c831d5e47c6c0ab6a96b1a0e98a
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 101f17cbe519..3b43270c71d6 100644
--- a/metadata/md5-cache/www-misc/Manifest.gz
+++ b/metadata/md5-cache/www-misc/Manifest.gz
diff --git a/metadata/md5-cache/www-misc/buku-4.6 b/metadata/md5-cache/www-misc/buku-4.6
deleted file mode 100644
index 167273a34faf..000000000000
--- a/metadata/md5-cache/www-misc/buku-4.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/beautifulsoup-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/html5lib-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/py-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/vcrpy-4.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Powerful command-line bookmark manager
-EAPI=7
-HOMEPAGE=https://github.com/jarun/buku
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-python/beautifulsoup-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/html5lib-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jarun/buku/archive/v4.6.tar.gz -> buku-4.6.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c0eacbe862376a17ba148974ef690d91
diff --git a/metadata/md5-cache/www-misc/buku-4.6-r1 b/metadata/md5-cache/www-misc/buku-4.6-r1
new file mode 100644
index 000000000000..9d1660f8aead
--- /dev/null
+++ b/metadata/md5-cache/www-misc/buku-4.6-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/beautifulsoup-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/py-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/vcrpy-4.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DESCRIPTION=Powerful command-line bookmark manager
+EAPI=7
+HOMEPAGE=https://github.com/jarun/buku
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-python/beautifulsoup-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jarun/buku/archive/v4.6.tar.gz -> buku-4.6.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=81ef5158fdef9c3a29b80b5742174410
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 408cfd26b861..5df8f7436b67 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.51_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.51_beta
deleted file mode 100644
index 08e49bc9bc28..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.51_beta
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-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: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_93.0.4577.51-1_amd64.deb
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=5f3ea21bdfa8ac8a2d6473433e7959b2
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.58_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.58_beta
new file mode 100644
index 000000000000..dfaeef5fa9cd
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.58_beta
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+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: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_93.0.4577.58-1_amd64.deb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=5f3ea21bdfa8ac8a2d6473433e7959b2
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index d3835c411d03..4591ea7c0534 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/resin-4.0.48-r1 b/metadata/md5-cache/www-servers/resin-4.0.48-r1
deleted file mode 100644
index 65cbf8ce483b..000000000000
--- a/metadata/md5-cache/www-servers/resin-4.0.48-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=dev-java/jsr101:0 dev-java/mojarra:2.2 dev-java/oracle-javamail:0 dev-java/validation-api:1.0 dev-java/resin-servlet-api:3.1 dev-java/glassfish-xmlrpc-api:0 dev-java/glassfish-deployment-api:1.2 app-arch/unzip dev-libs/openssl >=virtual/jdk-1.6 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A fast Servlet and JSP engine
-EAPI=5
-HOMEPAGE=http://www.caucho.com
-IUSE=admin doc elibc_FreeBSD source
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-java/jsr101:0 dev-java/mojarra:2.2 dev-java/oracle-javamail:0 dev-java/validation-api:1.0 dev-java/resin-servlet-api:3.1 dev-java/glassfish-xmlrpc-api:0 dev-java/glassfish-deployment-api:1.2 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.caucho.com/download/resin-4.0.48-src.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	ac9fb9efa5413c5fb85a4203fe930e88	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2077e71bcec22e7dcef02cae441c1bc9
diff --git a/metadata/md5-cache/www-servers/varnish-6.5.0 b/metadata/md5-cache/www-servers/varnish-6.5.0
deleted file mode 100644
index e802f5018e87..000000000000
--- a/metadata/md5-cache/www-servers/varnish-6.5.0
+++ /dev/null
@@ -1,16 +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=sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= dev-python/docutils dev-python/sphinx virtual/pkgconfig
-DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
-EAPI=7
-HOMEPAGE=https://varnish-cache.org/
-IUSE=jemalloc jit static-libs python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=BSD-2 GPL-2
-RDEPEND=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(-)?] sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= acct-user/varnish acct-group/varnish sys-devel/gcc
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0/2
-SRC_URI=http://varnish-cache.org/_downloads/varnish-6.5.0.tgz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eab48f58b2e3407045c93256f0fe3ebf
diff --git a/metadata/md5-cache/www-servers/varnish-6.5.1 b/metadata/md5-cache/www-servers/varnish-6.5.1
deleted file mode 100644
index 66ca3a72c291..000000000000
--- a/metadata/md5-cache/www-servers/varnish-6.5.1
+++ /dev/null
@@ -1,16 +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=sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= dev-python/docutils dev-python/sphinx virtual/pkgconfig
-DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
-EAPI=7
-HOMEPAGE=https://varnish-cache.org/
-IUSE=jemalloc jit static-libs python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=BSD-2 GPL-2
-RDEPEND=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(-)?] sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= acct-user/varnish acct-group/varnish sys-devel/gcc
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0/2
-SRC_URI=http://varnish-cache.org/_downloads/varnish-6.5.1.tgz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=21a441d956705087dfd01b5d6aa8df02
diff --git a/metadata/md5-cache/www-servers/varnish-6.5.2 b/metadata/md5-cache/www-servers/varnish-6.5.2
new file mode 100644
index 000000000000..9e77cef63802
--- /dev/null
+++ b/metadata/md5-cache/www-servers/varnish-6.5.2
@@ -0,0 +1,16 @@
+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=sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= dev-python/docutils dev-python/sphinx virtual/pkgconfig
+DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
+EAPI=7
+HOMEPAGE=https://varnish-cache.org/
+IUSE=jemalloc jit static-libs python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=BSD-2 GPL-2
+RDEPEND=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(-)?] sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= acct-user/varnish acct-group/varnish sys-devel/gcc
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0/2
+SRC_URI=http://varnish-cache.org/_downloads/varnish-6.5.2.tgz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d1afeddc77896c75279a7c0ca5ff9c47
diff --git a/metadata/md5-cache/www-servers/varnish-6.6.1 b/metadata/md5-cache/www-servers/varnish-6.6.1
new file mode 100644
index 000000000000..5a3acd8a5b26
--- /dev/null
+++ b/metadata/md5-cache/www-servers/varnish-6.6.1
@@ -0,0 +1,16 @@
+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=sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= dev-python/docutils dev-python/sphinx virtual/pkgconfig
+DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
+EAPI=7
+HOMEPAGE=https://varnish-cache.org/
+IUSE=jemalloc jit static-libs python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=BSD-2 GPL-2
+RDEPEND=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(-)?] sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= acct-user/varnish acct-group/varnish sys-devel/gcc
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0/2
+SRC_URI=http://varnish-cache.org/_downloads/varnish-6.6.1.tgz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1c2c386bc90faf447e14ca2a86f669d9
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 87dee686a003..1499886e2caa 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.144 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.144
index f3f390b22974..dafe9f9e7cd1 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.144
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.144
@@ -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.144/NVIDIA-Linux-x86_64-390.144.run ) x86? ( https://download.nvidia.com/XFree86/Linux-x86/390.144/NVIDIA-Linux-x86-390.144.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.144.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.144.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.144.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.144.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.144.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4f87c926c1af9f67f1632d8de39a4667
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03 b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03
index 79d2d1e8bb54..ff3445ea4220 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03
@@ -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.91.03/NVIDIA-Linux-x86_64-460.91.03.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/460.91.03/NVIDIA-Linux-aarch64-460.91.03.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-460.91.03.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	30ce9dec2b8943338c9b015bd32bac6a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	30ce9dec2b8943338c9b015bd32bac6a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=caf731fad15cbae21a269c54bb7dfab0
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.57.02 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.57.02
index 10b6661d949a..fec08adbc696 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.57.02
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.57.02
@@ -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(-)?] ) wayland? ( >=gui-libs/egl-wayland-1.1.7-r1 ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/470
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/470.57.02/NVIDIA-Linux-x86_64-470.57.02.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/470.57.02/NVIDIA-Linux-aarch64-470.57.02.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.57.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.57.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.57.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.57.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.57.02.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f078c848d190ba175d03a1a6d78e28ec
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.63.01 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.63.01
index e715a6d5d178..ca934a549786 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.63.01
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.63.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(-)?] ) wayland? ( >=gui-libs/egl-wayland-1.1.7-r1 media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/470
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/470.63.01/NVIDIA-Linux-x86_64-470.63.01.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/470.63.01/NVIDIA-Linux-aarch64-470.63.01.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.63.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.63.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.63.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.63.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.63.01.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	9ef6ef855002c3ec7750c403b80a55dd	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a9ced3d9ef6c43df471a2aa6404ef54d
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 9071f2d95a37..0f66b3f98769 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/colord-gtk-0.2.0 b/metadata/md5-cache/x11-libs/colord-gtk-0.2.0
index 6d8f05ef860d..ad2b2ca733f1 100644
--- a/metadata/md5-cache/x11-libs/colord-gtk-0.2.0
+++ b/metadata/md5-cache/x11-libs/colord-gtk-0.2.0
@@ -5,7 +5,7 @@ DESCRIPTION=GTK support library for colord
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/software/colord/
 IUSE=doc +introspection vala
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/glib-2.28:2 x11-libs/gtk+:3[introspection?] >=x11-misc/colord-0.1.27:=[introspection?,vala?]
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/1
 SRC_URI=https://www.freedesktop.org/software/colord/releases/colord-gtk-0.2.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9d7e1a074dba1cf48d9111150c7fd704
+_md5_=07d530a6193247e69673a176b8c76324
diff --git a/metadata/md5-cache/x11-libs/pango-1.48.7-r1 b/metadata/md5-cache/x11-libs/pango-1.48.7-r1
index 96cb00d5fd95..baabd835576f 100644
--- a/metadata/md5-cache/x11-libs/pango-1.48.7-r1
+++ b/metadata/md5-cache/x11-libs/pango-1.48.7-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Internationalized text layout and rendering library
 EAPI=7
 HOMEPAGE=https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango
 IUSE=debug +introspection sysprof 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=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.62.2: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(-)?] >=dev-libs/fribidi-1.0.6[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-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),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-libs/fontconfig-2.12.92:1.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(-)?] >=x11-libs/cairo-1.12.10:=[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(-)?] >=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,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:= ) 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/libXft-2.3.1-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/libXrender-0.9.8[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
 SRC_URI=http://ftp.gnome.org/pub/GNOME/sources/pango/1.48/pango-1.48.7.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6bacec60116aacefc464207aaa7bcd3c
+_md5_=4daae588593f14c1bab078727db15038
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 5d1f93d6817d..b69681e694e8 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/obmenu-generator-0.90 b/metadata/md5-cache/x11-misc/obmenu-generator-0.90
new file mode 100644
index 000000000000..a64cffefd0ad
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/obmenu-generator-0.90
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=A fast pipe/static menu generator for the Openbox Window Manager
+EAPI=7
+HOMEPAGE=https://github.com/trizen/obmenu-generator
+KEYWORDS=~amd64 ~x86
+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.90.tar.gz -> obmenu-generator-0.90.tar.gz
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
+_md5_=a8f8f8946d870e8267e7ef8325fdbe2c
diff --git a/metadata/md5-cache/x11-misc/sddm-0.18.1-r5 b/metadata/md5-cache/x11-misc/sddm-0.18.1-r5
index 974dd1ab8e45..91109642a5ae 100644
--- a/metadata/md5-cache/x11-misc/sddm-0.18.1-r5
+++ b/metadata/md5-cache/x11-misc/sddm-0.18.1-r5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sddm/sddm/releases/download/v0.18.1/sddm-0.18.1.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fab085553614845ab8963fd1eff24728
+_md5_=4fb349b76cd3ba99c122e6680140869a
diff --git a/metadata/md5-cache/x11-misc/unclutter-xfixes-1.6 b/metadata/md5-cache/x11-misc/unclutter-xfixes-1.6
new file mode 100644
index 000000000000..9308842062fe
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/unclutter-xfixes-1.6
@@ -0,0 +1,13 @@
+BDEPEND=app-text/asciidoc virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/libev x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi !x11-misc/unclutter x11-base/xorg-proto
+DESCRIPTION=Hides mouse pointer while not in use (rewrite of unclutter)
+EAPI=8
+HOMEPAGE=https://github.com/Airblader/unclutter-xfixes
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/libev x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi !x11-misc/unclutter
+SLOT=0
+SRC_URI=https://github.com/Airblader/unclutter-xfixes/archive/v1.6.tar.gz -> unclutter-xfixes-1.6.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=292eb196b6492175c65a7b2deca55aa9
diff --git a/metadata/md5-cache/x11-misc/xwallpaper-0.7.1 b/metadata/md5-cache/x11-misc/xwallpaper-0.7.1
deleted file mode 100644
index 0e82a1533d47..000000000000
--- a/metadata/md5-cache/x11-misc/xwallpaper-0.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig 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
-DEFINED_PHASES=configure prepare
-DEPEND=x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-image jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) xpm? ( x11-libs/libXpm )
-DESCRIPTION=Wallpaper setting utility for X
-EAPI=7
-HOMEPAGE=https://github.com/stoeckmann/xwallpaper
-IUSE=jpeg png seccomp xpm
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=ISC
-RDEPEND=x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-image jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) xpm? ( x11-libs/libXpm )
-SLOT=0
-SRC_URI=https://github.com/stoeckmann/xwallpaper/releases/download/v0.7.1/xwallpaper-0.7.1.tar.xz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=791e064a3a2eeda086dd03c20b5199a7
diff --git a/metadata/md5-cache/x11-misc/xwallpaper-0.7.3 b/metadata/md5-cache/x11-misc/xwallpaper-0.7.3
new file mode 100644
index 000000000000..51e79a537467
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xwallpaper-0.7.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig 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
+DEFINED_PHASES=configure prepare
+DEPEND=x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-image jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) xpm? ( x11-libs/libXpm )
+DESCRIPTION=Wallpaper setting utility for X
+EAPI=7
+HOMEPAGE=https://github.com/stoeckmann/xwallpaper
+IUSE=+jpeg +png seccomp xpm
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=ISC
+RDEPEND=x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-image jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) xpm? ( x11-libs/libXpm )
+SLOT=0
+SRC_URI=https://github.com/stoeckmann/xwallpaper/releases/download/v0.7.3/xwallpaper-0.7.3.tar.xz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cedbe7ce30f96edefd8bd4d5a4bd4f61
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index fe58691cde21..6e535180013b 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/pidgin-telegram-1.4.6 b/metadata/md5-cache/x11-plugins/pidgin-telegram-1.4.6
deleted file mode 100644
index 184712155907..000000000000
--- a/metadata/md5-cache/x11-plugins/pidgin-telegram-1.4.6
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure prepare
-DEPEND=net-im/pidgin sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:0= ) !gcrypt? ( dev-libs/openssl:0= ) png? ( media-libs/libpng:0= ) webp? ( media-libs/libwebp:= )
-DESCRIPTION=A libpurple protocol plugin that adds support for the Telegram messenger
-EAPI=7
-HOMEPAGE=https://github.com/majn/telegram-purple
-IUSE=gcrypt +nls +png +webp
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=net-im/pidgin sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:0= ) !gcrypt? ( dev-libs/openssl:0= ) png? ( media-libs/libpng:0= ) webp? ( media-libs/libwebp:= )
-SLOT=0
-SRC_URI=https://github.com/majn/telegram-purple/releases/download/v1.4.6/telegram-purple_1.4.6.orig.tar.gz
-_md5_=62a4874b3635aef562c88f785f309e19
diff --git a/metadata/md5-cache/x11-plugins/pidgin-telegram-1.4.7 b/metadata/md5-cache/x11-plugins/pidgin-telegram-1.4.7
index b1291432bff3..62ea61e91940 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-telegram-1.4.7
+++ b/metadata/md5-cache/x11-plugins/pidgin-telegram-1.4.7
@@ -5,9 +5,9 @@ DESCRIPTION=A libpurple protocol plugin that adds support for the Telegram messe
 EAPI=7
 HOMEPAGE=https://github.com/majn/telegram-purple
 IUSE=gcrypt +nls +png +webp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=net-im/pidgin sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:0= ) !gcrypt? ( dev-libs/openssl:0= ) png? ( media-libs/libpng:0= ) webp? ( media-libs/libwebp:= )
 SLOT=0
 SRC_URI=https://github.com/majn/telegram-purple/releases/download/v1.4.7/telegram-purple_1.4.7.orig.tar.gz
-_md5_=960c7a40f81868b0d5b13304d0950cbd
+_md5_=62a4874b3635aef562c88f785f309e19
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 1497ae2633d0..bfaf9ec420ad 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/adwaita-qt-1.2.1 b/metadata/md5-cache/x11-themes/adwaita-qt-1.2.1
deleted file mode 100644
index e4e6fdee7404..000000000000
--- a/metadata/md5-cache/x11-themes/adwaita-qt-1.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
-DESCRIPTION=A style to bend Qt applications to look like they belong into GNOME Shell
-EAPI=7
-HOMEPAGE=https://github.com/FedoraQt/adwaita-qt
-IUSE=gnome
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=GPL-2 LGPL-2
-PDEPEND=gnome? ( x11-themes/QGnomePlatform )
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
-SLOT=0
-SRC_URI=https://github.com/FedoraQt/adwaita-qt/archive/1.2.1/adwaita-qt-1.2.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b5a3b00f9fbe6a9e5098c7763ded1de7
diff --git a/metadata/md5-cache/x11-themes/adwaita-qt-1.4.0 b/metadata/md5-cache/x11-themes/adwaita-qt-1.4.0
new file mode 100644
index 000000000000..df5272eb431d
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/adwaita-qt-1.4.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
+DESCRIPTION=A style to bend Qt applications to look like they belong into GNOME Shell
+EAPI=7
+HOMEPAGE=https://github.com/FedoraQt/adwaita-qt
+IUSE=gnome
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2
+PDEPEND=gnome? ( x11-themes/QGnomePlatform )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
+SLOT=0
+SRC_URI=https://github.com/FedoraQt/adwaita-qt/archive/1.4.0/adwaita-qt-1.4.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bc2652b56c4a64f5fb250b8bb2fe51d8
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 850f3f018d5a..b6886d843725 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r1 b/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r1
deleted file mode 100644
index 8de72fc7f201..000000000000
--- a/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=dev-libs/efl-1.24.1[eet,fontconfig,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config acpi? ( sys-power/acpid ) bluetooth? ( net-wireless/bluez ) connman? ( dev-libs/efl[connman] ) geolocation? ( app-misc/geoclue:2.0 ) pam? ( sys-libs/pam ) policykit? ( sys-auth/polkit ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( || ( dev-libs/efl[systemd] dev-libs/efl[elogind] ) dev-libs/efl[drm,wayland] dev-libs/wayland x11-libs/libxkbcommon x11-libs/pixman ) xwayland? ( dev-libs/efl[X,wayland] x11-base/xorg-server[wayland] )
-DESCRIPTION=Enlightenment window manager
-EAPI=7
-HOMEPAGE=https://www.enlightenment.org
-IUSE=acpi bluetooth connman doc geolocation nls pam policykit systemd udisks wayland wifi xwayland
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=BSD-2
-RDEPEND=>=dev-libs/efl-1.24.1[eet,fontconfig,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config acpi? ( sys-power/acpid ) bluetooth? ( net-wireless/bluez ) connman? ( dev-libs/efl[connman] ) geolocation? ( app-misc/geoclue:2.0 ) pam? ( sys-libs/pam ) policykit? ( sys-auth/polkit ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( || ( dev-libs/efl[systemd] dev-libs/efl[elogind] ) dev-libs/efl[drm,wayland] dev-libs/wayland x11-libs/libxkbcommon x11-libs/pixman ) xwayland? ( dev-libs/efl[X,wayland] x11-base/xorg-server[wayland] )
-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_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=19421496955c073f676a921d82d551a7
diff --git a/metadata/news/2021-08-24-eudev-retirement/2021-08-24-eudev-retirement.en.txt b/metadata/news/2021-08-24-eudev-retirement/2021-08-24-eudev-retirement.en.txt
new file mode 100644
index 000000000000..fd360d7c003f
--- /dev/null
+++ b/metadata/news/2021-08-24-eudev-retirement/2021-08-24-eudev-retirement.en.txt
@@ -0,0 +1,48 @@
+Title: eudev retirement on 2022-01-01
+Author: Anthony G. Basile <blueness@gentoo.org>
+Posted: 2021-08-24
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: sys-fs/eudev
+
+sys-fs/udev is becoming the standard provider of udev on non-systemd (e.g.
+OpenRC) systems. Users of systemd will continue to use the udev services
+provided by the sys-apps/systemd package itself.
+
+The transition should be uneventful in most cases, but please
+read this item in full to understand some possible corner cases.
+
+eudev will be retired and removed from Gentoo on 2022-01-01. We will
+start masking eudev on 2021-10-01 and give people 3 months to prepare
+their transition. You should ensure that sys-fs/eudev is not in your
+world file by running
+
+  emerge --deselect sys-fs/eudev
+
+in order for Portage to replace eudev with sys-fs/udev once the
+package.mask is in place. We fully support udev on musl, whereas uclibc
+will still have to rely on eudev before also being removed on 2022-01-01.
+
+  **WARNING**
+
+If you happen to have an INSTALL_MASK with a blanket "*systemd*" glob,
+you will inevitably break your system. sys-fs/udev contains "systemd" in
+some of its filenames, hence a blanket filter rule will likely lead to
+a non-functional udev installation.
+
+  Rationale
+
+The integration of udev into the systemd git repo introduced numerous
+problems for non-glibc systems, such as musl and uclibc.  Several
+options were considered, and the one chosen was to fork and maintain udev
+independent of the rest of systemd.  This was meant as a stop-gap solution
+until such time as the problems with systemd on musl had been resolved.
+This is now the case with patches provided by openembedded, and my original
+reason for maintaining eudev is no longer relevant.
+
+I am willing to transfer eudev to another umbrella organization or Linux
+distribution that is willing to continue its maintenance, but maintaining
+eudev cannot be done purely through proxy-maintaining and requires an
+understanding of its internals.  This is a steep learning curve and must
+be an earnest effort.  For this reason, the Base System project has decided
+not to support eudev as an option going forward.
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 2b900ffe9a2f..c86f20fb050c 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 14023 BLAKE2B b7fe5c660c515d277fb36e36ce058a9ec5f44276bf3f6ae49cd5b840b8db2ead880bc6cce7e50a404b627589e739dcc89e51dac44e4d2b703f2c32e7fe5a7e9e SHA512 101fcdb7b77de9633e8ae6b3c4cccab98494a5c12b971f84f079d4d770201279ff3195392a94d87f4165ce4046b1de4747e28c39296894ef76ca7c7a5b861a86
-TIMESTAMP 2021-08-21T21:39:12Z
+MANIFEST Manifest.files.gz 14200 BLAKE2B 83d1ac5d89a288dc709ef2f5816841e63852e8a254df02bcca689f43d5d2fa138b91de825c2cd73063f5297bfab499d725cca24a2f5875dab1a4ee660cb4dd43 SHA512 1f8ef571b4b11518ca1bd808b14747b1db32a926c86a6f8f145e892c5cb56b5b612a4a374fa364dfc4ebce39bcfa1bd949a832bff6351d2e64f71d60858edb49
+TIMESTAMP 2021-08-25T22:39:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmEhcoBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmEmxpFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDxyBAAiwgsshloF89zG8wL6FCMRrYmG/r2lEKX2zN+ochpS0bkElL2p+CZdUNo
-s52Sh3p7tT5oWnqCqelm2tP71HfndYKm66GjhVOcFtMOq5mcZIF9eGzM8C2+pT9T
-7lfflMoYary0FFeE0kT9DD8TpT84rdQ6CZe+zpRFWXLPBKbUnbpDLAIoWJGU9aho
-ID84TqHdmEjOVG87D822xGVIcS2vOwNKIYu28hnvXUjxdqUlvVQWxTCvS4RNYTWX
-hwanau18ixFEFnIXOGodaJw5hl3JiJmrd0v7dCjZQuHhST9QE6LKKpujRgz4ZAe0
-qWjmpp6GkWl2OEGDPvwV0wkGMIeRtat1NIggQLYghffhNt3EOv90JHhAaX1j7CgF
-XbomEuvgqyEvC4jPtjQwqeId1RfGMWEWptHE1+QYw456OipL9Nw1im949ch9fBLT
-fCZ2p8ZeMCbBCXkR2Hw9KdqRO/IzeOtIsDZf04oECHRgfrQ8/zenoDpktUc+5U9w
-KIEficD1SmrHWeVdLNEbhXPSvXo0El5j3qjeUsTCBwd7FKj2mQEYEFY+zqFXh/lQ
-Wqc+ihJfo0ZxddPY999xmURIpmNUDQ3d3TjSp5Cnt+5m0cSl/QTfuHEFqMQvqNoY
-/PIMCc1DPm2IjSu2t0TRXiEooxNQmWGuluJaaWUHMhrdf4BVOm0=
-=L+IE
+klAz9BAAlQKuHugLQ6IJjJJZeRuUpYpa5PFfXsiho4KysID8KGX/D0oXH/W0A4F/
+g+OJ8OmN3/EzE5/uM59CGzg3wSqXP1ezDinL8FWp0eke9sA6GL5RUSTVj8esFAPv
++/GbN+g/hGCqIXoH+xYP1R5y8pmMydksN5Z6Jomlw4N8zTULi6PPir4/ixbb70VU
+3nXRGLPL9qH4TEEXh7U3ebMQZ51kMMX0W2EQHzjFHN1XVrc7jctrVCgu0tgXpCcE
+VlZVIvBqAh/PQc8FZjkLO1dzEa9aaNbEj62KSekHaq2SHn35Bj8bb0Xwly5TCV/4
+QozAhjhGkfEnopV4Dce5R0JN/EXIgjvb17aeK91rZug9Ej/U1e1nNOhmIg6XxWUQ
+PalZdLWhQe6J5y5djoVQSey54ROhwt/yce7d+UmGmAkeStZhnngYL1Dq9xaYmfaT
+Wj65auK5riQaG4HDD81RdeGxRoFIglvHpPpKv2LW9711D7DJCMamVMqYceOyERGm
+zny0y1ggMVlMMM2wMqyPzj73uqL0yjylQWMBG4F+Vpe/+NuNwJ048ShdRhr1v1Mw
+QkGFgmeNaaR61QigvmHdo5P2jqj+/Sr3tYFeaW+y3QlhGL5DV4YBfUIB5AyFiDlg
+UK412LKLNawVIEQgDAvYQ1nTUkMRcMrh34BmjPK0gIs7sWw83Rc=
+=BaRv
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index d7ab647206e6..dfb04051dfbf 100644
--- a/metadata/news/Manifest.files.gz
+++ b/metadata/news/Manifest.files.gz
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 9ee6d7482628..919d7fa1bfb7 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 21 Aug 2021 21:39:06 +0000
+Wed, 25 Aug 2021 22:39:10 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index ec59753b2264..d5aeab680629 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-6eba14b16d3cbb8fb5be9959c911a40b477ac3ca 1629388240 2021-08-19T15:50:40+00:00
+4a7df7c965fa8c251e32ef1d82ffad43bcf9436f 1629809155 2021-08-24T12:45:55+00:00
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 5b50c00ecb5d..c037e918f71e 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -215,6 +215,10 @@
       <email>lordvan@gentoo.org</email>
       <name>Thomas Raschbacher</name>
     </member>
+    <member>
+      <email>mjo@gentoo.org</email>
+      <name>Michael Orlitzky</name>
+    </member>
   </project>
   <project>
     <email>apache-bugs@gentoo.org</email>
@@ -291,11 +295,16 @@
     <url>https://wiki.gentoo.org/wiki/Project:Base</url>
     <description>The Base System Project provides an umbrella project for keeping system tools, libraries, and layout consistent for all the various architectures under Gentoo Linux.</description>
     <member>
+      <email>chainsaw@gentoo.org</email>
+      <name>Tony Vroon</name>
+      <role>LILO</role>
+    </member>
+    <member>
       <email>chutzpah@gentoo.org</email>
       <name>Patrick McLean</name>
       <role>Misc stuff that needs to get done</role>
     </member>
-    <member is-lead="1">
+    <member>
       <email>dilfridge@gentoo.org</email>
       <name>Andreas K. Hüttel</name>
       <role>Misc stuff, toolchain</role>
@@ -305,18 +314,17 @@
       <name>Mike Gilbert</name>
     </member>
     <member>
-      <email>gyakovlev@gentoo.org</email>
-      <name>Georgy Yakovlev</name>
-      <role>new helper</role>
+      <email>lu_zero@gentoo.org</email>
+      <name>Luca Barbato</name>
     </member>
     <member>
       <email>mattst88@gentoo.org</email>
       <name>Matt Turner</name>
     </member>
-    <member>
+    <member is-lead="1">
       <email>polynomial-c@gentoo.org</email>
       <name>Lars Wendler</name>
-      <role>package maintainer</role>
+      <role>base-system team lead</role>
     </member>
     <member>
       <email>robbat2@gentoo.org</email>
@@ -652,6 +660,10 @@
     <url>https://wiki.gentoo.org/wiki/Project:Crossdev</url>
     <description>Crossdev is a small wrapper script around emerge to build cross-toolchains.</description>
     <member>
+      <email>slyfox@gentoo.org</email>
+      <name>Sergei Trofimovich</name>
+    </member>
+    <member>
       <email>vapier@gentoo.org</email>
       <name>Mike Frysinger</name>
     </member>
@@ -1243,24 +1255,12 @@
       <name>Matt Turner</name>
     </member>
     <member>
-      <email>vapier@gentoo.org</email>
-      <name>Mike Frysinger</name>
-    </member>
-  </project>
-  <project>
-    <email>handbook@gentoo.org</email>
-    <name>Handbook</name>
-    <url>https://wiki.gentoo.org/wiki/Project:Handbook</url>
-    <description>The Handbook project is responsible for maintaining Gentoo's official Handbook.</description>
-    <member>
-      <email>dilfridge@gentoo.org</email>
-      <name>Andreas K. Hüttel</name>
-      <role>Editor</role>
+      <email>slyfox@gentoo.org</email>
+      <name>Sergei Trofimovich</name>
     </member>
     <member>
-      <email>maffblaster@gentoo.org</email>
-      <name>Matthew Marchese</name>
-      <role>Maintainer</role>
+      <email>vapier@gentoo.org</email>
+      <name>Mike Frysinger</name>
     </member>
   </project>
   <project>
@@ -1356,6 +1356,10 @@
       <email>gienah@gentoo.org</email>
       <name>Mark Wright</name>
     </member>
+    <member is-lead="1">
+      <email>slyfox@gentoo.org</email>
+      <name>Sergei Trofimovich</name>
+    </member>
   </project>
   <project>
     <email>ia64@gentoo.org</email>
@@ -1376,6 +1380,10 @@
       <name>Matt Turner</name>
     </member>
     <member>
+      <email>slyfox@gentoo.org</email>
+      <name>Sergei Trofimovich</name>
+    </member>
+    <member>
       <email>vapier@gentoo.org</email>
       <name>Mike Frysinger</name>
     </member>
@@ -2138,11 +2146,6 @@
       <role>Prefix liaison</role>
     </member>
     <member>
-      <email>mgorny@gentoo.org</email>
-      <name>Michał Górny</name>
-      <role>Member</role>
-    </member>
-    <member>
       <email>robbat2@gentoo.org</email>
       <name>Robin Johnson</name>
       <role>Infra Liaison</role>
@@ -2233,6 +2236,11 @@
       <name>Sam James</name>
     </member>
     <member>
+      <email>slyfox@gentoo.org</email>
+      <name>Sergei Trofimovich</name>
+      <role>ppc/ppc64 arch specific bug fixes</role>
+    </member>
+    <member>
       <email>vapier@gentoo.org</email>
       <name>Mike Frysinger</name>
       <role>ppc/ppc64 keywording/stabilization</role>
@@ -2463,10 +2471,6 @@
     <url>https://wiki.gentoo.org/wiki/Project:Python</url>
     <description>The Python project maintains dev-lang/python and most of dev-python/*.</description>
     <member>
-      <email>arthurzam@gentoo.org</email>
-      <name>Arthur Zamarin</name>
-    </member>
-    <member>
       <email>bman@gentoo.org</email>
       <name>Aaron Bauman</name>
     </member>
@@ -2842,6 +2846,11 @@
     <member>
       <email>sam@gentoo.org</email>
       <name>Sam James</name>
+      <role>Mostly security/core bugs</role>
+    </member>
+    <member>
+      <email>slyfox@gentoo.org</email>
+      <name>Sergei Trofimovich</name>
     </member>
     <member>
       <email>vapier@gentoo.org</email>
@@ -2886,6 +2895,10 @@
       <role>Lead</role>
     </member>
     <member>
+      <email>slyfox@gentoo.org</email>
+      <name>Sergei Trofimovich</name>
+    </member>
+    <member>
       <email>vapier@gentoo.org</email>
       <name>Mike Frysinger</name>
     </member>
@@ -2992,9 +3005,10 @@
       <email>sam@gentoo.org</email>
       <name>Sam James</name>
     </member>
-    <member>
+    <member is-lead="1">
       <email>whissi@gentoo.org</email>
       <name>Thomas Deutschmann</name>
+      <role>Lead</role>
     </member>
     <member>
       <email>zlogene@gentoo.org</email>
@@ -3080,9 +3094,29 @@
       <role>Lead</role>
     </member>
     <member>
+      <email>maffblaster@gentoo.org</email>
+      <name>Matthew Marchese</name>
+    </member>
+    <member>
+      <email>pacho@gentoo.org</email>
+      <name>Pacho Ramos</name>
+    </member>
+    <member>
+      <email>rich0@gentoo.org</email>
+      <name>Richard Freeman</name>
+    </member>
+    <member>
+      <email>tamiko@gentoo.org</email>
+      <name>Matthias Maier</name>
+    </member>
+    <member>
       <email>williamh@gentoo.org</email>
       <name>William Hubbs</name>
     </member>
+    <member>
+      <email>zx2c4@gentoo.org</email>
+      <name>Jason A. Donenfeld</name>
+    </member>
   </project>
   <project>
     <email>tcltk@gentoo.org</email>
@@ -3162,6 +3196,10 @@
       <name>Sam James</name>
     </member>
     <member>
+      <email>slyfox@gentoo.org</email>
+      <name>Sergei Trofimovich</name>
+    </member>
+    <member>
       <email>soap@gentoo.org</email>
       <name>David Seifert</name>
     </member>
@@ -3208,10 +3246,6 @@
       <name>Pacho Ramos</name>
     </member>
     <member>
-      <email>sam@gentoo.org</email>
-      <name>Sam James</name>
-    </member>
-    <member>
       <email>soap@gentoo.org</email>
       <name>David Seifert</name>
     </member>
@@ -3221,6 +3255,32 @@
     </member>
   </project>
   <project>
+    <email>udev-bugs@gentoo.org</email>
+    <name>Udev</name>
+    <url>https://wiki.gentoo.org/wiki/Project:Udev</url>
+    <description>The purpose of this project is to maintain sys-fs/udev and related packages.</description>
+    <member>
+      <email>blueness@gentoo.org</email>
+      <name>Anthony G. Basile</name>
+    </member>
+    <member>
+      <email>floppym@gentoo.org</email>
+      <name>Mike Gilbert</name>
+    </member>
+    <member>
+      <email>polynomial-c@gentoo.org</email>
+      <name>Lars Wendler</name>
+    </member>
+    <member>
+      <email>robbat2@gentoo.org</email>
+      <name>Robin Johnson</name>
+    </member>
+    <member>
+      <email>williamh@gentoo.org</email>
+      <name>William Hubbs</name>
+    </member>
+  </project>
+  <project>
     <email>vdr@gentoo.org</email>
     <name>VDR project</name>
     <url>https://wiki.gentoo.org/wiki/Project:VDR</url>
@@ -3321,7 +3381,6 @@
     <name>Wiki</name>
     <url>https://wiki.gentoo.org/wiki/Project:Wiki</url>
     <description>The wiki project oversees the community and the content surrounding wiki.gentoo.org</description>
-    <subproject ref="handbook@gentoo.org" inherit-members="1"/>
     <member>
       <email>grknight@gentoo.org</email>
       <name>Brian Evans</name>
diff --git a/metadata/timestamp b/metadata/timestamp
index 04c63ab564eb..1c23d95d8f57 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Aug 21 09:39:06 PM UTC 2021
+Wed Aug 25 10:39:09 PM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 3d3a7311f59c..37d067d44389 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 21 Aug 2021 21:45:01 +0000
+Wed, 25 Aug 2021 22:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 56acd19bf678..788b44e48340 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ecd369184a34cbd42ae9f4d52b8c3eaca634a696 1629579178 2021-08-21T20:52:58+00:00
+3524b48f716743728e80cd03011c4a8ad8e5051f 1629923920 2021-08-25T20:38:40+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3f89efb5fd88..7abd055dd397 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1629581701 Sat 21 Aug 2021 09:35:01 PM UTC
+1629930901 Wed 25 Aug 2021 10:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 9ee6d7482628..b04e403eceb1 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 21 Aug 2021 21:39:06 +0000
+Wed, 25 Aug 2021 22:39:09 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 54cb97982641..97c4ba92b456 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index f07f4d9e1e1b..687df2cec9bc 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -2,6 +2,6 @@ AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb
 DIST cacti-spine-1.2.16.tar.gz 108252 BLAKE2B ba0349cff7f4e82a5dc1d90c216cf7a4e0f939e28ab20d008b1725c948a85a00e2594f8997c8bbd69c305e3e58d944858c8439210956f45220b67229bc6df13d SHA512 0259084d70f9c8d20a8b19daf61e525228f99fba3eac4e2e5c9865114a5f1231b18389ca955fc4644c71c6c48cc45dda9b17e969a02c80552b84f98ad8945951
 DIST cacti-spine-1.2.17.tar.gz 110371 BLAKE2B 1f9605d34fcff0e4e7921ccbb5a22eeb9e2f2e2f22cf56189790dcdec798db5bff681df11cd82006254cc270174248c07ce3d94dca8d3367add6b220f1599adf SHA512 4c616af041d2f08e18fd274409c98d3efce84b7cca2d6e23db3d6c2a0d4c9a77a2c52c0ef8e0ed0c6ad409f28b56fdf3160e27654522d8aeb1b88e3cb4128d4a
 EBUILD cacti-spine-1.2.16.ebuild 812 BLAKE2B 9d463bf6b62d3c1e0af474a29a13b64704b4216b282ea9b0c20136d42222d25d70dd35b193e6c29943f3037fdf22b9a64ca924de9f42854df58d73e171b8750f SHA512 1acbe3686e387bbeebadbc804fcbb75d1a9e05db5e51dfdcc46a46b30707e1adcf9eb0be67e169dc9666404abe38bf32d244b6be9135208f7947c1623454761b
-EBUILD cacti-spine-1.2.17.ebuild 813 BLAKE2B ec598538a23d3a2b785914d78f21e419b4f7e2ad5cb99795786d2e6b6b9db94dfcc79524bde08dcce228ca1281430cbaa6c25eb80f1185220a27c89d68983754 SHA512 bc7ffb489545c5342ca96a30c7286bea9f79e42bf7daa0d06aa3ef399f0666c8e1713b9e95bc6e664734372c4d04b19235bf3b041d5361452a839d276733bd75
+EBUILD cacti-spine-1.2.17.ebuild 812 BLAKE2B 9d463bf6b62d3c1e0af474a29a13b64704b4216b282ea9b0c20136d42222d25d70dd35b193e6c29943f3037fdf22b9a64ca924de9f42854df58d73e171b8750f SHA512 1acbe3686e387bbeebadbc804fcbb75d1a9e05db5e51dfdcc46a46b30707e1adcf9eb0be67e169dc9666404abe38bf32d244b6be9135208f7947c1623454761b
 EBUILD cacti-spine-99999.ebuild 763 BLAKE2B 5fa057bba01f62088350268e440768f9275c50606a3948dd00c5189a8aa801c0abc3bff41785dc829e3b1fa1313c53f1c42173595ee7bd33a01620fff6cd9e34 SHA512 1068671693e9aba8adb9d9264557985f914a6c557e2f6a5aa5412d02cfc11a1464a21efc6aa6dd35b6bbfca4a20612daa91e51f03dc69bbdb3c550f564a36683
 MISC metadata.xml 804 BLAKE2B 8d0bb7fae8d899f50b443f69baf541947404fe5d283385a54a7a321b3b722420d2ccd253f1dc36ff0fa11878cf1020c7e0e30967cad745b9524b8941f7fc384a SHA512 d64c9fdbfa90a74cf85a9988d9f35af6760c909a74cd2298e7f8e299993757ee867b54bca6ec59b60134d08e80bdb66269e5cba297d38c3a6779779ea87b37bd
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.17.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.17.ebuild
index 1bfe8dbbdfff..6c9200ecdceb 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.17.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.17.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 
 BDEPEND="sys-apps/help2man"
 DEPEND="
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index da7c524138ca..64ac77c3fded 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -4,5 +4,5 @@ AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005
 DIST cacti-1.2.16.tar.gz 29197220 BLAKE2B 19939d0ff79c895b481aeb7ffec8331d8b9c10a6b7e0dbda6532e06ef0322f21cf02f4bf53a9522e1f672dd04b343f5550e2f34f08b3af2050e1f72465cffc43 SHA512 fe22acf4dea8ab6ec79825d66a84ad4c43fdce2815e7327536d182bc04400ed7b1d268209bbbca8b307c4779ee5bf7369a617ec1f052d8805757c2ca9b30cc35
 DIST cacti-1.2.17.tar.gz 38344112 BLAKE2B e555fc99560d10e94181c38b50e6f839532fb3dc66ff688b36a7efd10c15304e7636c9b4b483763fcea751317bcb283bb2bd8f813d5759c98aed6bbf02fd256a SHA512 94ae75b2494a91c536906c7bbeaa948d16c7ad96ed3a62c1eb21175f92c01787c6849960bbc791e04b3df46edbfd3cd787eb825bb423ce0814c0904edb2c915d
 EBUILD cacti-1.2.16-r1.ebuild 1111 BLAKE2B 15341dcd648cf686bd1f840538494b700d96df84a924b5badfe8034d03f2ce859bf9b498b45031459e23a8cc26127ab7454f85c697c4d26cced5d1862232a6a4 SHA512 94639a653783ce6589f523f5506bc6f15abc8f9f21b585b39fa168b3ed8404d34b257673a870dca10c9d99d85425735c5c4527fd54e8f62ed94ff668d47402a6
-EBUILD cacti-1.2.17.ebuild 1017 BLAKE2B 6886c7da8a5cdf3981ebddb36b831617fd0a22555574cd241c862767e007bc453ea241ae17e29d0f33c70fec57a2d5c4ac4ae5541024b11b0c142b863098770c SHA512 acd96ed2476240ec55049760e24a798713e49eca136816e2b08f668be60f255f05083e0f1ba96b168fed0ee4c3d33f0c90dbdac16e3ca8ce95bcc95c751718b8
+EBUILD cacti-1.2.17.ebuild 1016 BLAKE2B 3fd84d213f5f184e06eb129880a19efa6442e1004534688a7f68a2a72387beded0b1a27e0c7763e7b7c849a50c61400f0a0a2cae4341780c9dd2b011b7481d34 SHA512 33d434610d58e3962fc3f61b17b47bbf9aab2f00176053d497a4572ee2029a493aec9f27639f134ccacdaf1ff4b28cea2ca29699e136a409b30a26a0b3786f53
 MISC metadata.xml 934 BLAKE2B ddf6460296c62f7aef96152fb724b1cdff7a846ac33e9119a935b63d4eb6d9aaf4ab077487300be4d38dd1a005e80de34bffec8a72bc34460e1f772c8e18ed56 SHA512 a7139b430dfe53fca0684b33e8f5e2e496d5b16deb0b5da52e427066b9388eb487273b166c53dc77a2db1770d39fd6669bff61cd70c65c94de35ce3acab0acc3
diff --git a/net-analyzer/cacti/cacti-1.2.17.ebuild b/net-analyzer/cacti/cacti-1.2.17.ebuild
index 7f1f6541c921..6a0752cd4181 100644
--- a/net-analyzer/cacti/cacti-1.2.17.ebuild
+++ b/net-analyzer/cacti/cacti-1.2.17.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.cacti.net/"
 SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="snmp doc"
 
 need_httpd
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index f340b73f8b4c..c1d148d3f673 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -9,5 +9,5 @@ AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c39
 DIST suricata-5.0.7.tar.gz 29211384 BLAKE2B 939e672d9df61863c7adcc4bf52f5620e3760f0d6178362828474b1a72c4e3a69bf1ab52a3220c0069ae5a545c56307553c2796166af488a72a25dddd68782a8 SHA512 dce3929c796e04778eb9437bd4c7203aa9dae56be0baa4b7d986d3eedff3bfc71aa2886ecdeed9d87ec3d88cd3060ff8ef01540d15eb857698a2c4696da5899c
 DIST suricata-6.0.3.tar.gz 32421197 BLAKE2B c1b339823f2caab73aeb82f96fb703834cd3ca9f0f60662cf340cbc36734aea47106d49869bd70cf3acb419e954ca37bcd22ad1b2d789597bf36f8fe7ceebe11 SHA512 186b871959988ca7cbd0d69e725aed18af915f93363c7ecc0ffa20d8ad8f50a326be08452d085772b1df84ef25258ef0dd6b35d41b0988cb1c653e60aeb103a2
 EBUILD suricata-5.0.7.ebuild 6328 BLAKE2B 663b792d20371e5333293365db2070a253285a19e72b1accb12b88cbbf68bb7a143a1cf201820c4d328688ea4781ba9ab9a5d61a83eb6d59139d6ff99421c7dc SHA512 5a45c6fb2528cb9d130b95d76795b2daa89876f71dc8016bfce6c95e7d1cbb02e3c301050726d4ff1cb2bba04b04fde97573b0460a63574069e3cb369187581b
-EBUILD suricata-6.0.3.ebuild 6604 BLAKE2B 0095c03b426f8e0b0245446427e1620d2bc21c8c1629bbb28c9827e332b8627d36dec6b9a7b078181913202635f596bd562de92a3fb1a6c78d4e89498048b085 SHA512 fc3faef17001e3ccb9764248306fc7f9b81361c750168982ba13e46685bb0a898860b0dfeeb4141590fd93b3898ceb079a0e2f69f95bdce0dd035898aa470574
+EBUILD suricata-6.0.3.ebuild 6611 BLAKE2B 37a93bb8d749f0f22a0000424e4c34c6d2f8538bb809355b8d2b7cdeb35d43fe038a2ea0d9852d1db0f8bd165659b065973fab73bc353f8f8ab67d7844e588a5 SHA512 ac7856f2adfd43118d33849290677376c67878d35ead90ec10f8f83afa884b3cccf629dda32be81aacd0bf6f21f22d1d0cb051009d854f78902c6d1b340cae6a
 MISC metadata.xml 958 BLAKE2B 944628811fffa8d4c801dfab169a83b31fbca9d5e6c52a7aaf7131b56118bd53e9360002fc5e335253f9bab7c434c2f4defe44f4f1bed00fabc9013454f24c14 SHA512 b077688adea6058d1249a025898c81289ce04f47f6fd2684d8a2aa8e4494f994d68d07393097b1181add90d8f87c62e07e6717e08e3d4a0ebf9c1109859ef551
diff --git a/net-analyzer/suricata/suricata-6.0.3.ebuild b/net-analyzer/suricata/suricata-6.0.3.ebuild
index 6b5b71ffe43b..7e48fc1c6d58 100644
--- a/net-analyzer/suricata/suricata-6.0.3.ebuild
+++ b/net-analyzer/suricata/suricata-6.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened lua lz4 nflog +nfqueue redis systemd test"
 
 RESTRICT="!test? ( test )"
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index c9c4319a4e45..fdf92e72b581 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/freeradius-client/Manifest b/net-dialup/freeradius-client/Manifest
index ee2c5c1014f0..39ca83d12e98 100644
--- a/net-dialup/freeradius-client/Manifest
+++ b/net-dialup/freeradius-client/Manifest
@@ -1,4 +1,4 @@
 AUX freeradius-client-1.1.7-ar-configure.in.patch 241 BLAKE2B fc58d9477275ddbe7724adba4cbd7d1f4a5a134ca355aa41375376e056c321e22fe4f355602c0cffa70cb532cfee32f2c0728cea93c9e0d579cceea6425c8147 SHA512 654f142be0ff695ab4b9c8c9fa52e3a448c3d0027b5e7d8e776323e49be0cf268cb7cab82a5dd2ccf067a7089a8ff618296755973af1155ab40034cd93a6bea8
 DIST freeradius-client-1.1.7.tar.gz 433141 BLAKE2B 3a1ba65eb8b66d28362fd66a905af0a4e12b67e664da2c64dab87616e3787cded58d0c3bf56705bdb879d41f1a9a984cf5256b06eeb382209caebf748f679e12 SHA512 20e79ec97da79f46b334e1c2880803a692885a4038196a4d016094d349f675e2d0521d921140c5ab06703008619417f7a20d3e90cdfc7b3578faccbd232be0ce
-EBUILD freeradius-client-1.1.7-r1.ebuild 1038 BLAKE2B 092968a7c711138017c7a3cb1658d5e1f73827d7b2408f955da610f063c8e2b24f701222cb940032a8dc496d14f0d08a76ea87d0460865e5b53a1b93d211f160 SHA512 3ac70a29f6210bf2e96021e4cac1796595a90f83de872b5872771a6c4ca556f2e1967c6de5a7daef48c3769e19dc37a3cff1c93730e8eaaef42329dbfbb4a39b
+EBUILD freeradius-client-1.1.7-r2.ebuild 1061 BLAKE2B f296c6f6386d37d619578611dc0ac65827663dd2618f3bfe097d03db4e2bfa94c9382ec9a71051bf8a2249f1864220daaf2c4d39567796b70004781d41824bd3 SHA512 845ea0a97c9eec67c6f6ef868041bfd76fb796581220ccdbb3a807cb90c51b42e16838fa0d695d15ee58d587ad8c5ced5693f6a1d4d7b3dd47e96fe3c8aba7ac
 MISC metadata.xml 967 BLAKE2B 58843c33e950349e9d1ff3ba2b7978c0856c2b177c7ae65fd7c917c4a43cdfadbc93a6273b22b8308e33f3cac3dd2ca8819e1ea919fed014b2c99fac2ad91006 SHA512 83296b63df8cf2102c8e8df49277cbc3edbcc411255f845816c698dc721de9c9b84f8578646dd580ad58469961ba936d98d1a6c37a6efc255a072ffea905651b
diff --git a/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild b/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild
deleted file mode 100644
index 087811a91b4c..000000000000
--- a/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="FreeRADIUS Client framework"
-HOMEPAGE="https://wiki.freeradius.org/project/Radiusclient"
-SRC_URI="ftp://ftp.freeradius.org/pub/freeradius/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-IUSE="scp shadow static-libs"
-
-DEPEND="!net-dialup/radiusclient-ng"
-RDEPEND="${DEPEND}"
-
-DOCS=(
-	BUGS doc/{ChangeLog,login.example,release-method.txt,instop.html}
-	README.{radexample,rst}
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.7-ar-configure.in.patch"
-)
-
-src_prepare() {
-	default
-	mv configure.in configure.ac || die \
-		"Renaming configure.in to configure.ac failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable scp)
-		$(use_enable shadow)
-		--with-secure-path
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newdoc doc/README README.login.example
-
-	use static-libs || \
-		find "${ED}" -name '*.a' -delete
-}
diff --git a/net-dialup/freeradius-client/freeradius-client-1.1.7-r2.ebuild b/net-dialup/freeradius-client/freeradius-client-1.1.7-r2.ebuild
new file mode 100644
index 000000000000..447e44887dd1
--- /dev/null
+++ b/net-dialup/freeradius-client/freeradius-client-1.1.7-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="FreeRADIUS Client framework"
+HOMEPAGE="https://wiki.freeradius.org/project/Radiusclient"
+SRC_URI="ftp://ftp.freeradius.org/pub/freeradius/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+
+IUSE="scp shadow static-libs"
+
+DEPEND="
+	!net-dialup/radiusclient-ng
+	virtual/libcrypt:=
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	BUGS doc/{ChangeLog,login.example,release-method.txt,instop.html}
+	README.{radexample,rst}
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.7-ar-configure.in.patch"
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die \
+		"Renaming configure.in to configure.ac failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable scp)
+		$(use_enable shadow)
+		--with-secure-path
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	newdoc doc/README README.login.example
+
+	use static-libs || \
+		find "${ED}" -name '*.a' -delete
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 665f138d4c87..b1ce4a38b212 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 0163d8fc1682..644bdea04028 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -9,7 +9,9 @@ AUX unbound.socket 101 BLAKE2B 4885d311873d7f3e5daf1c0a63798b13761b7c0bfb1bead0b
 AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a73b0c6148f4df336c4c07e8da19320df6bedb49cb6884da565543f78456d38dc3000ca2a1abde84816be SHA512 71bd8c422ffe57e448b66f97775075a407671757266d40294a670b41cd1a59f16b65488d30aa74b79b7536f0c4c50adb56e32377e8029fd6c327b85c022c5fe3
 DIST unbound-1.13.0.tar.gz 5950063 BLAKE2B 742eed33845079452a942837a64e80f89ec7ec73459d0045c70ff83d3ba982fae6bade9feb56ef6faa9fca4859222ea00ac587c65c8ad722bef4a6b66a276ade SHA512 d4f3c5a7df5d46f8b1ee32b61e68bdc0d63030820d236ecc51bc3ac356d15248acb9a5e0b6009e1936b03b751e8dd05a071a95ab239fdbbbb308442a59642ad5
 DIST unbound-1.13.1.tar.gz 5976957 BLAKE2B 5fabb9205773a1983842e41cf7a4d6c3878fa8beb7c8ccc71ae1edf7738cb9506c3d7bb32cf887b305317ca695bf876d9f5bf9aeb0129b0e9e926d437b3e6eb3 SHA512 f4d26dca28dbcc33a5e65a55147fa01077c331292e88b6a87798cb6c3d4edb0515015d131fd893c92b74d22d9998a640f0adce404e6192d61ebe69a6a599287c
+DIST unbound-1.13.2.tar.gz 6127915 BLAKE2B 71806edc86b323ff1f9f2d7bd3f699b15da2cd1cfefe9ca6008d74915dd6c7b45690026fb0244531ae563a3ca1b142f21fc8aed97ba4bb0015d8ab9196ff045a SHA512 1e89441446e7a25c6a49bded645f8b348c1758c3be54e3a986041cb1f00c45d152fd469dc52666fb820574db9d51b16f1627dc8afcb9519508d4833ca358191a
 EBUILD unbound-1.13.0-r4.ebuild 5997 BLAKE2B 71c2346478513cca62bb52f72f28a58e90e9976ea39213420b19c8d8e5665a14889f95ce872030a13bdd15cca86bc8cdbd488a9802798ee21506d771ce90e6cb SHA512 a985a96c7359bdc9c7e10b52f83a1158f1a092a384194780b7b6f9335d8e83ea0a3c228b7d912372219cbd8ab6d1ad593e2b070bdb197335dcadfa896dfa9e47
 EBUILD unbound-1.13.0-r5.ebuild 6048 BLAKE2B 2a8e24f6dbe2d4d6913308e03d2c52368570d9396328f58ab0eedcb754adc12c03138f81c220b8225934f6d92c2f2a5f5c07547f2d52cd4c25eea89c76fa60e2 SHA512 e5da3d935ff2c98affb300a96dfc9555e0a56454246f1c6ccf6800d988871ed19128ddb02a595d41ed551274be88d571549edc2074addf997f58139c2c3d16f4
 EBUILD unbound-1.13.1-r2.ebuild 6043 BLAKE2B c945879e1938887f99a513d00ed76f3bad9e4b98e16cab132e7587c885f330bbaa9b167c024d34e7e524aa99b3c81a509bb84c36ada1bff5ec29b8f1457880d8 SHA512 7e9c405b21f143105654357c909da068769650555ae680c67eca67d0e841ca4fc6e0aee1580966666e89f8a711e710aa727e642a63d81202b25db6a9d8d3da41
+EBUILD unbound-1.13.2.ebuild 6051 BLAKE2B 12aef31cce4354a60a2659f56d4791bd41784588b5cf6cc1f22c14a2bedb2991b898a4379ad4d4b63591185f1da9ab71c413dea3b9646cfb38cb154636e08776 SHA512 bc88e8a6e19e221475440fbfd185184bac6a965dbe39a4586a8d4713bed727104e7eb97d6c62f38ad786e455dde074d0c7ee4744c054bf7923705e80eabf876f
 MISC metadata.xml 1530 BLAKE2B 122d80d5cfbe76db026eae05c5e04b05f83e081713ac31c1d35d4677fa44eda03629fd964f0aa7fd5f9d16ff70913ebc83fddc5ee8c3c22df9bc7c5fc1b99e22 SHA512 4b9f0e48a871e0f4fa86b85bea5639aa6ab7778da2a32845f4ed95def7f0432f8a314d43f9e4f00a145b10d4a4250f6574a31a3e443545abc716e421f1b64bd0
diff --git a/net-dns/unbound/unbound-1.13.2.ebuild b/net-dns/unbound/unbound-1.13.2.ebuild
new file mode 100644
index 000000000000..83b74f7345dc
--- /dev/null
+++ b/net-dns/unbound/unbound-1.13.2.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
+SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/8" # ABI version of libunbound.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND="acct-group/unbound
+	acct-user/unbound
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+	dnscrypt? ( dev-libs/libsodium:=[${MULTILIB_USEDEP}] )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1:=[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		dev-libs/openssl:0[-bindist(-)]
+	)
+	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis:= )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)
+	systemd? ( sys-apps/systemd )"
+
+RDEPEND="${CDEPEND}
+	net-dns/dnssec-root
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
+	"${FILESDIR}"/${PN}-1.10.1-find-ar.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_enable ecdsa) \
+		$(use_enable ecs subnet) \
+		$(multilib_native_use_enable redis cachedb) \
+		$(use_enable static-libs static) \
+		$(use_enable systemd) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		$(use_with http2 libnghttp2) \
+		--disable-flto \
+		--disable-rpath \
+		--enable-event-api \
+		--enable-ipsecmod \
+		--enable-tfo-client \
+		--enable-tfo-server \
+		--with-libevent="${EPREFIX}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX}"/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX}"/usr \
+		--with-libexpat="${EPREFIX}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	systemd_dounit contrib/unbound.service
+	systemd_dounit contrib/unbound.socket
+}
+
+multilib_src_install_all() {
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound-r1.initd unbound
+	newconfd "${FILESDIR}"/unbound-r1.confd unbound
+
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+
+	# create space for auto-trust-anchor-file...
+	keepdir /etc/unbound/var
+	fowners root:unbound /etc/unbound/var
+	fperms 0770 /etc/unbound/var
+	# ... and point example config to it
+	sed -i \
+		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
+		"${ED}/etc/unbound/unbound.conf" \
+		|| die
+
+	# Used to store cache data
+	keepdir /var/lib/${PN}
+	fowners root:unbound /var/lib/${PN}
+	fperms 0770 /var/lib/${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]] ; then
+		einfo "Trying to create unbound control key ..."
+		if ! unbound-control-setup &>/dev/null ; then
+			ewarn "Failed to create unbound control key!"
+		fi
+	fi
+
+	if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]] ; then
+		einfo ""
+		einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
+		einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf"
+		einfo "and run"
+		einfo ""
+		einfo "  su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound"
+		einfo ""
+		einfo "as root to create it initially before starting unbound for the first time after enabling this."
+		einfo ""
+	fi
+
+	# Our user is not available on prefix
+	use prefix && return
+
+	local _perm_check_testfile=$(mktemp --dry-run "${EPREFIX}"/etc/unbound/var/.pkg_postinst-perm-check.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_perm_check_testfile}" unbound &>/dev/null
+	if [ $? -ne 0 ] ; then
+		ewarn "WARNING: unbound user cannot write to \"${EPREFIX}/etc/unbound/var\"!"
+		ewarn "Run the following commands to restore default permission:"
+		ewarn ""
+		ewarn "    chown root:unbound ${EPREFIX}/etc/unbound/var"
+		ewarn "    chmod 0770 ${EPREFIX}/etc/unbound/var"
+	else
+		# Cleanup -- no reason to die here!
+		rm -f "${_perm_check_testfile}"
+	fi
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index a88db7532e14..400676e8e744 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest
index 54f899de61b0..f6fa9d4c3841 100644
--- a/net-firewall/ebtables/Manifest
+++ b/net-firewall/ebtables/Manifest
@@ -4,5 +4,5 @@ AUX ebtables-2.0.11-remove-stray-atsign.patch 1120 BLAKE2B 14bac4aec87d44e5ca166
 AUX ebtables.confd-r1 685 BLAKE2B 647eeb26f9c046341c79d450fa5771480cbd9047b063b2e6c32aedeaa669f8c6f73dd317731eac86bfb85f352aec23969af505a461e7f307cf6538cb9c6b21ff SHA512 5bb7ac7aa1a723a7b71f26fbc0337f3cb5b4efd700b95695ab47ac7edc9de7ab0190591d0f56db8e461be93a79cb3ce534335c8ce13a6a6773ff5229c0959033
 AUX ebtables.initd-r1 2020 BLAKE2B f73f5904690c5c6344f0668c8327de5605b41ca5a699b3076f3b30545bbea19ff125c5c21d18a73e3bb2cc2986fbf74e7cad5757ced38887551ff59f2ca81dda SHA512 8d4c56102a2a4771e7a0d3a62ddbc4c82eba640ea6d5cba2e55ae2c2d7d0fe2621bcb81a4fa6aebdd1674ac55bb88beb964a89b521d8e684fc02f4b9da555823
 DIST ebtables-2.0.11.tar.gz 428411 BLAKE2B 62af4c38ad21498e43f41ef96c8abb5704e8d8a48f1327c587b664f36fdfa9849a9a37e59958db56d38019465d8bf1775914f7387fde99a441615913702cf504 SHA512 43a04c6174c8028c501591ef260526297e0f018016f226e2a3bcf80766fddf53d4605c347554d6da7c4ab5e2131584a18da20916ffddcbf2d26ac93b00c5777f
-EBUILD ebtables-2.0.11-r3.ebuild 2489 BLAKE2B 4bd44c75c25656490bc712ab87b1d50a3fba6a2ec0848186420a72ab230f13e30a20b46e4bfb163795b5bce961b30df0bc750f5670356d78ea0774ab7924163d SHA512 79b4b348affc14cc186a8d650b7c3db72a88d214a8d39db690b26200f1db04037901f22ae72d3b48803b499e70cf02d074c19625725fb349f8bb3005d86e0686
+EBUILD ebtables-2.0.11-r3.ebuild 2496 BLAKE2B cc0506e84dc9a6e6168b59f01f204537649736465b9792a7bbff814e3726b3d7c274e1e1bbfe20f2976b62f1132c362a7425b4a61fd8a1d98e436ce7983d951c SHA512 eff2e063c1489c0ecff02712724853a626eb40035aa9ba86397a22a09e987e7e6a3366541580b5852e01f264d090e6ba4e29f6a574b59d55171d27f428799560
 MISC metadata.xml 488 BLAKE2B 683d7552083e64daf3e41f9c1e7c53033ac4059a1f3ae248e666001424725f21efb1ec0d35c28492ac80c19998692c00e795818501b0c9f0df1037175b8bda93 SHA512 88d08269d25c3f4a22d89b5774e21c4af048c2e39beba41514780d3dac72494cb39e993becd49b0a73cb9c2d0b2e7e46c7bbe1b3a40fe6d7094431a9fb384f35
diff --git a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
index c8736d46935f..3701ea171e82 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
 IUSE="+perl static"
 
 BDEPEND=">=app-eselect/eselect-iptables-20200508"
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 6b3a541f433e..fa344d2dfe53 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -6,5 +6,5 @@ DIST firewalld-0.9.3.tar.gz 1309371 BLAKE2B 78a86f9c14ed8cc2497f3b79e4be627a28dc
 EBUILD firewalld-0.7.1-r3.ebuild 3220 BLAKE2B 3bc079c30540420da1f62aac363837eff13187c4b727dd47ee7f8512bb31ccfd2198a28226ef89abfdb6aa4aacecd75d618edeaa38836f6146034d77f007dc7b SHA512 77a9cf6d7ffade8bd151bdfa85d51c6962174faf63a5dbd5bc7bf1f610273a4044996ff93814845dbac9998d004973fcaa91fa9bbb38b21dcd5092aaa456cc2c
 EBUILD firewalld-0.7.3-r1.ebuild 3223 BLAKE2B 2409755e06f8b5def3fadc59f90bea9e9b9af57de0abd4ccbe5c65729b38c5f864f5d79e113b9289d553cd6f4f79fde47423c5acf1ab86542a4f51a9dcd52826 SHA512 99ac981b9d029ee17482d8299bd67005eab980ab41193d1cecf39c3fe17f9a73024ede67390ba86fbea631be82a7802772329e16d16a0c58394b2ace0fedb99b
 EBUILD firewalld-0.9.1-r1.ebuild 3165 BLAKE2B ee5f4f02f1dd911bd55b7f001ae416657cdb873205e916f7c5e16941699831f91918360ced1712d41153e7342f57a4f3f0362ed99e4ee4a5d07907b3da3b6cb1 SHA512 676409b0d329f4c9d5549819059141cad6fb99861bca58351e27ff5e44ac9d69b85d1ddba953658be319db7f5fdc43e8fbda7f2b093cfc21645ada32f095e10a
-EBUILD firewalld-0.9.3-r1.ebuild 3168 BLAKE2B fe0bdce016a97fb2cbde02072a5ff1ea8e956b2cac1822aeed355d3879704ef41e22463c62e0a27b9b08860b7cfcd3887d6e582cab1637ecf6a7504dcb62e329 SHA512 22b3f035114456c27be23534b785673d83e0b6d76577e9c29a3f24e8d240d0609ddd47de0e59cb8d83bb1c0cefb9d8e63ecf5142f1f09d25d715888ca366ee52
+EBUILD firewalld-0.9.3-r1.ebuild 3175 BLAKE2B 1dd8c9aeb2d1085fdc823a5f5e44c6353f27e8a3584609290fff6a65a1f68961e1ceebeebf03f1e4bc70849f9f0245708f59f62379191201346b034338a2a84d SHA512 db6145418127778121313844a05c5ec772b8963fe3153e6efa5eecc3b8f67a91f2fabd0bbc88e66df2d89dd2ba53e46e1ae78e6ff2885c0cb7b78e4826b73936
 MISC metadata.xml 486 BLAKE2B 0d1b9c530a7b7ac43414cda002e07cbc9b897164be53d9183dc50ba78bc8d29a40bfc364444f4253f903ac1698a459e6f7ca68431a22905a6f5aed02ca41bb61 SHA512 d4b20ffb819399bfc60760ec90bfaf60ffbe666a1c0b2117a8eae42db2f85c1f5274c8dee28fbfa7b66bea1d9720ad1dd8acb425c43eb71cf0c9b2557a1471a0
diff --git a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
index 527e4ba823e5..59c6dff62994 100644
--- a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 4ec038865088..a942d83cfd10 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -3,5 +3,7 @@ AUX ipset.confd 588 BLAKE2B fb1b728c12953cb6d5009469eaeeb9e58e01dd76b6849ad554d5
 AUX ipset.initd-r4 2997 BLAKE2B 9c376e1a5083829a1fc40bfcca192cad19644c8ba585c29018a55837c0788127963071de2a94a251288ee19a7308ba4d7d80f48f3bc1aba497489872f9810479 SHA512 0e674308ae51b5d65e8aba913ffece7e9233ff69b15086d5f35cd8b4e23e6ee08d6c233ed21b647a033039a9e268ee2cb01718ac9ebb548734c5996a8acb3961
 AUX ipset.systemd 476 BLAKE2B 6d536142066ab60fdec24bcb138976709f186c575a7958ad9e8f0762c5b473de6882dcbdb7fbe16c79840096806fb8472308647aaa5b26dec192f91f4a541174 SHA512 c537c8c1bacbf9f3eeedfa123b666ac4f3d71cca9e44e89c9dc0f95328e1ec6be9480927272bd69d06a59f1d22bf4dc117c092d187d950c3f72e31608ab27a08
 DIST ipset-7.11.tar.bz2 674100 BLAKE2B 97f2e3372e963654ece511960e8c22d0dd9e29376d087a3767d89544dfbd85f9f9e75e0cc6c4eb9e1d813d1a472a410033a76feef3319b1d87fd51b0c3fd97cd SHA512 20890de32c17c04d9d3ae42fff64acfe21a252974bee5843ae39bdda707fcef55fde11cffccab9f987bf7e18f5445443c46c50eb854fb6f93f172f7bad07f922
-EBUILD ipset-7.11-r1.ebuild 3443 BLAKE2B b8021b1761afe2a25954902d26a47a42590c95375b937164b7493a9af3a0f8eace7df7c1dd5aa1921e72f6ba780373b73f87363066811a29e0d1763d67491db5 SHA512 4ce2cb5d34cff34618740ba8c2c9d89068cf9c04511d90265fa73833b05bc7d1f07f737d6679b72f770b1165147fbb930748a160d4247053af6501c9da27ef53
+DIST ipset-7.15.tar.bz2 680383 BLAKE2B 10acff9741370ad80a2845605be1be4f691e987b271f4dcf1fab3abfe158c63c7d39e6b3453ba7cd361dee3df92f85419cfb70806a71b6806555f6571c70b1ed SHA512 0fc936d971c30a0925c585d506c8840e782fdaeec09bc8fd249e874fe838fa55a4dbb697f6e1423a6769abf07a1ce2195abc37cb641e8e4ad70f1b4c7130916a
+EBUILD ipset-7.11-r1.ebuild 3450 BLAKE2B 214cade04c6b499a7e0043df1eec4cd475b9247b21fa1bc218503082a5265d54d93f6a388281ac7360c48de65581dd3517e49aea7022557535ff42590695795f SHA512 a8ec2d9ca9b17ba666641c6e9539714bb836e043363a5a8e0a913314b476aca59eb4fb9efd6febcc8c13bbe35962ea14bdddc510a2055d980a347e43271c6439
+EBUILD ipset-7.15.ebuild 3454 BLAKE2B a14d731bb83f6b6b8a4353e67bfab3c71221727b2b435af4a29c872a148c80ba03f3e1aac3eda3ccf5ef5f66c7e308f23fd2c0df825eb3936cceaf47f8a80d71 SHA512 dc8192083e5a59f2b12d46b1d66675db151a62d41a7255aa6414ecc1cfa50eeb0b7e6eecf42301e775263f6781d8177e829145882c1f901f95a7548d7b69fa1d
 MISC metadata.xml 368 BLAKE2B fd3ff78ab724fc8cb35326703b2605e894cdfacc3d306659ba128765aa7c88fc5fe397492caf3b7e11c6aadbc750c7bd7d578c4a47e4bcce05da708887863e52 SHA512 5ab08e27c87cd00f4ed9c9f7268692b20947554bf778579f138de82356eb9ee531a1e4da3ac65c25cdadc8ad9ccc2cb24397ce4842e7a559f1d5f77947481f63
diff --git a/net-firewall/ipset/ipset-7.11-r1.ebuild b/net-firewall/ipset/ipset-7.11-r1.ebuild
index c7dfc5a9b0cc..cbee799db563 100644
--- a/net-firewall/ipset/ipset-7.11-r1.ebuild
+++ b/net-firewall/ipset/ipset-7.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/net-firewall/ipset/ipset-7.15.ebuild b/net-firewall/ipset/ipset-7.15.ebuild
new file mode 100644
index 000000000000..b37a716c1821
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.15.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+MODULES_OPTIONAL_USE=modules
+inherit autotools linux-info linux-mod systemd
+
+DESCRIPTION="IPset tool for iptables, successor to ippool"
+HOMEPAGE="https://ipset.netfilter.org/"
+SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND=">=net-firewall/iptables-1.4.7
+	net-libs/libmnl:="
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
+
+# configurable from outside, e.g. /etc/portage/make.conf
+IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
+
+BUILD_TARGETS="modules"
+MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
+MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
+MODULE_NAMES+=" em_ipset(kernel/net/sched/:${S}/kernel/net/sched/)"
+for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set}; do
+	MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
+done
+
+pkg_setup() {
+	get_version
+	CONFIG_CHECK="NETFILTER"
+	ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+	CONFIG_CHECK+=" NETFILTER_NETLINK"
+	ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK support in your kernel."
+	# It does still build without NET_NS, but it may be needed in future.
+	#CONFIG_CHECK="${CONFIG_CHECK} NET_NS"
+	#ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel."
+	CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+	ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)"
+
+	build_modules=0
+	if use modules; then
+		if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
+			if linux_chkconfig_present "IP_NF_SET" || \
+				linux_chkconfig_present "IP_SET"; then #274577
+				eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
+				eerror "Please either build ipset with modules USE flag disabled"
+				eerror "or rebuild kernel without IP_SET support and make sure"
+				eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ."
+				die "USE=modules and in-kernel ipset support detected."
+			else
+				einfo "Modular kernel detected. Gonna build kernel modules..."
+				build_modules=1
+			fi
+		else
+			eerror "Nonmodular kernel detected, but USE=modules. Either build"
+			eerror "modular kernel (without IP_SET) or disable USE=modules"
+			die "Nonmodular kernel detected, will not build kernel modules"
+		fi
+	fi
+	[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with modules kmod) \
+		--disable-static \
+		--with-maxsets=${IP_NF_SET_MAX} \
+		--libdir="${EPREFIX}/$(get_libdir)" \
+		--with-ksource="${KV_DIR}" \
+		--with-kbuild="${KV_OUT_DIR}"
+}
+
+src_compile() {
+	einfo "Building userspace"
+	emake
+
+	if [[ ${build_modules} -eq 1 ]]; then
+		einfo "Building kernel modules"
+		set_arch_to_kernel
+		emake modules
+	fi
+}
+
+src_install() {
+	einfo "Installing userspace"
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/ipset.initd-r4 ${PN}
+	newconfd "${FILESDIR}"/ipset.confd ${PN}
+	systemd_newunit "${FILESDIR}"/ipset.systemd ${PN}.service
+	keepdir /var/lib/ipset
+
+	if [[ ${build_modules} -eq 1 ]]; then
+		einfo "Installing kernel modules"
+		linux-mod_src_install
+	fi
+}
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 8d9385032b14..19e70063a905 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -9,7 +9,9 @@ AUX nftables.init-r1 2279 BLAKE2B 1c4c28ea5b6a22905b3ec7de8e54726933b579352ecd79
 AUX systemd/nftables-restore.service 394 BLAKE2B 1c1f358eb2eff789e68c051098c971f11a8df6621c3c919e30a1ec1213f6db822c390609c01827fe9fc75c540effa3e3a7b6f93bd24e16ea19841bbfaab796ed SHA512 18da6a770bb3e94fd6b2c9e6f033450aaff9fe886c8846f780d08a21e2fc884ac078652743b50b3d4ea8c9500f92d272bdd27e2881e438c2b223d40816c100a0
 DIST nftables-0.9.8.tar.bz2 879516 BLAKE2B 5063090d648668f4d5ae6d4be48ebecc65dfd4b525768e94a0d90ceebbee73874c916727be8de633550db71c612d698d88cf93575931362b48d954e6ac275143 SHA512 1c5709825c8b2c13cbed0310658959ecee164c930bc9e2447618a0894598138b9a549d20509c32a5c23ce99e40438df38f9e170cf656ce993d819f365490a180
 DIST nftables-0.9.9.tar.bz2 922624 BLAKE2B 8de2709576a26ca84a8d694f7cb06cad2bb2fb4671ba21ffc32c0d5997e8124ae7cd794dafddf4db48d8a49c280b48b07d2a31b6c18f6647fdb67cfe7f065b61 SHA512 dfdd3ffc0ffc1742ca0494a3f8fac1c7b2fe942849e60d33fc3cb8a51e27bd39e1ccfeda2195191377a32bb5363ea244f4c3e71b4a6d930f33bf87e17a534fab
+DIST nftables-1.0.0.tar.bz2 921053 BLAKE2B ee86a323170433c3ba62f80118947864aac0fe0aaeb48afeb5a116a48782185c83313ef1b5735c7749eb5eccb88f252b444d1ee908be25bdaa4d9c0b833c1dc2 SHA512 33460bef4ee76b7caa44fa5515357127ae84be468448cc838dd31919b6e045ba6195b761118d4c8a4219a9f008c4416542ce784f4daad94f3b44c0626bcdd014
 EBUILD nftables-0.9.8.ebuild 4283 BLAKE2B d8fe0db1b588ac9fe53b7d06d10fbd3b4ea5ab28bc7cf97bec1357422e5c9d29cb5709cac592071ab583b56018e591f120108e70f573226bc4c8bf95de2a7651 SHA512 ad668b9c2633fc2408d3d23850f3df02d26825a03a8675f84b962feec82f435fa64f022a9e5977895426ae7ff1655ac17e3b1dd3b3b53a4e4c5d342ac6c90a61
 EBUILD nftables-0.9.9.ebuild 4553 BLAKE2B 54b3de2a5413532de597c7b496dcc83405136e442f1d9dca2e3c3cabe23f0ed8d2e84311d9091b62ec14e284cf768652f924cfd51df537a576d391026d82df2d SHA512 6d17349a2749437becd3d8a75c192e58d6019b49c3e99594d7f0f6989cb84b5a24820b843aed08cf6a43cdf359f63c250b7a00fdf2cb994c93faa31f3ad458b3
-EBUILD nftables-9999.ebuild 4559 BLAKE2B 69d40760391a11a3b8f8bcacb6281d2e2e590da4ad0f998f95aaff64f834e85fc2b733858a3aa0205a2563ee3cc957830516a14386f8290c75ff9d0681e140ab SHA512 b7026efea6bc02a77eb9c9a1f0e10c867ffa6e5ad154f19697c55ec3ea2c8310faa7cabef94e1a1b73cd61e1393883eea864836abbcd5bb866f755cebfa2256c
+EBUILD nftables-1.0.0.ebuild 4559 BLAKE2B 2abaebf2633942855cee7b67aa2d1a93575a038be04c81b0811b81fb20e51f409393f865475678defcd0eabb7728bb10e75284831aa333cbcefef1776f6399f9 SHA512 4dd6d0ad1ebb25d6e394b8f0fd09ca348b2944f0f77a9963d704c7e69f7ca8664756d2a1e4b175b37aa3e19a64d84e236da5f8da60167aedb01b9ed0fc1c535f
+EBUILD nftables-9999.ebuild 4559 BLAKE2B 2abaebf2633942855cee7b67aa2d1a93575a038be04c81b0811b81fb20e51f409393f865475678defcd0eabb7728bb10e75284831aa333cbcefef1776f6399f9 SHA512 4dd6d0ad1ebb25d6e394b8f0fd09ca348b2944f0f77a9963d704c7e69f7ca8664756d2a1e4b175b37aa3e19a64d84e236da5f8da60167aedb01b9ed0fc1c535f
 MISC metadata.xml 932 BLAKE2B 1d75a3e5a7d7416bc86d9f85bb2ca62d33a78017d773d2984b7f9666a0f615ac41cdbdab58f63f612a2b95e498fe8a785a1dce0e4be188446c197a3d96bbecd5 SHA512 8845820c9c3be773a1b8dbbf24eeb1db7327722f4710c473112b4450265bdedbd8b0284cb6ba87e915596cdc1d608e573920f19116f06fe6a1fa167e8d0e23d5
diff --git a/net-firewall/nftables/nftables-1.0.0.ebuild b/net-firewall/nftables/nftables-1.0.0.ebuild
new file mode 100644
index 000000000000..376318f5382c
--- /dev/null
+++ b/net-firewall/nftables/nftables-1.0.0.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit autotools linux-info python-r1 systemd
+
+DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+
+if [[ ${PV} =~ ^[9]{4,}$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
+
+	BDEPEND="
+		sys-devel/bison
+		sys-devel/flex
+	"
+else
+	SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/1"
+IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs xtables"
+
+RDEPEND="
+	>=net-libs/libmnl-1.0.4:0=
+	>=net-libs/libnftnl-1.2.0:0=
+	gmp? ( dev-libs/gmp:0= )
+	json? ( dev-libs/jansson:= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	xtables? ( >=net-firewall/iptables-1.6.1 )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND+="
+	doc? (
+		app-text/asciidoc
+		>=app-text/docbook2X-0.8.8-r4
+	)
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	libedit? ( !readline )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.8-slibtool.patch"
+)
+
+python_make() {
+	emake \
+		-C py \
+		abs_builddir="${S}" \
+		DESTDIR="${D}" \
+		PYTHON_BIN="${PYTHON}" \
+		"${@}"
+}
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		if use modern-kernel && kernel_is lt 3 18; then
+			eerror "The modern-kernel USE flag requires kernel version 3.18 or newer to work properly."
+		fi
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# fix installation path for doc stuff
+	sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels@' \
+		-i files/nftables/Makefile.am || die
+	sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels/osf@' \
+		-i files/osf/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		# We handle python separately
+		--disable-python
+		--sbindir="${EPREFIX}"/sbin
+		$(use_enable debug)
+		$(use_enable doc man-doc)
+		$(use_with !gmp mini_gmp)
+		$(use_with json)
+		$(use_with libedit cli editline)
+		$(use_with readline cli readline)
+		$(use_enable static-libs static)
+		$(use_with xtables)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		python_foreach_impl python_make
+	fi
+}
+
+src_install() {
+	default
+
+	if ! use doc && [[ ! ${PV} =~ ^[9]{4,}$ ]]; then
+		pushd doc >/dev/null || die
+		doman *.?
+		popd >/dev/null || die
+	fi
+
+	local mksuffix="$(usex modern-kernel '-mk' '')"
+
+	exeinto /usr/libexec/${PN}
+	newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh
+	newconfd "${FILESDIR}"/${PN}${mksuffix}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}${mksuffix}.init-r1 ${PN}
+	keepdir /var/lib/nftables
+
+	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
+
+	if use python ; then
+		python_foreach_impl python_make install
+		python_foreach_impl python_optimize
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	local save_file
+	save_file="${EROOT}/var/lib/nftables/rules-save"
+
+	# In order for the nftables-restore systemd service to start
+	# the save_file must exist.
+	if [[ ! -f "${save_file}" ]]; then
+		( umask 177; touch "${save_file}" )
+	elif [[ $(( "$( stat --printf '%05a' "${save_file}" )" & 07177 )) -ne 0 ]]; then
+		ewarn "Your system has dangerous permissions for ${save_file}"
+		ewarn "It is probably affected by bug #691326."
+		ewarn "You may need to fix the permissions of the file. To do so,"
+		ewarn "you can run the command in the line below as root."
+		ewarn "    'chmod 600 \"${save_file}\"'"
+	fi
+
+	if has_version 'sys-apps/systemd'; then
+		elog "If you wish to enable the firewall rules on boot (on systemd) you"
+		elog "will need to enable the nftables-restore service."
+		elog "    'systemctl enable ${PN}-restore.service'"
+		elog
+		elog "If you are creating firewall rules before the next system restart"
+		elog "the nftables-restore service must be manually started in order to"
+		elog "save those rules on shutdown."
+	fi
+	if has_version 'sys-apps/openrc'; then
+		elog "If you wish to enable the firewall rules on boot (on openrc) you"
+		elog "will need to enable the nftables service."
+		elog "    'rc-update add ${PN} default'"
+		elog
+		elog "If you are creating or updating the firewall rules and wish to save"
+		elog "them to be loaded on the next restart, use the \"save\" functionality"
+		elog "in the init script."
+		elog "    'rc-service ${PN} save'"
+	fi
+}
diff --git a/net-firewall/nftables/nftables-9999.ebuild b/net-firewall/nftables/nftables-9999.ebuild
index 5322eb53985b..376318f5382c 100644
--- a/net-firewall/nftables/nftables-9999.ebuild
+++ b/net-firewall/nftables/nftables-9999.ebuild
@@ -29,7 +29,7 @@ IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs xt
 
 RDEPEND="
 	>=net-libs/libmnl-1.0.4:0=
-	>=net-libs/libnftnl-1.1.9:0=
+	>=net-libs/libnftnl-1.2.0:0=
 	gmp? ( dev-libs/gmp:0= )
 	json? ( dev-libs/jansson:= )
 	python? ( ${PYTHON_DEPS} )
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 67eb6c9b5421..5374e82951b4 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index e266e65ba928..7e0b0748788f 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -1,9 +1,6 @@
-AUX cifs-utils-6.10-ln_in_destdir.patch 813 BLAKE2B 71ac0215407a2350c19a15545d96f77115357c04bbcae2d1e09b7fbe54fd344d40638d3778195865eff3f9686b1fa9a0a13e188fdd4cc3d25c7a100fc5c376a1 SHA512 f9ccbd0d4d14cde1d07cc165533c51cc2876ed65e651a797a8b7c69958f6ee827090731888cbc425aecbb879b41e87a0e9ed1fce6817e1907cc7b114c53b8fc9
 AUX cifs-utils-6.12-ln_in_destdir.patch 629 BLAKE2B aa901b00c41a58ae21d948b3eece79914dc78782fcd49afc27ba8d7fa061f8aec43d187ce1302d67b5e5fc2cce113906545b9ae9920704f29ad3758a71079994 SHA512 354e33c91b0678e08ba9dabd989a5afdb2e558fa71dc427b283f9b987f94908d9b696c95a7e608e13f26497a52e7e8bf973290a84b2024ac9bc817ba512adf26
 AUX cifs-utils-6.7-heimdal.patch 904 BLAKE2B de816117010e71ced5ad094e8ed3537b672b37a0e8ac0b999aa7aaf180ac051f6745ee68373948b266ad359e1ba3b58552eda6314b5a4339673bd04656ab6090 SHA512 e3364e05fba6aff57ea2f09b530692f4f5ec95213e91794388fff9382d210db9bacb28dae1440d3b35a570c0b3bc21084a067e0ce8333febd5246c52aa9260ae
-DIST cifs-utils-6.11.tar.bz2 408903 BLAKE2B 5ee7cd87b54a266750bf938396ee90b3f20c2a3446aca295ccb58cb667fbfb68be9aa0e2bbc20aa5e18ffd7f1fcd5fbb0aef3bc25fd13bb96abc5a57a0b45b4b SHA512 064c0ac75572fb44908390508462e4fdfe0686751149fd8b656a209dd961a5a24a7d9774c38c0e72fa5f9875b43aea7bf2de038c4e4a63a11664e71d9003100e
 DIST cifs-utils-6.13-kerberos_mount_regression_fix.patch.xz 4336 BLAKE2B de268f815ee4fbb750bf8b7d7110a69a808682c239a7c9196468ecc4d55a26eed3b63f8d8539569e16131060f57de389ef92e1063283eb2f41e65be00ed21bb1 SHA512 13d1fb8ff7c31100bfa481e647e9d3b90d61633173b3a71683246d7bb4b68c7e147d21697a17b7ad60e1ac8da2d48d6f4b51762370536a32d14da6c9a6db7e5e
 DIST cifs-utils-6.13.tar.bz2 414584 BLAKE2B 5133ea39fc65acaf2a9791f8ac97dee681dd12f509e0abd095542ce663e7c62002b033dcf35f0a8eec214cb9940597fb568fd50d4cfe5271ca4e433afbe1a7bc SHA512 1337ac4b69f0c3e8d0241eb608207ba81dfa35f84c661649d25da78637882c4d73467b0f632be0bd120362e0b786e40eb340bffcf21c8a09629c441100fd10de
-EBUILD cifs-utils-6.11.ebuild 3212 BLAKE2B a87a72d144e834998197802c23e3ad2c8f94f10fb54adc5654b1cde63d0a13104e3993ff250df710c710e5b0873a55fa823b7baa75f3f0fc04871ee32a56b50c SHA512 a4a06f59ae9f0c37c0084df205345647d1e9803e5973b54922803c5c8016607940669ed5a23ca11ae52fcef01a08d6da9c53bd809c2bc29807a357e4962941b3
-EBUILD cifs-utils-6.13-r1.ebuild 3538 BLAKE2B 4f7df30b314d8e6fd486931f168914389faffa880a6e3ce8cf94e6aeea436415ca24d5128058d5568119cf63d5d322dad5e72a513c04defb95ed61ffdda9a2a8 SHA512 949c95666acbd20b0a1560f3d6358fe9ea068b0bfd437990844ff7aebfd8921ea885b508c912586e9a234af5b677f7fb1a695efea6befabb609304662bb9aa7d
+EBUILD cifs-utils-6.13-r1.ebuild 3536 BLAKE2B 01926eef53ae32a33abc2f58dcc9ea193fe7202487566db4a053d50f6f520c0ffe064738ef76d5e51c60b3864fc413a0295af99a7b55e86fa54f7b0aec8a2574 SHA512 5853aba8f877dd9f733bf222409b67a8c767f69ffb78525e1182d6dc9f2e66c40e1221202bfd526fe092322d9101ba14d65d9c43cdc0b1b79eb421fc6dc71237
 MISC metadata.xml 886 BLAKE2B 2ddb0ff3b0da3392b23743f3804c1d63651904c05a17e69f105c7b062d33befca62a13a1a93f631b314143a60bca8e2b20ec9b331646f0e6804a2f8cfce3bb81 SHA512 36019a5885034309e16198a154fc0fc16de2ff507eec81f4d63840bf56e9f67cf67dbf4ba7662a6f64daeb17541604d5f588ec67cca134b7ff07e0612817072b
diff --git a/net-fs/cifs-utils/cifs-utils-6.11.ebuild b/net-fs/cifs-utils/cifs-utils-6.11.ebuild
deleted file mode 100644
index d33b983c63a9..000000000000
--- a/net-fs/cifs-utils/cifs-utils-6.11.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info multilib pam
-
-DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
-HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils"
-SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
-IUSE="+acl +ads +caps creds pam systemd"
-
-RDEPEND="
-	!net-fs/mount-cifs
-	sys-apps/keyutils:=
-	ads? (
-		sys-libs/talloc
-		virtual/krb5
-	)
-	caps? ( sys-libs/libcap-ng )
-	pam? ( sys-libs/pam )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-python/docutils"
-PDEPEND="
-	acl? ( >=net-fs/samba-4.0.0_alpha1 )
-"
-
-REQUIRED_USE="acl? ( ads )"
-
-DOCS="doc/linux-cifs-client-guide.odt"
-
-PATCHES=( "${FILESDIR}/${PN}-6.10-ln_in_destdir.patch" )
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
-		ewarn "You must enable CIFS support in your kernel config, "
-		ewarn "to be able to mount samba shares. You can find it at"
-		ewarn
-		ewarn "  File systems"
-		ewarn "	Network File Systems"
-		ewarn "			CIFS support"
-		ewarn
-		ewarn "and recompile your kernel ..."
-	fi
-}
-
-src_prepare() {
-	default
-
-	if has_version app-crypt/heimdal ; then
-		# https://bugs.gentoo.org/612584
-		eapply "${FILESDIR}/${PN}-6.7-heimdal.patch"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-man
-		--enable-smbinfo
-		$(use_enable acl cifsacl cifsidmap)
-		$(use_enable ads cifsupcall)
-		$(use_with caps libcap)
-		$(use_enable creds cifscreds)
-		$(use_enable pam)
-		$(use_with pam pamdir $(getpam_mod_dir))
-		# mount.cifs can get passwords from systemd
-		$(use_enable systemd)
-	)
-	ROOTSBINDIR="${EPREFIX}"/sbin \
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# remove empty directories
-	find "${ED}" -type d -empty -delete || die
-
-	if use acl ; then
-		dodir /etc/cifs-utils
-		dosym ../../usr/$(get_libdir)/cifs-utils/idmapwb.so \
-			/etc/cifs-utils/idmap-plugin
-		dodir /etc/request-key.d
-		echo 'create cifs.idmap * * /usr/sbin/cifs.idmap %k' \
-			> "${ED}/etc/request-key.d/cifs.idmap.conf"
-	fi
-
-	if use ads ; then
-		dodir /etc/request-key.d
-		echo 'create dns_resolver * * /usr/sbin/cifs.upcall %k' \
-			> "${ED}/etc/request-key.d/cifs.upcall.conf"
-		echo 'create cifs.spnego * * /usr/sbin/cifs.upcall %k' \
-			> "${ED}/etc/request-key.d/cifs.spnego.conf"
-	fi
-
-	dobashcomp bash-completion/smbinfo
-}
-
-pkg_postinst() {
-	# Inform about set-user-ID bit of mount.cifs
-	ewarn "setuid use flag was dropped due to multiple security implications"
-	ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586"
-	ewarn "You are free to set setuid flags by yourself"
-
-	# Inform about upcall usage
-	if use acl ; then
-		einfo "The cifs.idmap utility has been enabled by creating the"
-		einfo "configuration file /etc/request-key.d/cifs.idmap.conf"
-		einfo "This enables you to get and set CIFS acls."
-	fi
-
-	if use ads ; then
-		einfo "The cifs.upcall utility has been enabled by creating the"
-		einfo "configuration file /etc/request-key.d/cifs.upcall.conf"
-		einfo "This enables you to mount DFS shares."
-	fi
-}
diff --git a/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild
index 1e022fd166e3..559bfa43ea7c 100644
--- a/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${P}-kerberos_mount_regression_f
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="+acl +ads +caps creds pam systemd"
 
 RDEPEND="
diff --git a/net-fs/cifs-utils/files/cifs-utils-6.10-ln_in_destdir.patch b/net-fs/cifs-utils/files/cifs-utils-6.10-ln_in_destdir.patch
deleted file mode 100644
index 6952d72cf5c4..000000000000
--- a/net-fs/cifs-utils/files/cifs-utils-6.10-ln_in_destdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix sandbox violation caused by calling ln in /sbin instead of $(DESTDIR)/sbin
-
-Also fixed an inverted race condition when installing with MAKEOPTS="-j1"
-
-jer found this:
-  install-root_sbinPROGRAMS is called from install-data-am but
-  install-exec-hook is called from install-exec-am
-
-So moving the failing ln call into install-data-hook for now...
-
---- cifs-utils-6.10/Makefile.am
-+++ cifs-utils-6.10/Makefile.am
-@@ -118,11 +118,9 @@
- 
- SUBDIRS = contrib
- 
--install-exec-hook:
--	(cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3)
--
- install-data-hook:
--	(cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8)
-+	(cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3)
-+	(cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8)
- 
- uninstall-hook:
- 	(cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3)
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index 9e9e2c4dd328..b6b8ad73787c 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -3,6 +3,6 @@ AUX cvmfs-2.7.2-find-package.patch 1412 BLAKE2B c66a614a1aa7451ecac2cceb892c370d
 AUX cvmfs-2.7.2-xattr.patch 717 BLAKE2B 48d595b0219b62a3ac45e46d51e3910d6124edc89669ae8996a49e95331bf9d32b4f1eec8c6df76f6906594c3da4a89665b6457d3aef9dea96d2af3959c5780e SHA512 9be285da46f52d59ef28f666bee2b0b372d76cbb786f225a533239ac7683fdef6092aaa7d62458a89bc647598e12611f025060c37c0539071feac71b262e57a0
 DIST cvmfs-2.7.3.tar.gz 43123803 BLAKE2B 39d11f9dd69e36897c501bd4b24c01a13fc351d1251cd9a7965fe46ddf0c8128c3c976bb747d477d5d5231aeef09cad38337bb28c343c1d7bfbd915af02119cb SHA512 94940a09a713c14f776914b74bbec8794637b98b42ffcbab36e3455c0ea83219ae6f0eebaf41a62d1abf05134aada0abfd521dec793b2fec015458b80f387bfd
 DIST cvmfs-2.8.1.tar.gz 44117247 BLAKE2B 3505747833779463df79e40c03359c8458d51d2e4635ce6bc7ac080112ca4e81ca914dc6866afc28094e656acf8e3051749ec278e00b8357a50dd530fc2b65be SHA512 3ca4a45e24e06e4ea46a708b3e47fafc4c6eae172c296b091c8d0fb6b2d21c64d4b8975baf7f055101a9d68ada1e3082e7ec808da3fdaf68b5a3a3b5c4ed7731
-EBUILD cvmfs-2.7.3.ebuild 2180 BLAKE2B 4967b1845bfc9a135fc64bf5ecf0410fa641eb08ac5ab557dae87b8cd31adaa7ebabb032b082b590125a162bba4a082fd66d13ebcb28686a18e9f2c838a906de SHA512 009048bca99ce7bca85e563bbb3b5c4879127a0cbf147f11c6a03ab610e669c80ab56e06a416b30a73c657a16c102d98fc018016222bbacf6e4841bd00d3020f
-EBUILD cvmfs-2.8.1.ebuild 2351 BLAKE2B cd500904909ae9ea91cbf56f06956570e580ae2623b9fc019003946a3f52a8ac6696fd9343b1d8ee3efc78bc83366ec81f49d0d90f2113774eef132ebeca34f3 SHA512 a55e7e2d2282430a90549e82be9bf7154360600d0e8e5fdc134b8570a56bf2382ab1000daccf80f687352e0eae98087d2e205e47499355957cb7df9343d0c1a0
+EBUILD cvmfs-2.7.3-r1.ebuild 2186 BLAKE2B 6232ad5193daa5a0f89667f7c22b634127955816e2f22f1e0fa699b0903af2d90f895deccc5c8fd6285e0a5bbdb94d7ee84b7bee612c6b29ee4ee6cc76ad5bc9 SHA512 b261bf73106355c3048b218e1e0664995766b2fdc4f74102db95d18182915279fd8909396272259c0235c9895a94ed47a320b7ee8547326b47b121f358d62ab7
+EBUILD cvmfs-2.8.1-r1.ebuild 2357 BLAKE2B 05c4bcb0d895ba56e436140149d8f1ffca43c20cf76acdc4303fa6cb99d39aac6a074d3600ec000d5a77ae7a21b89d268bf665cac5388aa10bbc254aee243672 SHA512 742fe39ba2c859924c79e57b0fc6c26301bc8f3e106902e09d0b07608d51c1ab7badb7ee4142394b8c5a3c6c15f63682bec09dca93827073ada63649167d0e03
 MISC metadata.xml 1445 BLAKE2B 05a946a662c2f55cf57a50a88e698769e9e930f197880afaa8a81b51d2a6bb36c7e83061635992729c187e07463fc2914a214d7bf66279cd892835bebe971c73 SHA512 ee20a97ff26790a2cecfa28f0be7afdac3eda4a0aaade4cea4cb5d6c500d7634a2bb086dc0271189c50707deabc3c8882abfa25e959770976bf1196476b6aae9
diff --git a/net-fs/cvmfs/cvmfs-2.7.3-r1.ebuild b/net-fs/cvmfs/cvmfs-2.7.3-r1.ebuild
new file mode 100644
index 000000000000..877a5371c7f2
--- /dev/null
+++ b/net-fs/cvmfs/cvmfs-2.7.3-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info bash-completion-r1
+
+DESCRIPTION="HTTP read-only file system for distributing software"
+HOMEPAGE="https://cernvm.cern.ch/fs/"
+SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="amd64 x86"
+IUSE="doc server"
+
+CDEPEND="
+	acct-group/cvmfs
+	acct-user/cvmfs
+	app-arch/libarchive
+	dev-cpp/gtest
+	dev-cpp/sparsehash
+	dev-db/sqlite:3=
+	<dev-libs/leveldb-1.23:0=
+	dev-libs/openssl:0=
+	dev-libs/protobuf:0=
+	net-dns/c-ares:0=
+	net-libs/pacparser:0=
+	net-misc/curl:0[adns]
+	sys-apps/attr
+	sys-fs/fuse:0=
+	sys-fs/fuse:3=
+	sys-libs/libcap:0=
+	sys-libs/zlib:0=
+"
+
+RDEPEND="${CDEPEND}
+	app-admin/sudo
+	net-fs/autofs
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+"
+
+pkg_setup() {
+	if use server; then
+		CONFIG_CHECK="~OVERLAY_FS"
+		ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.7.2-builtins.patch"
+	cmake_src_prepare
+	# gentoo stuff
+	rm bootstrap.sh || die
+	sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" cvmfs/cvmfs_config || die
+	sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
+		CMakeLists.txt || die
+	eapply_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILTIN_EXTERNALS=OFF
+		-DBUILD_CVMFS=ON
+		-DBUILD_LIBCVMFS=OFF # static library used only for development
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_GEOAPI=OFF # only used for stratum 1 servers
+		-DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs
+		-DBUILD_PRELOADER=OFF # special purpose utility for HPCs
+		-DBUILD_RECEIVER=OFF # for distributed publishers only
+		-DBUILD_SERVER=$(usex server)
+		-DINSTALL_BASH_COMPLETION=OFF
+		-DINSTALL_MOUNT_SCRIPTS=ON
+		-DINSTALL_PUBLIC_KEYS=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs
+	dodoc doc/*.md
+}
+
+pkg_config() {
+	einfo "Setting up CernVM-FS client"
+	cvmfs_config setup
+	einfo "Now edit ${EROOT}/etc/cvmfs/default.local"
+	einfo "and restart the autofs service"
+}
diff --git a/net-fs/cvmfs/cvmfs-2.7.3.ebuild b/net-fs/cvmfs/cvmfs-2.7.3.ebuild
deleted file mode 100644
index f52b8b8ddfe0..000000000000
--- a/net-fs/cvmfs/cvmfs-2.7.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info bash-completion-r1
-
-DESCRIPTION="HTTP read-only file system for distributing software"
-HOMEPAGE="https://cernvm.cern.ch/fs/"
-SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE="doc server"
-
-CDEPEND="
-	acct-group/cvmfs
-	acct-user/cvmfs
-	app-arch/libarchive
-	dev-cpp/gtest
-	dev-cpp/sparsehash
-	dev-db/sqlite:3=
-	dev-libs/leveldb:0=
-	dev-libs/openssl:0=
-	dev-libs/protobuf:0=
-	net-dns/c-ares:0=
-	net-libs/pacparser:0=
-	net-misc/curl:0[adns]
-	sys-apps/attr
-	sys-fs/fuse:0=
-	sys-fs/fuse:3=
-	sys-libs/libcap:0=
-	sys-libs/zlib:0=
-"
-
-RDEPEND="${CDEPEND}
-	app-admin/sudo
-	net-fs/autofs
-"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-"
-
-pkg_setup() {
-	if use server; then
-		CONFIG_CHECK="~OVERLAY_FS"
-		ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.7.2-builtins.patch"
-	cmake_src_prepare
-	# gentoo stuff
-	rm bootstrap.sh || die
-	sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" cvmfs/cvmfs_config || die
-	sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
-		CMakeLists.txt || die
-	eapply_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILTIN_EXTERNALS=OFF
-		-DBUILD_CVMFS=ON
-		-DBUILD_LIBCVMFS=OFF # static library used only for development
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_GEOAPI=OFF # only used for stratum 1 servers
-		-DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs
-		-DBUILD_PRELOADER=OFF # special purpose utility for HPCs
-		-DBUILD_RECEIVER=OFF # for distributed publishers only
-		-DBUILD_SERVER=$(usex server)
-		-DINSTALL_BASH_COMPLETION=OFF
-		-DINSTALL_MOUNT_SCRIPTS=ON
-		-DINSTALL_PUBLIC_KEYS=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs
-	dodoc doc/*.md
-}
-
-pkg_config() {
-	einfo "Setting up CernVM-FS client"
-	cvmfs_config setup
-	einfo "Now edit ${EROOT}/etc/cvmfs/default.local"
-	einfo "and restart the autofs service"
-}
diff --git a/net-fs/cvmfs/cvmfs-2.8.1-r1.ebuild b/net-fs/cvmfs/cvmfs-2.8.1-r1.ebuild
new file mode 100644
index 000000000000..294027c7e2b8
--- /dev/null
+++ b/net-fs/cvmfs/cvmfs-2.8.1-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info bash-completion-r1
+
+DESCRIPTION="HTTP read-only file system for distributing software"
+HOMEPAGE="https://cernvm.cern.ch/fs/"
+SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="server"
+
+CDEPEND="
+	acct-group/cvmfs
+	acct-user/cvmfs
+	app-arch/libarchive
+	dev-cpp/gtest
+	dev-cpp/sparsehash
+	dev-db/sqlite:3=
+	<dev-libs/leveldb-1.23:0=
+	dev-libs/openssl:0=
+	dev-libs/protobuf:0=
+	net-dns/c-ares:0=
+	net-libs/pacparser:0=
+	net-misc/curl:0[adns]
+	sys-apps/attr
+	sys-fs/fuse:0=
+	sys-fs/fuse:3=
+	sys-libs/libcap:0=
+	sys-libs/zlib:0=
+"
+
+RDEPEND="${CDEPEND}
+	app-admin/sudo
+	net-fs/autofs
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-2.7.2-builtins.patch
+		"${FILESDIR}"/${PN}-2.7.2-find-package.patch
+		"${FILESDIR}"/${PN}-2.7.2-xattr.patch
+)
+
+pkg_setup() {
+	if use server; then
+		CONFIG_CHECK="~OVERLAY_FS"
+		ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	# gentoo stuff
+	rm bootstrap.sh || die
+	sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" cvmfs/cvmfs_config || die
+	sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
+		CMakeLists.txt || die
+	eapply_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILTIN_EXTERNALS=OFF
+		-DBUILD_CVMFS=ON
+		-DBUILD_LIBCVMFS=OFF # static library used only for development
+		-DBUILD_DOCUMENTATION=OFF
+		-DBUILD_GEOAPI=OFF # only used for stratum 1 servers
+		-DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs
+		-DBUILD_PRELOADER=OFF # special purpose utility for HPCs
+		-DBUILD_RECEIVER=OFF # for distributed publishers only
+		-DBUILD_SERVER=$(usex server)
+		-DINSTALL_BASH_COMPLETION=OFF
+		-DINSTALL_MOUNT_SCRIPTS=ON
+		-DINSTALL_PUBLIC_KEYS=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs_config
+	bashcomp_alias cvmfs_config cvmfs_server
+	dodoc doc/*.md
+	keepdir /var/lib/cvmfs
+	use server && keepdir /var/lib/cvmfs-server
+}
+
+pkg_config() {
+	einfo "Setting up CernVM-FS client"
+	cvmfs_config setup
+	einfo "Now edit ${EROOT}/etc/cvmfs/default.local"
+	einfo "and restart the autofs service"
+}
diff --git a/net-fs/cvmfs/cvmfs-2.8.1.ebuild b/net-fs/cvmfs/cvmfs-2.8.1.ebuild
deleted file mode 100644
index f1aa0fc16ee5..000000000000
--- a/net-fs/cvmfs/cvmfs-2.8.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info bash-completion-r1
-
-DESCRIPTION="HTTP read-only file system for distributing software"
-HOMEPAGE="https://cernvm.cern.ch/fs/"
-SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="server"
-
-CDEPEND="
-	acct-group/cvmfs
-	acct-user/cvmfs
-	app-arch/libarchive
-	dev-cpp/gtest
-	dev-cpp/sparsehash
-	dev-db/sqlite:3=
-	dev-libs/leveldb:0=
-	dev-libs/openssl:0=
-	dev-libs/protobuf:0=
-	net-dns/c-ares:0=
-	net-libs/pacparser:0=
-	net-misc/curl:0[adns]
-	sys-apps/attr
-	sys-fs/fuse:0=
-	sys-fs/fuse:3=
-	sys-libs/libcap:0=
-	sys-libs/zlib:0=
-"
-
-RDEPEND="${CDEPEND}
-	app-admin/sudo
-	net-fs/autofs
-"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-		"${FILESDIR}"/${PN}-2.7.2-builtins.patch
-		"${FILESDIR}"/${PN}-2.7.2-find-package.patch
-		"${FILESDIR}"/${PN}-2.7.2-xattr.patch
-)
-
-pkg_setup() {
-	if use server; then
-		CONFIG_CHECK="~OVERLAY_FS"
-		ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	# gentoo stuff
-	rm bootstrap.sh || die
-	sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" cvmfs/cvmfs_config || die
-	sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
-		CMakeLists.txt || die
-	eapply_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILTIN_EXTERNALS=OFF
-		-DBUILD_CVMFS=ON
-		-DBUILD_LIBCVMFS=OFF # static library used only for development
-		-DBUILD_DOCUMENTATION=OFF
-		-DBUILD_GEOAPI=OFF # only used for stratum 1 servers
-		-DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs
-		-DBUILD_PRELOADER=OFF # special purpose utility for HPCs
-		-DBUILD_RECEIVER=OFF # for distributed publishers only
-		-DBUILD_SERVER=$(usex server)
-		-DINSTALL_BASH_COMPLETION=OFF
-		-DINSTALL_MOUNT_SCRIPTS=ON
-		-DINSTALL_PUBLIC_KEYS=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs_config
-	bashcomp_alias cvmfs_config cvmfs_server
-	dodoc doc/*.md
-	keepdir /var/lib/cvmfs
-	use server && keepdir /var/lib/cvmfs-server
-}
-
-pkg_config() {
-	einfo "Setting up CernVM-FS client"
-	cvmfs_config setup
-	einfo "Now edit ${EROOT}/etc/cvmfs/default.local"
-	einfo "and restart the autofs service"
-}
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index dbe67543e8a0..97b7af97bbad 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,5 +1,5 @@
 DIST openafs-1.8.7-doc.tar.bz2 3808045 BLAKE2B 8ded75239dd59633297ee4208a0f3f018486b5b5b71fda91229583fd2d6a7743bbbeba280e61ff91d602617fc47944105b06a5c0610b0c89c808ecba38af7f9c SHA512 6d087320ab6681686b6afb78621b21eaec26b91dbd03a13df447ad9f0ce897332ac378b38bf1abc590575d82d8cb22757249e60a2407e4ad498d46c083632e0d
 DIST openafs-1.8.7-src.tar.bz2 15059909 BLAKE2B 89aacc48100d3eabbec45acca3911fbd823c029a30e79ad16564dcc3646b9bbadb60a528f142fc907de0d4eb2831d922d8146cdba72c02f4e8db9ab806c84d86 SHA512 12d5aa9177dde10e504f71b4b1ae19be0b0c52e8031e0f5afacce4a2c3f2321970af65591edab6145f7400f6276acd7e8624aa66e816d2394324e2ef5c403c01
 DIST openafs-patches-20210116.tar.xz 67300 BLAKE2B aaafa197d1be1e9d89685fe5193a4682ea9e5e5c1c3227963a97ca7a98e6ab5e855ee65d615a31162559b30ae5867fde6ceeec1055af1a375e73b9fa25654de5 SHA512 06e9e1b65fceda34a197556aba1a05eabb630723fc17c5060d5e2a054e60ab8c5195d5c80eff3d3444bcdca40b7115da9143f5b8100659061446038ad4a79007
-EBUILD openafs-1.8.7.ebuild 10940 BLAKE2B a55b36df8385f92ecfee7a4cb3fe12a570ff0d0a8e7cca6e8c8cba761fe97fa4a98bedc07d7df921e1e70e98ade495cb2565310872007061f3ea310a08f9c6a3 SHA512 f71a7e2a462884d4d2f7e01bfbecfdbb7cae5e05862f1675aa3f5be8a765e7a78cc41373a2be78affb96872080cd87c17bad23ff1ab157f38f69cedfe2df9e66
+EBUILD openafs-1.8.7.ebuild 10947 BLAKE2B 77eabe0d6ca7ac9afbc91cedf3b9ca02bfa8e8210bfdccfce81a3a310979d69d576947031ac8e55d220141ee3317b61c1e08f104495b97e2bb0df23750236990 SHA512 e0e647b65144e6bd3e168ccc697d437c73238908c2179a2c2d4ede58e2ea70f2e2b0fe7ba29dc89737c78adf3d914d06143e8441fc1c32bb1400c0a38e70bb15
 MISC metadata.xml 1433 BLAKE2B 417077a1f2c0bccd21b27abe12b2fad7d0e9153e2373ff9a8cd7ecf9d2ef6758f5329319e6190f50718669ed69e79100834979073eac2a2d463b1c07ad8f0267 SHA512 fef8a8b5ff956729b3a43b39c93a95c1b587e85d5031cf6f7aa4e610b75dc63bd93552b359e8e2b19234d801d80daf08f3f162c2a9ce5fe195b5449e1be2dc96
diff --git a/net-fs/openafs/openafs-1.8.7.ebuild b/net-fs/openafs/openafs-1.8.7.ebuild
index 192afc599d78..f2f6237fddcc 100644
--- a/net-fs/openafs/openafs-1.8.7.ebuild
+++ b/net-fs/openafs/openafs-1.8.7.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 -riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei
 ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write"
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index e0b76acd9d96..a6bebb2b81d1 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -6,9 +6,11 @@ AUX samba.conf 88 BLAKE2B 5bf3391fdf31b284bfa68b904370776d2e5b14fe0ce5677b4982b5
 DIST samba-4.13.10.tar.gz 18450805 BLAKE2B 3e9e1c951efe45b1954428c479aefc715b1fff6264d3735873710ca35a6b28320dd82a21e6abb5d75d500dc93514730f88907f51c601b68dceb1261b13163bf2 SHA512 dc4ad2dabc630575150d7b6db7818cd62827bdd9cc955c856bf0ba1684a1258d6306acd6e373aff1893255ad42d97fe8bf67c6fc30c5cffb1624fbfe4a238865
 DIST samba-4.13.9.tar.gz 18443813 BLAKE2B 24046586f666e9db02e1dd71d7eb854691f39e6b575b9652a8b7c1aa5569c856dfd48911e3f221de74f9deec5808152fa2836d03bb9810d55d4f526f1567574b SHA512 35c98979c1141fe4bd700e3c8f2439ec08876697faeaced6668ea6a9fea1d8303ca34e82123499aa4a41054b9ed6e1260ae779ea8d59978ba6de6b5861f21948
 DIST samba-4.14.6.tar.gz 18661572 BLAKE2B d3bd9ba13c89afab1a2d119cbd0488240802710b24c6f681ba962804c6f5097003ed939da8747582aab710405f09ca90eded06eeddd3dd42a5aaa2a99be6be1b SHA512 0ce3f46b2693daa27656fe9a04925cbe7dd398342cab352f0422a350eb9f91d1ea6d64fb18d04010b93fb3c0b9fe6434b23deb1f26018bd1f9bdc1b0f97beca2
+DIST samba-4.14.7.tar.gz 18668592 BLAKE2B 3cd8c806c6af85eecafa93ba10562544815f3d73aaa6152774d2443971e8c46e4c12c3097f82d04d1560410e796d60d681ce6b1a637a09f0262b39a1fe28cbea SHA512 155621b44232f696f389b8e01fd7d8a5ef8d4aa6b3de54090589268cf377c09714715a05e6198ee7e168ead71c08b5b20cd63a71811ef7d9bc9746c0d05ae9a6
 DIST samba-4.15.0rc2.tar.gz 19124041 BLAKE2B dbb9048ef76472c3f5533a4600a399ceb75c6804a7dbd4903f1633418ae9b6d68f10b7df94f8cdb4037208a29fbd6d160c11703121d7dbe42b80ddc00d280fbc SHA512 9adf0add0739c05e2dc302a55dcfff53c8a57a1065435c6fd4e6c7455538129a9199e97fba18910a670d182f35e3cafbb5d31834ddb2adf30eb7daacc8739de2
 EBUILD samba-4.13.10-r1.ebuild 9949 BLAKE2B ea390ab7ebf754f13df802bd7cafec9e225007ed17ff9141119b3dad161db3405e56d49797e727cbf8a4ae0077f53db28f1d459f75ba59198585ef103a3beab9 SHA512 ee3d5d92a99ff087a728432ff5033163ed6513f70cf27ddfe891c46f3614318089cbf4c65d62b029f46a8b26de9544e39d65f5d99a885e0e2289e0a0366a0d8e
 EBUILD samba-4.13.9-r2.ebuild 9942 BLAKE2B 7bee9ff108d961c7974c3605cfeb5d9c58094b379079bfae49b7c6623bc3bcc0ae6e6ec698d190e4ef96a1948b514e3aa3dc6f4e6bc1fb63a5b9535e2de452ab SHA512 a79bcfd3bf0a4576bcc31468ccad7c73a59bb921e40641f23f4fbf2267ca0ee48967279141b7ae24283df730cda43be00f59a374565b30045a38567936f75081
 EBUILD samba-4.14.6-r1.ebuild 10069 BLAKE2B 612013a18e68bb9490337e0a1a5667a2943a6bc143b9a41ac166f20985a20c3f86fa12bafd9ea3fd09ab658fda9b56d479c548f222f9412151de1495833bf1dc SHA512 252b22eea885f102d0c76021a333bd724376e0850ff8783a39f87d16f6e87b664c6fc772918849a173f1106333a193cbc0b66a503239b6c223be64f1b6727206
+EBUILD samba-4.14.7.ebuild 10069 BLAKE2B 612013a18e68bb9490337e0a1a5667a2943a6bc143b9a41ac166f20985a20c3f86fa12bafd9ea3fd09ab658fda9b56d479c548f222f9412151de1495833bf1dc SHA512 252b22eea885f102d0c76021a333bd724376e0850ff8783a39f87d16f6e87b664c6fc772918849a173f1106333a193cbc0b66a503239b6c223be64f1b6727206
 EBUILD samba-4.15.0_rc2.ebuild 9929 BLAKE2B 1ccd2656c7658a2df6c629f0775e1042d486389f2f3ef59f7f7391b7e8f2d4834d9643ea974abe43f88cb1862a299218f4479ff89eaa27458842c08e4f8819ec SHA512 534f6c04fed2f6b8e73a183dcd4d434a77deed0a1e8446e4092807e280efc717eeeb08dc701da28de000523c6d78c445a93c2b1014e990ff2997e1c83f85287b
 MISC metadata.xml 2165 BLAKE2B 5fa428c3ddb3f45073923778fc80ca4d62090232b9bb6bcfdd0a16a6c4c51304794db41359c17b6ba9492b30dba0f42ff7ada6c8a30c5df80e83e748d8009ee9 SHA512 8723f3a16210e8da11eb1d3ea8142bff3deeaecc44c62da68a789b5364bf3456aef65794b205d24cc41eff7ba03fffd38266aea2dd1883eff5c9ca305d2032ed
diff --git a/net-fs/samba/samba-4.14.7.ebuild b/net-fs/samba/samba-4.14.7.ebuild
new file mode 100644
index 000000000000..52f211eaa846
--- /dev/null
+++ b/net-fs/samba/samba-4.14.7.ebuild
@@ -0,0 +1,339 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( python json winbind )
+	addns? ( python )
+	ads? ( acl ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	ntvfs? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep "
+		addc? (
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			dev-python/markdown[\${PYTHON_USEDEP}]
+		)
+		addns? (
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	")
+	!alpha? ( !sparc? ( !riscv? ( sys-libs/libunwind:= ) ) )
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	spotlight? ( dev-libs/glib )
+	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	## ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with ntvfs ntvfs-fileserver)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process samba.conf
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Be aware that this release contains the best of all of Samba's"
+		elog "technology parts, both a file server (that you can reasonably expect"
+		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
+		elog "controller work previously known as 'samba4'."
+		elog
+	fi
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index d2abb5c615c8..e256ae6161e0 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index 564be75b3280..dcc6e7f0b9ee 100644
--- a/net-ftp/ftpbase/Manifest
+++ b/net-ftp/ftpbase/Manifest
@@ -1,7 +1,5 @@
-AUX ftp-pamd 700 BLAKE2B c867c659cac367c51021504dd4da0a9dc90609564613f580a0a01a94d2a87d0df903f22486561f23722901df4df06a33d7d7b643ffa4562cf426f2058391d887 SHA512 61aceee28610cb7a6989fca0ee82702df1118dd2e964bb26fe5cfcb508250599e9e1cdb9aa5dfb61df9c5fef25af4334a87d5f1f4065f693193912dfe172bb68
 AUX ftp-pamd-include 632 BLAKE2B 28aa913499698f136e784e8ed420748fe1415d0ddeb64761b8ed71b869e4b9afb6b86df4b8a8a748ec3a740d99c000fcc4789ee45c3a302f81ffbaab07c7e106 SHA512 adc59c544b815bd88b7e91a43cb5620008d1f83d15a08620f56242d74991ba413e56b31bcca8e5fcfe71f05362bbad89b02d5289260f08649d38965c8951ec76
 AUX ftp.service 278 BLAKE2B 8c0c636297d60c3d9fb8baaf9e3a9d545fbe56a6a6031c50fa202292fcf747a4c14621a8e34529617c5b3f0d1a89d5c151f1c90cc8e5f1af5d85b9c85194f3e3 SHA512 fcba0f31adf681bc67ce206dcabcd94486ecafdf96c348ec9ef3597f6f040a99e20a00db9757d5f077105e5fcb9183291585568b7edb0676ef9d522be56f6d6e
 AUX ftpusers 300 BLAKE2B 02489b8eed29bfd4cea148b1b4214ac5ba798faa44da1be68cea06c18680e44f0054c952107810e4a199398b6ba382c649a481cf9d7388cd5caa10ace50e06d3 SHA512 29a8bdca1a6bb516c5189e6c69969cba3c220ea878e352e78bb6ea5cb2ac7476306736240155dc6d3f7512aac48164354db68721ea952d1010639e8ae14635e0
-EBUILD ftpbase-0.01-r4.ebuild 738 BLAKE2B 270a30abcd61bd75664da4a1ead38bff0eb60d0ecf23b6e7cbca43858cfb531709e7fa2f8224faaa8cf4522c534d293b90642266debfcb66cd72608f2b771afa SHA512 02ea902cc72ca5cad4d110f4e7027b495e5f5fa40ac6c4845c76fb04995975f82b20fcc55569f1b5d4976c85c0f08c12c0d18d90fa04b11854540ca717651f3b
-EBUILD ftpbase-0.01-r5.ebuild 792 BLAKE2B b6dd31b522adb103ff5c96a5b352de8c0f3a1ca5727dd900a2f763672dbbac84a1378309daad5faf208b1bdb0b3300ce83044078aafcfbdd483bb8dcb15eb860 SHA512 a14d90e70852ef606a189324dc568fd32da09393b4ecc0aa6a289d973053cc7f7d6c38330df47af796b02c629b46a79c092d7a2e3564fab5877d078c44adaf29
+EBUILD ftpbase-0.01-r5.ebuild 786 BLAKE2B 3208bcdf8bc46159e0bec215cc6704d1787e53d38b6d45bf2382d66d46afdc7c4c1088fbfa039fc57ab41423db86a0391284e907e0db7d8dd56adc4d85128ab9 SHA512 2ac80f73e0c40e5c3945a1c8c9c5ded69f59a93bdd16871dc499a841c9e02e9e3859092fb2c668ad7e22ffa41b09239b83b76e97fca4a0d44128485a555528d0
 MISC metadata.xml 380 BLAKE2B 277dc1c8940d7a57eeec5466fb008bc1833f97e5446b46012d3d3c2727711e019ce96bf374cdafb9507e3f8d1a0d3dcdad897400c2e39f5deab1c4ac03440af7 SHA512 f563d7650ab3cca05eb8d855105b300961dc4e8af03b29598d4b14986b9729eeefdf54cd56a4175966ec4e362ce8d45532d28fad63c1e03d9df9dca139b1bcd5
diff --git a/net-ftp/ftpbase/files/ftp-pamd b/net-ftp/ftpbase/files/ftp-pamd
deleted file mode 100644
index 34b7912a0b48..000000000000
--- a/net-ftp/ftpbase/files/ftp-pamd
+++ /dev/null
@@ -1,17 +0,0 @@
-# Provided by ftpbase (dont remove this line!)
-# Standard pam.d file for ftp service packages.
-
-auth     required   pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed
-auth     required   pam_stack.so service=system-auth
-
-# If this is enabled, anonymous logins will fail because the 'ftp' user does
-# not have a "valid" shell, as listed in /etc/shells.
-#
-# If you enable this, it is recommended that you do *not* give the 'ftp'
-# user a real shell. Instead, give the 'ftp' user /bin/false for a shell and
-# add /bin/false to /etc/shells.
-# auth     required   pam_shells.so
-
-account  required   pam_stack.so service=system-auth
-
-session  required   pam_stack.so service=system-auth
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild
deleted file mode 100644
index dc3a2253a339..000000000000
--- a/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam
-
-DESCRIPTION="FTP layout package"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="pam"
-
-DEPEND="pam? ( sys-libs/pam )
-	!<net-ftp/proftpd-1.2.10-r6
-	!<net-ftp/pure-ftpd-1.0.20-r2
-	!<net-ftp/vsftpd-2.0.3-r1"
-RDEPEND="
-	acct-group/ftp
-	acct-user/ftp"
-
-S=${WORKDIR}
-
-src_install() {
-	# The ftpusers file is a list of people who are NOT allowed
-	# to use the ftp service.
-	insinto /etc
-	doins "${FILESDIR}/ftpusers"
-
-	if use pam; then
-		newpamd "${FILESDIR}"/ftp-pamd-include ftp
-	fi
-}
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r5.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r5.ebuild
index 526756b0ee02..4f85c63eb8e2 100644
--- a/net-ftp/ftpbase/ftpbase-0.01-r5.ebuild
+++ b/net-ftp/ftpbase/ftpbase-0.01-r5.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="pam zeroconf"
 
 DEPEND="
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 97cf99e35955..ec2c5edd42e7 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/minbif/Manifest b/net-im/minbif/Manifest
deleted file mode 100644
index 550c5c5b7888..000000000000
--- a/net-im/minbif/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX minbif-1.0.5-gcc47.patch 1835 BLAKE2B 80c5dc8d703e13d7754564cb8e69fba612cf08b376de698cbff780e88a691c6e6e2a9b0f41eac387409eb185456bbdcce134b0f76e5cf05fa882d946dd2e50c0 SHA512 673d82b856af74b16ec5e9db8e5d17521e07369fc8f34902bd72ee1d630ebd13b47de308d4591091029cfed37eaca8146b762185c5761a245acf82e3546b9b88
-AUX minbif-1.0.5-glib-single-includes.patch 754 BLAKE2B f353f751d4ebd60ab525b6e437bfd12132cc665e24af7affd48c36be78031885523c5d7cc76b99c07fc449f8fab0e7406a3c8fba39027b66a534477cdbfe8f46 SHA512 fd7c27d1e171aa1e321e82f5e41e6908109101b52519dcad32a9107d14c95b0664dcf7d6ed1969dfce7397976712a6f094966bb06e36ff21fa0c75fe6d86ea91
-AUX minbif-1.0.5-rename-imlib-load-error.patch 469 BLAKE2B 9e2937261de7ab8ea2838e0f4b33c0cddfd0fc1da4035c24a6b2df376f24b46039cb9186c855541a5636581aa3fb28dd7fa0271113f6780c807e9cf75cad4a1c SHA512 5cfa90fe70a4f2f45967b928d1062ab10d45aa6f7dcd4dd1575abb66047984977482ec8943481cc3344cc172292ea81b33f639baefb771aa181b10ea5f740344
-AUX minbif.initd 457 BLAKE2B e10c892d4002b1570a298282134cf6a25a65fdb0ea7689affa5a1f9ab92ea76428bbf4bd1de65fb40baa2f26df7bd7bec3f1a0a7f9e710189d846d2cdbf4c63e SHA512 f845120e70b96fc307e5ba5e2fc439713da0040b87fa1cdfd2ea38707c47260381004f5d98ddc08b738a1c928335c0b807ecc09b4d3a3e0dec240cab3e6ff7b7
-DIST minbif-1.0.5.tar.gz 176039 BLAKE2B 195af3dbb45f0c2b6499fd440c4ffc637d7e4e723879282a4914538d562c2833f30ae562098ebc5c47ac694b37f558984e599cb3701d6b1af6256db32ad91152 SHA512 e84c6f38ad35a660f9c319b702ae5743cece167c8e116976a9ca0caf527ad23ea17ea8f518f9bd76536e87283362d2087201a5307128740fc7f05dccabacfbcd
-EBUILD minbif-1.0.5-r3.ebuild 1638 BLAKE2B 6f2a9df463cf7d1893fb2605c32c443add879669ed3e50472ddb0d5f711b7eba6d964cf457e4447efea06fcba52a7821f15b22557cd5e453c9a41f0d293f8570 SHA512 098b6e0ae1f4196cdd2ddf65d841900704b1cdb1062ee0f246283897c82973a5eff0580009cfc764f710d0fa17f53c0dd81e0beff46367f751379e2eef2b72d1
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-im/minbif/files/minbif-1.0.5-gcc47.patch b/net-im/minbif/files/minbif-1.0.5-gcc47.patch
deleted file mode 100644
index 8566406a318f..000000000000
--- a/net-im/minbif/files/minbif-1.0.5-gcc47.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-commit fe71fd989a4501c77314b2906756f4e9a328ff31
-Author: Romain Bignon <romain@symlink.me>
-Date:   Tue May 8 16:46:35 2012 +0200
-
-    fixes for gcc 4.7
-
---- a/src/im/account.cpp
-+++ b/src/im/account.cpp
-@@ -18,6 +18,7 @@
- 
- #include <cassert>
- #include <cstring>
-+#include <unistd.h>
- #ifdef HAVE_IMLIB
- 	#include <Imlib2.h>
- #endif /* HAVE_IMLIB */
---- a/src/im/request.cpp
-+++ b/src/im/request.cpp
-@@ -18,6 +18,7 @@
- 
- #include <errno.h>
- #include <string.h>
-+#include <unistd.h>
- 
- #include "request.h"
- #include "buddy.h"
---- a/src/irc/dcc.cpp
-+++ b/src/irc/dcc.cpp
-@@ -23,6 +23,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <netinet/in.h>
-+#include <unistd.h>
- 
- #include "dcc.h"
- #include "nick.h"
---- a/src/irc/irc.cpp
-+++ b/src/irc/irc.cpp
-@@ -246,7 +246,7 @@ Nick* IRC::getNick(string nickname, bool case_sensitive) const
- Buddy* IRC::getNick(const im::Buddy& buddy) const
- {
- 	map<string, Nick*>::const_iterator it;
--	Buddy* nb;
-+	Buddy* nb = NULL;
- 	for(it = users.begin();
- 	    it != users.end() && (!(nb = dynamic_cast<Buddy*>(it->second)) || nb->getBuddy() != buddy);
- 	    ++it)
-@@ -261,7 +261,7 @@ Buddy* IRC::getNick(const im::Buddy& buddy) const
- ConvNick* IRC::getNick(const im::Conversation& conv) const
- {
- 	map<string, Nick*>::const_iterator it;
--	ConvNick* n;
-+	ConvNick* n = NULL;
- 	for(it = users.begin();
- 	    it != users.end() && (!(n = dynamic_cast<ConvNick*>(it->second)) || n->getConversation() != conv);
- 	    ++it)
---- a/src/server_poll/inetd.cpp
-+++ b/src/server_poll/inetd.cpp
-@@ -18,6 +18,7 @@
- 
- #include <cassert>
- #include <glib.h>
-+#include <unistd.h>
- 
- #include "inetd.h"
- #include "irc/irc.h"
---- a/src/sockwrap/sockwrap.cpp
-+++ b/src/sockwrap/sockwrap.cpp
-@@ -22,6 +22,7 @@
- #  include "sockwrap_tls.h"
- #endif
- #include "core/util.h"
-+#include <unistd.h>
- 
- namespace sock
- {
diff --git a/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch b/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch
deleted file mode 100644
index 599355eb502c..000000000000
--- a/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: minbif-1.0.5/src/server_poll/daemon_fork.cpp
-===================================================================
---- minbif-1.0.5.orig/src/server_poll/daemon_fork.cpp
-+++ minbif-1.0.5/src/server_poll/daemon_fork.cpp
-@@ -20,7 +20,7 @@
- #include <cassert>
- #include <cstring>
- #include <cerrno>
--#include <glib/gmain.h>
-+#include <glib.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <arpa/inet.h>
-Index: minbif-1.0.5/src/server_poll/inetd.cpp
-===================================================================
---- minbif-1.0.5.orig/src/server_poll/inetd.cpp
-+++ minbif-1.0.5/src/server_poll/inetd.cpp
-@@ -17,7 +17,7 @@
-  */
- 
- #include <cassert>
--#include <glib/gmain.h>
-+#include <glib.h>
- 
- #include "inetd.h"
- #include "irc/irc.h"
diff --git a/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch b/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch
deleted file mode 100644
index e9fa875d247c..000000000000
--- a/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/im/account.cpp b/src/im/account.cpp
-index f155334..f040fcd 100644
---- a/src/im/account.cpp
-+++ b/src/im/account.cpp
-@@ -272,7 +272,7 @@ void Account::setBuddyIcon(string filename)
- 				else
- 				{
- 					char** prpl_formats = g_strsplit(prplinfo->icon_spec.format,",",0);
--					ImlibLoadError err = IMLIB_LOAD_ERROR_UNKNOWN;
-+					Imlib_Load_Error err = IMLIB_LOAD_ERROR_UNKNOWN;
- 
- 					close(temp_fd);
- 					/* Try to encode in a supported format. */
diff --git a/net-im/minbif/files/minbif.initd b/net-im/minbif/files/minbif.initd
deleted file mode 100644
index 06cac415f61d..000000000000
--- a/net-im/minbif/files/minbif.initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-MINBIF_EXEC="/usr/bin/minbif"
-
-depend() {
-	need logger net
-}
-
-start() {
-	ebegin "Starting minbif"
-	start-stop-daemon --start --startas ${MINBIF_EXEC} \
-		-c minbif:minbif --exec ${MINBIF_EXEC} -- \
-		/etc/minbif/minbif.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping minbif"
-	start-stop-daemon --stop --exec ${MINBIF_EXEC}
-	eend $?
-}
diff --git a/net-im/minbif/metadata.xml b/net-im/minbif/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-im/minbif/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/net-im/minbif/minbif-1.0.5-r3.ebuild b/net-im/minbif/minbif-1.0.5-r3.ebuild
deleted file mode 100644
index d438c5b97a63..000000000000
--- a/net-im/minbif/minbif-1.0.5-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="IRC gateway to IM networks"
-HOMEPAGE="https://symlink.me/projects/minbif/wiki/"
-SRC_URI="https://symlink.me/attachments/download/148/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gnutls +imlib +libcaca pam xinetd"
-REQUIRED_USE="libcaca? ( imlib )"
-
-DEPEND="
-	acct-group/minbif
-	acct-user/minbif
-	net-im/pidgin
-	gnutls? ( net-libs/gnutls )
-	imlib? ( media-libs/imlib2 )
-	libcaca? (
-		media-libs/imlib2
-		media-libs/libcaca
-	)
-	pam? ( sys-libs/pam )
-"
-RDEPEND="
-	${DEPEND}
-	virtual/logger
-	xinetd? ( sys-apps/xinetd )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.5-glib-single-includes.patch"
-	"${FILESDIR}/${PN}-1.0.5-gcc47.patch"
-	"${FILESDIR}/${PN}-1.0.5-rename-imlib-load-error.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed "s/-Werror//g" -i CMakeLists.txt || die
-
-	if use xinetd; then
-		sed "s/type\s=\s[0-9]/type = 0/" -i minbif.conf || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONF_PREFIX="${EPREFIX}"/etc/minbif
-		-DDOC_PREFIX="${EPREFIX}"/usr/share/doc/"${PF}"
-		-DENABLE_VIDEO=OFF
-		-DENABLE_TLS=$(usex gnutls)
-		-DENABLE_IMLIB=$(usex imlib)
-		-DENABLE_CACA=$(usex libcaca)
-		-DENABLE_PAM=$(usex pam)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	keepdir /var/lib/minbif
-	fperms 700 /var/lib/minbif
-	fowners minbif:minbif /var/lib/minbif
-
-	doman man/minbif.8
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		newins doc/minbif.xinetd minbif
-	fi
-
-	newinitd "${FILESDIR}"/minbif.initd minbif
-
-	insinto /usr/share/minbif
-	doins -r scripts
-}
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 57e8a6128ba3..3c608b5e22cc 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -4,6 +4,6 @@ AUX prosody.service-r2 228 BLAKE2B 61741cb7ecf64777b516a1fcb4e8e8c5c7b9c5d92dafb
 AUX prosody.tmpfilesd-r1 36 BLAKE2B dfb5025508cc62b4cd53de35b83f47bfee61821fbfe3301c1b67a4324ab753067cd3ecd84f56ae9a0241395a50d90ce2ec49c9333dc3378798a290e638a56cf9 SHA512 13a99fb925f7c3584dbfcbc98b3b929b67e165f70d700a25a861e512becd8a21ca48ee385da67ead23beeb68a43aaa10a2cfd342d1b3184883fede5d985cb599
 DIST prosody-0.11.10.tar.gz 438888 BLAKE2B 590f97f4eb8a333701eca516de3c3bcee9cf093267d2000af03b48d32396a1be21a0cf2f8ff542e7fbcb8419138bab5cf411f71b17666593559004a8a9674367 SHA512 419d8f8465f1807015f0a52d8f35ee89892b0869084dae38b60fc833d63c3d70892d8e59ae00039cd15e0e25f46d042954896f51f8c0520650a877f5296707cb
 DIST prosody-0.11.9.tar.gz 431647 BLAKE2B b6cf013a53c91675b50f601031b4843a826d011c4e06b06b27968413f4807a083811465b836531652fb47adc3bdb2ac82308a3c79953d80d6839ca23c669ab80 SHA512 fabbbbb1acb3de4ff01e3e8c6e9e4dc37cb161259f1649683a1f9d925ed9f1709e052bfc831cba3f1861a9cca599f2b725ee739bfcb57164d6f50ac07011b52a
-EBUILD prosody-0.11.10.ebuild 2857 BLAKE2B 3e37641c2e758b610d419e4c8d5fc03105451fec839ae3dd9e23a36d21335ffd345b86955078f1383ccd09176d6819aa650e31293201d24978fc045697f97779 SHA512 ad230ee0c472d4bb7bd004e5c22cae4ef712e39f9315770d1976232c128cff4883673a8a485ea9842ad618505cf0b1917b06999348f2795c0aee9f56baf29aee
+EBUILD prosody-0.11.10.ebuild 2856 BLAKE2B 627c34c5aa225ec6ae67a024ac475d62c4aad5ffffb7ef2099e7ca2f3928feceb576510f1e0f5abf99c968054a8d3fab6b2fd43884805acd186b23c53b89b029 SHA512 7d1b31669c0df0a1f223297db666f8a3e5760977601e33e1dbf4642694bb511b66cd1080ed205f5663116aaa1a85da18e3212dd85dfbc44ae83f1369716abd75
 EBUILD prosody-0.11.9.ebuild 2855 BLAKE2B 5ef0b0509a1785f01fd408585cbea1d9de23e65df65768eaa4f0e7e6aae65f321cc8e19c2a539283445b23034ba1a2238f14c7f51152d265c3d814668ac63ec2 SHA512 fdac2d0644f9e0f4f8544cca19ee3bedcecce696125d10af6709432f6001b0df02b24f57c6ad0367b2b89b67f03f6681e9a3d357f803c5c0a0db1956c1b7bba2
 MISC metadata.xml 669 BLAKE2B e8f1d6b1df790563b92637351fe3f824f48c34b95234ad950b2376fcd010195d1d25d0023d468ab6ca98fc068df3e83db88513eb6c1a12a7b93426302516e71b SHA512 6336b469b3fee51cc6b2b7e23398430294ed7ce0b53525515d22dc1dd5f70b97a0388d654378d34fc809164aa5c9bdcd4a3d2078df75c2bac8a954f0fe549710
diff --git a/net-im/prosody/prosody-0.11.10.ebuild b/net-im/prosody/prosody-0.11.10.ebuild
index 83f73dc728a1..e0e7c07c4505 100644
--- a/net-im/prosody/prosody-0.11.10.ebuild
+++ b/net-im/prosody/prosody-0.11.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="icu +idn +libevent mysql postgres selinux +sqlite +ssl test +zlib"
 REQUIRED_USE="
 	^^ ( icu idn )
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index d09187d28050..737e402f6e9a 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_5.13.0_amd64.deb 111639354 BLAKE2B d3dc689cfaa13c9c38e9d626ad8c50742abc835604cb81b045291077b983c76b081997825628b683fbca43635de5c73f9da218b1d9a6f5d0983bac1928d59416 SHA512 23caafbd9c48f45b9576a0d01548d9d5a1bfdb8e142e909ca1ec5e297d93d57b20aef5d21be592aef6dc4e3b37a43b3442180c48c96b0a30630a9d9713ba3acc
-EBUILD signal-desktop-bin-5.13.0.ebuild 2789 BLAKE2B 1ade4d51b1a472ef7c4b4396b2044886a7bd1e06461b26c75977ac6eb7f90619c6761ce0b4f9db0d245bcc9f97cf343cf5dead03d024eb388d8a50132bd0134c SHA512 aa2c22282010509bc52c45e63f891c1327b8bc141968cb587feab339c41b2515411cc2f4c0c5f226b661dceab68fa630bd9c4ba5296776b846213a9dbaedd908
+DIST signal-desktop_5.14.0_amd64.deb 112462612 BLAKE2B cf87bd61d378f5677c6e0512bd137de3c9a95865218403516dd6e0d99ff9ec21bf8a326f1e6c0479322fa25f47f5a2a7d94da8538ea8741028081440baa438fb SHA512 f49b87cb4b6bc3e6764097d78975bcae6536e82dbaac6277a56931f6af9ce66a67006eaa009a436f952508f5c79e4d0a471108b330f2682ef1748b2f622c8477
+EBUILD signal-desktop-bin-5.14.0.ebuild 2789 BLAKE2B 1ade4d51b1a472ef7c4b4396b2044886a7bd1e06461b26c75977ac6eb7f90619c6761ce0b4f9db0d245bcc9f97cf343cf5dead03d024eb388d8a50132bd0134c SHA512 aa2c22282010509bc52c45e63f891c1327b8bc141968cb587feab339c41b2515411cc2f4c0c5f226b661dceab68fa630bd9c4ba5296776b846213a9dbaedd908
 MISC metadata.xml 396 BLAKE2B 38a79e09275e5b085003b4fd511917b1ada4b25a7f7d8693da9fa35be6f924fd3a8cac88aa689a482391b3ccc89a07ec1946b8d0dc1ec5c45f23b94f65095ade SHA512 e173a6d2920e003012ffa756fc3e0aa15bbea2eb63b37b9387ec016680cdef7d7db0d510f4663e2a941df4b587c367d3af66ef0fa8d0c4b069648b1dbfd0d4ad
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.13.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.14.0.ebuild
index 0cbadc9286be..0cbadc9286be 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.13.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.14.0.ebuild
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 744cf33e22b0..235b952cb1d0 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,7 +1,10 @@
-DIST toxic-0.10.0.tar.gz 1160161 BLAKE2B 30089398211945f366fd7b52ab4014cd9b020f58b7d3e47ec1a12a87055f10cdb723211f38d1028a3fb149cd76aa7771591e37f7961cda37b7bcbb8e21b33181 SHA512 bfbe8e4c90b4fcbdbe7cc96cb402e4c2f1609e2970e51d6d2ad2c8596350ce96ac9f4d06fbb71350e56d8892e2ed4ee8c5adf4f66cdad6b152c959802bddc6cc
+AUX toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch 1221 BLAKE2B 2410d954710fd59ae26a308490aca577680f1db283cbf4e6b1c403e778492bd9b889c2d7f32674a844a36b8ee4f396129fa6a3ee4a65c3c13f0b130efdb860d4 SHA512 21c493de57a1d0bc72ddccf6c1b42348ae4aae48ff009e1bc006dd22d7bfc5bfd70b76a40db1b63a03156514306fb240965053844b841988adcab15d666effbc
+AUX toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch 1274 BLAKE2B cb5f7b6e7d73c6f42b8ef30ac09ea6e9cc33d46ed4089c9fd29176ee92c1fa763108b2dd0c0cba199000c8011bb9189ab82c5aa3345341c883b31c12862d45a5 SHA512 0acd682f2657f57975ca01f353cf172b68d34edf9f08b4489b6904f956d516966ab65b38e13af3f7df5a139d3626e6efc1769e57c353daf1c29b86a5a80d6d59
+AUX toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch 1236 BLAKE2B ecbb048e6e34792c958a25fea05922ec5b82e24792566d8599b8fc355b7c8d5327735dc07b7fd707687647e19f79f1f5580643866eeaa3fb2cda17770086a383 SHA512 2c029f4e62a94a42649933658de7a85c220357a3c02035a2628202298341a729b7a26e81bbf3bc648ef1cd43d2eb52061185218af14bb63954771280a19daf42
 DIST toxic-0.10.1.tar.gz 1165118 BLAKE2B d367039bef9c97c23c8e5453b607cf72f70776e8c86c41da0480eb04725a901bf33bb89727aee3010ad97d33ef2aa653ff09ea49b597cdf2008ff976c395065c SHA512 aec2e6612d639e0210ae68db3368b656647575e3d927444d0726422ff2cf9718dd5a8b3f37a8253cdc3714f09f9f96828dfccf7a7ae12f8a41ce3207f92a684d
+DIST toxic-0.11.1.tar.gz 1204163 BLAKE2B 1e388982236badf1a27cb1cfd9e84ec635be6a576a0719a7394f32ac82f23796f94236ab807180620cbfa8c0c42f43ff244d2d99d27cd5ab3258c1ce69acc545 SHA512 53fba05271020547e779d63bea777f90f56b61e3eb2775afabe92e047a8347b4a9166628bb59d2eaab2e36a1121d791206ac68ff6604cb06fac6aaddbb05e787
 DIST toxic-0.8.3.tar.gz 1147100 BLAKE2B d73a861112aca65e54773c98473c2858bb81e63fef11212633e34dac9e87101956e3ab0d9d56757767bc5d48d1d5a406e550f8fc55ae34860dbc4977c94ee347 SHA512 c8d746efcc055592dd990dfa57415cc1eacaaa3b66303d7583d9f9e7e98b8829c8f1ae849f36a243c8896e99787dd2e493c92367de719b20a4a160bc7daea76e
-EBUILD toxic-0.10.0-r1.ebuild 2714 BLAKE2B 5473d9c4b78e94abe0827f9b8191cfd1f44b42ee5c07ef22c38be41474c812d542380a4af0f4b655e6590d4abaeff4fbdf67e3f802ccf48f98732b0a55c6c19f SHA512 bdf5e716b072843570bfbafa234b636871e71e20dbcf2a20a5b4e455e26ef104c78634a8bf854a3dd214cdd114768d6efb4111f061755ba3db266d0824d39ee7
-EBUILD toxic-0.10.1.ebuild 2697 BLAKE2B 1d9745a20a753ac3bf38cc9ae14ad85b24f99df947bb6a5bc7d057c23afd6b9d65897336c0574411bd41a51fbaf3b3b459256acf18bfca827c70b97f2594340a SHA512 5cce18abf16ec4d64034df723c56cc72a09cef70d2f09ac14d746379f4e78132cddb82898d9ba8955be5dae2d33c5838ea114e724ef567348a20b0bfea10564d
-EBUILD toxic-0.8.3-r2.ebuild 1817 BLAKE2B 73f8276337997cc2ea695cf691a47241ba981d414d6055b6f466503db0e79a14985cd1e08736570196c3196119f1db60edc668b5f271dfeca8dc2352b06682de SHA512 d94d058e687405ab6361babd1f3a8e7b8d98d456c4b7a8f06d55a7831cf88eedf041e778b605731d130baef1839b993280bfcf92ec7d54b46b703a56e8f69d29
-MISC metadata.xml 1154 BLAKE2B 5f94676351ad071b3278cc986d715ac5980fafa89a2be08253ac05787027b7a4cdbd3a9de8c88fece1ad35c8442956cbd089568d3c340f3ad6832186ed1d341b SHA512 2a65c022688774e5f892e7be3e69283e17164a47484f311544bc1bacbf3c5374c80736568adaa00db9b18f2ae1ff8946cc6a7c0912aaeb0a2c3b33f42ab7609b
+EBUILD toxic-0.10.1-r1.ebuild 3051 BLAKE2B 44a340be721ec9ae43739225f3ed695ca98f3561deece983f1e9b196d7b530b568dab07dc9118536b28cc620ebe0e064128ca3c29a459ccc3c4ca86735b330c4 SHA512 670856e91e0074648fc9decbfec57dd3a4d707dae7a680f6c83e729829065157ae79efd48798f1dddadcb6c8193f7a91688683735230ae871edfffc93cf4a835
+EBUILD toxic-0.11.1.ebuild 3027 BLAKE2B cfc32823322febc37941787bf1e489c2c235339373ac95821c82c7dfd2067b8fadcde3820dbf7e86b647174a59f8ab2e27db518eac9e04c64b53e03990a2f483 SHA512 0189331ae0a633867c9de2897d0be804d409ba661794c1f62f21929e071d87058919c2220194e8a862335419c305159f9452e9795b8c27c3f5da7debf406c552
+EBUILD toxic-0.8.3-r3.ebuild 2009 BLAKE2B 2d2888afcd59c4b087071182e3e7b612e608a0b733a064eb69f5e5317cd2146937e27bd1c757dff1ceecbbf9155c9b302135258f3beedf3f41babecfb4a66249 SHA512 63ae73ffea094e32a11f1a9d8bb1ab28f49e0eeafc7ce1c1b3cc6941fdbc109c447fc454d98148d2fa1320be77e4d5bccac8091b22390a3512d234215947c837
+MISC metadata.xml 1212 BLAKE2B bdee5f15d0a63e87e6868afa5e6c54903dec8007d0a33671c2bb2e4daef0cd0b86c5a4eda11492c8f7bc681b28728473fe258aced24106ec374d481576298f5d SHA512 60706359c2057d6b937a3e894fc1274a41b7e5968d6e7be21a2513f14fe425becc358437a7c4a20c96aa6fd67b6355d95655e869afb6a06ef9647c152a01d860
diff --git a/net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch
new file mode 100644
index 000000000000..68cb0bb59ccc
--- /dev/null
+++ b/net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch
@@ -0,0 +1,49 @@
+diff -ruN src/autocomplete.c src/autocomplete.c
+--- src/autocomplete.c	2021-07-26 15:04:59.172715491 -0400
++++ src/autocomplete.c	2021-07-26 15:22:06.652686609 -0400
+@@ -25,10 +25,12 @@
+ #include <string.h>
+ 
+ #ifdef __APPLE__
+-#include <sys/types.h>
+ #include <sys/dir.h>
++#include <sys/types.h>
++#include <sys/sysinfo.h>
+ #else
+ #include <dirent.h>
++#include <linux/limits.h>
+ #endif /* __APPLE__ */
+ 
+ #include "configdir.h"
+diff -ruN src/file_transfers.h src/file_transfers.h
+--- src/file_transfers.h	2021-07-26 15:39:36.765990567 -0400
++++ src/file_transfers.h	2021-07-26 15:39:41.899323757 -0400
+@@ -24,6 +24,12 @@
+ #define FILE_TRANSFERS_H
+ 
+ #include <limits.h>
++//This includes NAME_MAX and PATH_MAX
++#ifdef __APPLE__
++#include <sys/sysinfo.h>
++#elif __linux__
++#include <linux/limits.h>
++#endif
+ 
+ #include "notify.h"
+ #include "toxic.h"
+diff -ruN src/settings.h src/settings.h
+--- src/settings.h	2021-07-26 15:04:59.176048823 -0400
++++ src/settings.h	2021-07-26 15:12:01.772703590 -0400
+@@ -24,6 +24,12 @@
+ #define SETTINGS_H
+ 
+ #include <limits.h>
++//This includes NAME_MAX and PATH_MAX
++#ifdef __APPLE__
++#include <sys/sysinfo.h>
++#elif __linux__
++#include <linux/limits.h>
++#endif
+ 
+ #include <tox/tox.h>
+ 
diff --git a/net-im/toxic/files/toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch
new file mode 100644
index 000000000000..09845d294a2e
--- /dev/null
+++ b/net-im/toxic/files/toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch
@@ -0,0 +1,48 @@
+diff -ruN src/autocomplete.c src/autocomplete.c
+--- src/autocomplete.c	2021-08-09 18:52:27.090248882 -0400
++++ src/autocomplete.c	2021-08-11 14:57:39.029828530 -0400
+@@ -25,10 +25,12 @@
+ #include <string.h>
+ 
+ #ifdef __APPLE__
+-#include <sys/types.h>
+ #include <sys/dir.h>
++#include <sys/types.h>
++#include <sys/sysinfo.h>//This should contain PATH_MAX and NAME_MAX
+ #else
+ #include <dirent.h>
++#include <linux/limits.h>
+ #endif /* __APPLE__ */
+ 
+ #include "configdir.h"
+diff -ruN src/file_transfers.h src/file_transfers.h
+--- src/file_transfers.h	2021-07-26 15:39:36.765990567 -0400
++++ src/file_transfers.h	2021-08-11 14:59:41.223159195 -0400
+@@ -24,6 +24,12 @@
+ #define FILE_TRANSFERS_H
+ 
+ #include <limits.h>
++//This should include NAME_MAX and PATH_MAX
++#ifdef __APPLE__
++#include <sys/sysinfo.h>
++#elif __linux__
++#include <linux/limits.h>
++#endif
+ 
+ #include "notify.h"
+ #include "toxic.h"
+diff -ruN src/settings.h src/settings.h
+--- src/settings.h	2021-08-09 18:52:27.093582216 -0400
++++ src/settings.h	2021-08-11 15:00:46.889824433 -0400
+@@ -24,6 +24,12 @@
+ #define SETTINGS_H
+ 
+ #include <limits.h>
++//This should include NAME_MAX and PATH_MAX
++#ifdef __APPLE__
++#include <sys/sysinfo.h>
++#elif __linux__
++#include <linux/limits.h>
++#endif
+ 
+ #include <tox/tox.h>
diff --git a/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch
new file mode 100644
index 000000000000..11dc43c6b778
--- /dev/null
+++ b/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch
@@ -0,0 +1,49 @@
+diff -ruN src/autocomplete.c src/autocomplete.c
+--- src/autocomplete.c	2021-07-26 10:43:37.453154392 -0400
++++ src/autocomplete.c	2021-07-26 10:59:29.856460938 -0400
+@@ -27,8 +27,11 @@
+ #ifdef __APPLE__
+ #include <sys/types.h>
+ #include <sys/dir.h>
+-#else
++//This include NAME_MAX
++#include <sys/sysinfo.h>
++#elif __linux__
+ #include <dirent.h>
++#include <linux/limits.h>//This includes NAME_MAX
+ #endif /* __APPLE__ */
+ 
+ #include "windows.h"
+diff -ruN src/file_transfers.h src/file_transfers.h
+--- src/file_transfers.h	2021-07-26 10:43:37.456487724 -0400
++++ src/file_transfers.h	2021-07-26 11:41:30.513057111 -0400
+@@ -24,6 +24,12 @@
+ #define FILE_TRANSFERS_H
+ 
+ #include <limits.h>
++//This includes PATH_MAX
++#ifdef __APPLE__
++#include <sys/sysinfo.h>
++#elif __linux__
++#include <linux/limits.h>
++#endif
+ 
+ #include "toxic.h"
+ #include "windows.h"
+diff -ruN src/settings.h src/settings.h
+--- src/settings.h	2021-07-26 10:43:37.459821058 -0400
++++ src/settings.h	2021-07-26 11:45:46.709716594 -0400
+@@ -25,6 +25,13 @@
+ 
+ #include <limits.h>
+ 
++//This includes PATH_MAX
++#ifdef __APPLE__
++#include <sys/sysinfo.h>
++#elif __linux__
++#include <linux/limits.h>
++#endif
++
+ #include <tox/tox.h>
+ 
+ /* Represents line_* hints max strlen */
diff --git a/net-im/toxic/metadata.xml b/net-im/toxic/metadata.xml
index 799dd08bb740..a2f38a60d5b3 100644
--- a/net-im/toxic/metadata.xml
+++ b/net-im/toxic/metadata.xml
@@ -21,6 +21,7 @@
 	</longdescription>
 	<use>
 		<flag name="audio-notify">Enables native sound notifications</flag>
+		<flag name="games">Enables some small mini-games</flag>
 		<flag name="llvm">Enables support for LLVM Address Sanitizer</flag>
 		<flag name="notification">Enables desktop notifications with libnotify, with sound support.</flag>
 		<flag name="qrcode">Enables QR code support</flag>
diff --git a/net-im/toxic/toxic-0.10.0-r1.ebuild b/net-im/toxic/toxic-0.10.0-r1.ebuild
deleted file mode 100644
index de5dde5af0f2..000000000000
--- a/net-im/toxic/toxic-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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 python-single-r1 xdg
-
-DESCRIPTION="A curses-based client for Tox"
-HOMEPAGE="https://github.com/JFreegman/toxic"
-SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+audio-notify debug doc llvm notification png python qrcode +sound +video +X"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	video? ( sound X ) "
-
-RDEPEND="
-	dev-libs/libconfig:=
-	net-libs/tox:=
-	net-misc/curl
-	sys-libs/ncurses:=
-	audio-notify? (
-		media-libs/freealut
-		media-libs/openal
-	)
-	notification? ( x11-libs/libnotify )
-	debug? ( llvm? ( sys-devel/llvm:* ) )
-	python? ( ${PYTHON_DEPS} )
-	qrcode? (
-		media-gfx/qrencode:=
-		png? ( media-libs/libpng )
-	)
-	sound? (
-		media-libs/openal
-		net-libs/tox:=[av]
-	)
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-	)"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	#prevent man files from being compressed.
-	sed -i -e "/gzip/d" cfg/targets/install.mk || die "Unable to prevent compression of man pages."
-	#Fix incorrect linkage of pthread (may be optional)
-	sed -i -e 's/pthread/lpthread/g' Makefile || die "Unable to fix linking of pthread."
-	#Makefile sets some required CFLAGS only if CFLAGS variable is undefined,
-	#This line changes the "lazy set if absent" assignment to a "lazy set" assignment.
-	#look below in src_configure to see how CFLAGS are passed to the makefile in USER_CFLAGS
-	sed -i -e 's/?=/=/g' Makefile || die "Unable to change assignment of CFLAGS and LDFLAGS"
-}
-
-src_configure() {
-	if ! use audio-notify; then
-		USER_CFLAGS+="-DDISABLE_SOUND_NOTIFY=1 "
-	fi
-	if use debug; then
-		USER_CFLAGS+="-DENABLE_RELEASE=0 "
-		if use llvm; then
-			USER_CFLAGS+="-DENABLE_ASAN=1 "
-		fi
-	fi
-	if ! use notification; then
-		USER_CFLAGS+="-DDISABLE_DESKTOP_NOTIFY=1 "
-	fi
-	if ! use png; then
-		USER_CFLAGS+="-DDISABLE_QRPNG=1 "
-	fi
-	if use python; then
-		USER_CFLAGS+="-DENABLE_PYTHON=1"
-	fi
-	if ! use qrcode; then
-		USER_CFLAGS+="-DDISABLE_QRCODE=1"
-	fi
-	if ! use sound; then
-		USER_CFLAGS+="-DDISABLE_AV=1 "
-	fi
-	if ! use video; then
-		USER_CFLAGS+="-DDISABLE_VI=1"
-	fi
-	if ! use X; then
-		USER_CFLAGS+="-DDISABLE_X11=1 "
-	fi
-	USER_CFLAGS+="${CFLAGS}"
-	export USER_CFLAGS
-	export USER_LDFLAGS="${LDFLAGS}"
-	#set install directory to /usr.
-	sed -i -e "s,/usr/local,${EPREFIX}/usr,g" cfg/global_vars.mk || die "Failed to set install directory!"
-}
-
-src_install() {
-	default
-	if ! use audio-notify; then
-		rm -r "${ED}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
-	fi
-}
diff --git a/net-im/toxic/toxic-0.10.1-r1.ebuild b/net-im/toxic/toxic-0.10.1-r1.ebuild
new file mode 100644
index 000000000000..931dd62fc29a
--- /dev/null
+++ b/net-im/toxic/toxic-0.10.1-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit python-single-r1 xdg
+
+DESCRIPTION="A curses-based client for Tox"
+HOMEPAGE="https://github.com/JFreegman/toxic"
+SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+audio-notify debug doc llvm notification png python qrcode +sound +video +X"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	video? ( sound X ) "
+
+BDEPEND="dev-libs/libconfig"
+
+RDEPEND="net-libs/tox:=
+	net-misc/curl
+	sys-libs/ncurses:=
+	sys-kernel/linux-headers
+	audio-notify? (
+		media-libs/freealut
+		media-libs/openal
+	)
+	notification? ( x11-libs/libnotify )
+	debug? ( llvm? ( sys-devel/llvm:* ) )
+	python? ( ${PYTHON_DEPS} )
+	qrcode? (
+		media-gfx/qrencode:=
+		png? ( media-libs/libpng )
+	)
+	sound? (
+		media-libs/openal
+		net-libs/tox:=[av]
+	)
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+	)"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	#prevent man files from being compressed.
+	sed -i -e "/gzip/d" cfg/targets/install.mk || die "Unable to prevent compression of man pages."
+	#Fix incorrect linkage of pthread (may be optional)
+	sed -i -e 's/pthread/lpthread/g' Makefile || die "Unable to fix linking of pthread."
+	#Makefile sets some required CFLAGS only if CFLAGS variable is undefined,
+	#This line changes the "lazy set if absent" assignment to a "lazy set" assignment.
+	#look below in src_configure to see how CFLAGS are passed to the makefile in USER_CFLAGS
+	sed -i -e 's/?=/=/g' Makefile || die "Unable to force CFLAGS and LDFLAGS"
+	#Fix incomplete invocation of python-config
+	sed -i -e "s/--ldflags/--ldflags --embed/" cfg/checks/python.mk || die "Unable to fix python linking"
+	#Fix incorrect include statements for NAME_MAX and PATH_MAX macros
+	eapply -p0 "${FILESDIR}/${P}-NAME_MAX-and-PATH_MAX.patch" || die "Unable to fix header inclusion"
+}
+
+src_configure() {
+	if ! use audio-notify; then
+		USER_CFLAGS+="-DDISABLE_SOUND_NOTIFY=1 "
+	fi
+	if use debug; then
+		USER_CFLAGS+="-DENABLE_RELEASE=0 "
+		if use llvm; then
+			USER_CFLAGS+="-DENABLE_ASAN=1 "
+		fi
+	fi
+	if ! use notification; then
+		USER_CFLAGS+="-DDISABLE_DESKTOP_NOTIFY=1 "
+	fi
+	if ! use png; then
+		USER_CFLAGS+="-DDISABLE_QRPNG=1 "
+	fi
+	if use python; then
+		USER_CFLAGS+="-DENABLE_PYTHON=1"
+	fi
+	if ! use qrcode; then
+		USER_CFLAGS+="-DDISABLE_QRCODE=1"
+	fi
+	if ! use sound; then
+		USER_CFLAGS+="-DDISABLE_AV=1 "
+	fi
+	if ! use video; then
+		USER_CFLAGS+="-DDISABLE_VI=1"
+	fi
+	if ! use X; then
+		USER_CFLAGS+="-DDISABLE_X11=1 "
+	fi
+	USER_CFLAGS+="${CFLAGS}"
+	export USER_CFLAGS
+	export USER_LDFLAGS="${LDFLAGS}"
+	#set install directory to /usr.
+	sed -i -e "s,/usr/local,${EPREFIX}/usr,g" cfg/global_vars.mk || die "Failed to set install directory!"
+}
+
+src_install() {
+	default
+	if ! use audio-notify; then
+		rm -r "${ED}"/usr/share/"${PN}"/sounds || die "Could not remove sounds directory"
+	fi
+}
diff --git a/net-im/toxic/toxic-0.10.1.ebuild b/net-im/toxic/toxic-0.10.1.ebuild
deleted file mode 100644
index 4f0639961dc5..000000000000
--- a/net-im/toxic/toxic-0.10.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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 python-single-r1 xdg
-
-DESCRIPTION="A curses-based client for Tox"
-HOMEPAGE="https://github.com/JFreegman/toxic"
-SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+audio-notify debug doc llvm notification png python qrcode +sound +video +X"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	video? ( sound X ) "
-
-RDEPEND="dev-libs/libconfig:=
-	net-libs/tox:=
-	net-misc/curl
-	sys-libs/ncurses:=
-	audio-notify? (
-		media-libs/freealut
-		media-libs/openal
-	)
-	notification? ( x11-libs/libnotify )
-	debug? ( llvm? ( sys-devel/llvm:* ) )
-	python? ( ${PYTHON_DEPS} )
-	qrcode? (
-		media-gfx/qrencode:=
-		png? ( media-libs/libpng )
-	)
-	sound? (
-		media-libs/openal
-		net-libs/tox:=[av]
-	)
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-	)"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	#prevent man files from being compressed.
-	sed -i -e "/gzip/d" cfg/targets/install.mk || die "Unable to prevent compression of man pages."
-	#Fix incorrect linkage of pthread (may be optional)
-	sed -i -e 's/pthread/lpthread/g' Makefile || die "Unable to fix linking of pthread."
-	#Makefile sets some required CFLAGS only if CFLAGS variable is undefined,
-	#This line changes the "lazy set if absent" assignment to a "lazy set" assignment.
-	#look below in src_configure to see how CFLAGS are passed to the makefile in USER_CFLAGS
-	sed -i -e 's/?=/=/g' Makefile || die "Unable to force CFLAGS and LDFLAGS"
-}
-
-src_configure() {
-	if ! use audio-notify; then
-		USER_CFLAGS+="-DDISABLE_SOUND_NOTIFY=1 "
-	fi
-	if use debug; then
-		USER_CFLAGS+="-DENABLE_RELEASE=0 "
-		if use llvm; then
-			USER_CFLAGS+="-DENABLE_ASAN=1 "
-		fi
-	fi
-	if ! use notification; then
-		USER_CFLAGS+="-DDISABLE_DESKTOP_NOTIFY=1 "
-	fi
-	if ! use png; then
-		USER_CFLAGS+="-DDISABLE_QRPNG=1 "
-	fi
-	if use python; then
-		USER_CFLAGS+="-DENABLE_PYTHON=1"
-	fi
-	if ! use qrcode; then
-		USER_CFLAGS+="-DDISABLE_QRCODE=1"
-	fi
-	if ! use sound; then
-		USER_CFLAGS+="-DDISABLE_AV=1 "
-	fi
-	if ! use video; then
-		USER_CFLAGS+="-DDISABLE_VI=1"
-	fi
-	if ! use X; then
-		USER_CFLAGS+="-DDISABLE_X11=1 "
-	fi
-	USER_CFLAGS+="${CFLAGS}"
-	export USER_CFLAGS
-	export USER_LDFLAGS="${LDFLAGS}"
-	#set install directory to /usr.
-	sed -i -e "s,/usr/local,${EPREFIX}/usr,g" cfg/global_vars.mk || die "Failed to set install directory!"
-}
-
-src_install() {
-	default
-	if ! use audio-notify; then
-		rm -r "${ED}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
-	fi
-}
diff --git a/net-im/toxic/toxic-0.11.1.ebuild b/net-im/toxic/toxic-0.11.1.ebuild
new file mode 100644
index 000000000000..d2d629d69b60
--- /dev/null
+++ b/net-im/toxic/toxic-0.11.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit python-single-r1 xdg
+
+DESCRIPTION="A curses-based client for Tox"
+HOMEPAGE="https://github.com/JFreegman/toxic"
+SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+audio-notify debug games llvm notification png python qrcode +sound +video +X"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	video? ( sound X ) "
+
+BDEPEND="dev-libs/libconfig:=
+	virtual/pkgconfig"
+
+RDEPEND="net-libs/tox:=
+	net-misc/curl
+	sys-kernel/linux-headers
+	sys-libs/ncurses:=
+	audio-notify? (
+		media-libs/freealut
+		media-libs/openal
+	)
+	notification? ( x11-libs/libnotify )
+	debug? ( llvm? ( sys-devel/llvm:* ) )
+	python? ( ${PYTHON_DEPS} )
+	qrcode? (
+		media-gfx/qrencode:=
+		png? ( media-libs/libpng )
+	)
+	sound? (
+		media-libs/openal
+		net-libs/tox:=[av]
+	)
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+	)"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	#prevent man files from being compressed.
+	sed -i -e "/gzip/d" cfg/targets/install.mk || die "Unable to prevent compression of man pages."
+	#Fix incorrect linkage of pthread (may be optional)
+	sed -i -e 's/pthread/lpthread/g' Makefile || die "Unable to fix linking of pthread."
+	#Makefile sets some required CFLAGS only if CFLAGS variable is undefined,
+	#This line changes the "lazy set if absent" assignment to a "lazy set" assignment.
+	#look below in src_configure to see how CFLAGS are passed to the makefile in USER_CFLAGS
+	sed -i -e 's/?=/=/g' Makefile || die "Unable to change assignment of CFLAGS and LDFLAGS"
+	#Fix incomplete invocation of python-config
+	sed -i -e "s/--ldflags/--ldflags --embed/" cfg/checks/python.mk || die "Unable to fix python linking"
+	#This is to fix incorrect include statements of NAME_MAX and PATH_MAX macros
+	eapply -p0 "${FILESDIR}/${P}-NAME_MAX-and-PATH_MAX.patch" || die "Unable to fix include statements"
+}
+
+src_configure() {
+	if ! use audio-notify; then
+		export DISABLE_SOUND_NOTIFY=1
+	fi
+	if use debug; then
+		export ENABLE_RELEASE=0
+		if use llvm; then
+			export ENABLE_ASAN=1
+		fi
+	fi
+	if ! use games; then
+		export DISABLE_GAMES=1
+	fi
+	if ! use notification; then
+		export DISABLE_DESKTOP_NOTIFY=1
+	fi
+	if ! use png; then
+		export DISABLE_QRPNG=1
+	fi
+	if use python; then
+		export ENABLE_PYTHON=1
+	fi
+	if ! use qrcode; then
+		export DISABLE_QRCODE=1
+	fi
+	if ! use sound; then
+		export DISABLE_AV=1
+	fi
+	if ! use video; then
+		export DISABLE_VI=1
+	fi
+	if ! use X; then
+		export DISABLE_X11=1
+	fi
+	export USER_CFLAGS="${CFLAGS}"
+	export USER_LDFLAGS="${LDFLAGS}"
+	#set install directory to /usr.
+	sed -i -e "s,/usr/local,${EPREFIX}/usr,g" cfg/global_vars.mk || die "Failed to set install directory!"
+}
+
+src_install() {
+	default
+	if ! use audio-notify; then
+		rm -r "${ED}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
+	fi
+}
diff --git a/net-im/toxic/toxic-0.8.3-r2.ebuild b/net-im/toxic/toxic-0.8.3-r2.ebuild
deleted file mode 100644
index fb4792fc89e0..000000000000
--- a/net-im/toxic/toxic-0.8.3-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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 python-single-r1 xdg
-
-DESCRIPTION="A curses-based client for Tox"
-HOMEPAGE="https://github.com/JFreegman/toxic"
-SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="notification python qrcode +sound +video +X"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/libconfig:=
-	>=net-libs/tox-0.2.8:=
-	net-misc/curl
-	sys-libs/ncurses:=
-	notification? ( x11-libs/libnotify )
-	python? ( ${PYTHON_DEPS} )
-	qrcode? ( media-gfx/qrencode:= )
-	sound? (
-		media-libs/freealut
-		media-libs/openal
-		net-libs/tox:=[av]
-	)
-	video? (
-		media-libs/libvpx:=
-		net-libs/tox:=[av]
-		x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	#prevent man files from being compressed.
-	sed -i -e "/gzip/d" cfg/targets/install.mk || die "Unable to prevent compression of man pages."
-}
-
-src_configure() {
-	export USER_CFLAGS="${CFLAGS}"
-	export USER_LDFLAGS="${LDFLAGS}"
-	if ! use sound; then
-		export DISABLE_AV=1
-		export DISABLE_SOUND_NOTIFY=1
-	fi
-	if ! use video; then
-		export DISABLE_VI=1
-	fi
-	if ! use X; then
-		export DISABLE_X11=1
-	fi
-	if ! use notification; then
-		export DISABLE_DESKTOP_NOTIFY=1
-	fi
-	if ! use qrcode; then
-		export DISABLE_QRCODE=1
-		export DISABLE_QRPNG=1
-	fi
-	if use python; then
-		export ENABLE_PYTHON=1
-	fi
-	#set install directory to /usr.
-	sed -i -e "s,/usr/local,${EPREFIX}/usr,g" cfg/global_vars.mk || die "Failed to set install directory!"
-}
-
-src_install() {
-	default
-	if ! use sound; then
-		rm -r "${ED}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
-	fi
-}
diff --git a/net-im/toxic/toxic-0.8.3-r3.ebuild b/net-im/toxic/toxic-0.8.3-r3.ebuild
new file mode 100644
index 000000000000..97ed2aa0ae38
--- /dev/null
+++ b/net-im/toxic/toxic-0.8.3-r3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit python-single-r1 xdg
+
+DESCRIPTION="A curses-based client for Tox"
+HOMEPAGE="https://github.com/JFreegman/toxic"
+SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="notification python qrcode +sound +video +X"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="dev-libs/libconfig"
+
+RDEPEND="net-libs/tox:=
+	net-misc/curl
+	sys-libs/ncurses:=
+	sys-kernel/linux-headers
+	notification? ( x11-libs/libnotify )
+	python? ( ${PYTHON_DEPS} )
+	qrcode? ( media-gfx/qrencode:= )
+	sound? (
+		media-libs/freealut
+		media-libs/openal
+		net-libs/tox:=[av]
+	)
+	video? (
+		media-libs/libvpx:=
+		net-libs/tox:=[av]
+		x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	#prevent man files from being compressed.
+	sed -i -e "/gzip/d" cfg/targets/install.mk || die "Unable to prevent compression of man pages."
+	#Fix incorrect include declarations for NAME_MAX and PATH_MAX.
+	eapply -p0 "${FILESDIR}/${P}-NAME_MAX-and-PATH_MAX.patch" || die "Unable to fix include statements"
+}
+
+src_configure() {
+	export USER_CFLAGS="${CFLAGS}"
+	export USER_LDFLAGS="${LDFLAGS}"
+	if ! use sound; then
+		export DISABLE_AV=1
+		export DISABLE_SOUND_NOTIFY=1
+	fi
+	if ! use video; then
+		export DISABLE_VI=1
+	fi
+	if ! use X; then
+		export DISABLE_X11=1
+	fi
+	if ! use notification; then
+		export DISABLE_DESKTOP_NOTIFY=1
+	fi
+	if ! use qrcode; then
+		export DISABLE_QRCODE=1
+		export DISABLE_QRPNG=1
+	fi
+	if use python; then
+		export ENABLE_PYTHON=1
+	fi
+	#set install directory to /usr.
+	sed -i -e "s,/usr/local,${EPREFIX}/usr,g" cfg/global_vars.mk || die "Failed to set install directory!"
+}
+
+src_install() {
+	default
+	if ! use sound; then
+		rm -r "${ED}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
+	fi
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 81b103aa97b0..252ed9525f49 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/quasselgrep/Manifest b/net-irc/quasselgrep/Manifest
index 55dc3a681ed3..8ec11b67402d 100644
--- a/net-irc/quasselgrep/Manifest
+++ b/net-irc/quasselgrep/Manifest
@@ -1,3 +1,3 @@
 DIST quasselgrep-0_p20200830.tar.gz 29944 BLAKE2B 011633afee9d9519b0c343c5d0b1a9ba775c870802532515a42a7c22d39af5138a051707a82f2b6a19dda3523fe9f04d2b56b62a36c554ff873275c095e7dd94 SHA512 88f568852cc9e85e0019335d3362f192766a2ce3e94ff1947485ad6eaf43d49873d94396791165f74e95edb25601c078a947a7740b4ae2e40424b5bdfecc2a48
-EBUILD quasselgrep-0_p20200830.ebuild 811 BLAKE2B 6a0f8ccbee7c039f06a39ec1dd02ff4f38e9549953d79a7446e99a9cdc2fcaf87f63f88c97daaae0066af66d01bf102cce12222941b5f9815fed255b0b082f15 SHA512 a019e388e2be8731c9e9894de0efaf883eac17d83e56954bb34cac48e3d58e697e7cc5e667e4de77750b0b3b6b67c3b8256d3d6aa338d66237771e76b969a477
+EBUILD quasselgrep-0_p20200830.ebuild 779 BLAKE2B e1208ffaf169fc63031b156989931a4514e3236d8886af242ad363840eaaa2559649964d56151ddf87ac076a245b9d5b884a741a684dea1ab9af55da6ea860e6 SHA512 f239766efff3f50008dffbfe09853fbdd5162dbd8e03f7e7e89ad81b3ae3022789e99be087b15fa8e110ca22f8d3603344a4a8fa03435bc8b94418fea78a8538
 MISC metadata.xml 568 BLAKE2B d1f434b87aaf93d48849aa3fcf833d0fc3213be9879e674ce455b241d3cc43cc1fe75aafdbb86eacc5d7c2cd7885cebab3bd1ab64cf0cd8804813e367e74cd29 SHA512 4b4ddb025cdfb2f9dad58a59187fa579b2d7e0cb1de54eb4a9d087520796270edfa620f146903bfc0999716de57920ecea62c1df5bb3ccf7d2163ab21cd15e5f
diff --git a/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild b/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild
index 2e651cfc5a8b..831039aeb81f 100644
--- a/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild
+++ b/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE=( sqlite )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1 optfeature
 
@@ -15,14 +14,16 @@ HOMEPAGE="https://github.com/fish-face/quasselgrep"
 MY_COMMIT="9b6b0bc1252daa6e574363d87d04eebd981215a5"
 SRC_URI="https://github.com/fish-face/quasselgrep/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${MY_COMMIT}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/future[${PYTHON_USEDEP}]
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
 
 pkg_postinst() {
 	optfeature "access postgres db" dev-python/psycopg:2
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 1f4c2622cacf..81612fac3fc8 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,11 +1,13 @@
-AUX README.gentoo-r1 530 BLAKE2B 5feab666142884c67c3c1a51322bb614bbdbaa453a4b6a4eb17b9fe774e4a4b188471a449f2cb5a1d07845a02a5eb15f2fad08958a839306d2029f56e8306543 SHA512 d5be4c0fc0069e6e8c6bf92f281034a603d6041f2b9a54d4fa97cae662225095d4473f54c4573141396ecccf369158f6c0986cafb9c39837edf9ab15200c8e18
+AUX README.gentoo-r1 557 BLAKE2B c947f5f343723fed637dd3c63f9cdb532d8997e9c225f2caaca510d728f5dc15b6c202b56f31411cc213c78a1ec93fbea7f9a6a74afe22a9979c7c452c47ac96 SHA512 84098676656d3c03ddde8e09f96d332e403c179cc77de5db08f1262635e78d4badc902870d4621ec4b2a13f7d92aed1f076659e10ef0e8d6b977d04d8f6b1dc6
 AUX znc-1.7.1-inttest-dir.patch 2205 BLAKE2B f322f6884170c71ba537897d38c5ca2787937afdd2ac1fe0b0b4ab55ad7d453029bf4a8c748c5787fc4ed3b46e2b33c925cb962ec868f7a5c07356697a3039e2 SHA512 b74d136985546114604252be74e55e8f5e0740b678bdd224ea63cc3587d17d861c81c69b4bdea0aabc23e64097dda0097e97fbd80110c2c2a919b33d912d2dea
+AUX znc-1.8.2-add-libera.patch 2205 BLAKE2B 756ddf827d4f39ac52c031ccdc13e07eddbcc079e37248ca3fa82bab5f9b90a1cf6faffd8d9a0c81a2c6a3ef912bfb314f3e03f657fd15bdadb61b0c7887fa1a SHA512 06c1a9f6a2729ed557f89ec247d89a87bca70b8a36103dbb1e230e7816df5155950f08f39b1011a0925354c073d4c3570f7918e730d01ad2c6ed3cdbf4b6df6c
+AUX znc-1.8.2-fix-python-3.10.patch 997 BLAKE2B b2be81e71483ea64912db8511dd9cb8ff92b2a7ea3b5d23f57fccd349c0e86d147d9245c5cbd54f99640e198b312847d6a14a256627f0f69d114f214f11dc6a8 SHA512 d39548a34ccf23a814f8b9b7b50fc87f470932e717db079bd3aea4f47e093cf10daa36f003dd1de33e0e493e43de8d5e2e354d5cc881326b249003870408c3aa
+AUX znc-1.8.2-fix-systemd-datadir.patch 692 BLAKE2B d6585fc5c2087b51c8c2277eb1c8f70585cad3621fcaa0f746a918a1f5e9f5455a8ca8dcbc6e73c0200e723d2fd6e3f4080d3a1d185fc9cc2dd3b14dcd80908a SHA512 d54f36cd4da9bb2d67852e2d7f302538fd2807d95b3480b4416fbf1d7a4d010a03a06e8f20c3f8907ea8d33d1be4872a4433c3db30530327fcfb39f43ada0b23
 AUX znc.confd-r1 720 BLAKE2B 4857a8bcd36ed1008a558ac7b067d6fad53b5d39c0df9130ca28d4ac3db3924a3a1200682c19c7e6f7869f22338b492f73bf6ccbc2b723d117c9eebc10a89838 SHA512 3ab102f64ea0572350c8595fd3739874da591c43a3dbc3a740c72c53bd7418fded721d478d1fb92de0c0d18131313ba6679e842a135dfe239ea3f42821d8e468
 AUX znc.initd-r2 952 BLAKE2B 81346bf0a1581543683eb5c125b29474c0bc01b8aee11c036a134c5a01042059564f2982aaec65715ac0a2c87b64fcd9746464148a81daeee549f4228d6ff55f SHA512 c3d676796aaa485dcaebee0fba58a8f86560cd192e0e2ccf06f58346c1368f58aa5be1c1e5160f8105e3dc5c684d3d1f82eff6a4d7b87c07f11450b72288727f
 DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
-DIST znc-1.8.1.tar.gz 2161359 BLAKE2B 5b9026156a62748659ae0496f9d799e7d1e0815358fa59f7538ca9d750b8f418fe8a57362b5b5bba40cfb00c2adc5fdc3eee0b56ebde50565c97d158296b827e SHA512 87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16
 DIST znc-1.8.2.tar.gz 2101215 BLAKE2B 7f0e5840fe57cc6b6549115b0fcf02e6afd3be0bf52e79da0a39bcc1463d983cbeb504bad30f3d2f7582f0295c7210d3c1eec40ec87bcc3546ba2d21a67cca9e SHA512 e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9
-EBUILD znc-1.8.1.ebuild 4645 BLAKE2B 5d1be110a6532adb7880286cd21be2e8bf242a9b9959976e5235504cd57d9a70196a13344e8554b4662447e35ed83927dd9d11179e58c96505813d296d5d085d SHA512 bd5e96e5b733d17b5f7e3995c6d086836728a5ab4f5a837aa097898d3c8f2a22a257f06a8131ef25cd63066da81f13870f8c76f6bb45762f2678162ed7816828
+EBUILD znc-1.8.2-r1.ebuild 5538 BLAKE2B 9ecdaacd7a53c90d391c15bee990274bfcef834d5fec23b22c3d98e39d03a70679bfcee83b3efd4bba384e3e1bfa851f14da0c9e75c72ac1f69aab4c85a386d7 SHA512 3e79552f4d276fa0753a8257ec44ad90c52dd212e96a2228069af19141eb37eef57dc48024cb34d79825dcecfea70b723feb60982556382ca8d79945b4b625e6
 EBUILD znc-1.8.2.ebuild 4767 BLAKE2B f7f5b485f231417c56935b094d23ac662b901bdf3c368715c035b258ddd61026008dcaa1015a72d7f885ac73dd1e5c955b15272eae28606667c2057f0d62545a SHA512 26223568c22bfb62ba138e7661635c0ced3067bded70cafaff473e10001344200a608aefef326cdea3b5e31fbce44fa7e1f9b6b57e752b3559f8d64f13cda0d0
-EBUILD znc-9999.ebuild 4771 BLAKE2B 739df11a6b463895fe54e4b16a953b317aafe96fa86f1917a90a6d41949c99018aefa18ea8c652115c59cb97a1d29bda824daa2c418c3b2ab2da7c1973659c47 SHA512 6fd680144b722e2a89fdc84aead46dacda33ff279a73bfaef60a48ae17c4d9d7a5e720d34f579c766b047ca60f2f05ac9fb357bfdb083a3e0d42fdff0c3864bc
+EBUILD znc-9999.ebuild 5386 BLAKE2B bad7ca62e28a01fe6ff70f0afe0c626b253730a2b57a1350e1afa2a5d73ba69616389a56363536710038646b0356b58bf2265c2809174bf520dc56e623238230 SHA512 77520dffee0823b0fe9e8f05974c5b305cd7e3a7bbc4ce5afb7b1642e3e2623db13013b7fece873bab2fc64a065bbac133f66d15c1067f864275d1d2bcac3f90
 MISC metadata.xml 507 BLAKE2B c8926f6668f57c84f5715156a424b18f7cb01f0ea9ac6a499550f731a00c7de035ec270f89297bda07ac3115292deffdcd0f3a339484c9de5d8bd7170be00de6 SHA512 d69af8535c2e409e6b6e65bfd279d74bd89ce01e911e0d21b4079bd13328e47f3b959ef82531b833c702955225e01db6915f4fb3f94d048a05ce2107b61bf1a6
diff --git a/net-irc/znc/files/README.gentoo-r1 b/net-irc/znc/files/README.gentoo-r1
index ca41e4dac26b..1812383beb29 100644
--- a/net-irc/znc/files/README.gentoo-r1
+++ b/net-irc/znc/files/README.gentoo-r1
@@ -5,11 +5,11 @@ To configure the system-wide daemon, you may run 'emerge --config znc'.
 If migrating from a user-based install, you can copy the existing
 configuration files:
 
-  # mkdir /var/lib/znc
   # mv /home/$USER/.znc/* /var/lib/znc
   # rm -rf /home/$USER/.znc
   # chown -R znc:znc /var/lib/znc
 
 OpenRC users may also adjust the location of the files and the user running
-znc in /etc/conf.d/znc instead. Systemd users may have to overwrite the
-existing unit file.
+znc in /etc/conf.d/znc instead.
+The same thing can be achieved for systemd by overriding the existing
+unit file (systemctl edit znc.service).
diff --git a/net-irc/znc/files/znc-1.8.2-add-libera.patch b/net-irc/znc/files/znc-1.8.2-add-libera.patch
new file mode 100644
index 000000000000..e7015754d8c1
--- /dev/null
+++ b/net-irc/znc/files/znc-1.8.2-add-libera.patch
@@ -0,0 +1,55 @@
+From 15e2351d40763acee5d246df7c725c3bd259c304 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <alexey+znc@asokolov.org>
+Date: Wed, 26 May 2021 10:10:20 +0100
+Subject: [PATCH] Switch --makeconf wizard from freenode to libera
+
+---
+ src/znc.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/znc.cpp b/src/znc.cpp
+index c5ad17dc69..365367545a 100644
+--- a/src/znc.cpp
++++ b/src/znc.cpp
+@@ -778,7 +778,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
+         CUtils::PrintMessage("");
+ 
+         do {
+-            CUtils::GetInput("Name", sNetwork, "freenode");
++            CUtils::GetInput("Name", sNetwork, "libera");
+         } while (!CIRCNetwork::IsValidNetwork(sNetwork));
+ 
+         vsLines.push_back("\t<Network " + sNetwork + ">");
+@@ -795,8 +795,8 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
+         bool bSSL = false;
+         unsigned int uServerPort = 0;
+ 
+-        if (sNetwork.Equals("freenode")) {
+-            sHost = "chat.freenode.net";
++        if (sNetwork.Equals("libera")) {
++            sHost = "irc.libera.chat";
+ #ifdef HAVE_LIBSSL
+             bSSL = true;
+ #endif
+From 688645413c258f1fe42a39e42e5b5d1dead03d71 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <alexey+znc@asokolov.org>
+Date: Fri, 18 Jun 2021 21:20:53 +0100
+Subject: [PATCH] Fix integration test after switch to libera
+
+---
+ test/integration/framework/znctest.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/integration/framework/znctest.cpp b/test/integration/framework/znctest.cpp
+index 195b6083a9..40dae85fc2 100644
+--- a/test/integration/framework/znctest.cpp
++++ b/test/integration/framework/znctest.cpp
+@@ -39,7 +39,7 @@ void WriteConfig(QString path) {
+     p.ReadUntil("Real name");               p.Write();
+     p.ReadUntil("Bind host");               p.Write();
+     p.ReadUntil("Set up a network?");       p.Write();
+-    p.ReadUntil("Name [freenode]");         p.Write("test");
++    p.ReadUntil("Name [libera]");           p.Write("test");
+     p.ReadUntil("Server host (host only)"); p.Write("127.0.0.1");
+     p.ReadUntil("Server uses SSL?");        p.Write();
+     p.ReadUntil("6667");                    p.Write();
diff --git a/net-irc/znc/files/znc-1.8.2-fix-python-3.10.patch b/net-irc/znc/files/znc-1.8.2-fix-python-3.10.patch
new file mode 100644
index 000000000000..fe40d190d1ba
--- /dev/null
+++ b/net-irc/znc/files/znc-1.8.2-fix-python-3.10.patch
@@ -0,0 +1,31 @@
+From e8ff16123582eb9d5c321f5c7e652335abfba368 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <alexey+znc@asokolov.org>
+Date: Sat, 23 May 2020 13:28:13 +0100
+Subject: [PATCH] Fix PY_SSIZE_T_CLEAN python warning
+
+---
+ .travis.yml           | 2 +-
+ modules/modpython.cpp | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/modules/modpython.cpp b/modules/modpython.cpp
+index dfe53b5b6b..7bc76fc5c1 100644
+--- a/modules/modpython.cpp
++++ b/modules/modpython.cpp
+@@ -14,6 +14,7 @@
+  * limitations under the License.
+  */
+ 
++#define PY_SSIZE_T_CLEAN
+ #include <Python.h>
+ 
+ #include <znc/Chan.h>
+@@ -455,7 +456,7 @@ CBSOCK(ConnectionRefused);
+ void CPySocket::ReadData(const char* data, size_t len) {
+     PyObject* pyRes =
+         PyObject_CallMethod(m_pyObj, const_cast<char*>("OnReadData"),
+-                            const_cast<char*>("y#"), data, (int)len);
++                            const_cast<char*>("y#"), data, (Py_ssize_t)len);
+     CHECKCLEARSOCK("OnReadData");
+ }
+ 
diff --git a/net-irc/znc/files/znc-1.8.2-fix-systemd-datadir.patch b/net-irc/znc/files/znc-1.8.2-fix-systemd-datadir.patch
new file mode 100644
index 000000000000..06dd6991b4a4
--- /dev/null
+++ b/net-irc/znc/files/znc-1.8.2-fix-systemd-datadir.patch
@@ -0,0 +1,23 @@
+From d4bfd143b4b12f6e6695878cc1b5168cc31c362c Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <alexey+znc@asokolov.org>
+Date: Tue, 22 Sep 2020 10:20:47 +0100
+Subject: [PATCH] Fix path in systemd service (which shouldn't be here at all)
+
+https://bugs.gentoo.org/743856
+---
+ znc.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/znc.service.in b/znc.service.in
+index a6c9e68df..7accad906 100644
+--- a/znc.service.in
++++ b/znc.service.in
+@@ -3,7 +3,7 @@ Description=ZNC, an advanced IRC bouncer
+ After=network.target
+ 
+ [Service]
+-ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/znc -f
++ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/znc -f --datadir=/var/lib/znc
+ User=znc
+ 
+ [Install]
diff --git a/net-irc/znc/znc-1.8.1.ebuild b/net-irc/znc/znc-1.8.1.ebuild
deleted file mode 100644
index 4caac33b16da..000000000000
--- a/net-irc/znc/znc-1.8.1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# 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 cmake python-single-r1 readme.gentoo-r1 systemd
-
-GTEST_VER="1.8.1"
-GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz"
-DESCRIPTION="An advanced IRC Bouncer"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
-	SRC_URI=""
-else
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="
-		https://znc.in/releases/archive/${MY_P}.tar.gz
-		test? ( ${GTEST_URL} )
-	"
-	KEYWORDS="amd64 arm arm64 x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-HOMEPAGE="https://znc.in"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
-
-DEPEND="
-	icu? ( dev-libs/icu:= )
-	nls? ( dev-libs/boost:=[nls] )
-	perl? ( >=dev-lang/perl-5.10:= )
-	python? ( ${PYTHON_DEPS} )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	ssl? ( dev-libs/openssl:0= )
-	tcl? ( dev-lang/tcl:0= )
-	zlib? ( sys-libs/zlib:0= )
-"
-RDEPEND="
-	${DEPEND}
-	acct-user/znc
-	acct-group/znc
-"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	perl? (
-		>=dev-lang/swig-3.0.0
-		>=dev-lang/perl-5.10
-	)
-	python? (
-		>=dev-lang/swig-3.0.0
-		>=dev-lang/perl-5.10
-	)
-	test? (
-		${PYTHON_DEPS}
-		dev-qt/qtnetwork:5
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Let SWIG rebuild modperl/modpython to make user patching easier.
-	if [[ ${PV} != *9999* ]]; then
-		rm modules/modperl/generated.tar.gz || die
-		rm modules/modpython/generated.tar.gz || die
-	fi
-
-	sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \
-		test/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWANT_SYSTEMD=yes  # Causes -DSYSTEMD_DIR to be used.
-		-DSYSTEMD_DIR="$(systemd_get_systemunitdir)"
-		-DWANT_ICU="$(usex icu)"
-		-DWANT_IPV6="$(usex ipv6)"
-		-DWANT_I18N="$(usex nls)"
-		-DWANT_PERL="$(usex perl)"
-		-DWANT_PYTHON="$(usex python)"
-		-DWANT_CYRUS="$(usex sasl)"
-		-DWANT_OPENSSL="$(usex ssl)"
-		-DWANT_TCL="$(usex tcl)"
-		-DWANT_ZLIB="$(usex zlib)"
-	)
-
-	if [[ ${PV} != *9999* ]] && use test; then
-		export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest"
-		export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock"
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build unittest
-	DESTDIR="${T}/inttest" cmake_build install
-	local filter='-'
-	if ! use perl; then
-		filter="${filter}:ZNCTest.Modperl*"
-	fi
-	if ! use python; then
-		filter="${filter}:ZNCTest.Modpython*"
-	fi
-	# CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod
-	# invocations from inside the test
-	GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \
-		CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \
-		CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \
-		cmake_build inttest
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc NOTICE
-	newinitd "${FILESDIR}"/znc.initd-r2 znc
-	newconfd "${FILESDIR}"/znc.confd-r1 znc
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die
-	DISABLE_AUTOFORMATTING=1
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		readme.gentoo_print_elog
-	fi
-
-	if [[ -d "${EROOT}"/etc/znc ]]; then
-		ewarn "${EROOT}/etc/znc exists on your system."
-		ewarn "Due to the nature of the contents of that folder,"
-		ewarn "we have changed the default configuration to use"
-		ewarn "	${EROOT}/var/lib/znc"
-		ewarn "please move ${EROOT}/etc/znc to ${EROOT}/var/lib/znc"
-		ewarn "or adjust your service configuration."
-	fi
-}
-
-pkg_config() {
-	if [[ -e "${EROOT}/var/lib/znc" ]]; then
-		ewarn "${EROOT}/var/lib/znc already exists, aborting to avoid damaging"
-		ewarn "any existing configuration. If you are sure you want"
-		ewarn "to generate a new configuration, remove the folder"
-		ewarn "and try again."
-	else
-		einfo "Press enter to interactively create a new configuration file for znc."
-		einfo "To abort, press Control-C"
-		read
-		mkdir -p "${EROOT}/var/lib/znc" || die
-		chown -R ${PN}:${PN} "${EROOT}/var/lib/znc" ||
-			die "Setting permissions failed"
-		start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \
-			"${EROOT}"/usr/bin/znc -- --makeconf --datadir "${EROOT}/var/lib/znc" ||
-			die "Config failed"
-		einfo
-		einfo "You can now start the znc service using the init system of your choice."
-		einfo "Don't forget to enable it if you want to use znc at boot."
-	fi
-}
diff --git a/net-irc/znc/znc-1.8.2-r1.ebuild b/net-irc/znc/znc-1.8.2-r1.ebuild
new file mode 100644
index 000000000000..396026d8980b
--- /dev/null
+++ b/net-irc/znc/znc-1.8.2-r1.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1 readme.gentoo-r1 systemd
+
+GTEST_VER="1.8.1"
+GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz"
+DESCRIPTION="An advanced IRC Bouncer"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/znc/znc.git"
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-${MY_PV}
+	SRC_URI="
+		https://znc.in/releases/archive/${MY_P}.tar.gz
+		test? ( ${GTEST_URL} )
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+HOMEPAGE="https://znc.in"
+LICENSE="Apache-2.0"
+# "If you upgrade your ZNC version, you must recompile all your modules."
+# - https://wiki.znc.in/Compiling_modules
+SLOT="0/${PV}"
+IUSE="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
+
+# perl is a build-time dependency of modpython
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	perl? (
+		>=dev-lang/swig-3.0.0
+		>=dev-lang/perl-5.10
+	)
+	python? (
+		>=dev-lang/swig-3.0.0
+		>=dev-lang/perl-5.10
+	)
+	test? (
+		${PYTHON_DEPS}
+		dev-qt/qtnetwork:5
+	)
+"
+DEPEND="
+	icu? ( dev-libs/icu:= )
+	nls? ( dev-libs/boost:=[nls] )
+	perl? ( >=dev-lang/perl-5.10:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( dev-libs/openssl:0= )
+	tcl? ( dev-lang/tcl:0= )
+	zlib? ( sys-libs/zlib:0= )
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/znc
+	acct-group/znc
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch
+	# All these are backports
+	"${FILESDIR}"/${P}-fix-systemd-datadir.patch
+	"${FILESDIR}"/${P}-add-libera.patch
+	"${FILESDIR}"/${P}-fix-python-3.10.patch
+)
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Let SWIG rebuild modperl/modpython to make user patching easier.
+	if [[ ${PV} != *9999* ]]; then
+		rm modules/modperl/generated.tar.gz || die
+		rm modules/modpython/generated.tar.gz || die
+	fi
+
+	sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \
+		test/CMakeLists.txt || die
+
+	sed -i "s|--datadir=|&${EPREFIX}|" znc.service.in || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_SYSTEMD=yes  # Causes -DSYSTEMD_DIR to be used.
+		-DSYSTEMD_DIR="$(systemd_get_systemunitdir)"
+		-DWANT_ICU="$(usex icu)"
+		-DWANT_IPV6="$(usex ipv6)"
+		-DWANT_I18N="$(usex nls)"
+		-DWANT_PERL="$(usex perl)"
+		-DWANT_PYTHON="$(usex python)"
+		-DWANT_PYTHON_VERSION="${EPYTHON#python}"
+		-DWANT_CYRUS="$(usex sasl)"
+		-DWANT_OPENSSL="$(usex ssl)"
+		-DWANT_TCL="$(usex tcl)"
+		-DWANT_ZLIB="$(usex zlib)"
+	)
+
+	if [[ ${PV} != *9999* ]] && use test; then
+		export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest"
+		export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock"
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build unittest
+	DESTDIR="${T}/inttest" cmake_build install
+	local filter='-'
+	if ! use perl; then
+		filter="${filter}:ZNCTest.Modperl*"
+	fi
+	if ! use python; then
+		filter="${filter}:ZNCTest.Modpython*"
+	fi
+	# CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod
+	# invocations from inside the test
+	GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \
+		CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \
+		CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \
+		cmake_build inttest
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc NOTICE
+	newinitd "${FILESDIR}"/znc.initd-r2 znc
+	newconfd "${FILESDIR}"/znc.confd-r1 znc
+
+	local DOC_CONTENTS
+	# "local" has its own return value which is not what we want to catch
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die
+	local DISABLE_AUTOFORMATTING=1
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -d "${EROOT}/var/lib/znc/.znc/" ]]; then
+		eerror "${EROOT}/var/lib/znc/.znc/ exists, please move your data to ${EROOT}/var/lib/znc/"
+		eerror ""
+		eerror "The systemd unit has changed and now expects data to be located"
+		eerror "at the root of ${EROOT}/var/lib/znc instead of its '.znc' subfolder."
+		eerror "The recommended procedure to move the data is the following:"
+		eerror "1. stop the service: systemctl stop znc.service"
+		eerror "2. move the data: cp -a '${EROOT}/var/lib/znc/.znc/.' '${EROOT}/var/lib/znc/'"
+		eerror "3. fix the config file: sed -i 's|${EROOT}/var/lib/znc/.znc|${EROOT}/var/lib/znc|g' '${EROOT}/var/lib/znc/configs/znc.conf'"
+		eerror "4. restart znc: systemctl start znc.service"
+		eerror "5. once everything works, remove the old data directory: rm -r '${EROOT}/var/lib/znc/.znc/'"
+		eerror "See https://bugs.gentoo.org/743856 for details."
+	fi
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		readme.gentoo_print_elog
+	fi
+}
+
+pkg_config() {
+	if [[ -d "${EROOT}/var/lib/znc/configs" ]]; then
+		ewarn "${EROOT}/var/lib/znc/configs/ already exists,"
+		ewarn "aborting to avoid damaging any existing configuration."
+		ewarn "If you are sure you want to generate a new configuration,"
+		ewarn "remove the folder and try again."
+	else
+		einfo "Press enter to interactively create a new configuration file for znc."
+		einfo "To abort, press Control-C"
+		read
+		su ${PN} -p -s /bin/sh -c 'ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \
+			"${EROOT}"/usr/bin/znc --makeconf \
+			--datadir "${EROOT}/var/lib/znc"' || die "Config failed"
+		einfo
+		einfo "You can now start the znc service using the init system of your choice."
+		einfo "Don't forget to enable it if you want to use znc at boot."
+	fi
+}
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index 303be8154904..d00dd9757dd2 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1 readme.gentoo-r1 systemd
 
@@ -13,8 +13,7 @@ DESCRIPTION="An advanced IRC Bouncer"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
-	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/znc/znc.git"
 else
 	MY_PV=${PV/_/-}
 	MY_P=${PN}-${MY_PV}
@@ -36,21 +35,7 @@ RESTRICT="!test? ( test )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
 
-DEPEND="
-	icu? ( dev-libs/icu:= )
-	nls? ( dev-libs/boost:=[nls] )
-	perl? ( >=dev-lang/perl-5.10:= )
-	python? ( ${PYTHON_DEPS} )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	ssl? ( dev-libs/openssl:0= )
-	tcl? ( dev-lang/tcl:0= )
-	zlib? ( sys-libs/zlib:0= )
-"
-RDEPEND="
-	${DEPEND}
-	acct-user/znc
-	acct-group/znc
-"
+# perl is a build-time dependency of modpython
 BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
@@ -67,8 +52,25 @@ BDEPEND="
 		dev-qt/qtnetwork:5
 	)
 "
+DEPEND="
+	icu? ( dev-libs/icu:= )
+	nls? ( dev-libs/boost:=[nls] )
+	perl? ( >=dev-lang/perl-5.10:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( dev-libs/openssl:0= )
+	tcl? ( dev-lang/tcl:0= )
+	zlib? ( sys-libs/zlib:0= )
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/znc
+	acct-group/znc
+"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch
+)
 
 pkg_setup() {
 	if use python; then
@@ -86,6 +88,8 @@ src_prepare() {
 	sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \
 		test/CMakeLists.txt || die
 
+	sed -i "s|--datadir=|&${EPREFIX}|" znc.service.in || die
+
 	cmake_src_prepare
 }
 
@@ -98,6 +102,7 @@ src_configure() {
 		-DWANT_I18N="$(usex nls)"
 		-DWANT_PERL="$(usex perl)"
 		-DWANT_PYTHON="$(usex python)"
+		-DWANT_PYTHON_VERSION="${EPYTHON#python}"
 		-DWANT_CYRUS="$(usex sasl)"
 		-DWANT_OPENSSL="$(usex ssl)"
 		-DWANT_TCL="$(usex tcl)"
@@ -137,43 +142,47 @@ src_install() {
 	newinitd "${FILESDIR}"/znc.initd-r2 znc
 	newconfd "${FILESDIR}"/znc.confd-r1 znc
 
+	local DOC_CONTENTS
+	# "local" has its own return value which is not what we want to catch
 	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die
-	DISABLE_AUTOFORMATTING=1
+	local DISABLE_AUTOFORMATTING=1
 	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
+	if [[ -d "${EROOT}/var/lib/znc/.znc/" ]]; then
+		eerror "${EROOT}/var/lib/znc/.znc/ exists, please move your data to ${EROOT}/var/lib/znc/"
+		eerror ""
+		eerror "The systemd unit has changed and now expects data to be located"
+		eerror "at the root of ${EROOT}/var/lib/znc instead of its '.znc' subfolder."
+		eerror "The recommended procedure to move the data is the following:"
+		eerror "1. stop the service: systemctl stop znc.service"
+		eerror "2. move the data: cp -a '${EROOT}/var/lib/znc/.znc/.' '${EROOT}/var/lib/znc/'"
+		eerror "3. fix the config file: sed -i 's|${EROOT}/var/lib/znc/.znc|${EROOT}/var/lib/znc|g' '${EROOT}/var/lib/znc/configs/znc.conf'"
+		eerror "4. restart znc: systemctl start znc.service"
+		eerror "5. once everything works, remove the old data directory: rm -r '${EROOT}/var/lib/znc/.znc/'"
+		eerror "See https://bugs.gentoo.org/743856 for details."
+	fi
+
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		# This is a new installation
 		readme.gentoo_print_elog
 	fi
-
-	if [[ -d "${EROOT}"/etc/znc ]]; then
-		ewarn "${EROOT}/etc/znc exists on your system."
-		ewarn "Due to the nature of the contents of that folder,"
-		ewarn "we have changed the default configuration to use"
-		ewarn "	${EROOT}/var/lib/znc"
-		ewarn "please move ${EROOT}/etc/znc to ${EROOT}/var/lib/znc"
-		ewarn "or adjust your service configuration."
-	fi
 }
 
 pkg_config() {
-	if [[ -e "${EROOT}/var/lib/znc" ]]; then
-		ewarn "${EROOT}/var/lib/znc already exists, aborting to avoid damaging"
-		ewarn "any existing configuration. If you are sure you want"
-		ewarn "to generate a new configuration, remove the folder"
-		ewarn "and try again."
+	if [[ -d "${EROOT}/var/lib/znc/configs" ]]; then
+		ewarn "${EROOT}/var/lib/znc/configs/ already exists,"
+		ewarn "aborting to avoid damaging any existing configuration."
+		ewarn "If you are sure you want to generate a new configuration,"
+		ewarn "remove the folder and try again."
 	else
 		einfo "Press enter to interactively create a new configuration file for znc."
 		einfo "To abort, press Control-C"
 		read
-		mkdir -p "${EROOT}/var/lib/znc" || die
-		chown -R ${PN}:${PN} "${EROOT}/var/lib/znc" ||
-			die "Setting permissions failed"
-		start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \
-			"${EROOT}"/usr/bin/znc -- --makeconf --datadir "${EROOT}/var/lib/znc" ||
-			die "Config failed"
+		su ${PN} -p -s /bin/sh -c 'ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \
+			"${EROOT}"/usr/bin/znc --makeconf \
+			--datadir "${EROOT}/var/lib/znc"' || die "Config failed"
 		einfo
 		einfo "You can now start the znc service using the init system of your choice."
 		einfo "Don't forget to enable it if you want to use znc at boot."
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index cd409998b1c7..b1e2ff0e022f 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 2d556d2931c6..26be1ce2461f 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,7 +1,5 @@
 DIST gupnp-1.2.7.tar.xz 142928 BLAKE2B 094e9569c501ae32def1335c8129d5585a2bec37d86c2317a2c9b2d965db5ce0ae6c19017bd44fb718709cf068f93ed75d08ab7e30c5f265e1ce45a9a9352897 SHA512 83d012989f9aab578c9bdb4dd95d316003938a39cc997949622b56523dd7081e09093c48c0016d738ca0040a00b3e6218ba59cad9e49e05f4106213160e7c409
-DIST gupnp-1.3.0.tar.xz 150160 BLAKE2B 300147881e30300cd2bbff7ffc2666d6281dc165cbfcca46617a59c244bb699d49f26074e07909782038f5a87939ac342fe5ae5468a9c38d8065ceea70293c6b SHA512 6367f3d616acef433a26d2475b4ec3067ced9d09e9e9ccf6400f30abc4202e0dd524aa33beb7bb5f88c9a62ff69fafc0d283dc0cb80220f53bfd027205069763
 DIST gupnp-1.3.1.tar.xz 152484 BLAKE2B bfed35567da37f420568ae90acb8c33674f5ef754d00722ce11ec381c602f7aee86502276a3e6bb04abd98d49826ff11518bf6283d2c4be9c4ddf48fb880627f SHA512 ee632d42803cb689926839336c2427c9622c40d1a43e69ef4c48dd26714649d544772697b4a440861dc896a13faba6793b02b7b9ab7c5288b6cf125abbb2d477
 EBUILD gupnp-1.2.7.ebuild 2065 BLAKE2B 3fe0f17df8f0b46738a499c4bc397df8f2cee85c043dbc5e05c15c233eac2d4e913d2faf411b98426f4065e38ffe4be693e6e5cafd733015444ef956cf00429c SHA512 56fccfb391d16337c85fa9db4230eb3ec4c370b3b23c9953eb2cbe3c4b481be563eda9dd9858382ebf836063a60eec0af156389d2e0191853da5b657c7120f78
-EBUILD gupnp-1.3.0.ebuild 2106 BLAKE2B 18dc5285702f075e17d40a683eb764e5d3ea94af0e9f631ea420f494d7c6e0c9bb81729b6d4a50b90c02552de79d07589f13ce651e82761fd21fc31e7f355854 SHA512 588d198c7df6ec981286a6a8cf50370a68a50f767c957606095c7094c9b3f78ba035034c7161eff681a6a539555eaa7bc52f8cd43f4aa9a3e63294ca753bfb88
 EBUILD gupnp-1.3.1.ebuild 2106 BLAKE2B 18dc5285702f075e17d40a683eb764e5d3ea94af0e9f631ea420f494d7c6e0c9bb81729b6d4a50b90c02552de79d07589f13ce651e82761fd21fc31e7f355854 SHA512 588d198c7df6ec981286a6a8cf50370a68a50f767c957606095c7094c9b3f78ba035034c7161eff681a6a539555eaa7bc52f8cd43f4aa9a3e63294ca753bfb88
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.3.0.ebuild b/net-libs/gupnp/gupnp-1.3.0.ebuild
deleted file mode 100644
index e981b8b42e46..000000000000
--- a/net-libs/gupnp/gupnp-1.3.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome.org meson-multilib python-single-r1 vala xdg
-
-DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp"
-
-LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
-SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( connman networkmanager )
-"
-
-# prefix: uuid dependency can be adapted to non-linux platforms
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.66:2[${MULTILIB_USEDEP}]
-	>=net-libs/gssdp-1.3.0:0=[introspection?,${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.2 )
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	virtual/pkgconfig
-	!connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) )
-	vala? ( $(vala_depend)
-		>=net-libs/gssdp-1.3.0:0[vala]
-		net-libs/libsoup:2.4[vala]
-	)
-"
-
-src_prepare() {
-	use introspection && vala_src_prepare
-	xdg_src_prepare
-}
-
-multilib_src_configure() {
-	local backend=system
-	use kernel_linux && backend=linux
-	use connman && backend=connman
-	use networkmanager && backend=network-manager
-
-	local emesonargs=(
-		-Dcontext_manager=${backend}
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		-Dexamples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.2
-}
diff --git a/net-libs/libaxc/Manifest b/net-libs/libaxc/Manifest
index 5abac3c07629..79bcd1ce1f14 100644
--- a/net-libs/libaxc/Manifest
+++ b/net-libs/libaxc/Manifest
@@ -1,4 +1,6 @@
 AUX libaxc-0.3.4-so-symlinks.patch 997 BLAKE2B 51b60a7055b0357a951425a83aa7f98b84a5cedc4a807992191766d51a5f5b672123a07e876972feba4753cd102851b9dbcbd15957bf11b5f794473f5a3bbdbe SHA512 b9567f60b37a4c2cc658a7215bdd864409f2b3626c28648547a9fe6bdaeebbc5f414cb5ca6e5a78dfd9d24b7b81a38bd358bd83887a56adb9ceed5049df6c187
 DIST libaxc-0.3.4.tar.gz 40198 BLAKE2B 78fc122eefbc5c6173bdad5cf31734cf95b750c09bddede5b2656a88bede3d6c25fb22af5447681c58eb1f296ee326480e22aacb843d951f1bd7a6933155432a SHA512 7b6b5466ee89d78d3c3a2e7cf961dfb3310bff01947e69e906c83ff97e89d1bdc0e2e92f7bd0d4b48a97af91409f435a4fd869229af5b67b2f66ba464bbfd7b8
+DIST libaxc-0.3.5.tar.gz 40418 BLAKE2B bcafe30c295fb6c5bd075cc7ecb9b81dcb094301a65d51ec7bcff82159c4fecdc6a4a64530e81c429803c8e267c3d6f6ccede8b5fda7d920af1c10c3806d66f0 SHA512 7708c136dfd57cc799ac467bea010ddbdcfe78a4cdae3c5882f97de7674e38e5f183f94fd42dd2df74dfec451f1822ef43122321aca46c042d5355b74e128694
 EBUILD libaxc-0.3.4-r2.ebuild 1253 BLAKE2B cfd715172d69015bafbd4ae41104a749fbfd0fede1c222beb4e3ad60770e6c394beff7af2d0e32edad3a88b5ae31c9fe00cccc892d655dd5f2600fbe98e88bdd SHA512 2c244b826eb7a25cd16040b1347561f973fb3cf0c7208f6d7312ef4c4f87d8cb44cfa9faca442e296bc70cac6bda0a35862f577df1ae8d96ab36c9e937c39b60
+EBUILD libaxc-0.3.5.ebuild 1204 BLAKE2B 3c3e6e7455583ed2a383a3e0415de5437e8fb3180db49b2db769bae4d10953adbdddb8a18db6fc56be7d5399cc5a1654a6216accef7bd67dc3f5206d997a1ed4 SHA512 06c75949deb1b84ba27224849d867021e8831aeab2bf6d8054ea70c1820f633c060da6d450c0d00b715c357c13b5753a974449ea9ec1750d391bcc53684a64b1
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/net-libs/libaxc/libaxc-0.3.5.ebuild b/net-libs/libaxc/libaxc-0.3.5.ebuild
new file mode 100644
index 000000000000..fe624430b582
--- /dev/null
+++ b/net-libs/libaxc/libaxc-0.3.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="axc-${PV}"
+DESCRIPTION="Client library for libsignal-protocol-c"
+HOMEPAGE="https://github.com/gkdr/axc"
+SRC_URI="https://github.com/gkdr/axc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"  # not GPL-3+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib
+	dev-libs/libgcrypt
+	net-libs/libsignal-protocol-c
+	"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-util/cmocka )
+	"
+
+S="${WORKDIR}"/${MY_P}
+RESTRICT="!test? ( test )"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rm -R lib || die  # unbundle libsignal-protocol-c
+	default
+}
+
+src_compile() {
+	emake PREFIX=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	# Respect libdir other than /usr/lib, e.g. /usr/lib64
+	local libdir="$(get_libdir)"
+	if [[ ${libdir} != lib ]]; then
+		mv "${D}"/usr/{lib,${libdir}} || die
+		sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \
+				-i "${D}/usr/${libdir}/pkgconfig/libaxc.pc" || die
+	fi
+
+	einstalldocs
+
+	if ! use static-libs ; then
+		rm "${D}/usr/${libdir}/libaxc.a" || die
+	fi
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/net-libs/libhtp/Manifest b/net-libs/libhtp/Manifest
index 4325b31ac605..13670f9fe0a4 100644
--- a/net-libs/libhtp/Manifest
+++ b/net-libs/libhtp/Manifest
@@ -1,3 +1,3 @@
 DIST libhtp-0.5.38.tar.gz 497753 BLAKE2B 84c4a89914dfadb9e3ab076e6f2354034cd384e7e76c9cbf00a7bf344cfcd7c24de200bd1af7f37356b00fbe13196fd3e49896f301b75fa05ce5b4e4ed297115 SHA512 6f2aa3b564948bde738ff60b917d64ffdcb71bbd5b25f11270ce16400fab6b8aab5c0e2372aff7f6be8818efab4b90843df527604835547691a4585fec9a19fe
-EBUILD libhtp-0.5.38.ebuild 856 BLAKE2B 99f95548fcd40c96a60ffa08aba47ed8c6fc585716697693f075cd112504836ca1575be342333ec6d00e21a22d21821d71073cf50797201bc32078f43b6c78ac SHA512 259c0095d1e8ba86b5c3013493d5a8d83dfb81149c1dd3b6721d1c771bb2f6674703fff1938967f572a255d956d1675bd3db327de809eaab87c25f4cda934d0e
+EBUILD libhtp-0.5.38.ebuild 863 BLAKE2B eaf5310ee316f7503149da00179a8af3de3073b73c30c2fca3518be3741e6b27048431b5bc51de54f675ffa03f934eab9f43cb2ff984c1f6f526ead3ff4b412f SHA512 6c1f9dcffce525a3a888cba242e4c1fe7514633be357509e459dffe5c248bdd53dd9455b3d605df9ee4a347ab4562d8c26c260c1958cc8c0fc37b0eeb0e1edf3
 MISC metadata.xml 314 BLAKE2B e5d844caabcf76837a2fdd5d27d3aeefa56773856d21a49187139a38a0ca445a7647fa72928a239df94f88137e213ef7560020baf4c250ec5257b892bc2f7d24 SHA512 c8738803840e411351a88683e51e1c89b7f4ca635d3c2bf6062abee768ee0571fd4d3ea9cde45698c7427391a2b7e2603114e6455647cb88e40be151d9aff714
diff --git a/net-libs/libhtp/libhtp-0.5.38.ebuild b/net-libs/libhtp/libhtp-0.5.38.ebuild
index 52f8e32728c6..fb42824c9846 100644
--- a/net-libs/libhtp/libhtp-0.5.38.ebuild
+++ b/net-libs/libhtp/libhtp-0.5.38.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OISF/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86"
 IUSE="debug static-libs"
 
 RDEPEND="sys-libs/zlib[static-libs?]"
diff --git a/net-libs/libnetfilter_log/Manifest b/net-libs/libnetfilter_log/Manifest
index 62c31757c088..bbf6a9a038f9 100644
--- a/net-libs/libnetfilter_log/Manifest
+++ b/net-libs/libnetfilter_log/Manifest
@@ -1,3 +1,3 @@
 DIST libnetfilter_log-1.0.1.tar.bz2 262545 BLAKE2B 4dcc7ff5deef95fc657a956556a1ff389cddaae3eaabed9c77cb7028793d5a0e377d2d02d55000ec853300b94164943436d658f42344a6314432b2f8f965fb8e SHA512 4088b9bf055fb4cd5f2e201a46a00def7642116b5d1695a371936b7b45eb93877944456506b45761bf2f3f81b40c161c1ecdcfb90532009f073dac3cedc6f436
-EBUILD libnetfilter_log-1.0.1.ebuild 698 BLAKE2B 0a7e2a46937aa4af09e9b2f4dfa065c0959e98c12565d6d1752a8646fcffe097dd1b94ad8e557af8fe607270fa28574967fecb2cca1c6246553689136a163a9e SHA512 74fa5f513863714ea9f372e486f7f0c9aa88e8d72ad8043cd1b9c2d2e65cfb8251b5eb7a29758e06f4f74ec80be57c1136d42cc54623e2dcef77d9146c0cc1bd
+EBUILD libnetfilter_log-1.0.1.ebuild 705 BLAKE2B 42febab635722cd8673c4512544eea0df814dc19af0092693c8bbd0dbb9eaa07f7c90790b9d95df9adc85791fdb5aafa74352cbe4b440c1eb24392108e434d10 SHA512 b0ac5df5cd2a7e5605ba732debffaf2eb8924a01dbfef5eb7d4f25ef318095bd158699c2396b201063db5469bfe17afda05a7fff804f33adca8def70cb19d05c
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild b/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild
index 97c5799a684b..6c560507f949 100644
--- a/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild
+++ b/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
+KEYWORDS="amd64 ~ia64 ppc ~riscv ~sparc x86"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND=">=net-libs/libnfnetlink-1.0.0"
diff --git a/net-libs/libnetfilter_queue/Manifest b/net-libs/libnetfilter_queue/Manifest
index 50f8152f40c0..97d114090815 100644
--- a/net-libs/libnetfilter_queue/Manifest
+++ b/net-libs/libnetfilter_queue/Manifest
@@ -3,5 +3,5 @@ DIST libnetfilter_queue-1.0.4.tar.bz2 312699 BLAKE2B 29d553c36af551cbaa3b1b4382a
 DIST libnetfilter_queue-1.0.5.tar.bz2 313856 BLAKE2B 0d7806fd23961f6b80f6ef63faf0fe10307a34495337a7f6dd4f0eb76b5ba8a96292b86285e0740f83414417810e47f47b1400c7d83fb4d8fc6f58954f4bd9df SHA512 732a44b602e5efaa4f5582ea25ff8f5ec8f4dca5c0e725cd93fe2d441db80416b25c6018147be90acb262d7428eb5b21b3f7b5920e612d115061ec6a19d67f85
 EBUILD libnetfilter_queue-1.0.3.ebuild 723 BLAKE2B 5904b5c2c5289c1eb44a1970b08e020698c46fa7eecfb600deb3dd8fc1657cca027eddecc73b0d8abdc6de2cc0c337952a7b9c4cb3fc2dbf16add36abbd91425 SHA512 c4cd950c48d2d1d842bec72000e66ce776d39becff0e89373a68f08663c19f7aa084ebc215c99d5676842c867eea9959aa9dc174181de28b1a4631069b7ca9b5
 EBUILD libnetfilter_queue-1.0.4.ebuild 895 BLAKE2B 2839c19ee5ebbe3dd18348ed49cd88843fab057bf878a5b860d5374d4bff43133ca94cbbcc9b4892471632716f46bf3484073ba6edd8211ab24ef280a696924c SHA512 b4bf7aca2998a878e8c71fa7f6cd3f8bd45f66735503f4dd523dabe937cd988ed56a6ac2a7ecbcef6b4f9918cc9872810bb2b60986ed464fc78005672176288a
-EBUILD libnetfilter_queue-1.0.5.ebuild 887 BLAKE2B 49df9c2e3d09696558a13388da533d81d79213bff92955eab9b69d9b9151164a41ad4c7ca44dfaa27660aa26499dba2e41bd9c47535d3c0699beabaeb27acfae SHA512 b20f4292fd865b8bb0fb2f2d022c8a3150bcbab982f4610598a77512bf040f63fcf25afa4ad2269ca2771e4fa1361db1d4593e0d66b37b2785655840fa81ff69
+EBUILD libnetfilter_queue-1.0.5.ebuild 894 BLAKE2B 76e834b1f6b1845ae03286c9345902f027af993c41671d49c8703d6172f4af11f252f2b7f3ae07315733b92dc0f346c59aadf4dcdfdc73852c465f4d16315450 SHA512 708cf76edd6ecd6aaf1ed158810bf2319f6cd03dca998ca838b15568f39ace63781dae6a809a04f350abdfcecd9bf33a359dd3f1aadefa2517816da43b4e319d
 MISC metadata.xml 370 BLAKE2B 5ffcfd5d89a391b532e7d64188fe64b9a99a72c9072aa8bea89157a3b322b0f1ee0edab1ba3d2b088857748ab2e5402dc6ba0db514e9c1ba465bf0b6716b6fc9 SHA512 d81ab4bbba709f4b4dd90ba5029ed20471230817f7c538e502ce3cd533e1439326d101e8e7a34e81c8714699d87f195dd95c2157216f9926baafe7b5c8aeb213
diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild
index e809f5a1e1e8..149830904d0d 100644
--- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild
+++ b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
index 3100fdb24611..726d863140e4 100644
--- a/net-libs/libquotient/Manifest
+++ b/net-libs/libquotient/Manifest
@@ -1,5 +1,7 @@
 AUX libquotient-0.6.3-no-android.patch 930 BLAKE2B 15ae94889d5543b9d8e6113752df00fef0bcabd2c44adf4146d2751077ec08db17048d4c8716bd245b4f6856e581970c1d230511a681dbb6ae64178bc3fcf75e SHA512 ef3414f3e3dda3926c246d0360be227c52a1ce0aa970f65aff29d2dcbe2c605fc2f583cebba4ad3f8934b872a035a3cc7a9895847eaf9faddf0f46023647f7b9
 AUX libquotient-0.6.3-no-tests.patch 1421 BLAKE2B 97f6b9c3cfe5b32607d64fadbd8e72aa0d1f5d14382edd2792fd564cc226cc473ccda18e770d1b449c158b156bb67dcbbbc36f8587436bec28295b8737279f9e SHA512 76d47d6837c4cfb86be95253ad89fb31de60181b12433a579072b567d18c49a040aafeeb51f333ae4038b141724fbaf68a28a440a1a986f5c61eb25b093b2139
 DIST libquotient-0.6.7.tar.gz 560174 BLAKE2B 1f0fe371bf84925c7a8b7728a1e484e9cb7c7d5887539c86a863d05d34727b2385425743260c7c0b33205473215475c7bd5ec8b709032a00591dbfd7cafa721c SHA512 7f7c56ef5f775d38a0bd9f112f2fb7473d42d1e886d17e84d4be1afda146999658eea8691c38071fd87aec7ece52b97bc837cc98452cc698cf152003474193f2
+DIST libquotient-0.6.8.tar.gz 561552 BLAKE2B b1be7c961a3b995b3c4aa0611161eefb35fffbc70528b86db78680c4a744c4fce296e40122b0e0ced48313f81f81311a35a19a751abdd3a41d0d8f09d28ba220 SHA512 e671049610069c9dc3624cc6471237504bcb9a388d2a7eecbf95eae2a2e9ac1e62f78cb9bb38c381510a69d00e4dc98d261c5951f41306a23065c35e157c69f6
 EBUILD libquotient-0.6.7.ebuild 872 BLAKE2B 292ac644871226e3b07e6d3920553e59be3e8c722d60909ca607378fd8fc270b2e8435c3f4d268ab02c9e32a28fd82ae03e3fda70bd24eda9c15b1f277a48993 SHA512 a2be01c7c8855ad00d385684df470f97dedf767d71078f76649283364292778c3875b46f89f88e2edcd021b21563ac1b19748b96a01721d363821f8a3c0a2276
+EBUILD libquotient-0.6.8.ebuild 872 BLAKE2B 292ac644871226e3b07e6d3920553e59be3e8c722d60909ca607378fd8fc270b2e8435c3f4d268ab02c9e32a28fd82ae03e3fda70bd24eda9c15b1f277a48993 SHA512 a2be01c7c8855ad00d385684df470f97dedf767d71078f76649283364292778c3875b46f89f88e2edcd021b21563ac1b19748b96a01721d363821f8a3c0a2276
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libquotient/libquotient-0.6.8.ebuild b/net-libs/libquotient/libquotient-0.6.8.ebuild
new file mode 100644
index 000000000000..ebeb0a0321d5
--- /dev/null
+++ b/net-libs/libquotient/libquotient-0.6.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Qt5-based SDK to develop applications for Matrix"
+HOMEPAGE="https://github.com/quotient-im/libQuotient"
+SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/libQuotient-${PV}"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# downstream patches
+	"${FILESDIR}"/${PN}-0.6.3-no-android.patch
+	"${FILESDIR}"/${PN}-0.6.3-no-tests.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DQuotient_INSTALL_TESTS=OFF
+		-DQuotient_ENABLE_E2EE=OFF # TODO: libolm, libqtolm not packaged
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON # no thanks.
+	)
+	cmake_src_configure
+}
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 933ab0ee9d08..3d020cacd931 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -4,8 +4,8 @@ DIST mbedtls-2.26.0.tar.gz 4080986 BLAKE2B 549f00db4bfbba4a88de0ff76f32140d7421a
 DIST mbedtls-2.27.0.tar.gz 4212185 BLAKE2B 31840e5a518643495f319cac8e0c876bdca5dbdee6524d30cace3538d5fb5ba7847dd653f61f775f5c3c384ac0533afdbf6172b3e523db515eceecc29fadd2da SHA512 9503ef75f08d2574e0800b2e3b6f030461cbd97c74863a20e5688ced7558b0b6f87cbe33cbd003e69c825d0321393fe9b00b0be190ab408138414b99d5102994
 DIST mbedtls-3.0.0.tar.gz 4163127 BLAKE2B 5d94124a251dbcc38de614319f93c6f0346de516fd944c765ab3e60d46fba8fbbdba7a6f9e00f5f0550137301b4de98795851df788e367c4fcf03abb981d3c63 SHA512 be11878d82fc93d0847718514f4887c68d7b186c54682316c4a01082583a917b81f9760bb708aab72bf37148581a8dbc9f7048faf745cd2e1cd7e5bf8c48abad
 EBUILD mbedtls-2.16.10.ebuild 2436 BLAKE2B 0d76524a1be47d488c732ba0a3d4ea76a5eeb915e0f83575ae498fffc5629f2b86e399e3f00ed5418fe14ca2204febcf4a23d2e9a3a5338630b9f67bc027e8cf SHA512 d54f04f7988457506fc2abe03fb8e97b6abb7555c72bc852917e33aa6ece7b291c96cb6dabd5806cd19d5407806279981e660a1ff371b37b94535d7ddfdd99cc
-EBUILD mbedtls-2.16.11.ebuild 2439 BLAKE2B 5e9f3cdaed82ea1c5289cd74f0dae801946758dedd85211a0bf5752fab1ca173dd760efc1e21d0dcbfc7531031acda915e43688ce462d8a5c00eebe18493323e SHA512 7df4981d8012a67c307723a450892fd175deec9184da08394ecc5f920712775719a5fb390d7bea2640db886499ff5ba4e6c898453c28549f84688bba7edf305a
+EBUILD mbedtls-2.16.11.ebuild 2438 BLAKE2B 5cafffdd2bc93104f11441b663950d1574f1a8ab0857b39dcf83319eb2342de43259848fa7ccac14c02d986244f98c11d4686c3ad461f734a461513af8d2dee4 SHA512 4524b24adbd489b80121a15ae3c27caf83db6aa0ec19bb8b24fced45bbe7e85eaccff4c8e0ee5e189be59ee13d90f080e89cf05185ad011b942909085bb39c5f
 EBUILD mbedtls-2.26.0.ebuild 2502 BLAKE2B 6f7f727b0466a0d091596f5c187222b095a21fa61d6b70073db7014f17539440781f70e763bf17c5451e832db6795d3289528f1cb9cec53450da120a5b5ffb0b SHA512 ffed411ce59d0476563af7393dd9733d0b44eebc7e232cc6f88b2788af4a98c7511dafb1238874fa941df57ec3de7acede0459353103973ec0ddb03274053c41
-EBUILD mbedtls-2.27.0-r1.ebuild 2507 BLAKE2B 2200e4449573725a77089fc2d93bfbb3a83f2971f2a4e13eff6c93b6173ec7bbadf093cdf508653e1e35f04b6ffa20173b6a3395ab93291dcf2e49fe2e9448b8 SHA512 b35169a17150ce41bd42b0cbd5e6e22ba31e20521eb4fba9bb07ca4ab9dc525dabce7e7e484bffa28428045508f12a98a4ec2e2845c9807d295efda25a071be2
+EBUILD mbedtls-2.27.0-r1.ebuild 2506 BLAKE2B a8afd967db60b7f7d88ffc2c37e522108684c8c646db5ff497cb0cd6320cc6c776db58a32a12fbbc225d9928effff67a9b2dd0c081b6eb7396abb896585da2c7 SHA512 fa2e62b2ec92e87b67b2a1d52e8fbc02b103c56e855599caff1f8a22267684b8929bf7694dc438d2cf6643b931ead4bbd42336f3a5d9c379a04fb2c588e01d14
 EBUILD mbedtls-3.0.0.ebuild 2303 BLAKE2B fc3b11e2295fc79a2368e26c0ef0fa3a05de3e8187be3ee23a8e6ad8375ae0553559d29701bc887130928f057b99fae64bc3b897814636f134d42dbfd87a7b66 SHA512 d54986230f6e43923ef4bbf35d85bc80f65af4542e6f15f7894af0bb505778ed7cacd27a5cda4697868b43473a7572bec69fea9a8f63f73427e2a35641fce3c1
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.16.11.ebuild b/net-libs/mbedtls/mbedtls-2.16.11.ebuild
index 85b70ebde1c4..cdad78fbee89 100644
--- a/net-libs/mbedtls/mbedtls-2.16.11.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.11.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86"
 IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild b/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
index 1ddd91911ae8..1a6dbf01e2a2 100644
--- a/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/7.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/telepathy-logger-qt/Manifest b/net-libs/telepathy-logger-qt/Manifest
index 3e4b46e015f4..0c1e4209a84f 100644
--- a/net-libs/telepathy-logger-qt/Manifest
+++ b/net-libs/telepathy-logger-qt/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-logger-qt-17.09.0.tar.xz 93480 BLAKE2B f516ff58b64a59ba3b51c0daf0c871fd0e03b7860fa94f2139175cccb3e5ff4f108b09db22366bdc2e4031556ab06712d1d935b8db7b1ed9b08803f047c943c3 SHA512 1524673a7dcba0d65c57e49d6e0dafd1b826b6444faaabc1dc482b29f6515374a1beb09a9bbfb115097e10fc18722ffe0187dc1bff9be06dc56a95ef32d805e3
-EBUILD telepathy-logger-qt-17.09.0.ebuild 732 BLAKE2B b5e1c16589a2a770b4fc4678333f7ee8c2c082351db0811de42c0c12c53bfb3a67e2b8764946af86ada0e912ad1a7b12efe4ad97f0c490bfce1f28983138b708 SHA512 1d4069a4f08f2eedd9ea19d16952b714f26b18173ad97378c7572fa58c997e35deaaa5500623bd9854855271181569b512b9d2a609ea88d8a73b482dbea4f040
+EBUILD telepathy-logger-qt-17.09.0.ebuild 732 BLAKE2B 24af3de19ca50b499b96fe05bb500f2fc1d0c8289c43206e597640118d5ccaf57b6ff498f3a2abc3043e2a293aed9ab9d6b634dad36f784e1b7c75fb210a5dfc SHA512 71c3ebe84fcd3bf256dd48db36273e986857a6f82873f984966da82e9a15ca584c0bdb87f9e3ff101ea433bd7c305daefb45056442eada6a5dd1e31fdd0d309e
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild
index 3e2278e712b6..0579ae2ff755 100644
--- a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild
+++ b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.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=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 QTMIN=5.12.3
 inherit ecm kde.org python-any-r1
 
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index d1e3da7fb517..c176774f7d8c 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/popa3d/Manifest b/net-mail/popa3d/Manifest
index c7e309a6465d..c2f729657a85 100644
--- a/net-mail/popa3d/Manifest
+++ b/net-mail/popa3d/Manifest
@@ -2,5 +2,5 @@ AUX popa3d-initrc 368 BLAKE2B ff43e20de31313409b7e9930c397cc4585a500ea6d2372206b
 DIST popa3d-0.5.9-maildir-2.diff.gz 3227 BLAKE2B 09cffef1280cd038c1953c0b14dc7b701231fdff0f18f9cfec4c732e2c2b1b857a01c12671afc510e24860554157bd990be917662ab5dadb9512683da831b4c6 SHA512 7d2ab786e6249acfaadaa544adf49dca42b5628f50aa9f52fd1caa80127adc83afa4623824170c9f3b761a39949fcf3c90edbdbb9fdfbf4e06afaa67cdfbaac3
 DIST popa3d-0.6.3-vname-2.diff.gz 947 BLAKE2B 1a64b8de2cbda4757a670aee61e4665bd394f4128763119feacacbdc4921c7a0c128050b3f15f369c4fdea68cc4c595ab1eb48e729a119e1078d4cfd6f874092 SHA512 eba7df6d03d2745272505b62053d0db56ea326a716e43a9133257465f78fc5030cb09b48d79e86f6a982f7d8e9d18ee64aadf261e60a4f0a56357a4a2517a30a
 DIST popa3d-1.0.2.tar.gz 32848 BLAKE2B 1f0af2f1f12ec255f3f42eb54087f7c4859beee49d55cae60f32b4f5a58a0062c7cd5eae3690d778f3d7f7bea6678fe937b4864a2a7586c12837edf19df57fdf SHA512 e577297b4dafb4091110886a5db07184707475651a8ee3b6369f4cab5676852d7286a3729da46fff9161bc3cd46bdc0d032205dc5609bfb38be69eaeab068906
-EBUILD popa3d-1.0.2-r1.ebuild 4923 BLAKE2B 1171c9a00ef7093036bd9a5da62510bac62244b9eb5d9c0841776426fdcbdf46e24abe956e93bf25b87e9da21196cbb4a4ff07bfea34db3cae5c506647c27244 SHA512 16fcd58001b5ab6cffcdae8848f9202628bc8d7ef3e1691205f24d87aa6097bd2444f2f2b4f235f9ff9d68389e810b552c4cc4f4b624233b0c83410a61e48334
+EBUILD popa3d-1.0.2-r2.ebuild 4943 BLAKE2B 19802ac3c4fc3b3f877a4e84260801e823dda144ef0c48a8f914314e63312d8d8983ae7b018f510b145fb20a37c5675c274f45e4f83a6158fb4d5c54a190024e SHA512 add1fe6d090cc35f58ad202092f9a7cc28979938f750b661a13fd212b9233b946cefcd0961c3ca2558164b60d2109ee900e087364dbbb9d492e36523ecb5c013
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/popa3d/popa3d-1.0.2-r1.ebuild b/net-mail/popa3d/popa3d-1.0.2-r1.ebuild
deleted file mode 100644
index 3211b59858e1..000000000000
--- a/net-mail/popa3d/popa3d-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A security oriented POP3 server"
-HOMEPAGE="http://www.openwall.com/popa3d/"
-SRC_URI="
-	http://www.openwall.com/popa3d/${P}.tar.gz
-	mirror://gentoo/popa3d-0.6.3-vname-2.diff.gz
-	maildir? ( mirror://gentoo/popa3d-0.5.9-maildir-2.diff.gz )"
-
-LICENSE="Openwall"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="pam mbox +maildir"
-REQUIRED_USE="^^ ( maildir mbox )"
-
-DEPEND="
-	acct-group/popa3d
-	acct-user/popa3d
-	pam? (
-		>=sys-libs/pam-0.72
-		>=net-mail/mailbase-0.00-r8[pam]
-	)"
-RDEPEND="${DEPEND}"
-
-# Mailbox format is determined by the 'mbox' and 'maildir'
-# system USE flags.
-#
-# Mailbox path configuration denoted by the system USE
-# flags.
-#
-# USE flag 'maildir' denotes ~/.maildir
-# USE flag 'mbox' denotes /var/mail/username
-#
-# You can overwrite this by setting the POPA3D_HOME_MAILBOX
-# environmental variable (see below) before emerge.
-#
-# Environmental variables.
-#
-# POPA3D_HOME_MAILBOX
-#
-# Overwrite the local user mailbox path. For example
-# if you want qmail-styled ~/Mailbox you can set it
-# to "Mailbox". For the traditional (although not in
-# gentoo Maildir) set it to "Maildir".
-#
-# POPA3D_VIRTUAL_ONLY
-#
-# Set this field to "YES" if you dont want local users
-# to have POP access. Setting this makes the POPA3D_HOME_MAILBOX
-# variable effectively useless.
-#
-# POPA3D_VIRTUAL_HOME_PATH
-#
-# Set this field to the base virtual home path. For more information
-# read the virtual guide here: https://forums.gentoo.org/viewtopic.php?t=82386
-#
-######
-# 12/07/2005 - port001
-# Version 1.0 introduced some increased default values for a number of
-# configuration paramaters. These values are way too high for most systems.
-MAX_SESSIONS=100 # Default is 500
-MAX_SESSIONS_PER_SOURCE=10 # Default is 50
-
-MAX_MAILBOX_MESSAGES=100000 # Default is 2097152
-MAX_MAILBOX_OPEN_BYTES=100000000 # Default is 2147483647
-MAX_MAILBOX_WORK_BYTES=150000000 # Default is 2147483647
-######
-
-pkg_setup() {
-	einfo "You can customize this ebuild with environmental variables."
-	einfo "If you don't set any I'll assume sensible defaults."
-	einfo
-	einfo "See inside this ebuild for details."
-}
-
-src_prepare() {
-	eapply "${WORKDIR}"/popa3d-0.6.3-vname-2.diff
-	use maildir && eapply "${WORKDIR}"/popa3d-0.5.9-maildir-2.diff
-	eapply_user
-}
-
-src_configure() {
-	sed -i \
-		-e "s:^\(#define MAX_SESSIONS\) .*$:\1 ${MAX_SESSIONS}:" \
-		-e "s:^\(#define MAX_SESSIONS_PER_SOURCE\).*$:\1 ${MAX_SESSIONS_PER_SOURCE}:" \
-		-e "s:^\(#define MAX_MAILBOX_MESSAGES\).*$:\1 ${MAX_MAILBOX_MESSAGES}:" \
-		-e "s:^\(#define MAX_MAILBOX_OPEN_BYTES\).*$:\1 ${MAX_MAILBOX_OPEN_BYTES}:" \
-		-e "s:^\(#define MAX_MAILBOX_WORK_BYTES\).*$:\1 ${MAX_MAILBOX_WORK_BYTES}:" \
-			params.h || die "sed on params.h failed (1)"
-
-	if use maildir ; then
-		einfo "Mailbox format is: MAILDIR."
-		if [[ -z ${POPA3D_HOME_MAILBOX} ]] ; then
-			POPA3D_HOME_MAILBOX=".maildir"
-		fi
-	else
-		einfo "Mailbox format is: MAILBOX."
-	fi
-
-	if [[ -n ${POPA3D_HOME_MAILBOX} ]] ; then
-		einfo "Mailbox path: ~/${POPA3D_HOME_MAILBOX}"
-		sed -i \
-			-e "s:^\(#define MAIL_SPOOL_PATH.*\)$://\1:" \
-			-e "s:^\(#define HOME_MAILBOX_NAME\).*$:\1 \"${POPA3D_HOME_MAILBOX}\":" \
-				params.h || die "sed on params.h failed (2)"
-	else
-		einfo "Mailbox path: /var/mail/username"
-	fi
-
-	if [[ ${POPA3D_VIRTUAL_ONLY} = "YES" ]] ; then
-		einfo "Virtual only, no local system users"
-		sed -i -e "s:^\(#define VIRTUAL_ONLY\).*$:\1 1:" \
-			params.h || die "sed on param.h failed (2.5)"
-	fi
-
-	if [[ -n ${POPA3D_VIRTUAL_HOME_PATH} ]] ; then
-		einfo "Virtual home path set to: ${POPA3D_VIRTUAL_HOME_PATH}"
-		sed -i \
-			-e "s:^\(#define VIRTUAL_HOME_PATH\).*$:\1 \"$POPA3D_VIRTUAL_HOME_PATH\":" \
-				params.h || die "sed on params.h failed (3)"
-	fi
-
-	if [[ ${POPA3D_VIRTUAL_ONLY} = "YES" ]] ; then
-		einfo "Authentication method: Virtual."
-	elif use pam ; then
-		einfo "Authentication method: PAM."
-		append-libs -lpam
-		sed -i \
-			-e "s:^\(#define AUTH_SHADOW\)[[:blank:]].*$:\1 0:" \
-			-e "s:^\(#define AUTH_PAM\)[[:blank:]].*$:\1 1:" \
-				params.h || die "sed on params.h failed (4)"
-	else
-		einfo "Authentication method: Shadow."
-	fi
-
-	sed -i \
-		-e "s:^\(#define POP_STANDALONE\).*$:\1 1:" \
-		-e "s:^\(#define POP_VIRTUAL\).*$:\1 1:" \
-		-e "s:^\(#define VIRTUAL_VNAME\).*$:\1 1:" \
-			params.h || die "sed on params.h failed (5)"
-
-	sed -i \
-		-e '/^CC =/d' \
-		-e '/^CFLAGS =/d' \
-		-e '/^LDFLAGS =/d' \
-			Makefile || die "Makefile cleaning failed"
-}
-
-src_compile() {
-	emake LIBS="${LIBS} -lcrypt" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC=$(tc-getCC)
-}
-
-src_install() {
-	dosbin popa3d
-	doman popa3d.8
-	dodoc DESIGN INSTALL CHANGES VIRTUAL CONTACT
-
-	diropts -m 755
-	dodir /var/empty
-	keepdir /var/empty
-
-	newinitd "${FILESDIR}"/popa3d-initrc popa3d
-
-	if use pam ; then
-		dodir /etc/pam.d/
-		dosym pop /etc/pam.d/popa3d
-	fi
-}
diff --git a/net-mail/popa3d/popa3d-1.0.2-r2.ebuild b/net-mail/popa3d/popa3d-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..47383afa0c2f
--- /dev/null
+++ b/net-mail/popa3d/popa3d-1.0.2-r2.ebuild
@@ -0,0 +1,177 @@
+# 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="A security oriented POP3 server"
+HOMEPAGE="http://www.openwall.com/popa3d/"
+SRC_URI="
+	http://www.openwall.com/popa3d/${P}.tar.gz
+	mirror://gentoo/popa3d-0.6.3-vname-2.diff.gz
+	maildir? ( mirror://gentoo/popa3d-0.5.9-maildir-2.diff.gz )"
+
+LICENSE="Openwall"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="pam mbox +maildir"
+REQUIRED_USE="^^ ( maildir mbox )"
+
+DEPEND="
+	acct-group/popa3d
+	acct-user/popa3d
+	virtual/libcrypt:=
+	pam? (
+		>=sys-libs/pam-0.72
+		>=net-mail/mailbase-0.00-r8[pam]
+	)"
+RDEPEND="${DEPEND}"
+
+# Mailbox format is determined by the 'mbox' and 'maildir'
+# system USE flags.
+#
+# Mailbox path configuration denoted by the system USE
+# flags.
+#
+# USE flag 'maildir' denotes ~/.maildir
+# USE flag 'mbox' denotes /var/mail/username
+#
+# You can overwrite this by setting the POPA3D_HOME_MAILBOX
+# environmental variable (see below) before emerge.
+#
+# Environmental variables.
+#
+# POPA3D_HOME_MAILBOX
+#
+# Overwrite the local user mailbox path. For example
+# if you want qmail-styled ~/Mailbox you can set it
+# to "Mailbox". For the traditional (although not in
+# gentoo Maildir) set it to "Maildir".
+#
+# POPA3D_VIRTUAL_ONLY
+#
+# Set this field to "YES" if you dont want local users
+# to have POP access. Setting this makes the POPA3D_HOME_MAILBOX
+# variable effectively useless.
+#
+# POPA3D_VIRTUAL_HOME_PATH
+#
+# Set this field to the base virtual home path. For more information
+# read the virtual guide here: https://forums.gentoo.org/viewtopic.php?t=82386
+#
+######
+# 12/07/2005 - port001
+# Version 1.0 introduced some increased default values for a number of
+# configuration paramaters. These values are way too high for most systems.
+MAX_SESSIONS=100 # Default is 500
+MAX_SESSIONS_PER_SOURCE=10 # Default is 50
+
+MAX_MAILBOX_MESSAGES=100000 # Default is 2097152
+MAX_MAILBOX_OPEN_BYTES=100000000 # Default is 2147483647
+MAX_MAILBOX_WORK_BYTES=150000000 # Default is 2147483647
+######
+
+pkg_setup() {
+	einfo "You can customize this ebuild with environmental variables."
+	einfo "If you don't set any I'll assume sensible defaults."
+	einfo
+	einfo "See inside this ebuild for details."
+}
+
+src_prepare() {
+	eapply "${WORKDIR}"/popa3d-0.6.3-vname-2.diff
+	use maildir && eapply "${WORKDIR}"/popa3d-0.5.9-maildir-2.diff
+	eapply_user
+}
+
+src_configure() {
+	sed -i \
+		-e "s:^\(#define MAX_SESSIONS\) .*$:\1 ${MAX_SESSIONS}:" \
+		-e "s:^\(#define MAX_SESSIONS_PER_SOURCE\).*$:\1 ${MAX_SESSIONS_PER_SOURCE}:" \
+		-e "s:^\(#define MAX_MAILBOX_MESSAGES\).*$:\1 ${MAX_MAILBOX_MESSAGES}:" \
+		-e "s:^\(#define MAX_MAILBOX_OPEN_BYTES\).*$:\1 ${MAX_MAILBOX_OPEN_BYTES}:" \
+		-e "s:^\(#define MAX_MAILBOX_WORK_BYTES\).*$:\1 ${MAX_MAILBOX_WORK_BYTES}:" \
+			params.h || die "sed on params.h failed (1)"
+
+	if use maildir ; then
+		einfo "Mailbox format is: MAILDIR."
+		if [[ -z ${POPA3D_HOME_MAILBOX} ]] ; then
+			POPA3D_HOME_MAILBOX=".maildir"
+		fi
+	else
+		einfo "Mailbox format is: MAILBOX."
+	fi
+
+	if [[ -n ${POPA3D_HOME_MAILBOX} ]] ; then
+		einfo "Mailbox path: ~/${POPA3D_HOME_MAILBOX}"
+		sed -i \
+			-e "s:^\(#define MAIL_SPOOL_PATH.*\)$://\1:" \
+			-e "s:^\(#define HOME_MAILBOX_NAME\).*$:\1 \"${POPA3D_HOME_MAILBOX}\":" \
+				params.h || die "sed on params.h failed (2)"
+	else
+		einfo "Mailbox path: /var/mail/username"
+	fi
+
+	if [[ ${POPA3D_VIRTUAL_ONLY} = "YES" ]] ; then
+		einfo "Virtual only, no local system users"
+		sed -i -e "s:^\(#define VIRTUAL_ONLY\).*$:\1 1:" \
+			params.h || die "sed on param.h failed (2.5)"
+	fi
+
+	if [[ -n ${POPA3D_VIRTUAL_HOME_PATH} ]] ; then
+		einfo "Virtual home path set to: ${POPA3D_VIRTUAL_HOME_PATH}"
+		sed -i \
+			-e "s:^\(#define VIRTUAL_HOME_PATH\).*$:\1 \"$POPA3D_VIRTUAL_HOME_PATH\":" \
+				params.h || die "sed on params.h failed (3)"
+	fi
+
+	if [[ ${POPA3D_VIRTUAL_ONLY} = "YES" ]] ; then
+		einfo "Authentication method: Virtual."
+	elif use pam ; then
+		einfo "Authentication method: PAM."
+		append-libs -lpam
+		sed -i \
+			-e "s:^\(#define AUTH_SHADOW\)[[:blank:]].*$:\1 0:" \
+			-e "s:^\(#define AUTH_PAM\)[[:blank:]].*$:\1 1:" \
+				params.h || die "sed on params.h failed (4)"
+	else
+		einfo "Authentication method: Shadow."
+	fi
+
+	sed -i \
+		-e "s:^\(#define POP_STANDALONE\).*$:\1 1:" \
+		-e "s:^\(#define POP_VIRTUAL\).*$:\1 1:" \
+		-e "s:^\(#define VIRTUAL_VNAME\).*$:\1 1:" \
+			params.h || die "sed on params.h failed (5)"
+
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/^CFLAGS =/d' \
+		-e '/^LDFLAGS =/d' \
+			Makefile || die "Makefile cleaning failed"
+}
+
+src_compile() {
+	emake LIBS="${LIBS} -lcrypt" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC=$(tc-getCC)
+}
+
+src_install() {
+	dosbin popa3d
+	doman popa3d.8
+	dodoc DESIGN INSTALL CHANGES VIRTUAL CONTACT
+
+	diropts -m 755
+	dodir /var/empty
+	keepdir /var/empty
+
+	newinitd "${FILESDIR}"/popa3d-initrc popa3d
+
+	if use pam ; then
+		dodir /etc/pam.d/
+		dosym pop /etc/pam.d/popa3d
+	fi
+}
diff --git a/net-mail/qmailadmin/Manifest b/net-mail/qmailadmin/Manifest
index 1610268be61d..2bd3c22aab28 100644
--- a/net-mail/qmailadmin/Manifest
+++ b/net-mail/qmailadmin/Manifest
@@ -3,6 +3,6 @@ AUX qmailadmin-1.2.15-quota-security.patch 1820 BLAKE2B 59ffe36de71e5c02bba8a93d
 AUX qmailadmin-1.2.9-maildir.patch 253 BLAKE2B 6da2fb45531cc88a98960b9443ca7dff84bbd9385042bbba7a9e5f09bb59bc2b8e5543fb9f4792ab447ee259948f11f3244e37822b331150fb7aeef76f97d4f8 SHA512 e6d617db023af69d96e5d7d85ba7bbf24886b7b947feab333e4bd219c719351076396bf27b4de97e78a4888cdeabb0d989107133fe3dfcdcfbe92079c2f86045
 DIST qmailadmin-1.2.15.tar.gz 385529 BLAKE2B 2bd4f86d157c577f410e44ec8c8c7df25d654b1dbf0621e52c167067bf72ce04bc7b03230c2517e97c14bd4f5bb3354da23d9794faafc7d3d007476c7b98dfdb SHA512 0cf32916bd6ef47fce091d4a92203fb8b80e0c3349cf8af826c047ba778e7992bcb98002023219648c7aa1ab60fbb052d4726f12f44d68647e657fb3760b8347
 DIST qmailadmin-1.2.16.tar.gz 388689 BLAKE2B 713fbf862eb19940801394b85371f7249ab31528891356b226ba88b55ecd3027f0cdcd08b10a1eb1a4b93355b4bf948dae96d34dbfb3a1df3c3291fe5a8ddb8d SHA512 4afa18461d8bb91e7075f08f00f3e1ef030a01381d049e122d4c234f2b6db9884d4426e9f4c61d5257e55786228741a3b8ded1fbfb925611f536cedb9d61de91
-EBUILD qmailadmin-1.2.15-r1.ebuild 2249 BLAKE2B 00937339b99da654aec25bce4fa8aa7d33cf85f8d55701fc8de8131f7fe1f1843133bfb0f9ca8330442693b5b27098e0ed57ddbd20ea2dda1284b3ca73041a6c SHA512 91c6d9985b30586d7d55e044da958866a838f23772b6cc7993d73d6edcdc46eb15b17a60e063ab881274f64fda72eb6213fca609890f8c3b939286e9111ae8c6
-EBUILD qmailadmin-1.2.16.ebuild 2676 BLAKE2B 19f14a7b388a3dd782934b6a584f8c6ee017a8ef0b4a33ea6125fe8d3dfc0f93a8fc5bb76f70a8c1083dabc512e212ec9d208e8398ff19cdd68eed3104b29218 SHA512 f822e34d6ac09062ce5e5799dc38f0a0c3dd889cef96e6e67e0d6bc51b140a7394830607eeac8231648138f506b88be57164ac86277e56ff89926eb84c0d66b7
+EBUILD qmailadmin-1.2.15-r2.ebuild 2269 BLAKE2B 62cfc635fdb1a4c31c4f6e6ccd5decd086bffaf40b202e08fd53f79c9400bd274349572d676383fddc53dda2257bd9666cd7236c82624f326ced18392343376f SHA512 5143af2fc638d996bd6a01baaaa925eea66eca47d1071887f0a8735be02e72847dff8ace49a4c1e95398073e1059e7cf7359480d841a81f15b9a0460eea887bb
+EBUILD qmailadmin-1.2.16-r1.ebuild 2696 BLAKE2B b0dd1f5fc396d4104c74b28ac929c05c2a7b9eb2258a9ab7e9d9c0237e00c1f3adc6f8a3c75509c6b2f11b20156e24b4b7b150f851a0eb3f362205d90c352d3e SHA512 7250ee0d3107326d121ef9ca33718293395388b468428b97528ed94b832f3fafb849ace5d680b45564c3b35717e75d6d6f7a490568a62e6e6e80d1e30e150b34
 MISC metadata.xml 383 BLAKE2B 7d5f44a77875376d051d96c84e1f33146807299931154722ee05202eb93b31fdac420707de49870fe8e7b94075a82bb70d25c1c3a11c947f4e0de41d01a9c432 SHA512 ee861bd6d5cecd32a6f5dbbacc51d13d0105c83bd9b44f63fe9ec21937b17bb6cbcf27ae202e2b31f60e7e0e79c8810f3c6e63752ee2bef6423520395efa00fa
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
deleted file mode 100644
index 20bdc0db0cff..000000000000
--- a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WEBAPP_MANUAL_SLOT="yes"
-inherit autotools qmail webapp
-
-MY_P=${P/_rc/-rc}
-
-DESCRIPTION="A web interface for managing a qmail system with virtual domains"
-HOMEPAGE="http://www.inter7.com/qmailadmin.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc ~s390 sparc x86"
-IUSE="maildrop"
-# the RESTRICT is because the vpopmail lib directory is locked down
-# and non-root can't access them.
-RESTRICT="userpriv"
-
-RDEPEND="
-	net-mail/autorespond
-	>=net-mail/vpopmail-5.4.33
-	virtual/qmail
-	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-1.2.9-maildir.patch
-	eapply "${FILESDIR}"/${PN}-1.2.12-quota-overflow.patch
-	eapply "${FILESDIR}"/${PN}-1.2.15-quota-security.patch
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	# Pass spam stuff through $@ so we get the quoting right
-	if use maildrop ; then
-		set -- --enable-modify-spam \
-			--enable-spam-command='|preline maildrop /etc/maildroprc'
-	else
-		set --
-	fi
-
-	econf \
-		--enable-valias \
-		--enable-vpopmaildir=/var/vpopmail \
-		--enable-htmldir="${MY_HTDOCSDIR}" \
-		--enable-imagedir="${MY_HTDOCSDIR}"/images \
-		--enable-imageurl=/${PN}/images \
-		--enable-htmllibdir=/usr/share/${PN}/htmllib \
-		--enable-cgibindir="${MY_CGIBINDIR}" \
-		--enable-cgipath=/cgi-bin/${PN} \
-		--enable-qmaildir="${QMAIL_HOME}" \
-		--enable-autoresponder-path="${QMAIL_HOME}"/bin \
-		--enable-true-path=/bin \
-		--enable-ezmlmdir=/usr/bin \
-		--enable-domain-autofill \
-		--enable-modify-quota \
-		--enable-no-cache \
-		--enable-trivial-password \
-		--enable-catchall \
-		--enable-maxusersperpage=50 \
-		--enable-maxaliasesperpage=50 \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		"$@"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local DOCS=(
-		AUTHORS INSTALL README.hooks BUGS TODO ChangeLog TRANSLATORS
-		NEWS FAQ README contrib/*
-	)
-	default
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	einfo "If you would like support for ezmlm mailing lists inside qmailadmin,"
-	einfo "please emerge some variant of ezmlm-idx."
-	webapp_pkg_postinst
-}
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15-r2.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15-r2.ebuild
new file mode 100644
index 000000000000..fd7cf19b1cd9
--- /dev/null
+++ b/net-mail/qmailadmin/qmailadmin-1.2.15-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WEBAPP_MANUAL_SLOT="yes"
+inherit autotools qmail webapp
+
+MY_P=${P/_rc/-rc}
+
+DESCRIPTION="A web interface for managing a qmail system with virtual domains"
+HOMEPAGE="http://www.inter7.com/qmailadmin.html"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ~s390 sparc x86"
+IUSE="maildrop"
+# the RESTRICT is because the vpopmail lib directory is locked down
+# and non-root can't access them.
+RESTRICT="userpriv"
+
+RDEPEND="
+	net-mail/autorespond
+	>=net-mail/vpopmail-5.4.33
+	virtual/libcrypt:=
+	virtual/qmail
+	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-1.2.9-maildir.patch
+	eapply "${FILESDIR}"/${PN}-1.2.12-quota-overflow.patch
+	eapply "${FILESDIR}"/${PN}-1.2.15-quota-security.patch
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	# Pass spam stuff through $@ so we get the quoting right
+	if use maildrop ; then
+		set -- --enable-modify-spam \
+			--enable-spam-command='|preline maildrop /etc/maildroprc'
+	else
+		set --
+	fi
+
+	econf \
+		--enable-valias \
+		--enable-vpopmaildir=/var/vpopmail \
+		--enable-htmldir="${MY_HTDOCSDIR}" \
+		--enable-imagedir="${MY_HTDOCSDIR}"/images \
+		--enable-imageurl=/${PN}/images \
+		--enable-htmllibdir=/usr/share/${PN}/htmllib \
+		--enable-cgibindir="${MY_CGIBINDIR}" \
+		--enable-cgipath=/cgi-bin/${PN} \
+		--enable-qmaildir="${QMAIL_HOME}" \
+		--enable-autoresponder-path="${QMAIL_HOME}"/bin \
+		--enable-true-path=/bin \
+		--enable-ezmlmdir=/usr/bin \
+		--enable-domain-autofill \
+		--enable-modify-quota \
+		--enable-no-cache \
+		--enable-trivial-password \
+		--enable-catchall \
+		--enable-maxusersperpage=50 \
+		--enable-maxaliasesperpage=50 \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		"$@"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local DOCS=(
+		AUTHORS INSTALL README.hooks BUGS TODO ChangeLog TRANSLATORS
+		NEWS FAQ README contrib/*
+	)
+	default
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo "If you would like support for ezmlm mailing lists inside qmailadmin,"
+	einfo "please emerge some variant of ezmlm-idx."
+	webapp_pkg_postinst
+}
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.16-r1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.16-r1.ebuild
new file mode 100644
index 000000000000..e5cef4ce9568
--- /dev/null
+++ b/net-mail/qmailadmin/qmailadmin-1.2.16-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmail webapp autotools
+
+MY_P=${P/_rc/-rc}
+
+DESCRIPTION="A web interface for managing a qmail system with virtual domains"
+HOMEPAGE="http://www.inter7.com/qmailadmin.html"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
+IUSE="maildrop"
+# the RESTRICT is because the vpopmail lib directory is locked down
+# and non-root can't access them.
+RESTRICT="userpriv"
+
+RDEPEND="virtual/libcrypt:=
+	virtual/qmail
+	>=net-mail/vpopmail-5.4.33
+	net-mail/autorespond
+	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-1.2.9-maildir.patch
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	# Pass spam stuff through $@ so we get the quoting right
+	if use maildrop ; then
+		set -- --enable-modify-spam \
+			--enable-spam-command='|preline maildrop /etc/maildroprc'
+	else
+		set --
+	fi
+
+	econf \
+		--enable-valias \
+		--enable-vpopmaildir=/var/vpopmail \
+		--enable-htmldir="${MY_HTDOCSDIR}" \
+		--enable-imagedir="${MY_HTDOCSDIR}"/images \
+		--enable-imageurl=/${PN}/images \
+		--enable-htmllibdir=/usr/share/${PN}/htmllib \
+		--enable-cgibindir="${MY_CGIBINDIR}" \
+		--enable-cgipath=/cgi-bin/${PN} \
+		--enable-qmaildir="${QMAIL_HOME}" \
+		--enable-autoresponder-path="${QMAIL_HOME}"/bin \
+		--enable-true-path=/bin \
+		--enable-ezmlmdir=/usr/bin \
+		--enable-domain-autofill \
+		--enable-modify-quota \
+		--enable-no-cache \
+		--enable-trivial-password \
+		--enable-catchall \
+		--enable-maxusersperpage=50 \
+		--enable-maxaliasesperpage=50 \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		"$@"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local DOCS=(
+		AUTHORS INSTALL README.hooks BUGS TODO ChangeLog TRANSLATORS
+		NEWS FAQ README contrib/*
+	)
+	default
+
+	webapp_src_install
+
+	# CGI needs to be able to read /etc/vpopmail.conf
+	# Which is 0640 root:vpopmail, as it contains passwords
+	cgi=/usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/qmailadmin
+	fowners root:vpopmail ${cgi}
+	fperms g+s ${cgi}
+}
+
+pkg_postinst() {
+	einfo "If you would like support for ezmlm mailing lists inside qmailadmin,"
+	einfo "please emerge some variant of ezmlm-idx."
+	webapp_pkg_postinst
+	einfo "For complete webapp-config support:"
+	einfo "1. Add this for the Apache cgi-bin dir: Options +ExecCGI -MultiViews +FollowSymLinks"
+	einfo "2. Run: webapp-config -I -h localhost -d qmailadmin ${PN} ${PV}"
+	einfo "3. Symlink: ln -s {/usr/share/webapps/${PN}/${PV}/hostroot,/var/www/localhost}/cgi-bin/${PN}"
+}
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
deleted file mode 100644
index e8d3f27890b4..000000000000
--- a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmail webapp autotools
-
-MY_P=${P/_rc/-rc}
-
-DESCRIPTION="A web interface for managing a qmail system with virtual domains"
-HOMEPAGE="http://www.inter7.com/qmailadmin.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
-IUSE="maildrop"
-# the RESTRICT is because the vpopmail lib directory is locked down
-# and non-root can't access them.
-RESTRICT="userpriv"
-
-RDEPEND="virtual/qmail
-	>=net-mail/vpopmail-5.4.33
-	net-mail/autorespond
-	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-1.2.9-maildir.patch
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	# Pass spam stuff through $@ so we get the quoting right
-	if use maildrop ; then
-		set -- --enable-modify-spam \
-			--enable-spam-command='|preline maildrop /etc/maildroprc'
-	else
-		set --
-	fi
-
-	econf \
-		--enable-valias \
-		--enable-vpopmaildir=/var/vpopmail \
-		--enable-htmldir="${MY_HTDOCSDIR}" \
-		--enable-imagedir="${MY_HTDOCSDIR}"/images \
-		--enable-imageurl=/${PN}/images \
-		--enable-htmllibdir=/usr/share/${PN}/htmllib \
-		--enable-cgibindir="${MY_CGIBINDIR}" \
-		--enable-cgipath=/cgi-bin/${PN} \
-		--enable-qmaildir="${QMAIL_HOME}" \
-		--enable-autoresponder-path="${QMAIL_HOME}"/bin \
-		--enable-true-path=/bin \
-		--enable-ezmlmdir=/usr/bin \
-		--enable-domain-autofill \
-		--enable-modify-quota \
-		--enable-no-cache \
-		--enable-trivial-password \
-		--enable-catchall \
-		--enable-maxusersperpage=50 \
-		--enable-maxaliasesperpage=50 \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		"$@"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local DOCS=(
-		AUTHORS INSTALL README.hooks BUGS TODO ChangeLog TRANSLATORS
-		NEWS FAQ README contrib/*
-	)
-	default
-
-	webapp_src_install
-
-	# CGI needs to be able to read /etc/vpopmail.conf
-	# Which is 0640 root:vpopmail, as it contains passwords
-	cgi=/usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/qmailadmin
-	fowners root:vpopmail ${cgi}
-	fperms g+s ${cgi}
-}
-
-pkg_postinst() {
-	einfo "If you would like support for ezmlm mailing lists inside qmailadmin,"
-	einfo "please emerge some variant of ezmlm-idx."
-	webapp_pkg_postinst
-	einfo "For complete webapp-config support:"
-	einfo "1. Add this for the Apache cgi-bin dir: Options +ExecCGI -MultiViews +FollowSymLinks"
-	einfo "2. Run: webapp-config -I -h localhost -d qmailadmin ${PN} ${PV}"
-	einfo "3. Symlink: ln -s {/usr/share/webapps/${PN}/${PV}/hostroot,/var/www/localhost}/cgi-bin/${PN}"
-}
diff --git a/net-mail/vchkuser/Manifest b/net-mail/vchkuser/Manifest
index 08500ab0b80d..a8f791ddf855 100644
--- a/net-mail/vchkuser/Manifest
+++ b/net-mail/vchkuser/Manifest
@@ -1,3 +1,3 @@
 DIST vchkuser-0.4.tar.gz 5890 BLAKE2B 2b48f085fdc6acd86cce3c1e12ad2e445ef1059e6f1446719cbfb3649cfe67df36255cc220ef063fbd699d7f26bb1cefde20a0759cc45e0e92ea93c6711f1015 SHA512 3c33a1c26abeaf45ca90ac1f1c9cf7b1ae6eba3f6e5a8d0d8d0d12dce98fbada4209cd916af7af69d7682c174d88741b1140e5c758a08e0d196e73f2b6145699
-EBUILD vchkuser-0.4.ebuild 914 BLAKE2B f68298426cd955378da25604aa5062a2b1e34ca2d27d985de904d3d0a6af3e77ed7531535c3e1c71317cdad6e990762f5654d34e37c4e131bcfcf1da8cc5e2ca SHA512 828d951ae6a76d0af85a4d8fc626f2cc500aee7a78142d0aa2e3affe42919427be9db599153075e82d89fc6b1a7132d89634a3adcbf06c9813d6614670817a4a
+EBUILD vchkuser-0.4-r1.ebuild 958 BLAKE2B bc52b3e10e828746462bbf35178655b1b05ad2d4c4ce06b7fe9c9703738f6b5f3aeb6dd26e57d9c98f333a312ed20291094c2eb6d7684c9c414687323e7524d3 SHA512 2a1d11aef90048da5777b36abb3d0beb8ee733fbc0808c69ed4c3159065f5ca9278ca7025533606af127b3bd71fbb507277d5839f62b07598c0ee401ab336912
 MISC metadata.xml 323 BLAKE2B 0147c79382994634fde3cc6fdc43872a95cb5bfecd3290720dd604f48453a1e842edead7ad408b08b59f4393f902c997bbd3db259d34b13ac9ad3a5be9cb4f09 SHA512 9e86c9f10fa850b949b9ca13118399625310655314b607015cf7441c59432b6bbe9f6b3282d090d55de08ec07415b1c5f79b58c40d99f92173d4e59a02920f29
diff --git a/net-mail/vchkuser/vchkuser-0.4-r1.ebuild b/net-mail/vchkuser/vchkuser-0.4-r1.ebuild
new file mode 100644
index 000000000000..d243ea098800
--- /dev/null
+++ b/net-mail/vchkuser/vchkuser-0.4-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools qmail
+
+DESCRIPTION="qmail-spp plugin to check recipient existance with vpopmail"
+HOMEPAGE="https://github.com/hollow/vchkuser"
+SRC_URI="https://github.com/hollow/vchkuser/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND="
+	dev-libs/libpcre
+	net-mail/vpopmail
+	virtual/libcrypt:=
+	|| (
+		mail-mta/netqmail[qmail-spp]
+		mail-mta/qmail-ldap[qmail-spp]
+	)"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/hollow-${PN}-8a048f7"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		--with-vpopuser=vpopmail \
+		--with-qmailgroup=nofiles \
+		--with-vpopmaildir="${EPREFIX}"/var/vpopmail \
+		--with-qmaildir=${QMAIL_HOME}
+}
+
+src_install() {
+	default
+
+	fowners vpopmail:nofiles "${QMAIL_HOME}"/plugins/vchkuser
+	fperms 4750 "${QMAIL_HOME}"/plugins/vchkuser
+}
diff --git a/net-mail/vchkuser/vchkuser-0.4.ebuild b/net-mail/vchkuser/vchkuser-0.4.ebuild
deleted file mode 100644
index 93faf978ed0a..000000000000
--- a/net-mail/vchkuser/vchkuser-0.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools qmail
-
-DESCRIPTION="qmail-spp plugin to check recipient existance with vpopmail"
-HOMEPAGE="https://github.com/hollow/vchkuser"
-SRC_URI="https://github.com/hollow/vchkuser/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
-	net-mail/vpopmail
-	|| (
-		mail-mta/netqmail[qmail-spp]
-		mail-mta/qmail-ldap[qmail-spp]
-	)"
-RDEPEND=""
-
-S="${WORKDIR}/hollow-${PN}-8a048f7"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		--with-vpopuser=vpopmail \
-		--with-qmailgroup=nofiles \
-		--with-vpopmaildir="${EPREFIX}"/var/vpopmail \
-		--with-qmaildir=${QMAIL_HOME}
-}
-
-src_install() {
-	default
-
-	fowners vpopmail:nofiles "${QMAIL_HOME}"/plugins/vchkuser
-	fperms 4750 "${QMAIL_HOME}"/plugins/vchkuser
-}
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 2257c354edfc..75bc605b09be 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -15,5 +15,5 @@ AUX vpopmail-double-free.patch 399 BLAKE2B ac2d7ad9b8b3e9cf25fbd973c7e42e48c1107
 AUX vpopmail-lazy.patch 323 BLAKE2B c35a878e2aa69a9ba0e108fdf4f0f8de85965588acc8d2c3fecb1d152e2f0e9585d78b9ce5b2314735de8b70710687e0a75358ef3029dd96eaa704941df00bd7 SHA512 794ef15920ac565073d871a946df53395afb0630d561343f4d164af3287d1665e115ad42d7a2218306cedb5dc795b10d9c15852b69fd649854ddb0c18dc0b2dd
 AUX vpopmail-vpgsql.patch 2668 BLAKE2B 0f69aa8642d15d740e0e5944a438854fde240831176ae2152cc805809e5a87ecd8ce5c6791f4c4e53d2027393d158e28e9dbec49d0efd7c4c2d50c9eeb4cf10d SHA512 9f02f9f9ab186791fe071ee5cb27334144727e81f0bbd6b8f5ce472368f892f5396a225c6c1af9d5b7a66bf66e7be50aef146d7635132fab9d91f265b68af1d9
 DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab
-EBUILD vpopmail-5.4.33-r7.ebuild 7581 BLAKE2B 902160dfa9cdcce24270508ada8a266f5304bd47af73655c10ac305d081860a2c750fdd2c73783d9b1e1bb75f0c3abd3d6bbcf58865ec275ad7be7cb98dbebde SHA512 380158bc3dfc7bf34d96e7f2438fc3d24ed5e288114607cabbc762639255ee154a1f9b4cca852a788fb11e58b06fb5c1b54812b2cec1c4b53cffd4eb5ae2e5e7
+EBUILD vpopmail-5.4.33-r9.ebuild 7739 BLAKE2B ea3aac8a884fe1e8d23c9bef072dc610e1c0328028f82773040aecc2d347de11d0166c4482ed4ee0fb27ff9bdfb2eded758e3e03b389c266c1d9e2397e1f7572 SHA512 9b0a5926580beecb63d43a9ed462a3cf2f1b42464bf7e193b7b9fd74bc6e3939192eead6f33454b99519cd2b9df801a8ebac03a91d765b3b557f96373b8b32eb
 MISC metadata.xml 828 BLAKE2B 4c54578d11e0a74817c10edd0ea3314aad1f53703367a4baa89f0c5b53a1b9df6753452db9e2da7f2fa2771b91713c40b02cf93535890671eaff8fcd12b11718 SHA512 43330581de8b5c94a5240f70a6f78117808c4b6deef386daf68d531cfaf3e29888ed1c3c70f0560d22a7569f0c29dce4eb9f63676528783a9cf6f7b275f2eb4a
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
deleted file mode 100644
index b5f30d5092db..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools fixheadtails qmail
-
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
-REQUIRED_USE="mysql? ( !postgres )"
-
-DEPEND="
-	acct-group/vpopmail
-	acct-user/vpopmail
-	virtual/qmail
-	maildrop? ( mail-filter/maildrop )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql:= )
-	spamassassin? ( mail-filter/spamassassin )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.4.9-access.violation.patch
-	"${FILESDIR}"/${PN}-lazy.patch
-	"${FILESDIR}"/${PN}-vpgsql.patch
-	"${FILESDIR}"/${PN}-double-free.patch
-	"${FILESDIR}"/${PN}-5.4.33-vdelivermail-add-static.patch
-	"${FILESDIR}"/${PN}-5.4.33-fix-those-vfork-instances-that-do-more-than-exec.patch
-	"${FILESDIR}"/${PN}-5.4.33-remove-unneeded-forward-declaration.patch
-	"${FILESDIR}"/${PN}-5.4.33-clean-up-calling-maildrop.patch
-	"${FILESDIR}"/${PN}-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch
-	"${FILESDIR}"/${PN}-5.4.33-strncat.patch
-	"${FILESDIR}"/${PN}-5.4.33-unistd.patch
-	"${FILESDIR}"/${PN}-5.4.33-check-crypt-return-value-for-NULL.patch
-	"${FILESDIR}"/${PN}-5.4.33-use-proper-printf-format-strings.patch
-	"${FILESDIR}"/${PN}-5.4.33-vpgsql-onchange.patch
-)
-DOCS=(
-	ChangeLog
-	doc/.
-)
-HTML_DOCS=(
-	doc_html/.
-	man_html/.
-)
-
-VPOP_HOME="/var/vpopmail"
-
-pkg_setup() {
-	upgradewarning
-}
-
-src_prepare() {
-	default
-
-	echo 'install-recursive: install-exec-am' \
-		>>"${S}"/Makefile.am || die
-
-	# fix maildir paths
-	sed -i -e 's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c || die
-
-	# remove vpopmail advertisement
-	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c || die
-
-	# automake/autoconf
-	mv "${S}"/configure.{in,ac} || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
-		configure.ac || die
-
-	# _FORTIFY_SOURCE
-	sed -i \
-		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
-		vlistlib.c || die
-
-	eautoreconf
-	ht_fix_file cdb/Makefile
-}
-
-src_configure() {
-	local -a authopts
-	if use mysql; then
-		incdir=$(mysql_config --variable=pkgincludedir || die)
-		libdir=$(mysql_config --variable=pkglibdir || die)
-		authopts+=( "--enable-auth-module=mysql"
-			"--enable-incdir=${incdir}"
-			"--enable-libdir=${libdir}"
-			"--enable-sql-logging"
-			"--enable-valias"
-			"--disable-mysql-replication"
-			"--enable-mysql-limits"
-		)
-	elif use postgres; then
-		libdir=$(pg_config --libdir || die)
-		incdir=$(pg_config --pkgincludedir || die)
-		authopts+=( "--enable-auth-module=pgsql"
-			"--enable-incdir=${incdir}"
-			"--enable-libdir=${libdir}"
-			"--enable-sql-logging"
-			"--enable-valias"
-		)
-	else
-		authopts+=( "--enable-auth-module=cdb" )
-	fi
-
-	econf ${authopts[@]} \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-non-root-build \
-		--enable-qmaildir=${QMAIL_HOME} \
-		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
-		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
-		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-many-domains \
-		--enable-file-locking \
-		--enable-file-sync \
-		--enable-md5-passwords \
-		--enable-logging \
-		--enable-auth-logging \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--enable-onchange-script \
-		--disable-tcpserver-file \
-		--disable-roaming-users \
-		$(use_enable ipalias ip-alias-domains) \
-		$(use_enable clearpasswd clear-passwd) \
-		$(use_enable maildrop) \
-		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
-		$(use_enable spamassassin)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir "${VPOP_HOME}"/domains
-
-	# install helper script for maildir conversion
-	into "${VPOP_HOME}"
-	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	mv doc/doc_html/ doc/man_html/ . || die
-	einstalldocs
-	rm -r "${D}/${VPOP_HOME}"/doc || die
-
-	# create /etc/vpopmail.conf
-	if use mysql; then
-		insinto /etc
-		newins "${D}${VPOP_HOME}"/etc/vpopmail.mysql vpopmail.conf
-		dosym ../../../etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
-
-		sed 's/^[^#]/# &/' -i "${D}"/etc/vpopmail.conf || die
-		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf || die
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
-		echo '# Write DB' >> "${D}"/etc/vpopmail.conf || die
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
-
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	insinto "${VPOP_HOME}"/etc
-	doins vusagec.conf
-	dosym .."${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
-	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf || die
-
-	einfo "Installing env.d entry"
-	doenvd "${FILESDIR}"/99vpopmail
-
-	einfo "Locking down vpopmail permissions"
-	fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include}
-	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
-	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "  vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "owned by root:vpopmail"
-		elog
-	fi
-
-	# do this for good measure
-	if [[ -e /etc/vpopmail.conf ]]; then
-		chmod 640 /etc/vpopmail.conf || die
-		chown root:vpopmail /etc/vpopmail.conf || die
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	if has_version "<=net-mail/vpopmail-5.2.1-r8"; then
-		ewarn
-		ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-		ewarn "The internal structure of the mail storage has changed for"
-		ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-		ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-		ewarn "to upgrade your system! (It can do conversions both ways)."
-		ewarn "You should be able to run it right away without any changes."
-		ewarn
-	fi
-
-	elog
-	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	elog "using net-mail/relay-ctrl instead."
-	elog
-
-	if use mysql; then
-		if has_version "<=net-mail/vpopmail-5.4.17"; then
-			elog
-			elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-			elog "MySQL tables, please see the UPGRADE file in the documentation!"
-			elog
-		fi
-	fi
-
-	ewarn
-	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
-	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
-	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
-	ewarn "Otherwise mail delivery WILL BREAK"
-	ewarn
-}
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
new file mode 100644
index 000000000000..b70518ef1783
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fixheadtails qmail
+
+HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
+DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
+REQUIRED_USE="mysql? ( !postgres )"
+
+DEPEND="
+	acct-group/vpopmail
+	acct-user/vpopmail
+	virtual/libcrypt:=
+	virtual/qmail
+	maildrop? ( mail-filter/maildrop )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql:= )
+	spamassassin? ( mail-filter/spamassassin )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.9-access.violation.patch
+	"${FILESDIR}"/${PN}-lazy.patch
+	"${FILESDIR}"/${PN}-vpgsql.patch
+	"${FILESDIR}"/${PN}-double-free.patch
+	"${FILESDIR}"/${PN}-5.4.33-vdelivermail-add-static.patch
+	"${FILESDIR}"/${PN}-5.4.33-fix-those-vfork-instances-that-do-more-than-exec.patch
+	"${FILESDIR}"/${PN}-5.4.33-remove-unneeded-forward-declaration.patch
+	"${FILESDIR}"/${PN}-5.4.33-clean-up-calling-maildrop.patch
+	"${FILESDIR}"/${PN}-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch
+	"${FILESDIR}"/${PN}-5.4.33-strncat.patch
+	"${FILESDIR}"/${PN}-5.4.33-unistd.patch
+	"${FILESDIR}"/${PN}-5.4.33-check-crypt-return-value-for-NULL.patch
+	"${FILESDIR}"/${PN}-5.4.33-use-proper-printf-format-strings.patch
+	"${FILESDIR}"/${PN}-5.4.33-vpgsql-onchange.patch
+)
+DOCS=(
+	ChangeLog
+	doc/.
+)
+HTML_DOCS=(
+	doc_html/.
+	man_html/.
+)
+
+VPOP_HOME="/var/vpopmail"
+
+pkg_setup() {
+	upgradewarning
+}
+
+src_prepare() {
+	default
+
+	echo 'install-recursive: install-exec-am' \
+		>>"${S}"/Makefile.am || die
+
+	# fix maildir paths
+	sed -i -e 's|Maildir|.maildir|g' \
+		vchkpw.c vconvert.c vdelivermail.c \
+		vpopbull.c vpopmail.c vqmaillocal.c \
+		vuserinfo.c maildirquota.c || die
+
+	# remove vpopmail advertisement
+	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
+		vdelivermail.c vpopbull.c vqmaillocal.c || die
+
+	# automake/autoconf
+	mv "${S}"/configure.{in,ac} || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
+		configure.ac || die
+
+	# _FORTIFY_SOURCE
+	sed -i \
+		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
+		vlistlib.c || die
+
+	eautoreconf
+	ht_fix_file cdb/Makefile
+}
+
+src_configure() {
+	local -a authopts
+	if use mysql; then
+		incdir=$(mysql_config --variable=pkgincludedir || die)
+		libdir=$(mysql_config --variable=pkglibdir || die)
+		authopts+=( "--enable-auth-module=mysql"
+			"--enable-incdir=${incdir}"
+			"--enable-libdir=${libdir}"
+			"--enable-sql-logging"
+			"--enable-valias"
+			"--disable-mysql-replication"
+			"--enable-mysql-limits"
+		)
+	elif use postgres; then
+		libdir=$(pg_config --libdir || die)
+		incdir=$(pg_config --pkgincludedir || die)
+		authopts+=( "--enable-auth-module=pgsql"
+			"--enable-incdir=${incdir}"
+			"--enable-libdir=${libdir}"
+			"--enable-sql-logging"
+			"--enable-valias"
+		)
+	else
+		authopts+=( "--enable-auth-module=cdb" )
+	fi
+
+	econf ${authopts[@]} \
+		--sysconfdir=${VPOP_HOME}/etc \
+		--enable-non-root-build \
+		--enable-qmaildir=${QMAIL_HOME} \
+		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
+		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
+		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		--enable-many-domains \
+		--enable-file-locking \
+		--enable-file-sync \
+		--enable-md5-passwords \
+		--enable-logging \
+		--enable-auth-logging \
+		--enable-log-name=vpopmail \
+		--enable-qmail-ext \
+		--enable-onchange-script \
+		--disable-tcpserver-file \
+		--disable-roaming-users \
+		$(use_enable ipalias ip-alias-domains) \
+		$(use_enable clearpasswd clear-passwd) \
+		$(use_enable maildrop) \
+		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
+		$(use_enable spamassassin)
+
+	sed "s|'ar |'$(tc-getAR) |;s|'ranlib |'$(tc-getRANLIB) |" -i cdb/Makefile || die
+	sed "/^AR =/s|= .*|= $(tc-getAR)|" -i Makefile || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	keepdir "${VPOP_HOME}"/domains
+
+	# install helper script for maildir conversion
+	into "${VPOP_HOME}"
+	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
+	into /usr
+
+	mv doc/doc_html/ doc/man_html/ . || die
+	einstalldocs
+	rm -r "${D}/${VPOP_HOME}"/doc || die
+
+	# create /etc/vpopmail.conf
+	if use mysql; then
+		insinto /etc
+		newins "${D}${VPOP_HOME}"/etc/vpopmail.mysql vpopmail.conf
+		dosym ../../../etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
+
+		sed 's/^[^#]/# &/' -i "${D}"/etc/vpopmail.conf || die
+		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf || die
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
+		echo '# Write DB' >> "${D}"/etc/vpopmail.conf || die
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
+
+		# lock down perms
+		fperms 640 /etc/vpopmail.conf
+		fowners root:vpopmail /etc/vpopmail.conf
+	fi
+
+	insinto "${VPOP_HOME}"/etc
+	doins vusagec.conf
+	dosym .."${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
+	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf || die
+
+	einfo "Installing env.d entry"
+	doenvd "${FILESDIR}"/99vpopmail
+
+	einfo "Locking down vpopmail permissions"
+	fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include}
+	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
+	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog
+		elog "You have 'mysql' turned on in your USE"
+		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
+		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
+		elog
+		elog "First log into mysql as your mysql root user and pass. Then:"
+		elog "> create database vpopmail;"
+		elog "> use mysql;"
+		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
+		elog "  vpopmail@localhost identified by 'your password';"
+		elog "> flush privileges;"
+		elog
+		elog "If you have problems with vpopmail not accepting mail properly,"
+		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
+		elog "owned by root:vpopmail"
+		elog
+	fi
+
+	# do this for good measure
+	if [[ -e /etc/vpopmail.conf ]]; then
+		chmod 640 /etc/vpopmail.conf || die
+		chown root:vpopmail /etc/vpopmail.conf || die
+	fi
+
+	upgradewarning
+}
+
+pkg_postrm() {
+	elog "The vpopmail DATA will NOT be removed automatically."
+	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
+}
+
+upgradewarning() {
+	if has_version "<=net-mail/vpopmail-5.2.1-r8"; then
+		ewarn
+		ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
+		ewarn "The internal structure of the mail storage has changed for"
+		ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
+		ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
+		ewarn "to upgrade your system! (It can do conversions both ways)."
+		ewarn "You should be able to run it right away without any changes."
+		ewarn
+	fi
+
+	elog
+	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
+	elog "using net-mail/relay-ctrl instead."
+	elog
+
+	if use mysql; then
+		if has_version "<=net-mail/vpopmail-5.4.17"; then
+			elog
+			elog "If you are upgrading from 5.4.17 or older, you have to fix your"
+			elog "MySQL tables, please see the UPGRADE file in the documentation!"
+			elog
+		fi
+	fi
+
+	ewarn
+	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
+	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
+	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
+	ewarn "Otherwise mail delivery WILL BREAK"
+	ewarn
+}
diff --git a/net-mail/vqadmin/Manifest b/net-mail/vqadmin/Manifest
index 5a532a5d1342..6225bff1b8fb 100644
--- a/net-mail/vqadmin/Manifest
+++ b/net-mail/vqadmin/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en.txt 291 BLAKE2B 2d02039a95ecf734d6dd284fcd65911c9f38db8a2165d1bd4289a9927a3a3c847a99991c1301a5d6d9d485ccd06794dddf73f57dabee47dcb3ed01ff9a0f7f72 SHA512 27c4b4314b29547e3a485340086186c31d0d5ede249631738227ffdecd64c500baf7c3ee6852b02e18176376f0717c35ad3445b5a2bc684e82772eca27be2786
 DIST vqadmin-2.3.7.tar.gz 153678 BLAKE2B 3906c449d89e2747d10b9a4afdce14da7b41fdaca760d41b0374bfdd6a8dd2f756597b4bbdabb4d03b89806936e1550f069b7675dd2ef7486f235e497191bf94 SHA512 c427dc4b1e30926b0d3774bd0d296bf78a98037c566a82fa790f7a25d1fac64a80172498fd6342e93514108e42fdec0ebf1a76029546e43100ebcae5b845ef88
-EBUILD vqadmin-2.3.7.ebuild 1283 BLAKE2B ff524234541acfd0a556512b075dfa90075002ada24ae36e91ef786f4d7875e813a438a054e82f199b2de1c5135900ecf55a54e4bc63f9fab058cc8984067268 SHA512 fbf17af20d0e77d6197f2245148a78bab01eb0722b7e43d6bd1be9ca01ce1fd42be07a6db0beb1daaaaf2514a314467362b67db9e553e8e85879007d1020d362
+EBUILD vqadmin-2.3.7-r1.ebuild 1303 BLAKE2B 5873980c5e12d79dc438e2c6d33b10927a90ac9708c21199e6fd537b2285fe9d41906416130cc3308b6e5a24da2a5da73b63eeb3daf91cca297d90fd533dfb46 SHA512 965c60fbaf4f57d678e11b21635881048942f46845204c8dac10e62585765db74ea6cf71568b055700f855ae2f9638547bb4e1da27e4eb38103bb32906ef225d
 MISC metadata.xml 357 BLAKE2B f681f656d61cbf1c78616f26f8746b29a5f76234344fc9b79e29b5f83c91829385751301bcde12dbb12e16e476ecc69e28ef4144c531829bc4432ca8e41fd667 SHA512 82473567cbefa523ec0fcee697d7b5d30b184dedc7a73fa6e49a7958a3355ba22118d572908c3ceffecf821b234053310e56e5f2b4f6e7fd66c9a23248974791
diff --git a/net-mail/vqadmin/vqadmin-2.3.7-r1.ebuild b/net-mail/vqadmin/vqadmin-2.3.7-r1.ebuild
new file mode 100644
index 000000000000..a89f49b9d5c3
--- /dev/null
+++ b/net-mail/vqadmin/vqadmin-2.3.7-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp autotools qmail
+
+DESCRIPTION="A web based control pannel to manage Virtual Qmail Domains"
+HOMEPAGE="http://www.inter7.com/index.php?page=vqadmin"
+SRC_URI="http://www.inter7.com/vqadmin/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libcrypt:=
+	virtual/qmail
+	>=net-mail/vpopmail-5.3"
+RDEPEND="${DEPEND}
+	net-mail/qmailadmin"
+
+src_prepare() {
+	default
+
+	# fixes for sane webapp integration
+	sed -i \
+		-e "s|html/|/usr/share/${PN}/|g" \
+		-e "s|/images/vqadmin/|/vqadmin/|g" \
+		-e "s|/cgi-bin/vqadmin/|/cgi-bin/|g" \
+		-e "s|vqadmin\.cgi|vqadmin|g" \
+		*.h *.c html/*.html || die
+}
+
+src_configure() {
+	econf \
+		--enable-qmaildir="${QMAIL_HOME}" \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		--enable-cgibindir="${MY_CGIBINDIR}"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto /usr/share/${PN}
+	doins html/*
+
+	insinto "${MY_HTDOCSDIR}"
+	doins html/*.css
+
+	insinto "${MY_CGIBINDIR}"
+	doins vqadmin.acl
+	insopts -m 755
+	doins vqadmin
+
+	dodoc ACL AUTHORS BUGS ChangeLog FAQ INSTALL NEWS TODO README
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}
diff --git a/net-mail/vqadmin/vqadmin-2.3.7.ebuild b/net-mail/vqadmin/vqadmin-2.3.7.ebuild
deleted file mode 100644
index 3acb964ec3b8..000000000000
--- a/net-mail/vqadmin/vqadmin-2.3.7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp autotools qmail
-
-DESCRIPTION="A web based control pannel to manage Virtual Qmail Domains"
-HOMEPAGE="http://www.inter7.com/index.php?page=vqadmin"
-SRC_URI="http://www.inter7.com/vqadmin/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="virtual/qmail
-	>=net-mail/vpopmail-5.3"
-RDEPEND="${DEPEND}
-	net-mail/qmailadmin"
-
-src_prepare() {
-	default
-
-	# fixes for sane webapp integration
-	sed -i \
-		-e "s|html/|/usr/share/${PN}/|g" \
-		-e "s|/images/vqadmin/|/vqadmin/|g" \
-		-e "s|/cgi-bin/vqadmin/|/cgi-bin/|g" \
-		-e "s|vqadmin\.cgi|vqadmin|g" \
-		*.h *.c html/*.html || die
-}
-
-src_configure() {
-	econf \
-		--enable-qmaildir="${QMAIL_HOME}" \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-cgibindir="${MY_CGIBINDIR}"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto /usr/share/${PN}
-	doins html/*
-
-	insinto "${MY_HTDOCSDIR}"
-	doins html/*.css
-
-	insinto "${MY_CGIBINDIR}"
-	doins vqadmin.acl
-	insopts -m 755
-	doins vqadmin
-
-	dodoc ACL AUTHORS BUGS ChangeLog FAQ INSTALL NEWS TODO README
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c201c8fe01da..bf8fcbed0d8c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index edc4e96378b2..f04f31dc02ee 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -6,6 +6,6 @@ AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8c
 AUX initd-r3 599 BLAKE2B aee4ad69c9aa213ce00062b073c3c02a1f29b96aaa0b2b4573f009846be1f5b0f1bb53089f14c399b6accb73937545820eef5b84a765ed8fff26e79ac543bcfd SHA512 37ea0bc22347afad9e64e038c14552a4609fa95f3c4a4dd0a3938cada1545940f1c76114cf1a46cea41ce4cf524f9e6a2499d7a7770507c20bcb726b8ee9515f
 AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885
 DIST apt-cacher-ng_3.6.3.orig.tar.xz 334620 BLAKE2B 7e77edb966f0732f392a3fb243cda547dca7d4f878e44c6c000491ccb0a3115ad58a553706ef02834d25366b09d24ee6af2dafad76f97cd1978dc5a4d35f3380 SHA512 57d991c71f6d0bb9d43b4645ee7be2fb38ccbf73581206e01b6ca389bd8591d5e9f425350e3aff053527125c95caefe9ab1217dedff812162cf6bd4cdfdef792
-EBUILD apt-cacher-ng-3.6.3_p1-r1.ebuild 2554 BLAKE2B a4fb769215e9a2a371caf53184b5d2d6b9fc37cb2152b44a6a603dcf55125ca8787076d21d49721017061d3b5c1bb87a9c7b24a69aa109cfe3326bb0a8015dce SHA512 a6f4b5678a672885fa4f57bc77ab52113f1228149e747387799ff368472c19140992ef9d008206be8f38587ebd1d62110615d5256b397d03918b56f9b6469f7b
-EBUILD apt-cacher-ng-9999.ebuild 2409 BLAKE2B 5f3308a0080fb19fc89f442cce5eb2b5ab21c26c644cca30ab7641a04be8fc2fdd42f1739c02db3cee81a9bb8a0e9834b678c5f03cdfa004d8134a1519b97279 SHA512 160950f774cbb650511f989908c4cf66e2f711138a64046a5f42bc6c965a60611c0b2653184f50506f76fe00521c105086dbe5b4db20479ab9f4c97a724a6c3f
+EBUILD apt-cacher-ng-3.6.3_p1-r2.ebuild 2614 BLAKE2B 1f02755ebf1c2c270ef3bc9c1c8f6f0aa0630d4045ddfed294493ece4a9c4f9926d3655a1fe6703eca2d7c80fea710a2cad5e1a28ef7e8cd2557b0f36dabd63d SHA512 b51821cdc6a2eb0eaa0c1b91a68dd48d2afae89bce14d50bfe3c74617a9039a5891897b5d32d5348b769f00882e36a25ef426ce2f03db8791ad4889738fbc087
+EBUILD apt-cacher-ng-9999.ebuild 2571 BLAKE2B a10affa9280d6289bc7e6b64b4eb487be57de5e4339383c5d4620057c87192d156b7c29b2be0118124f0da408c9038a7ad9f2ea4c2d67d3ba4cdcc9902e86fad SHA512 6a68080dd1aae9ae441344bb1057aba4ff02839e058e8219d6551dc5c0f6cd90e1d9c79592424acdd85b2aa175a89ee0160f35d12f36a3740befbdca9149e37d
 MISC metadata.xml 387 BLAKE2B 8c38c862cf70d31fe8ffe60d978aa80a688e45296f11d257ab7abf56edefbed921660c4fd090daf63c60077d8232e5e2b7e65fd881cb2d623c4804192825b68c SHA512 0bc4487ec77c3511deb9df220cf31bc7dc8cf56bc46da5e23c10aa2234d5119b2283f0294651b18e3a4bec4aa0dcef79e3e777efea9d84e6955abee593f49aab
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1-r1.ebuild
deleted file mode 100644
index 4dd1587fad73..000000000000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
-HOMEPAGE="https://www.unix-ag.uni-kl.de/~bloch/acng/
-	https://packages.qa.debian.org/a/apt-cacher-ng.html"
-SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz"
-
-LICENSE="BSD-4 ZLIB public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fuse systemd tcpd"
-
-DEPEND="acct-user/apt-cacher-ng
-	acct-group/apt-cacher-ng
-	app-arch/bzip2
-	dev-libs/libevent:=[threads]
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse:0 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( sys-apps/tcp-wrappers )"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.3.1-flags.patch"
-	"${FILESDIR}/${PN}-3.5-perl-syntax.patch"
-	"${FILESDIR}/${PN}-3.6-optional-systemd.patch"
-)
-
-S="${WORKDIR}/${P/_*}"
-
-src_prepare() {
-	# Fixup systemd/CMakeLists.txt cmake version requirement
-	sed -ie "s/2.6/3.1/" systemd/CMakeLists.txt || die
-
-	# Make sure we install everything the same way it used to be after
-	# switching from mostly custom src_install to relying on build system
-	# installation
-	sed -e "/install/s/LIBDIR/CFGDIR/" \
-		-e "/install.*acng\.conf/s/)$/ RENAME ${PN}.conf)/" \
-		-e "/file/s/)$/ \"*hooks\" \"backends_debian\")/" -i conf/CMakeLists.txt || die
-	sed -ie "/INSTALL.*acngtool/s/LIBDIR/CMAKE_INSTALL_SBINDIR/" source/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DHAVE_FUSE_25=$(usex fuse)"
-		"-DHAVE_LIBWRAP=$(usex tcpd)"
-		"-DSDINSTALL=$(usex systemd)"
-	)
-
-	cmake_src_configure
-
-	sed -ie '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
-}
-
-src_install() {
-	# README is a symlink to doc/README and README automatically gets
-	# installed, leading to a broken symlink installed. Fix this by removing
-	# the symlink then installing the actual README. https://bugs.gentoo.org/770046
-	rm README || die
-	dodoc doc/README
-
-	newinitd "${FILESDIR}/initd-r3" "${PN}"
-	newconfd "${FILESDIR}/confd-r2" "${PN}"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" "${PN}"
-
-	insinto /etc/cron.daily
-	newins "${FILESDIR}/cron.daily" "${PN}"
-
-	# USE=fuse installs acngfs, don't install manpage without the bin
-	if use !fuse; then
-		rm doc/man/acngfs.8 || die
-	fi
-
-	if use !doc; then
-		rm -r doc/html || die
-	fi
-
-	dosbin scripts/expire-caller.pl
-
-	keepdir "/var/log/${PN}"
-	fowners -R ${PN}:${PN} "/var/log/${PN}"
-
-	cmake_src_install
-}
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1-r2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1-r2.ebuild
new file mode 100644
index 000000000000..f5616939a35b
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake tmpfiles
+
+DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
+HOMEPAGE="https://www.unix-ag.uni-kl.de/~bloch/acng/
+	https://packages.qa.debian.org/a/apt-cacher-ng.html"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz"
+
+LICENSE="BSD-4 ZLIB public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fuse systemd tcpd"
+
+DEPEND="acct-user/apt-cacher-ng
+	acct-group/apt-cacher-ng
+	app-arch/bzip2
+	dev-libs/libevent:=[threads]
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	fuse? ( sys-fs/fuse:0 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.1-flags.patch"
+	"${FILESDIR}/${PN}-3.5-perl-syntax.patch"
+	"${FILESDIR}/${PN}-3.6-optional-systemd.patch"
+)
+
+S="${WORKDIR}/${P/_*}"
+
+src_prepare() {
+	# Fixup systemd/CMakeLists.txt cmake version requirement
+	sed -ie "s/2.6/3.1/" systemd/CMakeLists.txt || die
+
+	# Make sure we install everything the same way it used to be after
+	# switching from mostly custom src_install to relying on build system
+	# installation
+	sed -e "/install/s/LIBDIR/CFGDIR/" \
+		-e "/install.*acng\.conf/s/)$/ RENAME ${PN}.conf)/" \
+		-e "/file/s/)$/ \"*hooks\" \"backends_debian\")/" -i conf/CMakeLists.txt || die
+	sed -ie "/INSTALL.*acngtool/s/LIBDIR/CMAKE_INSTALL_SBINDIR/" source/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DHAVE_FUSE_25=$(usex fuse)"
+		"-DHAVE_LIBWRAP=$(usex tcpd)"
+		"-DSDINSTALL=$(usex systemd)"
+	)
+
+	cmake_src_configure
+
+	sed -ie '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
+}
+
+src_install() {
+	# README is a symlink to doc/README and README automatically gets
+	# installed, leading to a broken symlink installed. Fix this by removing
+	# the symlink then installing the actual README. https://bugs.gentoo.org/770046
+	rm README || die
+	dodoc doc/README
+
+	newinitd "${FILESDIR}/initd-r3" "${PN}"
+	newconfd "${FILESDIR}/confd-r2" "${PN}"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" "${PN}"
+
+	insinto /etc/cron.daily
+	newins "${FILESDIR}/cron.daily" "${PN}"
+
+	# USE=fuse installs acngfs, don't install manpage without the bin
+	if use !fuse; then
+		rm doc/man/acngfs.8 || die
+	fi
+
+	if use !doc; then
+		rm -r doc/html || die
+	fi
+
+	dosbin scripts/expire-caller.pl
+
+	keepdir "/var/log/${PN}"
+	fowners -R ${PN}:${PN} "/var/log/${PN}"
+
+	cmake_src_install
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+}
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild
index c69b956cb3c7..317ac95f9c39 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake git-r3
+inherit cmake git-r3 tmpfiles
 
 DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
 HOMEPAGE="https://www.unix-ag.uni-kl.de/~bloch/acng/
@@ -13,7 +13,7 @@ EGIT_BRANCH="upstream/sid"
 
 LICENSE="BSD-4 ZLIB public-domain"
 SLOT="0"
-IUSE="doc fuse tcpd"
+IUSE="doc fuse systemd tcpd"
 
 DEPEND="acct-user/apt-cacher-ng
 	acct-group/apt-cacher-ng
@@ -22,6 +22,7 @@ DEPEND="acct-user/apt-cacher-ng
 	dev-libs/openssl:0=
 	sys-libs/zlib
 	fuse? ( sys-fs/fuse:0 )
+	systemd? ( sys-apps/systemd )
 	tcpd? ( sys-apps/tcp-wrappers )"
 BDEPEND="virtual/pkgconfig"
 RDEPEND="${DEPEND}
@@ -41,10 +42,11 @@ src_prepare() {
 	# Make sure we install everything the same way it used to be after
 	# switching from mostly custom src_install to relying on build system
 	# installation
-	sed -ie "/install/s/LIBDIR/CFGDIR/" conf/CMakeLists.txt || die
-	sed -ie '/install.*acng\.conf/s/)$/ RENAME '"${PN}"'.conf)/' conf/CMakeLists.txt || die
-	sed -ie '/file/s/)$/ "*hooks" "backends_debian")/' conf/CMakeLists.txt || die
+	sed -e "/install/s/LIBDIR/CFGDIR/" \
+		-e '/install.*acng\.conf/s/)$/ RENAME '"${PN}"'.conf)/' \
+		-e '/file/s/)$/ "*hooks" "backends_debian")/' -i conf/CMakeLists.txt || die
 	sed -ie "/INSTALL.*acngtool/s/LIBDIR/CMAKE_INSTALL_SBINDIR/" source/CMakeLists.txt || die
+
 	cmake_src_prepare
 }
 
@@ -52,22 +54,21 @@ src_configure() {
 	local mycmakeargs=(
 		"-DHAVE_FUSE_25=$(usex fuse)"
 		"-DHAVE_LIBWRAP=$(usex tcpd)"
-		# Unconditionally install systemd service file
-		"-DSDINSTALL=1"
+		"-DSDINSTALL=$(usex systemd)"
 	)
 
-	if tc-ld-is-gold; then
-		mycmakeargs+=( "-DUSE_GOLD=yes" )
-	else
-		mycmakeargs+=( "-DUSE_GOLD=no" )
-	fi
-
 	cmake_src_configure
 
 	sed -ie '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
 }
 
 src_install() {
+	# README is a symlink to doc/README and README automatically gets
+	# installed, leading to a broken symlink installed. Fix this by removing
+	# the symlink then installing the actual README. https://bugs.gentoo.org/770046
+	rm README || die
+	dodoc doc/README
+
 	newinitd "${FILESDIR}/initd-r3" "${PN}"
 	newconfd "${FILESDIR}/confd-r2" "${PN}"
 
@@ -93,3 +94,7 @@ src_install() {
 
 	cmake_src_install
 }
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+}
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index f5c2e1320748..f362c039907a 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,3 +1,5 @@
 DIST aria2-1.35.0.tar.xz 1534460 BLAKE2B fc207ad0054e211b79ee1c6302c6bf83d0638fd5659d19dbd63d7cfb31101feb7d1a661b989ec42552c9a5c072dd660d2f7203063c3c1e14f53d5ce4c5a3c317 SHA512 82b49cecd61064ae33b4a422a2320d533f54afea8fab0f014072a46afdc05972d2e9c603e843960c097410adf87290df65849f4ee05e047403618ae50db151ef
+DIST aria2-1.36.0.tar.xz 1619036 BLAKE2B 7894ec705f6fefdbc6c4844efa8a645b3e7674e36d04535ac96b9daf5098a453d047109bad0db16e6fd656f63a3ec0bab5746e8ba7d549149e2364395a94399f SHA512 8203dbb75274455a78c50dd4f894e631de6931ac889f26896dceed78ec38c98cdbcf07e164744f308f2bfffeae1016beec1bfdbe8cad7f3280d11376aa0c2542
 EBUILD aria2-1.35.0.ebuild 5074 BLAKE2B 775f7d972e19016a586fda1f381803908d7f6ba0ab9631b0521653a92171c5e39b427f83f008c50dd33302920aab53aa0aa1e4417991248ff66a3889d0c5b8a2 SHA512 c94f8e082089352bc4bd3a331e485aa8776ec623f31ad29f22726f645c014bed2271ae870df9621e6fce036f0362f021c7c1ddfecf4edcfa4fbc5ded5d08808d
+EBUILD aria2-1.36.0.ebuild 5074 BLAKE2B 3ab30487f36fee7c4ddb734056737384e32bf92b416ac618d743666f052a6f84c44bf98879136f86a6fe5697fbc823ce55a48009b51c3450d4f2da005c995cee SHA512 3e07f1105332c7fcc2b8cb93ad6f8eae0a906290314d4a3d8843683b336ee5aab74e1265e24028815ad8d7fdc058d8c095235f1ca41fefb172e892d249e33a9d
 MISC metadata.xml 1325 BLAKE2B d958c3669bbebc969e706f70ea93d91f2068d19fe117d4112a818f711e0b3d421f35d67ad303ad856d6abf87b3f85ae0be17c487afef9df48f0a47264aa390e8 SHA512 668bea0c2d30e3fb10131a9ea0a9ba860cccfed7d5e810d165cc01d0ae9bb5d49653cba5aabe1cf5eb42bfbc1759198a82bec63e205a2c0dc05e4f93fac0d696
diff --git a/net-misc/aria2/aria2-1.36.0.ebuild b/net-misc/aria2/aria2-1.36.0.ebuild
new file mode 100644
index 000000000000..288141a977bc
--- /dev/null
+++ b/net-misc/aria2/aria2-1.36.0.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
+HOMEPAGE="https://aria2.github.io/"
+SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
+# xmlrpc has no explicit switch, it's turned out by any XML library
+# so metalink implicitly forces it on
+REQUIRED_USE="?? ( jemalloc tcmalloc )
+	metalink? ( xmlrpc )"
+RESTRICT="!test? ( test )"
+
+# Crazy GnuTLS/OpenSSL/etc. logic below:
+# 1. Those libraries are used for two purposes: TLS & MD.
+# 2. Upstream preferences are:
+#    1) gnutls [tls]
+#    2) !gnutls? -> openssl [tls+md]
+#    3) !openssl? -> nettle [md]
+#    4) !openssl? !nettle? -> gcrypt [md]
+#    5) !*? -> bundled md routines (we don't use them)
+# 3. There's also gmp usage for bittorrent with nettle.
+# 4. You can't really control features, just dependencies.
+# (we are skipping native Apple/Windows TLS support)
+#
+# We map this into:
+# ssl? -> openssl || (gnutls + (nettle || libgcrypt ))
+# !ssl? -> nettle || libgcrypt
+RDEPEND="sys-libs/zlib:0=
+	adns? ( >=net-dns/c-ares-1.5.0:0= )
+	jemalloc? ( dev-libs/jemalloc )
+	libuv? ( >=dev-libs/libuv-1.13:0= )
+	metalink? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
+		!libxml2? ( dev-libs/expat:0= ) )
+	sqlite? ( dev-db/sqlite:3= )
+	ssh? ( net-libs/libssh2:= )
+	ssl? (
+		app-misc/ca-certificates
+		gnutls? (
+			>=net-libs/gnutls-1.2.9:0=
+			nettle? (
+				>=dev-libs/nettle-2.4:0=
+				bittorrent? (
+					>=dev-libs/nettle-2.4:0=[gmp]
+					>=dev-libs/gmp-6:0=
+				)
+			)
+			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= )
+		)
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	!ssl? (
+		nettle? (
+			>=dev-libs/nettle-2.4:0=
+			bittorrent? (
+				>=dev-libs/nettle-2.4:0=[gmp]
+				>=dev-libs/gmp-6:0=
+			)
+		)
+		!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	)
+	tcmalloc? ( dev-util/google-perftools )
+	xmlrpc? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
+		!libxml2? ( dev-libs/expat:0= ) )"
+
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cppunit-1.12.0:0 )"
+RDEPEND+="
+	nls? ( virtual/libiconv virtual/libintl )
+	scripts? ( dev-lang/ruby )"
+BDEPEND="app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	if use scripts && ! use xmlrpc; then
+		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
+		ewarn "and aria2mon scripts against the local aria2."
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
+	# Fails with USE=bittorrent && FEATURES=network-sandbox
+	sed -i -E \
+		-e '/^@ENABLE_BITTORRENT_TRUE@	LpdMessageDispatcherTest/d' \
+		-e '/^@ENABLE_BITTORRENT_TRUE@	LpdMessageReceiverTest/d' \
+		test/Makefile.in || die
+}
+
+src_configure() {
+	local myconf=(
+		# threads, epoll: check for best portability
+
+		# do not try to compile and run a test LIBXML program
+		--disable-xmltest
+		# enable the shared library
+		--enable-libaria2
+		# zlib should always be available anyway
+		--with-libz
+		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+
+		# optional features
+		$(use_enable bittorrent)
+		$(use_enable metalink)
+		$(use_enable nls)
+		$(use_with adns libcares)
+		$(use_with jemalloc)
+		$(use_with libuv)
+		$(use_with sqlite sqlite3)
+		$(use_with ssh libssh2)
+		$(use_with tcmalloc)
+	)
+
+	# See TLS/MD logic described above deps.
+	if use ssl && ! use gnutls; then
+		# 1. if ssl & !gnutls, use openssl and disable gnutls
+		myconf+=( --without-gnutls --with-openssl )
+	else
+		myconf+=(
+			# 2. otherwise, disable openssl
+			--without-openssl
+			# 3. if ssl & gnutls, use gnutls
+			$(use_with ssl gnutls)
+
+			# 4. switch between nettle & libgcrypt
+			$(use_with nettle libnettle)
+			$(use_with !nettle libgcrypt)
+		)
+
+		# 5. if bittorrent is used along with nettle, use libgmp
+		if use bittorrent && use nettle; then
+			myconf+=( --with-libgmp )
+		else
+			myconf+=( --without-libgmp )
+		fi
+	fi
+
+	# metalink+xmlrpc := libxml2 / expat
+	# USE=(metalink || xmlrpc)
+	#  + USE=libxml2 -> libxml2
+	#  + USE=-libxml2 -> expat
+
+	if use metalink || use xmlrpc; then
+		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
+	else
+		myconf+=( --without-libexpat --without-libxml2 )
+	fi
+
+	# Note:
+	# - always enable gzip/http compression since zlib should always be available anyway
+	# - always enable epoll since we can assume kernel 2.6.x
+	# - other options for threads: solaris, pth, win32
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -r "${ED}"/usr/share/doc/${PF}/README{,.html} || die
+
+	dobashcomp doc/bash_completion/aria2c
+	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
+}
+
+pkg_postinst() {
+	if use xmlrpc; then
+		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
+		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
+	fi
+}
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 04f117c5703c..c124491b65a9 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -10,6 +10,6 @@ DIST chrony-4.0.tar.gz.asc 195 BLAKE2B 1947a73f35eb5c58f91775d76473210a7b5edff5b
 DIST chrony-4.1.tar.gz 564648 BLAKE2B f9c4b44c521ee592c109b8a3d500b9cb3ea4fbf0d7dce9d8754498ad41ce2ac87c913cf72a38557ce5f28208672163b21b067307f723fd91cc91d71f69e739ef SHA512 5e283d6a56e6852606c681a7c29c5786b102d584178cbd7033ebbc95a8e95533605631363b850a3087cca438a5878db7a317f120aab2fd856487d02fccfbcb1f
 DIST chrony-4.1.tar.gz.asc 833 BLAKE2B 6d800ae436523f61cd713cdd12cf0246db53e732554433d5ef6cf1a437296ee9d0da3b2e9e72d1ccb0e3a6b1ee1227e5d1626bf031b0491670ee0712e17c57ff SHA512 82faf9171d782c18224d2d44b340994b0ddab141e88cc803dea83d0ffbb6468bc51e8b11c8dd9bd327220cae04f7d789b58ab23141a2bdf038ce628f9adeb57a
 EBUILD chrony-4.0-r2.ebuild 5486 BLAKE2B 5fdde6f20fd5bf52e8d0420a03ba876c8a089e314db34b72bf17ceedc4806ee873b39035ffad654fa3a176a1a377e1b113e3bfec65fc3bf4d1e2eab12bc64685 SHA512 7289a03274c007acf24dcb0060d1bcb961c1d10119af1b7559b13b93bb6c8af3e9d20e4bb38077f58eb427bfe4d9db60bc040d7a1ec1951cb1bfd325bbc2a4e9
-EBUILD chrony-4.1-r1.ebuild 6632 BLAKE2B 5e5de2d3d155e263801c1af8d26dce99a9992cec44d1a834050b29fdf1d61d4ce6fad49fca9066df40865014a731aebeb6c89cf028f7fab1338acfc90b9c8635 SHA512 5f6eb80d2d4edc0244818445eebf1adaa67b3c0ecedfb8f99f8eafa2c5139faafef82dbbb2e56fb2adf14b0b231a9c78cb763ec1559a68fa05ede78b5b4b8a40
-EBUILD chrony-9999.ebuild 6639 BLAKE2B 18ffeb606ea9af800b1690c6853b6436e1b8e3915701a563e6dd0cd8bacc22756c2682a4b845af73acdbf32d8602d003f0450b7997185d4bc563fdf41672545a SHA512 ec524df0d9ed1405baefeb53e471acce91035cdc183b80122c6eddee9c95ffbf452be056f00aff7c7b5805de29b0d75af4ecce89923c99adb2a632675b62c65b
+EBUILD chrony-4.1-r1.ebuild 6632 BLAKE2B 26ee75040500664b3c20fb6f9e2f189a95f51095efc1c2844df9d88d59901a6a4b0a891feb4dd7476381e05d7e9f418178555857b701c56581ab475005ad4262 SHA512 56590e49f6db5644d85a9a75b4a3f03bc306694580967746be51ae953e33b43717242b55344bd85598e7023d72f64f4897128172abe7edeb213814f0744799d1
+EBUILD chrony-9999.ebuild 6639 BLAKE2B 0cba522a8f0ef1addaf4c05ac05881ba17fd24b727b9117f31b835680cace7afaac872c1ac84a56d000f68cbf6aeb092c7bb7236b1f3a3a0debeafb10afe10d4 SHA512 5bd344725e7d9704a6f046e9ccbff9fe1ad6d3ebe4af1380b687f493d9e8ca36cd879537c89580d914fac5c55e3663796e7fe8f4361039aae16b5ab969827240
 MISC metadata.xml 2299 BLAKE2B f5e8667a5fdeb86395d773eaf6e7d80c2133fe945565d7d6005f156a0a4763f1434ba887627fba63dd0f0a15663d7fa194d91699f6961ad21b9afa40576cd1fd SHA512 370e06edf9df22a327ff8b528f8a810c731af4615d740331ac737af8cbc5af265f7592ec22bf844301c5089185bc4f7de102f87378f85cf276d4f550933e519a
diff --git a/net-misc/chrony/chrony-4.1-r1.ebuild b/net-misc/chrony/chrony-4.1-r1.ebuild
index bd15590467d1..8bbf54dc2baf 100644
--- a/net-misc/chrony/chrony-4.1-r1.ebuild
+++ b/net-misc/chrony/chrony-4.1-r1.ebuild
@@ -246,7 +246,7 @@ pkg_postinst() {
 		elog "To enable seccomp in a stricter mode, please modify:"
 		elog "- /etc/conf.d/chronyd for OpenRC"
 		elog "- systemctl edit chronyd for systemd"
-		elog "By default, we now use -F 2 which is a baseline/minimal filter."
 		elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
+		elog "By default, we now use -F 2 which is a baseline/minimal filter."
 	fi
 }
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index 3f3cc9880058..6051d64c9884 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -246,7 +246,7 @@ pkg_postinst() {
 		elog "To enable seccomp in a stricter mode, please modify:"
 		elog "- /etc/conf.d/chronyd for OpenRC"
 		elog "- systemctl edit chronyd for systemd"
-		elog "By default, we now use -F 2 which is a baseline/minimal filter."
 		elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
+		elog "By default, we now use -F 2 which is a baseline/minimal filter."
 	fi
 }
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index f29558506a07..f6b1b00a7cbd 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -3,5 +3,6 @@ AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8
 DIST curl-7.77.0.tar.xz 2439336 BLAKE2B 433b3179dcf2c3363514b72bf9c54286873d8e5559b33e543ba8f3e7df25a619c5be13a8aacb9361c4464b646af4d1fb214d4de57a17f3de7e8f379777214d13 SHA512 aef92a0e3f8ce8491b258a9a1c4dcea3c07c29b139a1f68f08619caa0295cfde76335d2dfb9cdf434525daea7dd05d8acd22f203f5ccc7735bd317964ec1da76
 DIST curl-7.78.0.tar.xz 2440640 BLAKE2B 0422071ce22d38b89652c702989674a2257dd18b05004245c4f2d7494ccdd24b5b52f330629ce6a411a059d5990e8c879cbbdf23d873b881141f9d2b9ad07f7f SHA512 f72e822a0b5e28320ef547c7a441c07f3b4870579a70ab4c428751baba435a1385cb89a22b9ed4b84a7fafecf620f155911e4131e3463ec1bdad80ecde47bb7a
 EBUILD curl-7.77.0-r2.ebuild 8193 BLAKE2B b95e0408183486856914fa90951fb7aff96a232c8897a4b0acfc1e33b7e307b892d7a0c08cc7288b27eb900ae79f94d029ee939cbb641ed13add64f3f1d8903c SHA512 e190765e6667d59fbd8fe3973623f1dad553e27103addf4448a7cd044005c61d9d779eea54f269deca778c0a99d95d7d4160aa1e5f441770949a78ac6ee9e202
-EBUILD curl-7.78.0-r1.ebuild 7964 BLAKE2B 4269506bdb65576078915cbe90a73f2024b813782176a7ef45b3e0bead1acd414845231310491e6c2b2627b53fb6e0a3d073792a1006c99090084ea91101fe57 SHA512 cabb001f143d6d320eba6423d0ea2356c0afa6bc6afc9df287de9c5827c03774b06836d86d4520572205a7b408becb877071f5d4dd475f5ec36c3e230bcd99bb
-MISC metadata.xml 2104 BLAKE2B cd965737bacd5cde978fdcb652559c3c29eee0083bdee82e00cf78055e681571e77a2deaf4ab6ef5a9aba0c33689356fc2299c346c4c1e6b4afda9c675b9f3b1 SHA512 a2e9ba5358d115b18fa089bd222f026a7553505a154e1d865af0cde1004a0a427f58ed38d802815d96453d5d58628aa91d8cd5d082fe059cb1afd4dc9d312052
+EBUILD curl-7.78.0-r1.ebuild 7963 BLAKE2B db7995cb94d314315fad8662637bcaa7cd3f36a69193f599a085e3d5463b220f757f00e6b8e58d13180a5275f76c54ab01f87d735e09af00fbbd998ba19bc660 SHA512 a60ad52af689276ab713b7b897fa587034dc2f7202427d06d0e627514d3d66a9c34bcacedcb380e5e391cc8490d0c7ad73f266454c64a32ffd9ff701c2e57018
+EBUILD curl-7.78.0-r2.ebuild 7979 BLAKE2B 8faca82d3a36197f6809a17fb8ea63f13a406f87dfb23b0131e70d8f2080c21e775f1c0c322d07204eb024377c2c8da8e4ae6232d7d15d0d7abb48b1e7104021 SHA512 d23c0bad557f95e42dae0095cf7180c4e55fb6b616ada4498e125de11cf9a1706a1142a1498bf84bd4014f8bb4b36ceb462d5bb671c42efb1af41d3706166991
+MISC metadata.xml 2151 BLAKE2B cc435ea42d2a07483bda22ff947b84d6a604c6739d7e93c7e5aae24e32427dd874cbb50c6c4b66b6cd5927ae452c4616f697126d43be9389fc64ae4edbc5127b SHA512 7afc9e5c91ef703a7ee8958fe814666d452806837a511afb249b88b02e9cbdccfcc7c51627276060fe38b9ef2145704008b5d215d5b5b6d6edf4d6fe606e2c8f
diff --git a/net-misc/curl/curl-7.78.0-r1.ebuild b/net-misc/curl/curl-7.78.0-r1.ebuild
index cb5e8f291237..c3e282bb3a10 100644
--- a/net-misc/curl/curl-7.78.0-r1.ebuild
+++ b/net-misc/curl/curl-7.78.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 
 LICENSE="curl"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
 IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" nghttp3 quiche"
diff --git a/net-misc/curl/curl-7.78.0-r2.ebuild b/net-misc/curl/curl-7.78.0-r2.ebuild
new file mode 100644
index 000000000000..b60388dc3080
--- /dev/null
+++ b/net-misc/curl/curl-7.78.0-r2.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
+
+LICENSE="curl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss ntlm +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
+IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" nghttp3 quiche"
+IUSE+=" elibc_Winnt"
+
+# c-ares must be disabled for threads
+# only one default ssl provider can be enabled
+REQUIRED_USE="
+	winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+# lead to lots of false negatives, bug #285669
+RESTRICT="!test? ( test )"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		openssl? (
+			dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+		)
+		nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
+	nghttp3? (
+		net-libs/nghttp3[${MULTILIB_USEDEP}]
+		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+	)
+	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	"${FILESDIR}"/${PN}-respect-cflags-3.patch
+)
+
+src_prepare() {
+	default
+
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+
+	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	#myconf+=( --without-default-ssl-backend )
+	if use ssl ; then
+		if use gnutls || use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		fi
+		if use mbedtls || use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		fi
+		if use nss || use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		fi
+		if use openssl || use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		fi
+		if use winssl || use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		fi
+
+		if use curl_ssl_gnutls; then
+			einfo "Default SSL provided by gnutls"
+			myconf+=( --with-default-ssl-backend=gnutls )
+		elif use curl_ssl_mbedtls; then
+			einfo "Default SSL provided by mbedtls"
+			myconf+=( --with-default-ssl-backend=mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "Default SSL provided by nss"
+			myconf+=( --with-default-ssl-backend=nss )
+		elif use curl_ssl_openssl; then
+			einfo "Default SSL provided by openssl"
+			myconf+=( --with-default-ssl-backend=openssl )
+		elif use curl_ssl_winssl; then
+			einfo "Default SSL provided by Windows"
+			myconf+=( --with-default-ssl-backend=winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	myconf+=(
+		$(use_enable alt-svc)
+		--enable-crypto-auth
+		--enable-dict
+		--disable-ech
+		--enable-file
+		$(use_enable ftp)
+		$(use_enable gopher)
+		$(use_enable hsts)
+		--enable-http
+		$(use_enable imap)
+		$(use_enable ldap)
+		$(use_enable ldap ldaps)
+		$(use_enable ntlm)
+		--disable-ntlm-wb
+		$(use_enable pop3)
+		--enable-rt
+		--enable-rtsp
+		$(use_enable samba smb)
+		$(use_with ssh libssh2)
+		$(use_enable smtp)
+		$(use_enable telnet)
+		$(use_enable tftp)
+		--enable-tls-srp
+		$(use_enable adns ares)
+		--enable-cookies
+		--enable-dateparse
+		--enable-dnsshuffle
+		--enable-doh
+		--enable-hidden-symbols
+		--enable-http-auth
+		$(use_enable ipv6)
+		--enable-largefile
+		--enable-manual
+		--enable-mime
+		--enable-netrc
+		$(use_enable progress-meter)
+		--enable-proxy
+		--disable-sspi
+		$(use_enable static-libs static)
+		$(use_enable threads threaded-resolver)
+		$(use_enable threads pthreads)
+		--disable-versioned-symbols
+		--without-amissl
+		--without-bearssl
+		$(use_with brotli)
+		--without-cyassl
+		--without-fish-functions-dir
+		$(use_with http2 nghttp2)
+		--without-hyper
+		$(use_with idn libidn2)
+		$(use_with kerberos gssapi "${EPREFIX}"/usr)
+		--without-libgsasl
+		--without-libpsl
+		$(use_with nghttp3)
+		$(use_with nghttp3 ngtcp2)
+		$(use_with quiche)
+		$(use_with rtmp librtmp)
+		--without-rustls
+		--without-schannel
+		--without-secure-transport
+		--without-spnego
+		--without-winidn
+		--without-wolfssl
+		--with-zlib
+		$(use_with zstd)
+	)
+
+	ECONF_SOURCE="${S}" \
+	econf "${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use quiche; then
+		libs+=( "-lquiche" )
+		priv+=( "quiche" )
+	fi
+	if use nghttp3; then
+		libs+=( "-lnghttp3" "-lngtcp2" )
+		priv+=( "libnghttp3" "-libtcp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default_src_test
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm -rf "${ED}"/etc/ || die
+}
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index 63231cb33c31..7ab1ec9987ba 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -19,6 +19,7 @@
 		<flag name="quiche">Enable HTTP/3.0 support using <pkg>net-libs/quiche</pkg></flag>
 		<flag name="metalink">Enable metalink support</flag>
 		<flag name="nss">Enable nss ssl backend</flag>
+		<flag name="ntlm">Enable ntlm support</flag>
 		<flag name="openssl">Enable openssl ssl backend</flag>
 		<flag name="pop3">Enable Post Office Protocol 3 support</flag>
 		<flag name="progress-meter">Enable the progress meter</flag>
diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 36009499f32a..8ff50ad341d9 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,6 +1,9 @@
 AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285ebd91cb0ba8f7fea0ef49d5eddd8660100315ca7d74ece8d553cdd8ad79a9a0b1a4c173c6dedf90e0be2bdc72d948b2be SHA512 56bdeb8a1f350fea3ad8ed0cdba28964b00384878853e584746d8ce80c6f9ea5ca5adc4539e314f7fd82203c08d5f2ce6adeec61dac9a7a28282131d0d371447
+AUX frr-8.0-c-ares.patch 482 BLAKE2B e7a29e165a40737624e234932ca80b07c1ed7c6db2d6972f5e27e727b81e95c39ac7f54e3b1ba19dd0944cbda495ce12c2f884a2fce169f851126e6c88200944 SHA512 d5f2de9c548664668e5bcc9d9a6e2c4b0d2f0e41d73f61c1a09881cec53854de983dea1585d00b0a29be7282925c1e456cf6c2e0b338241c609fa561022d5a63
 AUX frr-openrc-v1 7068 BLAKE2B c790c783ea9c289110b1e85aa23a1adccba36122524cde36798f26c31f82e5381eefb3e5e16b497e84a5aa2faf5bf1f59d12fe8f9b7b3c5d0f504c26ce13fb86 SHA512 34e371bb9bb34e494536091a811084d543c18b302489ce0a56ec3e69c805c22d84d7a928e24e17eba5d4fe6d4e33ac847060da95ded5a02975ba2a2e5a568243
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
 DIST frr-7.5.1.tar.gz 6746148 BLAKE2B e6a8d38bac1323852d933ca9eaac681df8824407af008bb0170937a01564b3fb9fb081418630b7540f3ccdb899ac0948121d63accfa65ae0fd3fd6933fdafd6d SHA512 cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e
+DIST frr-8.0.tar.gz 8195258 BLAKE2B 75d8d4410a5377dae3bf6938c3b095b163ad87776420a16c07d461bb3f635d623de642fa0ae483094788369c9dc6a04d5424107bf60c848ac54756c4bdb20c97 SHA512 fdf1e68c16e266a74221fb194851ef47c888e90324de2e42a4ca68b9dbce1ba6f45d73b9830bdb17774ecdde736111fa562201a5763c49092b6ce1f0a4d4865a
 EBUILD frr-7.5.1-r4.ebuild 3557 BLAKE2B ea76e974e78d946b0d993bab03f94e05328172e0d86bff1aac865fbd8cacc799710268122c9474ec9618d7c44e00bb258b5f7cde24181e783096348ca6037289 SHA512 c836edeadd95848bbb34d1e281b286246309c09c4ec1784a06ac848cb131d611b257e92a0a992eaa48fdb2ae98d7b30a8a0238b951a73523219554961be15b98
+EBUILD frr-8.0.ebuild 3574 BLAKE2B d936f13e01512991d4bb22e5d3101a23c08b569edd4a4ccaa4cfb9501b28cb3afd886c750311a364da51c564f3b9c878e5f4574cf954e4d661c8d1c9c325bf15 SHA512 dc3f46abfc7bdff106ea19f9a1d56d05aebefcf7fbbf0c3ef53cd0f65b4768d90e19d0393a08a9da5c31eaa8ff2e7ccfdf8f274ce299901314bcd2710b6ec72a
 MISC metadata.xml 770 BLAKE2B 13813d2c2fc611a87a9d2e516b0fd8fb5f9539339f99837ec08c9ed0ac276f9ee80b0e1afa84d6e52adfde8135b3b6950172faed307ae0dbec423bf1a4acd4bf SHA512 e4989acf1cfaabf52030284acff11ae6408dc8d958286ca1cf68d183526dd6a8379ed7ace5d5348f4e298e792387f3ba0a06dea402d125597aa9032222ff1dcb
diff --git a/net-misc/frr/files/frr-8.0-c-ares.patch b/net-misc/frr/files/frr-8.0-c-ares.patch
new file mode 100644
index 000000000000..c313006e8630
--- /dev/null
+++ b/net-misc/frr/files/frr-8.0-c-ares.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/809728
+--- a/lib/subdir.am
++++ b/lib/subdir.am
+@@ -144,7 +144,6 @@ vtysh_scan += \
+ 	lib/log_vty.c \
+ 	lib/nexthop_group.c \
+ 	lib/plist.c \
+-	lib/resolver.c \
+ 	lib/routemap.c \
+ 	lib/routemap_cli.c \
+ 	lib/spf_backoff.c \
+@@ -333,6 +332,7 @@ lib_libfrrsnmp_la_SOURCES = \
+ if CARES
+ lib_LTLIBRARIES += lib/libfrrcares.la
+ pkginclude_HEADERS += lib/resolver.h
++vtysh_scan += lib/resolver.c
+ endif
+ 
+ lib_libfrrcares_la_CFLAGS = $(AM_CFLAGS) $(CARES_CFLAGS)
diff --git a/net-misc/frr/frr-8.0.ebuild b/net-misc/frr/frr-8.0.ebuild
new file mode 100644
index 000000000000..6343f0f45e38
--- /dev/null
+++ b/net-misc/frr/frr-8.0.ebuild
@@ -0,0 +1,150 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools pam python-single-r1 systemd
+
+DESCRIPTION="The FRRouting Protocol Suite"
+HOMEPAGE="https://frrouting.org/"
+SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
+# FRR tarballs have weird format.
+S="${WORKDIR}/frr-${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-user/frr
+	dev-libs/json-c:0=
+	>=net-libs/libyang-2.0.0
+	sys-libs/libcap
+	sys-libs/readline:0=
+	virtual/libcrypt:=
+	grpc? ( net-libs/grpc:= )
+	nhrp? ( net-dns/c-ares:0= )
+	pam? ( sys-libs/pam )
+	rpki? ( >=net-libs/rtrlib-0.6.3[ssh] )
+	snmp? ( net-analyzer/net-snmp:= )
+"
+BDEPEND="
+	>=dev-util/clippy-${PV}
+	sys-devel/flex
+	virtual/yacc
+	doc? ( dev-python/sphinx )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
+	!net-misc/quagga
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
+	"${FILESDIR}"/${P}-c-ares.patch
+)
+
+src_prepare() {
+	default
+
+	python_fix_shebang tools
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--with-pkg-extra-version="-gentoo"
+		--enable-configfile-mask=0640
+		--enable-logfile-mask=0640
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/lib/frr
+		--sbindir="${EPREFIX}"/usr/lib/frr
+		--libexecdir="${EPREFIX}"/usr/lib/frr
+		--sysconfdir="${EPREFIX}"/etc/frr
+		--localstatedir="${EPREFIX}"/run/frr
+		--with-moduledir="${EPREFIX}"/usr/lib/frr/modules
+		--with-clippy="${BROOT}"/usr/bin/clippy
+		--enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples
+		--enable-user=frr
+		--enable-group=frr
+		--enable-vty-group=frr
+		--enable-multipath=64
+		$(use_enable doc)
+		$(use_enable fpm)
+		$(use_enable grpc)
+		$(use_enable ipv6 ospf6d)
+		$(use_enable ipv6 ripngd)
+		$(use_enable ipv6 rtadv)
+		$(use_enable kernel_linux realms)
+		$(use_enable nhrp nhrpd)
+		$(usex ospfapi '--enable-ospfclient' '' '' '')
+		$(use_enable rpki)
+		$(use_enable snmp)
+		$(use_enable systemd)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	# Install user documentation if asked
+	use doc && dodoc -r doc/user/_build/html
+
+	# Create configuration directory with correct permissions
+	keepdir /etc/frr
+	fowners frr:frr /etc/frr
+	fperms 775 /etc/frr
+
+	# Create logs directory with the correct permissions
+	keepdir /var/log/frr
+	fowners frr:frr /var/log/frr
+	fperms 775 /var/log/frr
+
+	# Install the default configuration files
+	insinto /etc/frr
+	doins tools/etc/frr/vtysh.conf
+	doins tools/etc/frr/frr.conf
+	doins tools/etc/frr/daemons
+
+	# Fix permissions/owners.
+	fowners frr:frr /etc/frr/vtysh.conf
+	fowners frr:frr /etc/frr/frr.conf
+	fowners frr:frr /etc/frr/daemons
+	fperms 640 /etc/frr/vtysh.conf
+	fperms 640 /etc/frr/frr.conf
+	fperms 640 /etc/frr/daemons
+
+	# Install logrotate configuration
+	insinto /etc/logrotate.d
+	newins redhat/frr.logrotate frr
+
+	# Install PAM configuration file
+	use pam && newpamd "${FILESDIR}"/frr.pam frr
+
+	# Install init scripts
+	systemd_dounit tools/frr.service
+	newinitd "${FILESDIR}"/frr-openrc-v1 frr
+
+	# Conflict files, installed by net-libs/libsmi, bug #758383
+	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
+}
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index c7bb56f35363..81bd3277ae7b 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,12 +1,10 @@
+AUX miniupnpd-2.2.3-testgetifaddr.patch 630 BLAKE2B d5f10c753f471a8f9d658a7c2cbc71ce5c64bc5cb2faae49e280cbaefe1fd6ce34ff0427d7512520a333a63fa4156df76271781cc1193fcd034e9b60d3b1d241 SHA512 6d87c50a64fffdefc3b251174ffc62ad9c855d248b6771343e6bf3e15f36b109c0b9b7eec3f2f47be12f5aac341c04b19c02e72eb30c38dc841c4e75bd5f21bb
 AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9
 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856
-DIST miniupnpd-2.2.0.tar.gz 249858 BLAKE2B ef216c7703cb9806a3719b247d67c5c844879308eafbef0936fc501305dbdada7b32e6fc212e50ee093c6f5728709da3d2d5114e89de52a124c229c63ee03563 SHA512 ac8bc3c140f369d0f92d203b94a4f73dde682a486c4395cd25aafda3461577b4a2a1d3160cf8bd37fa8520cda4f86cbdaec925b2ef4e9054e7bf10e04a227d3c
-DIST miniupnpd-2.2.0.tar.gz.sig 543 BLAKE2B 11778dd70128ece1f80144bb229176c53f3cd89847a8eedd4fe1b75ac55d986ae7c4689edf40f80c4605ba42260bc41f8fd069e99b8c249226ab9e2981d15412 SHA512 5e0e053a2a3ab876da001589677b0f5e3a4df8511ea5185dbbaee9b80928f9cb9705029f1c83bd9d26b144e39721fce1c4c8c33983956b6731ae654bc094063c
-DIST miniupnpd-2.2.1.tar.gz 250023 BLAKE2B 67418a8480f7d3ac3d51a9c18fdcce4a85c33ff6c373051e1f9df121b00d936f02038ed0a5a5a848b7b2c145aa08dc1e2b954b211cc79fae1de09075f55a9f21 SHA512 211b608472a72065d892e9197f8bdd8c82e44296bb692244ec5e83ca9b076cbcc3426c806ff27d5e805505b1c82b1a7afd7b4030ddecdb60aa85c37062c10c8a
-DIST miniupnpd-2.2.1.tar.gz.sig 543 BLAKE2B fac8c2fd5c50e3201c5fc490d91aed5752bf70297bed101cb3d5ec53d891fdc8f893b3d83e0cf064eb9e9bf16ae9504a849187e18eabc8ed12055574d1e551f5 SHA512 da5b52b1c62bf433a165acf87a64195e27c71c98dfa086cfde19f7b1c4046a62926cca5eb2d10f4260eb1b97c428ba08b4b7fcbf280c2a7009c86279a7563e0f
 DIST miniupnpd-2.2.2.tar.gz 250649 BLAKE2B d561916ced9b5c58371382fe0bec68cd0771d1dc3b2c7fa7e3701cb2579db69697fbdcd724bea2350abd46381eda1fd257dede6df99f99fa54e423db4ee52717 SHA512 3cc11ad901e93a9879fe07e35a20f8977df466bb402e0270e46d1dbd0b5dc3b5dc22303467d5022103952d7dd789ac590c17d0fa81fc7ec42676b66223d37ee4
 DIST miniupnpd-2.2.2.tar.gz.sig 543 BLAKE2B 461a9149c66b0e314a767405024fc7bfb641a20ae36b908dc467c9211660d5cb0753fb3c99fa9d6df35d693a2f6790efb6a325f0005804572eaa78a02b23a482 SHA512 8ffc9901cd992cbd9d0fa4c5e510fe43f748ab4a7c4732cc8f2f685f19b71a3f087a63a39e1dbf081175ac65de34b5c05dc3ef636a805e550a0406119a5904ef
-EBUILD miniupnpd-2.2.0.ebuild 2096 BLAKE2B 6b601880e0f1304055db875e2a2dbd67483848a7f104fdee47ae1f581b3cc8e97542d368745e18296178082104ec2e6a77af3b2d03000abd08970cb79637edc7 SHA512 06db84831b29bf3d34c8e35bce36b0b797622143d156ff9d0ff90d331d0ad2d9b0374c1e6b16765a903e67a772330eae51a91844d8605b9cf1c826dde7961e80
-EBUILD miniupnpd-2.2.1.ebuild 2096 BLAKE2B 6b601880e0f1304055db875e2a2dbd67483848a7f104fdee47ae1f581b3cc8e97542d368745e18296178082104ec2e6a77af3b2d03000abd08970cb79637edc7 SHA512 06db84831b29bf3d34c8e35bce36b0b797622143d156ff9d0ff90d331d0ad2d9b0374c1e6b16765a903e67a772330eae51a91844d8605b9cf1c826dde7961e80
+DIST miniupnpd-2.2.3.tar.gz 254752 BLAKE2B ebdb8d4ce7dc649ef0243d2d698b9f51cb2006055eb3abb70d9ccc839cb57c7113595ef1b9b5886f55bc458d8260edf95ae6e1964a5d5423f9b0b46e07e02775 SHA512 56b1e93e9576fa412202e1940fcd8b7af57584714c15017bbcec1aa4fa7bba7a6fa5d1136048100d7cce3222f31b38837de1eae344b533164314c858cdf08ef9
+DIST miniupnpd-2.2.3.tar.gz.sig 543 BLAKE2B 3ba2e69cfd7e0a27a746f45e5eb10e573e00c4fc20a7d62b94a2e0b7e4e9ad8779d53df72e31547b78dc6e34676204a4848652e81d1e479a68973e150f51f468 SHA512 9f766f3e94de1fbd458c7bda30cc87892198af7544aa9dc0fa4c6b6a1c9434e4bab6f8583eeccf3ae613da240ad599d750425c507e8138d483710459f31a0b21
 EBUILD miniupnpd-2.2.2.ebuild 2096 BLAKE2B 8d0fd68a34e76b77f74160775f8057c68b3c1a4e17b99461626b89fd703f20b9369164fba285c980e14f30028406cf215b0d707ecfe43dc703d1253974d7ae1f SHA512 3bc8158580d5040bfaf6953a6f2019547d8f6f6c7f64f6fb444d5108619c66cb98763d5f72c70fcd05514d185da19632f5435c2b5d7189b8b9f86dafc64d7fea
+EBUILD miniupnpd-2.2.3.ebuild 2323 BLAKE2B 8294335fe7030cabfeee6d68bd8ac205965476510e814a9c6d0c7a5d2da6aff42335955a5231761602d09a2595886a9d965b5482d5a4b4b385c01de42f26f757 SHA512 bd5c32e398acf92765f4812040f2b37bf3d412c68723334208ada532e7359eb54458af63c3f81694d5023af8cacec129ac1898412cd710733697bcd9f1501758
 MISC metadata.xml 902 BLAKE2B ec10dab38256289a3445ad960eb869fe01ad009e21f77e61ffa4e45cac71120df285461cc3515de395918635b8f76a5448d761f9644172064e1eea79aa926947 SHA512 931799b28d6b7b1676d7ed0b94ce6760b550087785885635cb03c656c20e51c810a75dd8d675e17e5b8fdb87e7909f2a972ba11e168310eef4f58efd0a065135
diff --git a/net-misc/miniupnpd/files/miniupnpd-2.2.3-testgetifaddr.patch b/net-misc/miniupnpd/files/miniupnpd-2.2.3-testgetifaddr.patch
new file mode 100644
index 000000000000..73e4a87903e8
--- /dev/null
+++ b/net-misc/miniupnpd/files/miniupnpd-2.2.3-testgetifaddr.patch
@@ -0,0 +1,14 @@
+diff --git a/miniupnpd/testgetifaddr.sh b/miniupnpd/testgetifaddr.sh
+index 7ad56d9..2a26a24 100755
+--- a/testgetifaddr.sh
++++ b/testgetifaddr.sh
+@@ -12,7 +12,8 @@ case $OS in
+ 	*)
+ 	IP="`which ip`" || exit 1
+ 	EXTIF="`LC_ALL=C $IP -4 route | grep 'default' | sed -e 's/.*dev[[:space:]]*//' -e 's/[[:space:]].*//'`" || exit 1
+-	EXTIP="`LC_ALL=C $IP -4 addr show $EXTIF | awk '/inet/ { print $2 }' | cut -d "/" -f 1`"
++	EXTIF="`LC_ALL=C $IP -4 addr show $EXTIF | awk '/[0-9]+:/ { print $2; exit 0 }' | cut -d ":" -f 1`"
++	EXTIP="`LC_ALL=C $IP -4 addr show $EXTIF | awk '/inet/ { print $2; exit 0 }' | cut -d "/" -f 1`"
+ 	;;
+ esac
+ 
diff --git a/net-misc/miniupnpd/miniupnpd-2.2.0.ebuild b/net-misc/miniupnpd/miniupnpd-2.2.0.ebuild
deleted file mode 100644
index 1c2981def4c4..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.2.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs verify-sig
-
-MY_P=${P/_rc/-RC}
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${MY_P}.tar.gz
-	verify-sig? ( http://miniupnp.free.fr/files/${MY_P}.tar.gz.sig )"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	sys-apps/util-linux:=
-	dev-libs/openssl:0=
-	!nftables? (
-		>=net-firewall/iptables-1.4.6:0=[ipv6?]
-		net-libs/libnfnetlink:=
-		net-libs/libmnl:=
-	)
-	nftables? (
-		net-firewall/nftables
-		net-libs/libnftnl:=
-		net-libs/libmnl:=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-apps/lsb-release
-	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
-
-src_configure() {
-	local opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-		--firewall=$(usex nftables nftables iptables)
-	)
-
-	# custom script
-	./configure "${opts[@]}" || die
-	# prevent gzipping manpage
-	sed -i -e '/gzip/d' Makefile || die
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	local confd_seds=()
-	if use nftables; then
-		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
-	else
-		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
-	fi
-	if ! use ipv6 || use nftables; then
-		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
-	fi
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
-	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
-		"${FILESDIR}"/${PN}-conf.d-r2 || die)
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.2.1.ebuild b/net-misc/miniupnpd/miniupnpd-2.2.1.ebuild
deleted file mode 100644
index 1c2981def4c4..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.2.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs verify-sig
-
-MY_P=${P/_rc/-RC}
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${MY_P}.tar.gz
-	verify-sig? ( http://miniupnp.free.fr/files/${MY_P}.tar.gz.sig )"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	sys-apps/util-linux:=
-	dev-libs/openssl:0=
-	!nftables? (
-		>=net-firewall/iptables-1.4.6:0=[ipv6?]
-		net-libs/libnfnetlink:=
-		net-libs/libmnl:=
-	)
-	nftables? (
-		net-firewall/nftables
-		net-libs/libnftnl:=
-		net-libs/libmnl:=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-apps/lsb-release
-	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
-
-src_configure() {
-	local opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-		--firewall=$(usex nftables nftables iptables)
-	)
-
-	# custom script
-	./configure "${opts[@]}" || die
-	# prevent gzipping manpage
-	sed -i -e '/gzip/d' Makefile || die
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	local confd_seds=()
-	if use nftables; then
-		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
-	else
-		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
-	fi
-	if ! use ipv6 || use nftables; then
-		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
-	fi
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
-	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
-		"${FILESDIR}"/${PN}-conf.d-r2 || die)
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.2.3.ebuild b/net-misc/miniupnpd/miniupnpd-2.2.3.ebuild
new file mode 100644
index 000000000000..1042f0c2cb80
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.2.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs verify-sig
+
+MY_P=${P/_rc/-RC}
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${MY_P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${MY_P}.tar.gz.sig )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	sys-apps/util-linux:=
+	dev-libs/openssl:0=
+	!nftables? (
+		>=net-firewall/iptables-1.4.6:0=[ipv6?]
+		net-libs/libnfnetlink:=
+		net-libs/libmnl:=
+	)
+	nftables? (
+		net-firewall/nftables
+		net-libs/libnftnl:=
+		net-libs/libmnl:=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/lsb-release
+	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-testgetifaddr.patch
+	)
+
+	default
+
+	# fails without a default route
+	sed -i -e 's:EXTIF=.*:EXTIF=lo:' testgetifaddr.sh || die
+}
+
+src_configure() {
+	local opts=(
+		--vendorcfg
+		$(usex igd2 '--igd2' '')
+		$(usex ipv6 '--ipv6' '')
+		$(usex leasefile '--leasefile' '')
+		$(usex portinuse '--portinuse' '')
+		$(usex pcp-peer '--pcp-peer' '')
+		$(usex strict '--strict' '')
+		--firewall=$(usex nftables nftables iptables)
+	)
+
+	# custom script
+	./configure "${opts[@]}" || die
+	# prevent gzipping manpage
+	sed -i -e '/gzip/d' Makefile || die
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_test() {
+	emake CC="$(tc-getCC)" check
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	local confd_seds=()
+	if use nftables; then
+		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
+	else
+		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
+	fi
+	if ! use ipv6 || use nftables; then
+		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
+	fi
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
+	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
+		"${FILESDIR}"/${PN}-conf.d-r2 || die)
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-misc/netkit-talk/Manifest b/net-misc/netkit-talk/Manifest
index 98ee5c41ec60..ac09fff159f8 100644
--- a/net-misc/netkit-talk/Manifest
+++ b/net-misc/netkit-talk/Manifest
@@ -1,6 +1,6 @@
-AUX netkit-talk-0.17-ipv6.diff 1587 BLAKE2B 82947b16ee0a8fbe3622de9109dd3dbb504d6d1c899d3a189220f8cb4721d19e6c86ffebf5c30a3f58c7c2fedeaad8eec4bf3a2b15838173818bf49b96ebf0c6 SHA512 6545182872092864f136f7c5e464435679cf06d5393d587b564cb19930c2a1fc068d737bdc8a4bdcbc8a708c891284d66625ad85efd1d5e60c3cf49abe4215f1
+AUX netkit-talk-0.17-ipv6.patch 1587 BLAKE2B 82947b16ee0a8fbe3622de9109dd3dbb504d6d1c899d3a189220f8cb4721d19e6c86ffebf5c30a3f58c7c2fedeaad8eec4bf3a2b15838173818bf49b96ebf0c6 SHA512 6545182872092864f136f7c5e464435679cf06d5393d587b564cb19930c2a1fc068d737bdc8a4bdcbc8a708c891284d66625ad85efd1d5e60c3cf49abe4215f1
 AUX netkit-talk-0.17-time.patch 385 BLAKE2B 5b49b4d562507c6b60911379e0623e17a2c5b25ec6ea1dc5f85c72e67823fac86b6152cde241e9823feb118c7e706b502031c583e216481cda7b5a47804ecbd1 SHA512 4da0417515e8e357cdc3b5b46b3edaa324dba767ae9dea6aa374ac8e4cf835dc0a4766684edc1e2b254840858721558a1e29940ea95ae274b06ded99fbf5499f
 AUX talk.xinetd 265 BLAKE2B 94381bf30fa51682b9dd272174cd8a3fed94233ff8ec654044419016a3adedbfac4e0db1f86c3851c9f7aa1c63d6e7411def635ecd3aa8cc88ec4d50656985c8 SHA512 f4f29a6e57aa80ffd6acc45b3c4a5bc5086fc6061f8d9bdfbe4fea4f874cedbdd5f85f60e311aa473e53119c16c42289161011699d24b944992aee0aec9ccb1f
 DIST netkit-ntalk-0.17.tar.gz 37396 BLAKE2B cdc7af27bb5f0b6b1139e3d8b33ecc3d4c661a76ee9de4cca8f5954251a30b5b3dc926ff906a7b51223b1c8590ff99a408ca07642c454bfd095b91fff482dffb SHA512 5a886c0f73179060f926d4af781a6b9d4de7b62562a69db7b93c4fd783ad12b488ee967af18e5a11f98e7f94d659c1688d2a3d4ba4a00bdec31869aa39a321c5
-EBUILD netkit-talk-0.17-r6.ebuild 1190 BLAKE2B 1208a50fecb70771846578d2ede6b46d283a6508ac4f29ea2c13bf18256aac7a2362edc80b5e947bde8a846376d3fd636b3a92e0ed9a697fa31b3bfed1ef655f SHA512 10b96aecbc26594fe8007dc768a9301a2641d07d2383b0d8b6b5417dfa95bb50e928f03b70be7e0070d419d661edb8db881c82160b99e560a54f3d9611a38830
+EBUILD netkit-talk-0.17-r7.ebuild 1166 BLAKE2B 89f48037c69b7ebf8a4cfeb38769f0f72a88c8e943a7ec081ff10c3c09de9ee31bdc73aca9d3d7efe4d7974a46712c2320e480523fc16c731e5d41a1b0652be4 SHA512 dd1ff01f80a58c12bf60b871d7d749b24b6bc397ab0bae26aabaa702a5124e37bb2c0f3fb537d8ef93c951f59aee4b737f74cd457ee3ed236ca948720d7c842e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/netkit-talk/files/netkit-talk-0.17-ipv6.diff b/net-misc/netkit-talk/files/netkit-talk-0.17-ipv6.patch
index f426bf7dfadf..f426bf7dfadf 100644
--- a/net-misc/netkit-talk/files/netkit-talk-0.17-ipv6.diff
+++ b/net-misc/netkit-talk/files/netkit-talk-0.17-ipv6.patch
diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r6.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r6.ebuild
deleted file mode 100644
index c76f72b34420..000000000000
--- a/net-misc/netkit-talk/netkit-talk-0.17-r6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch toolchain-funcs
-
-MY_P=netkit-ntalk-${PV}
-S=${WORKDIR}/netkit-ntalk-${PV}
-
-DESCRIPTION="Netkit - talkd"
-HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="ipv6"
-
-COMMON_DEPEND=">=sys-libs/ncurses-5.2:="
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	virtual/inetd
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-time.patch
-	use ipv6 && epatch "${FILESDIR}"/${P}-ipv6.diff
-	sed -i configure -e '/^LDFLAGS=/d' || die
-}
-
-src_configure() {
-	# not autotools based?
-	./configure --with-c-compiler=$(tc-getCC) || die
-}
-
-src_compile() {
-	emake LIBCURSES="$( $(tc-getPKG_CONFIG) --libs ncurses )"
-}
-
-src_install() {
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/talk.xinetd talk
-	dobin talk/talk
-	doman talk/talk.1
-	dosbin talkd/talkd
-	dosym talkd /usr/sbin/in.talkd
-	doman talkd/talkd.8
-	dosym talkd.8 /usr/share/man/man8/in.talkd.8
-	dodoc README ChangeLog BUGS
-}
diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r7.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r7.ebuild
new file mode 100644
index 000000000000..585a64aabeab
--- /dev/null
+++ b/net-misc/netkit-talk/netkit-talk-0.17-r7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P=netkit-ntalk-${PV}
+S="${WORKDIR}"/netkit-ntalk-${PV}
+
+DESCRIPTION="Netkit - talkd"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+IUSE="ipv6"
+
+DEPEND=">=sys-libs/ncurses-5.2:="
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	${DEPEND}
+	virtual/inetd
+"
+
+PATCHES=( "${FILESDIR}"/${P}-time.patch )
+
+src_prepare() {
+	default
+	use ipv6 && eapply "${FILESDIR}"/${P}-ipv6.patch
+	sed -i configure -e '/^LDFLAGS=/d' || die
+}
+
+src_configure() {
+	# not autotools based?
+	./configure --with-c-compiler=$(tc-getCC) || die
+}
+
+src_compile() {
+	emake LIBCURSES="$( $(tc-getPKG_CONFIG) --libs ncurses )"
+}
+
+src_install() {
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/talk.xinetd talk
+	dobin talk/talk
+	doman talk/talk.1
+	dosbin talkd/talkd
+	dosym talkd /usr/sbin/in.talkd
+	doman talkd/talkd.8
+	dosym talkd.8 /usr/share/man/man8/in.talkd.8
+	dodoc README ChangeLog BUGS
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 561b8e7ab5d0..7b6cf224c6ca 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,14 +2,10 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 0
 AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4
-DIST NetworkManager-1.30.4.tar.xz 5303420 BLAKE2B c2d81fe03f75f4afd05cac06741d9e7fb0d2892bad30462788a39d9c84afd056614e8f8d3371f15f4de7398cc40a32861814498fc36911c43bbe8e43f5053cde SHA512 ca42907d0c0fc6a981d94798a5e264dd58c7d11576a8dd52c8ef6799334af46848091d872e9cec553714766c51457cbe12c5c2017eaac63abce968823b047624
-DIST NetworkManager-1.32.2.tar.xz 5242372 BLAKE2B d19dbbb86cafd29023e0bd1b3a1ce69580d769d77a993b5e0db6cc526de7b1cce573e74c96483bf88c3a45f3ac7d4831a27d1efb1d8414cc8dd6e5671bdbf4f3 SHA512 9c7891a1106ebf333344818d29810ae182b284d1966760ec79bafa0618378a5ca68d58ec941357328ae8d4a43473f3916d62e4cfa316a46532773326312c0cc1
+DIST NetworkManager-1.32.10.tar.xz 5353296 BLAKE2B af176abd4dd8f725741cc8fde10245606d1b00cb6b11cde11b2e3bce74a33980fdf76fab5c6c769a4275c5168098cb2531a0a03909db8eef5fa502d464d59bd1 SHA512 c4eb9114869efba197c3ec1e99d7d5bc54222d9c7118cf699fe61130952a20376a760b86909290d6312a4a23016d51f9ff90ba8eadbbcda84ce811e441293d8d
 DIST NetworkManager-1.32.4.tar.xz 5250412 BLAKE2B 6c0931d50a8666f88865d4ca5281e1570dd230156e30bb27822c9ea3d93b3b3b24f336e154787794e7edd7c00296f9f7c5761136cac0c0eacf142a0371cbfe81 SHA512 95be90d4c8f8f9f58a3c7ad8d8c9b592d2b77f283df58b495fe1b673c4fadd4409f4fc00fc9766343e3ac240dd805583db4f05e6d1f0b367fe22b306227fc684
-DIST NetworkManager-1.32.6.tar.xz 5254712 BLAKE2B 44c3019ba6b04552e67f31e9c069754f627f9f97a9ed110ce662dff033c7e8c009bed55da15cd4df592f0edf2c44f445f2733307f06ffbc4c5a946e05c3f26a3 SHA512 7556e8c3934a83320646336bcaffc010a91258c1ab669596e4b7ece98eb35e1d1ae625bca0de3781638e0a186656de61d554ef8722beea6bc29cdb0c70314b1d
 DIST NetworkManager-1.32.8.tar.xz 5255076 BLAKE2B 5f1bc55e3b9e6864c05421c8506ac202162deaf5081450e5d50f52699abc2d9bfb6e89b6f48c9874cccdc11fe754a5063a63e830702e211cf178ce7df0d628fb SHA512 328733f3dce9e52e680e464b60112995439f94dfeaea3b6c2082b323e85418483db6c6dc9e43f52176ff7c1291b226db77fe5acab9935dad7735c4397f5e9b83
-EBUILD networkmanager-1.30.4.ebuild 11206 BLAKE2B 2eac583bf5c83f16e7417ebb890155a5386b91550071d2ad819d14a089ecd120a823b53b73eb01da2b212b2eef0095840a0de68bad7c8984aaaf8177ad2b5027 SHA512 5523dc378109cbf5f058a34dbfbdd75891d53f90cbf32d86c0bd15eb16b442082b37b8983ff59ef3f52756bff5472f855471906cc5d9a238d0f5434847a3792a
-EBUILD networkmanager-1.32.2.ebuild 11373 BLAKE2B d404928b488ea79a12e278df5e8f822ebd17fff4edef38b4877ff8888e38ebeedeece4eb903f71c838bf15430f1aa1506b46a9658d0938c2379a7b5f8138c62c SHA512 443b1a5471d1af71bb1796e242b1c8b6b21aff1203bf732ad2610e52f316678705157c379a0b925fec7eb016c31e24527f41d6a0bf55e0c720f3ab9f71110a29
+EBUILD networkmanager-1.32.10.ebuild 11698 BLAKE2B e45673bb8ce592470e5ac16f3b567b532ed86cde0410c2c34e76a118a5e273e8474354dd0fec89713910f742471586418da9906d4cfe5029a026a226f8884701 SHA512 50e90563b2a4e5e14ec91c2f6ac5b65272a644a70cf365e2e8fd3ab43742c7ba1133bfa525bbfa63c4b278550dbd996d67c3b2d13c29cd05ba3275a299309f54
 EBUILD networkmanager-1.32.4.ebuild 11367 BLAKE2B 3e06b9f6ec8c4d21536e7befee437a2f18abdf86bccbe8ef1151297f14f676141687b38884310ff10039000583d110c5919a58d443e79f8400c82ff1d324bf6c SHA512 61939b3e2e5e55915b59eec4701882a6037d80e9c546bef3ac126eb8a7a732874d1b153b315f2a51514190a8ba6a63dfeff9cf8b7de864d8faa8688aac0e0fba
-EBUILD networkmanager-1.32.6.ebuild 11373 BLAKE2B d404928b488ea79a12e278df5e8f822ebd17fff4edef38b4877ff8888e38ebeedeece4eb903f71c838bf15430f1aa1506b46a9658d0938c2379a7b5f8138c62c SHA512 443b1a5471d1af71bb1796e242b1c8b6b21aff1203bf732ad2610e52f316678705157c379a0b925fec7eb016c31e24527f41d6a0bf55e0c720f3ab9f71110a29
 EBUILD networkmanager-1.32.8.ebuild 11380 BLAKE2B dcbbed663f29fa55d547ed0bf96ca34c2f3db56b6090d45084d9083254c1e9abd72fd2cff37289d5b2e82477d43ce70556da82b4583b04f9b4ea23c543735856 SHA512 4ac72dd4be5e7a1bdc301fc9c47411001520e3409fc6bfa75621cfffa4a6903c7ae61693ac7d7ba46db1d6e125e7d144e3140c29cb1de1149237b2c6738fa36e
-MISC metadata.xml 2062 BLAKE2B 117ea58d66dbedc65d59db38a46aa9e4b5c49bf1699748aa03c52c4b1543c4074f8ebea462ff0ac855f153702201bd14cec246dfd8496f5426bbfa10aad53b88 SHA512 083e9b2ddddf781116e7b337f6cd80278e1bc4ea218d9612feed313ed61cfb6ba531b8be818d80eff7e076bab66b7d7d73d96f58d410c7b3708e02e43e724b97
+MISC metadata.xml 2376 BLAKE2B 677ecb6cdd111c15fd7798a4f769109e49f6c392d0d5e39df9b0d6f5c7835e00eaa748b24e8a0beac0d947d5c3fcdbf30909f19931b47f6821ff11990a70f9d3 SHA512 37c6556fdc6a27bfc84a517eb03dbd01072859ada91552dfe90fcd562c77c2aeaba142a89f6b139926bb5fddb48ce96e9258f6b30203a391c05b92874cff48cd
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index 70f8a3206ee3..e5c4a40c8ca0 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
+		<flag name="concheck">Enable connectivity checking support</flag>
 		<flag name="connection-sharing">
 			Support connection sharing (uses <pkg>net-dns/dnsmasq</pkg>)
 		</flag>
@@ -23,6 +24,10 @@
 			Use <pkg>net-wireless/iwd</pkg> instead of
 			<pkg>net-wireless/wpa_supplicant</pkg> for wifi support by default
 		</flag>
+		<flag name="psl">
+			Use public suffix list via <pkg>net-libs/libpsl</pkg>
+		</flag>
+		<flag name="lto">Build using Link Time Optimizations (LTO)</flag>
 		<flag name="modemmanager">
 			Enable support for mobile broadband devices using
 			<pkg>net-misc/modemmanager</pkg>
@@ -44,6 +49,9 @@
 			create a symlink to /run/systemd/resolve/stub-resolv.conf.
 		</flag>
 		<flag name="teamd">Enable Teamd control support</flag>
+		<flag name="tools">
+			Build cli tools such as nmcli, nmtui and nm_cloud_setup
+		</flag>
 		<flag name="wifi">Enable support for wifi and 802.1x security</flag>
 		<flag name="wext">
 			Enable support for the deprecated Wext (Wireless Extensions) API; needed
diff --git a/net-misc/networkmanager/networkmanager-1.30.4.ebuild b/net-misc/networkmanager/networkmanager-1.30.4.ebuild
deleted file mode 100644
index e65e736be858..000000000000
--- a/net-misc/networkmanager/networkmanager-1.30.4.ebuild
+++ /dev/null
@@ -1,345 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="NetworkManager"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	|| ( nss gnutls )
-	?? ( elogind systemd )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		net-firewall/iptables )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
-		net-misc/mobile-broadband-provider-info )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	!nss? ( gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.18
-	"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-
-	sed -i \
-		-e 's#/usr/bin/sed#/bin/sed#' \
-		data/84-nm-drivers.rules \
-		|| die
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--with-runstatedir=/run
-		--disable-lto
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		$(multilib_native_with nmcli)
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
-		--with-crypto=$(usex nss nss gnutls)
-		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
-		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
-		# (There is no off switch, and we do not support upower.)
-		# bug #747358
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		--without-dhcpcanon
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		--with-config-dhcp-default=internal
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_with resolvconf)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with systemd systemd-journal)
-		$(multilib_native_use_enable teamd teamdctl)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable vala)
-		--without-valgrind
-		$(multilib_native_use_with wifi iwd)
-		$(multilib_native_use_with wext)
-		$(multilib_native_use_enable wifi)
-	)
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		ln -s "${S}/docs" docs || die
-		ln -s "${S}/man" man || die
-	fi
-
-	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			libnm/libnm.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-		insinto /usr/lib/NetworkManager/conf.d #702476
-		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libnmincludeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.32.10.ebuild b/net-misc/networkmanager/networkmanager-1.32.10.ebuild
new file mode 100644
index 000000000000..86e790b61b6d
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.32.10.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="NetworkManager"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit gnome.org linux-info meson-multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux psl lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	connection-sharing? ( || ( iptables nftables ) )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( gnutls nss )
+	?? ( elogind systemd )
+	?? ( dhclient dhcpcd )
+	?? ( syslog systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+COMMON_DEPEND="
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	elogind? ( >=sys-auth/elogind-219 )
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	sys-apps/dbus
+	net-libs/libndp
+	systemd? ( >=sys-apps/systemd-209:0= )
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	selinux? ( sys-libs/libselinux )
+	audit? ( sys-process/audit )
+	teamd? (
+		>=dev-libs/jansson-2.7
+		>=net-misc/libteam-1.9
+	)
+	policykit? ( >=sys-auth/polkit-0.106 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	gnutls? (
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
+	)
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	modemmanager? (
+		net-misc/mobile-broadband-provider-info
+		>=net-misc/modemmanager-0.7.991:0=
+	)
+	bluetooth? ( >=net-wireless/bluez-5 )
+	ofono? ( net-misc/ofono )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
+	ovs? ( >=dev-libs/jansson-2.7 )
+	resolvconf? ( net-dns/openresolv )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		iptables? ( net-firewall/iptables )
+		nftables? ( net-firewall/nftables )
+	)
+	psl? ( net-libs/libpsl )
+	concheck? ( net-misc/curl )
+	tools? (
+		sys-libs/readline:0=
+		>=dev-libs/newt-0.52.15
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.18
+	net-libs/libndp[${MULTILIB_USEDEP}]
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		>=dev-libs/jansson-2.7
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	default
+	use vala && vala_src_prepare
+
+	sed -i \
+		-e 's#/usr/bin/sed#/bin/sed#' \
+		data/84-nm-drivers.rules \
+		|| die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		--localstatedir="${EPREFIX}/var"
+
+		-Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
+		-Dsystem_ca_path=/etc/ssl/certs
+		-Dudev_dir=$(get_udevdir)
+		-Ddbus_conf_dir=/usr/share/dbus-1/system.d
+		-Dkernel_firmware_dir=/lib/firmware
+		-Diptables=/sbin/iptables
+		-Dnft=/sbin/nft
+		-Ddnsmasq=/usr/sbin/dnsmasq
+		#-Ddnssec_trigger=
+
+		-Ddist_version=${PVR}
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool policykit config_auth_polkit_default)
+		-Dmodify_system=true
+		-Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool systemd systemd_journal)
+		-Dhostname_persist=gentoo
+		-Dlibaudit=$(multilib_native_usex audit)
+
+		$(meson_native_use_bool wext)
+		$(meson_native_use_bool wifi)
+		$(meson_native_use_bool iwd)
+		$(meson_native_use_bool ppp)
+		-Dpppd=/usr/sbin/pppd
+		$(meson_native_use_bool modemmanager modem_manager)
+		$(meson_native_use_bool ofono)
+		$(meson_native_use_bool concheck)
+		$(meson_native_use_bool teamd teamdctl)
+		$(meson_native_use_bool ovs)
+		$(meson_native_use_bool tools nmcli)
+		$(meson_native_use_bool tools nmtui)
+		$(meson_native_use_bool tools nm_cloud_setup)
+		$(meson_native_use_bool bluetooth bluez5_dun)
+		-Debpf=true
+
+		-Dconfig_plugins_default=keyfile
+		-Difcfg_rh=false
+		-Difupdown=false
+
+		$(meson_native_use_feature resolvconf)
+		-Dnetconfig=disable
+		-Dconfig_dns_rc_manager_default=symlink
+
+		$(meson_feature dhclient)
+		-Ddhcpcanon=disable
+		$(meson_feature dhcpcd)
+
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_true docs)
+		-Dtests=$(multilib_native_usex test)
+		$(meson_native_true firewalld_zone)
+		-Dmore_asserts=0
+		$(meson_use debug more_logging)
+		-Dvalgrind=no
+		-Dvalgrind_suppressions=
+		-Dld_gc=false
+		$(meson_native_use_bool psl libpsl)
+		-Dqt=false
+
+		$(meson_use lto b_lto)
+	)
+
+	if multilib_is_native_abi && use systemd; then
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=systemd )
+		emesonargs+=( -Dsuspend_resume=systemd )
+	elif multilib_is_native_abi && use elogind; then
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=elogind )
+		emesonargs+=( -Dsuspend_resume=elogind )
+	else
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=no )
+		emesonargs+=( -Dsuspend_resume=auto )
+	fi
+
+	if multilib_is_native_abi && use syslog; then
+		emesonargs+=( -Dconfig_logging_backend_default=syslog )
+	elif multilib_is_native_abi && use systemd; then
+		emesonargs+=( -Dconfig_logging_backend_default=journal )
+	else
+		emesonargs+=( -Dconfig_logging_backend_default=default )
+	fi
+
+	if multilib_is_native_abi && use dhclient; then
+		emesonargs+=( -Dconfig_dhcp_default=dhclient )
+	elif multilib_is_native_abi && use dhcpcd; then
+		emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
+	else
+		emesonargs+=( -Dconfig_dhcp_default=internal )
+	fi
+
+	if use nss; then
+		emesonargs+=( -Dcrypto=nss )
+	else
+		emesonargs+=( -Dcrypto=gnutls )
+	fi
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx meson_src_test
+	fi
+}
+
+multilib_src_install() {
+	meson_src_install
+	if ! multilib_is_native_abi; then
+		rm -rf "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var}
+	fi
+}
+
+multilib_src_install_all() {
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	insinto /usr/lib/NetworkManager/conf.d #702476
+	doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
+	rmdir "${ED}"/usr/share/doc/NetworkManager || die
+
+	# Empty
+	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
diff --git a/net-misc/networkmanager/networkmanager-1.32.2.ebuild b/net-misc/networkmanager/networkmanager-1.32.2.ebuild
deleted file mode 100644
index 0ab6357947d6..000000000000
--- a/net-misc/networkmanager/networkmanager-1.32.2.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="NetworkManager"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	connection-sharing? ( || ( iptables nftables ) )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	|| ( nss gnutls )
-	?? ( elogind systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		iptables? ( net-firewall/iptables )
-		nftables? ( net-firewall/nftables )
-	)
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
-		net-misc/mobile-broadband-provider-info )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	!nss? ( gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.18
-	"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-
-	sed -i \
-		-e 's#/usr/bin/sed#/bin/sed#' \
-		data/84-nm-drivers.rules \
-		|| die
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--with-runstatedir=/run
-		--disable-lto
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		$(multilib_native_with nmcli)
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-nft=/sbin/nft
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
-		--with-crypto=$(usex nss nss gnutls)
-		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
-		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
-		# (There is no off switch, and we do not support upower.)
-		# bug #747358
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		--without-dhcpcanon
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		--with-config-dhcp-default=internal
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_with resolvconf)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with systemd systemd-journal)
-		$(multilib_native_use_enable teamd teamdctl)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable vala)
-		--without-valgrind
-		$(multilib_native_use_with wifi iwd)
-		$(multilib_native_use_with wext)
-		$(multilib_native_use_enable wifi)
-	)
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		ln -s "${S}/docs" docs || die
-		ln -s "${S}/man" man || die
-	fi
-
-	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			src/libnm-client-impl/libnm.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-		insinto /usr/lib/NetworkManager/conf.d #702476
-		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libnmincludeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.32.6.ebuild b/net-misc/networkmanager/networkmanager-1.32.6.ebuild
deleted file mode 100644
index 0ab6357947d6..000000000000
--- a/net-misc/networkmanager/networkmanager-1.32.6.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="NetworkManager"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	connection-sharing? ( || ( iptables nftables ) )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	|| ( nss gnutls )
-	?? ( elogind systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		iptables? ( net-firewall/iptables )
-		nftables? ( net-firewall/nftables )
-	)
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
-		net-misc/mobile-broadband-provider-info )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	!nss? ( gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.18
-	"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-
-	sed -i \
-		-e 's#/usr/bin/sed#/bin/sed#' \
-		data/84-nm-drivers.rules \
-		|| die
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--with-runstatedir=/run
-		--disable-lto
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		$(multilib_native_with nmcli)
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-nft=/sbin/nft
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
-		--with-crypto=$(usex nss nss gnutls)
-		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
-		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
-		# (There is no off switch, and we do not support upower.)
-		# bug #747358
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		--without-dhcpcanon
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		--with-config-dhcp-default=internal
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_with resolvconf)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with systemd systemd-journal)
-		$(multilib_native_use_enable teamd teamdctl)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable vala)
-		--without-valgrind
-		$(multilib_native_use_with wifi iwd)
-		$(multilib_native_use_with wext)
-		$(multilib_native_use_enable wifi)
-	)
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		ln -s "${S}/docs" docs || die
-		ln -s "${S}/man" man || die
-	fi
-
-	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			src/libnm-client-impl/libnm.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-		insinto /usr/lib/NetworkManager/conf.d #702476
-		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libnmincludeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index 7197f105f760..c5e8801183d4 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -5,6 +5,7 @@ DIST sslh-1.21.tar.gz 111298 BLAKE2B 46003021292436023c7f2e0d9cbfb283f4ca7497f5d
 DIST sslh-1.21b.tar.gz 111740 BLAKE2B 5d42eab551e05ac1367da9ae85eac945657e086672712c148ee07c78af5c2a546e696d77081c7282e77c8bef535c186f89d541489f07153bd7ca2d338b341a48 SHA512 59bd33b47b70f82ae1ba3d6ffac3d54897dc6b7343d0d9e3bb8384adc30ac8a44a64e71590a7eecc5a83c2f70712bd79c0eb4ea8eef15ae770633dead9888c5f
 DIST sslh-1.21c.tar.gz 111895 BLAKE2B 3ec7a4a4f8eb7ec3d22e9630070037ebef7df2cbe3657a38234573ecf4eb9f331914858f703690b094ddc1977cd80b3a5760b94004f35a2ec2c59761f6cd142e SHA512 9446c6afe965684c5d6406ac8917338f57d95f8fbfacd7a51193dd5dbac77e1ed5e39eb8e2575e7025a8612b25e9fba7e64832a48c999f366875217b9328da22
 DIST sslh-1.22.tar.gz 147013 BLAKE2B b23f0a9601a7ba5121a6407872aee2d4c26eab934187070ab7ea3f360e815db9681db46b4f9c7f3ad5efe5446a44e0213c1bd791ad38505668b1cb3fa981bdcd SHA512 59bc40778350efbd21f22b66ecf2926ee04987784b1772450f8ce52b8d4a4270cfa307e3c978db70d420a7c3909a2c26df0b2b6127671be90537e40240a42652
+DIST sslh-1.22b.tar.gz 146854 BLAKE2B abeafeb35274b7d7d2b8e86206c3922deb98390da2fe023045c90ef68fe5720294c873ccdf2aa8443cd1521138e0b7dfe44a505a86d50291b4f7e84347499fee SHA512 de5ba0d5f241fb4742813b5ae1a2fcc4b872aa7d9c6acf7105e6c153b3a0b19482cfe28c96aa33a2561b5bfe7da3490a9c0b59d35dbd102f80f7f3b5ab68d52e
 DIST sslh-v1.20.tar.gz 60459 BLAKE2B fafb1876df54edce99473db9305eaad77e2b726904724c9c74b3eb2fe8666c219c48b49888b05cc52f993104b69a263ba3c8a271efd1217ba6f73258caa83249 SHA512 eccaddd5a4299206f195c2f7a78840b2f76f8a0cf10a715b5c72f959ed5d3259fc5ea3db8d398b33f0d556d71268b15c870999d742f83383a9d49120e476770a
 EBUILD sslh-1.20-r2.ebuild 1929 BLAKE2B 1cc0b4554e89aee8e7cde80da933824674a4ebf926bbc7fbf94186cb06e367ba4422949e20bb90f4dab2d85ad1ad59b613507b37b47df9d905254bdc0f80dea5 SHA512 4a9288d4dea17c0dd6ffab5ea1219b37f77c61675ca61a4baf443119c0543b3fae48c48923fc3b75653ffc01d340c302059d88abd96ae6aa89c3984fdb0d662f
 EBUILD sslh-1.21-r2.ebuild 1927 BLAKE2B 06fa388b50cf3be10daa60552a92fca375b10ff0a63acef5725e945423e365e9c8827173398cd1eb766ec3c145f967852b1e162a5e7906a7e4b75a60c4f3fbb2 SHA512 fd51f1353e53206b28336f9faee1d97de876dc72259ca866b466175d42841ff59ed52bd654a964c05f078bbb0de0d11ab7e1bd3a0626c235084273fd7e136dcf
@@ -12,5 +13,6 @@ EBUILD sslh-1.21b-r2.ebuild 1927 BLAKE2B 06fa388b50cf3be10daa60552a92fca375b10ff
 EBUILD sslh-1.21c-r2.ebuild 1927 BLAKE2B 06fa388b50cf3be10daa60552a92fca375b10ff0a63acef5725e945423e365e9c8827173398cd1eb766ec3c145f967852b1e162a5e7906a7e4b75a60c4f3fbb2 SHA512 fd51f1353e53206b28336f9faee1d97de876dc72259ca866b466175d42841ff59ed52bd654a964c05f078bbb0de0d11ab7e1bd3a0626c235084273fd7e136dcf
 EBUILD sslh-1.21c-r3.ebuild 1980 BLAKE2B 0155382b36231974ce9d59554b94c5761df0d1bddd87e34c79487ee0d5c5db60f5a64ac5bce9fcb46a930d39bf624c2613556280540322e3fa2a1b12ae043090 SHA512 397c90cd785a4a055a4ea1a0ed6d33d04cefa7a6db219de82af667b42e1195031281804c77f46b0d1bf0910893435e7bc625c13d8597afa2cd021177d455cbdf
 EBUILD sslh-1.22.ebuild 1885 BLAKE2B 9b1e2a512358f4fa53c2db0f6703a147d647ba3a97034e0213accd3303dccd3474da652af9cf4edb9d5c3c074beada092fbe97d226ad0f015f21445176cf648b SHA512 a9aa19a6abbf360fd7acf25417c26c9f8f235bd2fdfe36f021723e53606d6cca042c80bb7bbec543abf09fdede8541ce8bec35eb708f0b6867a9741f7df7f387
+EBUILD sslh-1.22b.ebuild 1885 BLAKE2B 9b1e2a512358f4fa53c2db0f6703a147d647ba3a97034e0213accd3303dccd3474da652af9cf4edb9d5c3c074beada092fbe97d226ad0f015f21445176cf648b SHA512 a9aa19a6abbf360fd7acf25417c26c9f8f235bd2fdfe36f021723e53606d6cca042c80bb7bbec543abf09fdede8541ce8bec35eb708f0b6867a9741f7df7f387
 EBUILD sslh-9999.ebuild 1885 BLAKE2B 9b1e2a512358f4fa53c2db0f6703a147d647ba3a97034e0213accd3303dccd3474da652af9cf4edb9d5c3c074beada092fbe97d226ad0f015f21445176cf648b SHA512 a9aa19a6abbf360fd7acf25417c26c9f8f235bd2fdfe36f021723e53606d6cca042c80bb7bbec543abf09fdede8541ce8bec35eb708f0b6867a9741f7df7f387
 MISC metadata.xml 409 BLAKE2B fefa58b2c38adf947e859893979931726dba91e4b30c6f7ae4e5343fb7e7a513a3b86c88ff6854df60ba92ef169beb4e22c7ad3a01ba69aea582765f13f82509 SHA512 373b7ca5bce7d2b680a7ccfdc4af15514365cf26824487baf2232608a6f29a5d1d338146c7f70841e7b03255527ec16967afc7a3fad3ef6d26fb2ab86fe8a3da
diff --git a/net-misc/sslh/sslh-1.22b.ebuild b/net-misc/sslh/sslh-1.22b.ebuild
new file mode 100644
index 000000000000..9ecf187a6416
--- /dev/null
+++ b/net-misc/sslh/sslh-1.22b.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
+HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86"
+	SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S=${WORKDIR}/${P}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps systemd tcpd"
+
+RDEPEND="caps? ( sys-libs/libcap )
+	dev-libs/libpcre2:=
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	>=dev-libs/libconfig-1.5:="
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/MAN/s:| gzip -9 - >:>:' \
+		-e '/MAN=sslh.8.gz/s:.gz::' \
+		Makefile || die
+}
+
+src_compile() {
+	# On older versions of GCC, the default gnu89 variant
+	# will reject within-for-loop initializers, bug #595426
+	# Furthermore, we need to use the gnu variant (gnu99) instead
+	# of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
+	# to be defined.
+	append-cflags -std=gnu99
+
+	emake \
+		CC="$(tc-getCC)" \
+		USELIBCAP=$(usev caps) \
+		USELIBWRAP=$(usev tcpd) \
+		USESYSTEMD=$(usev systemd)
+}
+
+src_install() {
+	dosbin sslh-{fork,select}
+	dosym sslh-fork /usr/sbin/sslh
+
+	doman ${PN}.8
+
+	dodoc ChangeLog README.md
+
+	newinitd "${FILESDIR}"/sslh.init.d-3 sslh
+	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
+
+	if use systemd; then
+		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
+		sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
+		systemd_newunit scripts/systemd.sslh.service sslh.service
+		exeinto /usr/lib/systemd/system-generators/
+		doexe systemd-sslh-generator
+	fi
+}
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 83a195e09836..579d312f1104 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -2,5 +2,5 @@ AUX wget-1.20.3-gcc10-fno-common.patch 887 BLAKE2B 34b94aa99b2335ade4f6c3e1fbb5b
 DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c
 DIST wget-1.21.1.tar.gz 4884887 BLAKE2B 28a3044f33df1d24e13900e8018a38cabae21fb41dd2e089bdbfd759b4adee3771ab558b84f5a8b6f546bc84a3387c973903f9fe06562093d3566e22d1528587 SHA512 784efbf9fe43a1671109e32a9c36237eb2d5c19cf756bf6f6e65517fb21464d3d94b1d6f491852d23b3ddff63e38fe6b60df9125c91b139993af59875e3a0712
 EBUILD wget-1.20.3-r3.ebuild 3290 BLAKE2B 46ba1c5d99cd2447e168c09affd97bcfb2f7f9842e9f9e70922e0579512e810400a7ee01bcfddf4c757440bb5ff6d39101251d75fb54e375cd4e4315d81cc5e7 SHA512 bfbbcbd088e1cb169d4bceea7dd831f5dcda35502545e55b095befe2dc9359daa2b909ce0e6916732af62bf323beb87db5f4640c247ff83de5695e63f901d9b7
-EBUILD wget-1.21.1.ebuild 3242 BLAKE2B f101a3e797dcf930208f306d0bf8e038839db82f0fa6f400eb365ab2ee62c70d59a0ea83477b2245c51f769a28eabe03f942e24a0f3a6fcf9f44830afb39e7d4 SHA512 d91c29860c2e1d55188f40d787355968df6b283bbc7a21490d376d6b152b420a89c33217dab98a65b9ac1399335b8bdcfc01187bf5b142b7838c6d851ff1a945
+EBUILD wget-1.21.1.ebuild 3474 BLAKE2B 61fa48665cd3fba01a0d83529c3e0087941e2d9fc97732409b27077305be0950fb5bc319a3c65c7bfda4c55ffbb231696dfa0568057829669e9f61fb6a0daa1f SHA512 5c5699eb526c63b185cbc95e94c5f68bd1c2b1c6220627b40d85e0f133a96fe45cf43c888baa97dd544fc37c5b7a07e81e41c66e9950ca8a30de034b94a09b3c
 MISC metadata.xml 739 BLAKE2B 04fee6f7fd9af83f7e15efcdb84b21af91e44a0af5e257627587d1aa605eb24c1a30fbfdc62b8366e3ecbe984cbc59bbfa373272593e4764e037ed4f71789034 SHA512 1dc7006cc8b01fd81f582bea76ef84fed0ca8490eff2e97a20112f6150d1f4001554ed8363f6d747bb66538bd85c6f3e1ecde9e0a66e52b2a1695ea45547baf4
diff --git a/net-misc/wget/wget-1.21.1.ebuild b/net-misc/wget/wget-1.21.1.ebuild
index 2d15744b57f8..dfd4fce484b8 100644
--- a/net-misc/wget/wget-1.21.1.ebuild
+++ b/net-misc/wget/wget-1.21.1.ebuild
@@ -75,6 +75,12 @@ src_configure() {
 	# the included gnutls -- force ioctl.h to include this header
 	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
 
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html
+		# https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html
+		append-cppflags '-D__nonnull\(X\)='
+	fi
+
 	if use static ; then
 		append-ldflags -static
 		tc-export PKG_CONFIG
diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest
index c5146fce37bc..19945ceb4a93 100644
--- a/net-misc/wget2/Manifest
+++ b/net-misc/wget2/Manifest
@@ -5,4 +5,4 @@ AUX wget2-1.99.2-remove_ldconfig_call.patch 768 BLAKE2B 203ad8814f1eba1f671ee4e6
 DIST wget2-1.99.2.tar.gz 3173906 BLAKE2B 1fc63de32725d0d980469cc730d17035a01ccb432a91fe24c37e06017c2604a4ef6d8474e76eb757c3a22cc61ea6c70e26af40dffc474a87f8bbdb2a8deced7c SHA512 c2c687124a2463d6a0397cd7dbbc5e475ba815e8d7e13a4b71b529e6be03c9f7dbe5f358702e929ed36034f6fffc698f3b1c5ac486a35e2b00ee6f135060ad7f
 EBUILD wget2-1.99.2.ebuild 2102 BLAKE2B da8f7c03ff6e86568f14e58f23e8d0cb6656bccaa3cff04ffe7c9b1073d5007c598052ee668f6c6e8eacdf80e47ae62a3e30df0453c8ce74b016be3d965669f3 SHA512 cf9b5acba95447cd0c30130052c2ddd9a5316744749fe873ed86b454ab8dec5d692abcbfd70a7c33d89624385ec01114aa629c6daa30629d4d6d18795d04816a
 EBUILD wget2-9999.ebuild 2579 BLAKE2B 8428353d808b131ecfa1006f20fc8c8101eb9ad62b9a961583495df938d2bf5c0023db1deebe0e5e2e0c3a012e33ac5ff83a0ebba50ff33d5d3bb7f4b7c4de0c SHA512 ca1f07a9893d2fd42ed32e6c4104509fc2a66b8229966821693365ad07e1d2014fea053fca832dcadba4b9f1164f2647209d3530d0d77d571e987fea7e78d3ae
-MISC metadata.xml 652 BLAKE2B 3404cf0ecbba0e6fbb3a1e1d232eb379fbcaf0e5f8d295c439a3d5613496c957daf40816f4bc5047df48e35fa4343f6fd874763e6681532412e9446e5860ee27 SHA512 8d98d6217536cd6a0ea07fdd588fd4f44f82e66c4dd6a8ecccbc58ddd5c4e4a0bef8e282fccc0064a442f5d6131b1475c7b1ef956f4841a990ddbcbf619c55b4
+MISC metadata.xml 735 BLAKE2B 1576145baca52953bb11f3dc62ba91ae020b1307f82c8c0ee41169f9f119db36e3c1db946494d6308cd579d9a911fa0fcd5cefa64f9041970bec9818f26bc821 SHA512 4fb658bde014d80a77cf0532e9dfc24f78fc0e3418d72937ae3ca9ee60508cf945c8812ce189025e808a8994bc82079887dc2a31b91d7254495404b92ffdd3ff
diff --git a/net-misc/wget2/metadata.xml b/net-misc/wget2/metadata.xml
index c84bc2d35c97..e11e2ca24ca2 100644
--- a/net-misc/wget2/metadata.xml
+++ b/net-misc/wget2/metadata.xml
@@ -7,10 +7,10 @@
 	</maintainer>
 	<use>
 		<flag name="brotli">Enable support for brotli compression</flag>
-		<flag name="gpgme">Build gpgme backend</flag>
-		<flag name="http2">Enable HTTP/2.0 support</flag>
-		<flag name="openssl">Enable crypto support via dev-libs/openssl</flag>
-		<flag name="psl">Use public suffix list via media-libs/libnspsl</flag>
-		<flag name="valgrind">Depend on dev-util/vagrind for test suite</flag>
+		<flag name="gpgme">Build <pkg>app-crypt/gpgme</pkg> backend</flag>
+		<flag name="http2">Enable HTTP/2.0 support via <pkg>net-libs/nghttp2</pkg></flag>
+		<flag name="openssl">Enable crypto support via <pkg>dev-libs/openssl</pkg></flag>
+		<flag name="psl">Use public suffix list via <pkg>net-libs/libpsl</pkg></flag>
+		<flag name="valgrind">Depend on <pkg>dev-util/valgrind</pkg> for test suite</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
new file mode 100644
index 000000000000..d4646f9ce638
--- /dev/null
+++ b/net-misc/yt-dlp/Manifest
@@ -0,0 +1,3 @@
+DIST yt-dlp-2021.8.10.tar.gz 1807968 BLAKE2B 664f9f5680c18531bb1c194e6e26a31b6be62894a88c6748bf146fbba79164fec6f5e6db017785daf6c8f5a2c1b7cfc0c2ee6c0d437b9d7bb4e1835eff73650f SHA512 fb321d308e634f6358f046762cc3e827b036083b4764d495bbcef253d06ce445152f4a330c51b5aac1eb3b21a8a345fc791f0fdbdc01089ea2a414b1cd457f20
+EBUILD yt-dlp-2021.8.10.ebuild 1133 BLAKE2B d08de5fd6d20d47c9687c28691225cc3b74d0745d195017afbb3959764a90162b788fb1bee6e6330f6c55a849fc9e53fbd3e51663d01768d1df20ae0719504a0 SHA512 bb5e06e853bbeeacbf7bd2e317d629867761d07d2ba6be8f5099158d30108be754c76b436eeec5d06ad64ab8d9396071ac4df05434690d31e9df9b4f841068c5
+MISC metadata.xml 330 BLAKE2B dce48896e3f03082a2af2ed40059805bdf28c43fbab338839577a8ebe25c1a1f891de7db1444acca7fc5ec9b270f7d2fb1769ad519972a81861b62efc7c456fc SHA512 45bba503be171531626132a8081c599b83178b9f5413f805dc5f626626dd05105fc9884ddd0762d2e16fed0140e74eaa53d6ec58ec9cbc6220d9ca65ef2b556c
diff --git a/net-misc/yt-dlp/metadata.xml b/net-misc/yt-dlp/metadata.xml
new file mode 100644
index 000000000000..2b132d02ee42
--- /dev/null
+++ b/net-misc/yt-dlp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">yt-dlp/yt-dlp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/yt-dlp/yt-dlp-2021.8.10.ebuild b/net-misc/yt-dlp/yt-dlp-2021.8.10.ebuild
new file mode 100644
index 000000000000..4c0bfc7cd619
--- /dev/null
+++ b/net-misc/yt-dlp/yt-dlp-2021.8.10.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_{8..10} )
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="A youtube-dl fork with additional features and fixes"
+HOMEPAGE="https://github.com/yt-dlp/yt-dlp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~riscv ~x86"
+LICENSE="public-domain"
+SLOT="0"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	dev-python/websockets[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	media-video/ffmpeg
+
+"
+
+distutils_enable_tests nose
+
+python_test() {
+	# make_lazy_extractors.py tries to rename it out, so fails if it does not exists.
+	mkdir ytdlp_plugins
+	epytest -k 'not download'
+}
+
+python_install_all() {
+	doman yt-dlp.1
+
+	newbashcomp completions/bash/yt-dlp yt-dlp
+
+	insinto /usr/share/zsh/site-functions
+	newins completions/zsh/_yt-dlp _yt-dlp
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/yt-dlp.fish
+
+	distutils-r1_python_install_all
+
+	rm -rf "${ED}"/usr/share/doc/yt_dlp || die
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 60481d453cb4..e2868d8cdb47 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/energi3/Manifest b/net-p2p/energi3/Manifest
index 359f8143f358..7d257c69ce79 100644
--- a/net-p2p/energi3/Manifest
+++ b/net-p2p/energi3/Manifest
@@ -1,7 +1,8 @@
+AUX 3.1.0-tidy.patch 17668 BLAKE2B cac704cd72e1922c514486b5a63f56150ca6a65bdeadb9351265b8cee380e217dd7acd4699a1f94a03737731935155bd974bbb79997562d714f8145ea208b624 SHA512 26ca3d4146707d1d44d2fa311de9116ebabcd3b603a9b33e1e96413ea41fcc9f2e9699a132b69d2775f59044f2711a2386d4cecbf4e11aed44ba3ebc3f421ac8
 AUX energi3.service 856 BLAKE2B d6f0fe6de4b533b2d7e817ce75a3e6e142b6084ee5b9f49d9af4a191e5a8ccd565b067fdadde9094e47ffeaa7245ea27a67c67fad8664678fbaa0dcfa48cb8fb SHA512 ec19e8f08d51e8ced057b109faec402e557d10edcf89a1760311b4c8963ccbf1d27ef5141415e72911f066236fa417e6fa0d86d02d801167a3028890d1a23572
 DIST energi3-3.0.8.tar.gz 10303024 BLAKE2B 5f3ab8de6320d7a1cc8a19e35387c3d6c9e4033b124f3457f8a09d19792eed895ae7738bf72bbd0bcb5c49d369b94bb433b7556aba42134fcd36e89f66985671 SHA512 4c62d41db637130b20dad309c6857149a17f14a6b9d12da9951fc5824c7f7215ff6b866e7c5f3d014b5b605512ca088be80bfbb169283e3d88029338034c4daa
 DIST energi3-3.1.0.tar.gz 10342226 BLAKE2B cd83db282753dcbc48b7c6d7eb4410b41f9abdc8079f119900abcbb6be1066d8b4d7486a96a34847f6814dc873193a8b1048e4d5cff8689985c84b2fb39cbe0d SHA512 f7fa826f87241f750d35ab3fe64a7d43ff3a4158da5a743760d05a5f75d2d606dc71f8205fbd5d9675c543e5cb47db2ac8d7d542ab088d1ad1c91a50dba80f4f
 EBUILD energi3-3.0.8.ebuild 1067 BLAKE2B 7bef218251b8d31b0a7b3f6a5d0a46d34ecee62510657cb997c7cc529298cd7e68f568cd0dafbdd69345fab0383f64adb8e9a9de643407002aff04b163aea935 SHA512 9cd22e5eb3b07bd309f452eb589f91f2d633b15aca4a2c3b1310553425c844c5c0bc105aebc1d47c6f692d551b5e039548df595013a10068255c760e9abf8f24
-EBUILD energi3-3.1.0.ebuild 1067 BLAKE2B 7bef218251b8d31b0a7b3f6a5d0a46d34ecee62510657cb997c7cc529298cd7e68f568cd0dafbdd69345fab0383f64adb8e9a9de643407002aff04b163aea935 SHA512 9cd22e5eb3b07bd309f452eb589f91f2d633b15aca4a2c3b1310553425c844c5c0bc105aebc1d47c6f692d551b5e039548df595013a10068255c760e9abf8f24
+EBUILD energi3-3.1.0.ebuild 1112 BLAKE2B 3ac20e59bb70b6133efdc24781a8fffce180476ca5bb0d373a17f3d244cd1b159823a8797b2e469e2fa30a668337a225ff40529207f26ffe3fb86af2020ba0cc SHA512 1c14436c88c004f28d2b3f8d4b85af13563b592939d6640c3735bfc7ba53093dee4d15b0ca038d05ce8dc53891f59ddc976c05eb8918fbce257eecb0be818b7c
 EBUILD energi3-9999.ebuild 1067 BLAKE2B 7bef218251b8d31b0a7b3f6a5d0a46d34ecee62510657cb997c7cc529298cd7e68f568cd0dafbdd69345fab0383f64adb8e9a9de643407002aff04b163aea935 SHA512 9cd22e5eb3b07bd309f452eb589f91f2d633b15aca4a2c3b1310553425c844c5c0bc105aebc1d47c6f692d551b5e039548df595013a10068255c760e9abf8f24
 MISC metadata.xml 351 BLAKE2B 6c6c1fb9fd58839f9b703bd3c695e921e84f640c123a9ac11f4637e817ff58335a8435a0e0d9e149cff22c486688256e8da4b9dbd41a4f6cef35e8c6857b32cb SHA512 1a37416ed613ba70e3b38a167a45175f228caadbd66ee3222e9b68256f2879156cd9a3e663c3da2f402af1037b32266784be65ef1fd80b84f711eb5c16341a78
diff --git a/net-p2p/energi3/energi3-3.1.0.ebuild b/net-p2p/energi3/energi3-3.1.0.ebuild
index 0e67da73ca48..0df0ff588ba4 100644
--- a/net-p2p/energi3/energi3-3.1.0.ebuild
+++ b/net-p2p/energi3/energi3-3.1.0.ebuild
@@ -8,6 +8,10 @@ inherit go-module systemd
 DESCRIPTION="Official golang implementation of the Energi Core"
 HOMEPAGE="https://www.energi.world/"
 
+PATCHES=(
+	"${FILESDIR}/${PV}-tidy.patch"
+)
+
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/energicryptocurrency/${PN}.git"
 	EGIT_SUBMODULES=()
diff --git a/net-p2p/energi3/files/3.1.0-tidy.patch b/net-p2p/energi3/files/3.1.0-tidy.patch
new file mode 100644
index 000000000000..047bc36afcf3
--- /dev/null
+++ b/net-p2p/energi3/files/3.1.0-tidy.patch
@@ -0,0 +1,472 @@
+https://github.com/energicryptocurrency/energi3/pull/8
+
+From 3ebedbdd924cbc07b745140c4c7fed82c45f178f Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Tue, 24 Aug 2021 09:06:53 -0400
+Subject: [PATCH] tidy up go.mod and vendor/modules.txt
+
+Provides compatibility with go 1.17
+Fixes warnings in earlier versions of go
+
+See https://github.com/golang/go/issues/47823
+---
+ go.mod             |  69 +++++++++++++++
+ vendor/modules.txt | 204 ++++++++++++++++++++++++++++++++++-----------
+ 2 files changed, 224 insertions(+), 49 deletions(-)
+
+diff --git a/go.mod b/go.mod
+index 887cb8fc6..7ada2d1be 100644
+--- a/go.mod
++++ b/go.mod
+@@ -1,3 +1,72 @@
+ go 1.15
+ 
++require (
++        bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898
++        github.com/Azure/azure-pipeline-go v0.1.9 // indirect
++        github.com/Azure/azure-storage-blob-go v0.0.0-20180712005634-eaae161d9d5e
++        github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
++        github.com/allegro/bigcache v1.2.0
++        github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847
++        github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6
++        github.com/cespare/cp v0.1.0
++        github.com/davecgh/go-spew v1.1.1
++        github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea
++        github.com/docker/docker v0.0.0-20180625184442-8e610b2b55bf
++        github.com/edsrzf/mmap-go v1.0.0
++        github.com/elastic/gosigar v0.0.0-20180330100440-37f05ff46ffa
++        github.com/fatih/color v1.9.0
++        github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc
++        github.com/gizak/termui v2.3.0+incompatible
++        github.com/go-kit/kit v0.11.0 // indirect
++        github.com/go-ole/go-ole v1.2.4 // indirect
++        github.com/go-stack/stack v1.8.0
++        github.com/golang/protobuf v1.5.2
++        github.com/golang/snappy v0.0.1
++        github.com/hashicorp/golang-lru v0.5.1
++        github.com/huin/goupnp v1.0.0
++        github.com/influxdata/influxdb v1.7.3
++        github.com/influxdata/platform v0.0.0-20190117200541-d500d3cf5589 // indirect
++        github.com/jackpal/go-nat-pmp v1.0.1
++        github.com/julienschmidt/httprouter v1.3.0
++        github.com/karalabe/hid v1.0.0
++        github.com/kylelemons/godebug v1.1.0 // indirect
++        github.com/maruel/panicparse v1.2.1 // indirect
++        github.com/mattn/go-colorable v0.1.6
++        github.com/mattn/go-isatty v0.0.12
++        github.com/mitchellh/go-wordwrap v1.0.0 // indirect
++        github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
++        github.com/naoina/go-stringutil v0.1.0 // indirect
++        github.com/naoina/toml v0.1.1
++        github.com/nsf/termbox-go v0.0.0-20190325093121-288510b9734e // indirect
++        github.com/olekukonko/tablewriter v0.0.1
++        github.com/opentracing/opentracing-go v1.2.0
++        github.com/pborman/uuid v1.2.0
++        github.com/peterh/liner v1.1.0
++        github.com/prometheus/prometheus v2.1.0+incompatible
++        github.com/prometheus/tsdb v0.10.0 // indirect
++        github.com/rjeczalik/notify v0.9.1
++        github.com/robertkrimen/otto v0.0.0-20170205013659-6a77b7cbc37d
++        github.com/rs/cors v1.3.0
++        github.com/shengdoushi/base58 v1.0.0
++        github.com/stretchr/testify v1.7.0
++        github.com/syndtr/goleveldb v1.0.0
++        github.com/uber-go/atomic v0.0.0-00010101000000-000000000000 // indirect
++        github.com/uber/jaeger-client-go v2.16.0+incompatible
++        github.com/uber/jaeger-lib v2.0.0+incompatible // indirect
++        golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b
++        golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
++        golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
++        golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40
++        gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15
++        gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce
++        gopkg.in/olebedev/go-duktape.v3 v3.0.0-20180302121509-abf0ba0be5d5
++        gopkg.in/sourcemap.v1 v1.0.5 // indirect
++        gopkg.in/urfave/cli.v1 v1.20.0
++)
++
+ module energi.world/core/gen3
++
++replace github.com/codahale/hdrhistogram => github.com/HdrHistogram/hdrhistogram-go v0.9.0
++
++replace github.com/uber-go/atomic => github.com/uber-go/atomic v1.4.0
++
+diff --git a/vendor/modules.txt b/vendor/modules.txt
+index 192df8944..3142c7337 100644
+--- a/vendor/modules.txt
++++ b/vendor/modules.txt
+@@ -1,56 +1,80 @@
+ # bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898
++## explicit
+ bazil.org/fuse
+ bazil.org/fuse/fs
+ bazil.org/fuse/fuseutil
+ # github.com/Azure/azure-pipeline-go v0.1.9
++## explicit
+ github.com/Azure/azure-pipeline-go/pipeline
+ # github.com/Azure/azure-storage-blob-go v0.0.0-20180712005634-eaae161d9d5e
++## explicit
+ github.com/Azure/azure-storage-blob-go/2018-03-28/azblob
+ # github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d
++## explicit
+ github.com/StackExchange/wmi
+ # github.com/allegro/bigcache v1.2.0
++## explicit
+ github.com/allegro/bigcache
+ github.com/allegro/bigcache/queue
+ # github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847
++## explicit
+ github.com/aristanetworks/goarista/monotime
+ # github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6
++## explicit
+ github.com/btcsuite/btcd/btcec
+ # github.com/cespare/cp v0.1.0
++## explicit
+ github.com/cespare/cp
+ # github.com/davecgh/go-spew v1.1.1
++## explicit
+ github.com/davecgh/go-spew/spew
+ # github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea
++## explicit
+ github.com/deckarep/golang-set
+ # github.com/docker/docker v0.0.0-20180625184442-8e610b2b55bf
++## explicit
+ github.com/docker/docker/pkg/reexec
+-# github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c
++# github.com/edsrzf/mmap-go v1.0.0
++## explicit
+ github.com/edsrzf/mmap-go
+ # github.com/elastic/gosigar v0.0.0-20180330100440-37f05ff46ffa
++## explicit
+ github.com/elastic/gosigar
+ github.com/elastic/gosigar/sys/windows
+-# github.com/fatih/color v1.7.0
++# github.com/fatih/color v1.9.0
++## explicit
+ github.com/fatih/color
+ # github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc
+-github.com/fjl/memsize/memsizeui
++## explicit
+ github.com/fjl/memsize
++github.com/fjl/memsize/memsizeui
+ # github.com/gizak/termui v2.3.0+incompatible
++## explicit
+ github.com/gizak/termui
++# github.com/go-kit/kit v0.11.0
++## explicit
+ # github.com/go-ole/go-ole v1.2.4
++## explicit
+ github.com/go-ole/go-ole
+ github.com/go-ole/go-ole/oleutil
+ # github.com/go-stack/stack v1.8.0
++## explicit
+ github.com/go-stack/stack
+-# github.com/golang/protobuf v1.2.0
++# github.com/golang/protobuf v1.5.2
++## explicit
+ github.com/golang/protobuf/proto
+ github.com/golang/protobuf/protoc-gen-go/descriptor
+ # github.com/golang/snappy v0.0.1
++## explicit
+ github.com/golang/snappy
+-# github.com/google/uuid v1.0.0
++# github.com/google/uuid v1.1.2
+ github.com/google/uuid
+ # github.com/hashicorp/golang-lru v0.5.1
++## explicit
+ github.com/hashicorp/golang-lru
+ github.com/hashicorp/golang-lru/simplelru
+ # github.com/huin/goupnp v1.0.0
++## explicit
+ github.com/huin/goupnp
+ github.com/huin/goupnp/dcps/internetgateway1
+ github.com/huin/goupnp/dcps/internetgateway2
+@@ -59,60 +83,84 @@ github.com/huin/goupnp/scpd
+ github.com/huin/goupnp/soap
+ github.com/huin/goupnp/ssdp
+ # github.com/influxdata/influxdb v1.7.3
++## explicit
+ github.com/influxdata/influxdb/client
+ github.com/influxdata/influxdb/models
+ github.com/influxdata/influxdb/pkg/escape
+ # github.com/influxdata/platform v0.0.0-20190117200541-d500d3cf5589
++## explicit
+ github.com/influxdata/platform/models
+ github.com/influxdata/platform/pkg/escape
+ # github.com/jackpal/go-nat-pmp v1.0.1
++## explicit
+ github.com/jackpal/go-nat-pmp
+-# github.com/julienschmidt/httprouter v1.2.0
++# github.com/julienschmidt/httprouter v1.3.0
++## explicit
+ github.com/julienschmidt/httprouter
+ # github.com/karalabe/hid v1.0.0
++## explicit
+ github.com/karalabe/hid
+-# github.com/kr/pretty v0.1.0
++# github.com/kr/pretty v0.2.0
+ github.com/kr/pretty
+ # github.com/kr/text v0.1.0
+ github.com/kr/text
++# github.com/kylelemons/godebug v1.1.0
++## explicit
+ # github.com/maruel/panicparse v1.2.1
++## explicit
+ github.com/maruel/panicparse/stack
+-# github.com/mattn/go-colorable v0.1.1
++# github.com/mattn/go-colorable v0.1.6
++## explicit
+ github.com/mattn/go-colorable
+-# github.com/mattn/go-isatty v0.0.7
++# github.com/mattn/go-isatty v0.0.12
++## explicit
+ github.com/mattn/go-isatty
+ # github.com/mattn/go-runewidth v0.0.3
+ github.com/mattn/go-runewidth
+ # github.com/mitchellh/go-wordwrap v1.0.0
++## explicit
+ github.com/mitchellh/go-wordwrap
+ # github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
++## explicit
+ github.com/mohae/deepcopy
+ # github.com/naoina/go-stringutil v0.1.0
++## explicit
+ github.com/naoina/go-stringutil
+ # github.com/naoina/toml v0.1.1
++## explicit
+ github.com/naoina/toml
+ github.com/naoina/toml/ast
+ # github.com/nsf/termbox-go v0.0.0-20190325093121-288510b9734e
++## explicit
+ github.com/nsf/termbox-go
+ # github.com/olekukonko/tablewriter v0.0.1
++## explicit
+ github.com/olekukonko/tablewriter
+-# github.com/opentracing/opentracing-go v1.1.0
++# github.com/opentracing/opentracing-go v1.2.0
++## explicit
+ github.com/opentracing/opentracing-go
+-github.com/opentracing/opentracing-go/log
+ github.com/opentracing/opentracing-go/ext
++github.com/opentracing/opentracing-go/log
+ # github.com/pborman/uuid v1.2.0
++## explicit
+ github.com/pborman/uuid
+ # github.com/peterh/liner v1.1.0
++## explicit
+ github.com/peterh/liner
+-# github.com/pkg/errors v0.8.1
++# github.com/pkg/errors v0.9.1
+ github.com/pkg/errors
+ # github.com/pmezard/go-difflib v1.0.0
+ github.com/pmezard/go-difflib/difflib
+ # github.com/prometheus/prometheus v2.1.0+incompatible
++## explicit
+ github.com/prometheus/prometheus/util/flock
++# github.com/prometheus/tsdb v0.10.0
++## explicit
+ # github.com/rjeczalik/notify v0.9.1
++## explicit
+ github.com/rjeczalik/notify
+ # github.com/robertkrimen/otto v0.0.0-20170205013659-6a77b7cbc37d
++## explicit
+ github.com/robertkrimen/otto
+ github.com/robertkrimen/otto/ast
+ github.com/robertkrimen/otto/dbg
+@@ -121,101 +169,159 @@ github.com/robertkrimen/otto/parser
+ github.com/robertkrimen/otto/registry
+ github.com/robertkrimen/otto/token
+ # github.com/rs/cors v1.3.0
++## explicit
+ github.com/rs/cors
+ # github.com/shengdoushi/base58 v1.0.0
++## explicit
+ github.com/shengdoushi/base58
+-# github.com/stretchr/testify v1.3.0
++# github.com/stretchr/testify v1.7.0
++## explicit
+ github.com/stretchr/testify/assert
+ github.com/stretchr/testify/require
+ # github.com/syndtr/goleveldb v1.0.0
+-github.com/syndtr/goleveldb/leveldb/util
++## explicit
+ github.com/syndtr/goleveldb/leveldb
++github.com/syndtr/goleveldb/leveldb/cache
++github.com/syndtr/goleveldb/leveldb/comparer
+ github.com/syndtr/goleveldb/leveldb/errors
+ github.com/syndtr/goleveldb/leveldb/filter
+ github.com/syndtr/goleveldb/leveldb/iterator
+-github.com/syndtr/goleveldb/leveldb/opt
+-github.com/syndtr/goleveldb/leveldb/storage
+-github.com/syndtr/goleveldb/leveldb/cache
+-github.com/syndtr/goleveldb/leveldb/comparer
+ github.com/syndtr/goleveldb/leveldb/journal
+ github.com/syndtr/goleveldb/leveldb/memdb
++github.com/syndtr/goleveldb/leveldb/opt
++github.com/syndtr/goleveldb/leveldb/storage
+ github.com/syndtr/goleveldb/leveldb/table
++github.com/syndtr/goleveldb/leveldb/util
++# github.com/uber-go/atomic v0.0.0-00010101000000-000000000000 => github.com/uber-go/atomic v1.4.0
++## explicit
+ # github.com/uber/jaeger-client-go v2.16.0+incompatible
++## explicit
+ github.com/uber/jaeger-client-go
+ github.com/uber/jaeger-client-go/config
+ github.com/uber/jaeger-client-go/internal/baggage
++github.com/uber/jaeger-client-go/internal/baggage/remote
+ github.com/uber/jaeger-client-go/internal/spanlog
+ github.com/uber/jaeger-client-go/internal/throttler
++github.com/uber/jaeger-client-go/internal/throttler/remote
+ github.com/uber/jaeger-client-go/log
++github.com/uber/jaeger-client-go/rpcmetrics
+ github.com/uber/jaeger-client-go/thrift
++github.com/uber/jaeger-client-go/thrift-gen/agent
++github.com/uber/jaeger-client-go/thrift-gen/baggage
+ github.com/uber/jaeger-client-go/thrift-gen/jaeger
+ github.com/uber/jaeger-client-go/thrift-gen/sampling
+ github.com/uber/jaeger-client-go/thrift-gen/zipkincore
+-github.com/uber/jaeger-client-go/utils
+-github.com/uber/jaeger-client-go/internal/baggage/remote
+-github.com/uber/jaeger-client-go/internal/throttler/remote
+-github.com/uber/jaeger-client-go/rpcmetrics
+ github.com/uber/jaeger-client-go/transport
+-github.com/uber/jaeger-client-go/thrift-gen/agent
+-github.com/uber/jaeger-client-go/thrift-gen/baggage
++github.com/uber/jaeger-client-go/utils
+ # github.com/uber/jaeger-lib v2.0.0+incompatible
++## explicit
+ github.com/uber/jaeger-lib/metrics
+-# golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc
+-golang.org/x/crypto/pbkdf2
+-golang.org/x/crypto/scrypt
+-golang.org/x/crypto/ssh
+-golang.org/x/crypto/ssh/terminal
+-golang.org/x/crypto/sha3
+-golang.org/x/crypto/ripemd160
+-golang.org/x/crypto/openpgp
++# golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b
++## explicit
++golang.org/x/crypto/blowfish
++golang.org/x/crypto/cast5
++golang.org/x/crypto/chacha20
+ golang.org/x/crypto/curve25519
+ golang.org/x/crypto/ed25519
+-golang.org/x/crypto/internal/chacha20
+-golang.org/x/crypto/poly1305
++golang.org/x/crypto/ed25519/internal/edwards25519
++golang.org/x/crypto/internal/subtle
++golang.org/x/crypto/openpgp
+ golang.org/x/crypto/openpgp/armor
++golang.org/x/crypto/openpgp/elgamal
+ golang.org/x/crypto/openpgp/errors
+ golang.org/x/crypto/openpgp/packet
+ golang.org/x/crypto/openpgp/s2k
+-golang.org/x/crypto/ed25519/internal/edwards25519
+-golang.org/x/crypto/internal/subtle
+-golang.org/x/crypto/cast5
+-golang.org/x/crypto/openpgp/elgamal
+-# golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519
+-golang.org/x/net/websocket
++golang.org/x/crypto/pbkdf2
++golang.org/x/crypto/poly1305
++golang.org/x/crypto/ripemd160
++golang.org/x/crypto/scrypt
++golang.org/x/crypto/sha3
++golang.org/x/crypto/ssh
++golang.org/x/crypto/ssh/internal/bcrypt_pbkdf
++golang.org/x/crypto/ssh/terminal
++# golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
++## explicit
+ golang.org/x/net/context
+-golang.org/x/net/html/charset
+ golang.org/x/net/html
+ golang.org/x/net/html/atom
+-# golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
++golang.org/x/net/html/charset
++golang.org/x/net/websocket
++# golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
++## explicit
+ golang.org/x/sync/syncmap
+-# golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223
++# golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40
++## explicit
+ golang.org/x/sys/cpu
++golang.org/x/sys/internal/unsafeheader
++golang.org/x/sys/plan9
+ golang.org/x/sys/unix
+ golang.org/x/sys/windows
+-# golang.org/x/text v0.3.0
++# golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
++golang.org/x/term
++# golang.org/x/text v0.3.5
+ golang.org/x/text/encoding
+ golang.org/x/text/encoding/charmap
+ golang.org/x/text/encoding/htmlindex
+-golang.org/x/text/transform
+-golang.org/x/text/encoding/internal/identifier
+ golang.org/x/text/encoding/internal
++golang.org/x/text/encoding/internal/identifier
+ golang.org/x/text/encoding/japanese
+ golang.org/x/text/encoding/korean
+ golang.org/x/text/encoding/simplifiedchinese
+ golang.org/x/text/encoding/traditionalchinese
+ golang.org/x/text/encoding/unicode
+-golang.org/x/text/language
++golang.org/x/text/internal/language
++golang.org/x/text/internal/language/compact
++golang.org/x/text/internal/tag
+ golang.org/x/text/internal/utf8internal
++golang.org/x/text/language
+ golang.org/x/text/runes
+-golang.org/x/text/internal/tag
+-# gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127
++golang.org/x/text/transform
++# google.golang.org/protobuf v1.27.1
++google.golang.org/protobuf/encoding/prototext
++google.golang.org/protobuf/encoding/protowire
++google.golang.org/protobuf/internal/descfmt
++google.golang.org/protobuf/internal/descopts
++google.golang.org/protobuf/internal/detrand
++google.golang.org/protobuf/internal/encoding/defval
++google.golang.org/protobuf/internal/encoding/messageset
++google.golang.org/protobuf/internal/encoding/tag
++google.golang.org/protobuf/internal/encoding/text
++google.golang.org/protobuf/internal/errors
++google.golang.org/protobuf/internal/filedesc
++google.golang.org/protobuf/internal/filetype
++google.golang.org/protobuf/internal/flags
++google.golang.org/protobuf/internal/genid
++google.golang.org/protobuf/internal/impl
++google.golang.org/protobuf/internal/order
++google.golang.org/protobuf/internal/pragma
++google.golang.org/protobuf/internal/set
++google.golang.org/protobuf/internal/strs
++google.golang.org/protobuf/internal/version
++google.golang.org/protobuf/proto
++google.golang.org/protobuf/reflect/protodesc
++google.golang.org/protobuf/reflect/protoreflect
++google.golang.org/protobuf/reflect/protoregistry
++google.golang.org/protobuf/runtime/protoiface
++google.golang.org/protobuf/runtime/protoimpl
++google.golang.org/protobuf/types/descriptorpb
++# gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15
++## explicit
+ gopkg.in/check.v1
+ # gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce
++## explicit
+ gopkg.in/natefinch/npipe.v2
+ # gopkg.in/olebedev/go-duktape.v3 v3.0.0-20180302121509-abf0ba0be5d5
++## explicit
+ gopkg.in/olebedev/go-duktape.v3
+ # gopkg.in/sourcemap.v1 v1.0.5
++## explicit
+ gopkg.in/sourcemap.v1
+ gopkg.in/sourcemap.v1/base64vlq
+ # gopkg.in/urfave/cli.v1 v1.20.0
++## explicit
+ gopkg.in/urfave/cli.v1
++# gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
++gopkg.in/yaml.v3
++# github.com/codahale/hdrhistogram => github.com/HdrHistogram/hdrhistogram-go v0.9.0
++# github.com/uber-go/atomic => github.com/uber-go/atomic v1.4.0
++
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 693b4df7ed8d..428958fb7d33 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index f2dd7dea0b87..6598f52e42e9 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -5,5 +5,5 @@ DIST gutenprint-5.3.3.tar.xz 5050624 BLAKE2B dbcf74169d0756d991bbdad7338a6e6f995
 DIST gutenprint-5.3.4.tar.xz 5341824 BLAKE2B 134e59c7dbf9c0ba95b91c717f1e6841f35520b55105feb1ba40b82785c825b8e2a2429990e78186a1455e5c6de9880f911438d514c53c56d05575dd4e2d68a4 SHA512 63de0b62edbe255a7efaaeab1dcd22577b7b46d7e0e48441b79977f19e76bf3862e4e8e18c55dd1f2e7392d555f9e8ee875ea53b90c689852d2343491a8fbcc8
 EBUILD gutenprint-5.3.3-r1.ebuild 1910 BLAKE2B e5ddb8a60c036a007ebfa872d497515c317a07a3d3f75fe1f679d87b300b653ce9402e0b374da8f34f94f25cc4f7a9617e4847f1ac064db01ae8feceb1592f5c SHA512 9b2e86460a131a4ddf413626b6f2429e67284f3b9babaf5bcbff91f6bf94b187301c7de6d4b966dc33284f0e2f4c2d4e1eded2cbef7210abb6429b9fd0eedf8f
 EBUILD gutenprint-5.3.3-r3.ebuild 2087 BLAKE2B 8f70415b61e037151493ea368a35769e73e01840e1f587c065544e9e0e3861c710bb5d0426215bb28cacca6de13545e772ca9e351b6eb8e552309f45d4d4a181 SHA512 b12a22d351d7c8e3b0798920a7aeaff71639554ccdbc840e2e47f6069a0e197ca76fce3f51233ad420668f469bdcad9270ab12525844f0123b554f95541b1005
-EBUILD gutenprint-5.3.4-r2.ebuild 1904 BLAKE2B 423c2f4d2f4234030c2449205495f446b8e0204069a6ddf21e87367c3d6606cc86f122b18a898887abf6edbc84977aeedf18ab8b7780ac8dd61ae86b6241c762 SHA512 02ca07f46dad137771d9526018919bd9824fdcb35fec7b430c9a8e58e80c15f0f2770d5a6086ba83ffb01f964ec22293a45d12c717405161b5f3c70d059e7620
+EBUILD gutenprint-5.3.4-r2.ebuild 1903 BLAKE2B 1365bb8955c09d29a2adf9e57f6c8cd7bcb2fe9d2efb7bb10b9b8637f21a3e0b48a02f431bf63d7ead61df88b4e49e73b47bb562b9afcb6c8a55d701829bc509 SHA512 3aa6f2a9ba1b48680ff855319b2f43c5ad0b844218c641b8c23ccff8b7526eab521fcbb56ffa8ebac665949581e037e4a23ea00e6801d4f3290de261a67301a4
 MISC metadata.xml 339 BLAKE2B 1090eefd725cc9e37f9c8e77daddb80c3791098af5ba2405dd2746426a46722bef0ed8706654100559735d9f29c2be45eec525cadc0653776dda60453abca786 SHA512 b2153b9425e34eb5561da4d5ea99c08bdfac03b036a94b0c471f985635e2a75f843956cd94d99cbb0d2e2b71b6a14493892bd8efa6eeecf2309ac4b964d9d6a6
diff --git a/net-print/gutenprint/gutenprint-5.3.4-r2.ebuild b/net-print/gutenprint/gutenprint-5.3.4-r2.ebuild
index e4c3b13d1d8c..64355a5a47fe 100644
--- a/net-print/gutenprint/gutenprint-5.3.4-r2.ebuild
+++ b/net-print/gutenprint/gutenprint-5.3.4-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 
 IUSE="cups gimp gtk nls readline ppds static-libs"
 RESTRICT="test"
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index c7850c3a38b1..73c2f7fccafc 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 9605b5c53e7b..5bc38b74ca32 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -13,10 +13,10 @@ DIST haproxy-2.4.2.tar.gz 3579220 BLAKE2B fc7f5d0c7ea8be103e74b8a62502c2ffd458ac
 DIST haproxy-2.4.3.tar.gz 3585501 BLAKE2B 81fda63a741a523e692078002b89048966409f601ed353ee91523a52e71859a9b0204514f5a371ecd0685c4c7c6d35ce7524be56999a3b062bca86b257c892bf SHA512 4ee11b6fd4c76d6ec3060f26bda67a8916c4f52bf1a800b921e04d2cec78b47b8b1343081935bc211f1e081b92db88130ec365161460b35ab88aa982917f82ee
 EBUILD haproxy-2.0.14-r4.ebuild 5487 BLAKE2B 5b4622a59d896e74f01849dc5ed28b468b8e38174b5e8c41aa9a3ea38a4b77143b8aa36902781829159981455a37e3c4dd7a399934969b65c1cdd8d1ddf6a5d6 SHA512 b11b191ccbcd769b67c1343b643e244dafa529cd8e9c25474430dd559654782ade68262b6734796f02d7a89af864d0aca9501a5d219c448e30ae92371759c4d5
 EBUILD haproxy-2.0.23-r1.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
-EBUILD haproxy-2.0.24.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
+EBUILD haproxy-2.0.24.ebuild 5487 BLAKE2B 07ae3475d2ad9bf132df8eaa070730e1742b3449cb84ee8cfd1241399782762b12df1ceea355e792ee7c21f19f80b246c5dfdfcb7dfa891001d9a6807e39221c SHA512 620178897399c7204dc01d4e8084f7443e5debd0e7579ab27478aeee0942f9f1d24462da2e88cb9c49889e5e3f44b42fd9c724a61622cb0ef69cb5ea14c433ba
 EBUILD haproxy-2.0.9999.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
 EBUILD haproxy-2.2.15-r1.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
-EBUILD haproxy-2.2.16.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
+EBUILD haproxy-2.2.16.ebuild 5487 BLAKE2B 07ae3475d2ad9bf132df8eaa070730e1742b3449cb84ee8cfd1241399782762b12df1ceea355e792ee7c21f19f80b246c5dfdfcb7dfa891001d9a6807e39221c SHA512 620178897399c7204dc01d4e8084f7443e5debd0e7579ab27478aeee0942f9f1d24462da2e88cb9c49889e5e3f44b42fd9c724a61622cb0ef69cb5ea14c433ba
 EBUILD haproxy-2.2.5-r3.ebuild 5546 BLAKE2B 34496ae5002d1d7659cb18e1d6c1b52ca6adbf0d8206989cdfe714b7ee5e077661caf7ba09b9a1f40085d6078b764d19eb9d16acece37c9c3aa590f557ccbdc9 SHA512 db03dc179a11c24cb541ebd1c7b1b51f9687c5738805ffe585817bd032003153b4df71f860219ddf9902fd8e91d819406ab0b0a0f271a67c8fb9c4e45e1cef3e
 EBUILD haproxy-2.2.9999.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
 EBUILD haproxy-2.3.12-r1.ebuild 5399 BLAKE2B 2218acf89a281aa07ce2d3f04c7503ef51a2555497a5c07fe711a475eb38b9a270f32079dffdc90ca845f1a500a5627e343d83587cded0a5bbfe49bf8fad9a6c SHA512 9444abf8051470c06d24647b39254b32c90753419277b7448a2bd972b497b64827cb116ec802dd45f53ec37aec5509cea76065302b5e458e12f92fa727268bef
diff --git a/net-proxy/haproxy/haproxy-2.0.24.ebuild b/net-proxy/haproxy/haproxy-2.0.24.ebuild
index 894bf001b81c..c00e1d597aa5 100644
--- a/net-proxy/haproxy/haproxy-2.0.24.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.24.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://www.haproxy.org"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+	KEYWORDS="amd64 ~arm ppc x86"
 else
 	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
 	EGIT_BRANCH=master
diff --git a/net-proxy/haproxy/haproxy-2.2.16.ebuild b/net-proxy/haproxy/haproxy-2.2.16.ebuild
index 894bf001b81c..c00e1d597aa5 100644
--- a/net-proxy/haproxy/haproxy-2.2.16.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.16.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://www.haproxy.org"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+	KEYWORDS="amd64 ~arm ppc x86"
 else
 	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
 	EGIT_BRANCH=master
diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index b161b58e199b..2dd3ae7b83ad 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/sipvicious/Manifest b/net-voip/sipvicious/Manifest
index fbd9cde7eced..eefeb3ef6f22 100644
--- a/net-voip/sipvicious/Manifest
+++ b/net-voip/sipvicious/Manifest
@@ -1,5 +1,7 @@
 DIST sipvicious-0.3.0.tar.gz 43097 BLAKE2B 5ddcdf775db0ade6e61e77009c7991d8523db02dbdd6e8588c23f5cd6f4d2868dd1d78e7f17322cde67414b4eb2b8c89f2d4ee0079487e5f5f7ee75f4759adf5 SHA512 35aa3ea7d3cfd6f84716cd95a263357881196eaa180375d1f0a392a1478292ba9a8bf6cd53888448523f7faa447c82cc43fb1ef6c105a0e93e6c7854a51da172
 DIST sipvicious-0.3.3.tar.gz 46217 BLAKE2B 4ef872ecea9113f3ec24df98133230f678ccfff24380c2fafff810a4cbc3e2fe26866deb3595a7540cd42d34fd5bc045e6a2f51c7eb6403a445f33acd74e2213 SHA512 d1bcfdc62054d7b8188c35f7b1d14284b1f66e5501e40747819a79d578677b724ce0d38b28b497c7afa390c6d46fd410749408109ec4e08ba0adfde53b5b79bc
+DIST sipvicious-0.3.4.tar.gz 48296 BLAKE2B 75f3d190cb4224ada84cd7c714eb545e44a9759589890a559d3cb5243c5430c0aa81138e3cd294926901e961a5ec156c8d991b648c70e1d8fc2dc906473d507d SHA512 5e8d60ee1e70cd7f6dd9e862560def34b33171a20a4af87275ef1434ae62f19bf120b4000079bc273ecf1aaf05c87cdd6b299c64a44738e3f658b3ede5ca17c3
 EBUILD sipvicious-0.3.0.ebuild 635 BLAKE2B c7501afb2f54c5730beec1b113fe81b4094cb5a5d07b2ead4a12365624d3a4c96188d23133f93f578494dd3aaf2bb3a1d60a485b9abd51d03aec736045a0047c SHA512 99a1feff751bbdc233efc448c25931dc58f981dbe622b7da604eb37c7a2b8b862fc66b06ea5942af300306534181185505066afb1fc8252a1b0bba50efa166b6
 EBUILD sipvicious-0.3.3.ebuild 769 BLAKE2B ce46383aacc42b65d5ce507594fee61f9495ac30b9bcdb97e651a0173fa9e6e0d782dbbea1194f62b2498a4036429bf513c8f6fd6991670a3b3cb43a282f55a7 SHA512 e596d2d34c8ea3e3b7cd417655b4b471625763956d69b1c8e7f07242dbd78f2cb92455b54b0a35ae064ce35d9b08f7420df8560c26945daa7d6d67a0b6461077
+EBUILD sipvicious-0.3.4.ebuild 698 BLAKE2B c0f7ca16f8e8fdf3b09f789ade0d1381b6f2bde3d682989602e8c7d8879a50a4529481fd307495b892bb64a9fa6331f91eb37d4f7cbf28e22921a70ea5fa3cb3 SHA512 27804e343a45ef5db2d5b842bda963ac633d69d303be35f056ce9d1caaf70e0cd68784e54a3312fe2895364d01d46b3963d08213a9973a6475e0ff9ef3f17e25
 MISC metadata.xml 527 BLAKE2B 6406107e9f484f769d7365f6fae5d8bf13a9d5bbd85472d167da7122b9f6169ec9c5fb7a171dbb50dcd2075023c6586592250d4ab8407580ca8617cf75c5e48d SHA512 101eb3dfe3f4e0a5c506676ba13d1423dd52585dde5b7e935b5db5286780fd7422de2fefe5166a21bfa4783daf8cc32536f9bdcd34ab7a9758bb1c010d379b93
diff --git a/net-voip/sipvicious/sipvicious-0.3.4.ebuild b/net-voip/sipvicious/sipvicious-0.3.4.ebuild
new file mode 100644
index 000000000000..602867da146f
--- /dev/null
+++ b/net-voip/sipvicious/sipvicious-0.3.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="SIPVicious is a SIP security package"
+HOMEPAGE="https://github.com/EnableSecurity/sipvicious/wiki"
+SRC_URI="https://github.com/EnableSecurity/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="$(python_gen_cond_dep '
+		dev-python/dnspython[${PYTHON_USEDEP}]
+		dev-python/reportlab[${PYTHON_USEDEP}]
+	')"
+
+src_prepare() {
+	default
+	sed -re 's:man/man1:share/man/man1:' -i setup.py || die "Error updating man page installation location."
+}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index b9a0ba0fab65..aa236e3ebd9b 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 0cf7b8d9c3cd..8d92f048005c 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -2,13 +2,12 @@ AUX libreswan-3.30-ip-path.patch 563 BLAKE2B 838ae401b4e7c04378e8cbb2561a6d34889
 AUX libreswan-3.32-nss-compat.patch 680 BLAKE2B 5eb1f43e95d2f0801e0725ae1186e96ccf529200b0f1e4c8aa8d6d09248114f45a61468ad88a247a85c2f97b019ab0a022c6ce8a6ed263097c8d42c0008cfa43 SHA512 231b3985f333cc4a6f588b6854a217847136dd67305152dd14be96db8c0d7e043b885c47382276387e44939e26d046753d16853f3f0f17b43f966e3c3213c8e1
 AUX libreswan-4.2-ip-path.patch 679 BLAKE2B 1af9dab7911ce25dff6f31437ced5ba5291701ed39a9852ff541c8d6e5523eeb317a5b25d5385c68bb9d5aa239570e11ec9118631e45af710e855b7ab9224575 SHA512 8035c77c1f3c927ccfcc2b7dfa84d9e095aaaa0e3274933c52a9de0726c83318b214118033a353be7b99a57f3cacb3ff9a83e8584a385304b599c6ce6fecb17f
 DIST libreswan-3.32.tar.gz 4141631 BLAKE2B 37a4cb5c1f52d69b17ba60abd2b7a181d9f5567914a453ab875185110aeda4d33ecdaacfc83e361f153860a1db66faec70e0ad06af65e310af28ae72ce68fc6a SHA512 bb65512351059e2fac6f1c3ed1e291eabd6835faacf6d9c58649dd71dab1bb4fe6d6074178dea6dea01f24d39f3fbefd84c6060e4d8436b5d057fa55ae4467f3
-DIST libreswan-4.2.tar.gz 3467095 BLAKE2B 0630e9f7cf7ce6182712b4837688fd6b7a1ad1644f167f7ded4e63c7a0aac960a38d903cefbf0189da22b6ddb8c15f217ff3134f220b64020812789c1a196d29 SHA512 290be2e36fb41959c9889597aad8ab5df1edc1999ed7315e8f2e50213de073732c91ad497a2b5634f7bc83bca84089ef9f711420a77309c6cce243f1419a2d0f
 DIST libreswan-4.3.tar.gz 3489322 BLAKE2B 36908bf043fb1085f40b4a5f35ca6dc1563e1a1701f9cced9cb6765094bb2ef603b6d6d4b076a333d540f6454c10b6350d9b8c20de8bc3f27b19915b4cf42b9f SHA512 4687c867d34655cd33997edf4ab7887b2121af41c99d1bd9c794fce1c1eef412f5528de7a338e92a44c1c5d0aaa8fbeb756b89849fcad3deb45a418751e64045
 DIST libreswan-4.4.tar.gz 3503201 BLAKE2B c6c5cb2d7141afe52128e71051fd39b058a06fe4972074c853dbba2937f4c113548392d9c202badac5c1350e4d05f60d4a4d0aed453b1ee91c38a3245b0cf209 SHA512 108b2ac7a36454c48ce448a83ddd81e72d7fbb7cf8b042116d9bd31f195cdab4ccd6311d72af7ab4cc6d054df50d30a6bfc50b56fe7cbfd35d54a68804a6678b
+DIST libreswan-4.5.tar.gz 3529355 BLAKE2B 7485a8c77b997026681b3b99194ee54176f1cd7230af72a2aa231e5caa97946c40b0178f0ffa1dd200085b5919883697d7300bb328561501789707035f045337 SHA512 451a4f71099aa4776624a4c127fdaff492acc38a44228255dcbf955efa0982fd963c989d63522f56279eec6a9ef738febb573dde34aa541724ab11e37a554f9e
 EBUILD libreswan-3.32-r4.ebuild 3191 BLAKE2B 256ae0b37e6efc53174ba4b1e5dce166ec49e719bd3b768f19d40f2a0aa2ecd820ad4f8fa40fc6896e070b70041e50730736be026bf22a439b6d9aa93e44131f SHA512 8f29ae93e948b912dd581b011e9ad03f3069bd1a0dc54ac24341ea75bcf067f61c65d08361145191f25a6b2da9987079514b0bfeb725cb522dce7676290ee60a
-EBUILD libreswan-3.32-r5.ebuild 3229 BLAKE2B ed6d3a1668d2877997a872111c2450d71be046b9acc96949b23405b7f92b178c56c087d1685494d5464f9b1a654e7719f750deeb1b63b5a52b8064060013f917 SHA512 45c5ddcc8e7509f5aa71b4b4e470fc2066b335d81ee304645e5371a873187812fe9bd250192dcfd8c0d89a0f3fbeb3bf90abd8c457d0ac7b7a2b388aa430b216
-EBUILD libreswan-4.2-r2.ebuild 3299 BLAKE2B 9c658f9901211a1a835e9a75b92af351fa572baa175567db55ce80048276d0a152df3a59682d9867fc69ce888b0025bd26347ad51d22d8f533ef425560ecfe1e SHA512 18bebcb26cd8e2933e574eaa3d267dced985b5d0ff6c4b6de3b7d6940eeca66cbf5f3c562e0123ed1abf8b08e0842f353991bb94ae0c75593d6b496ba15153ff
 EBUILD libreswan-4.3-r2.ebuild 3297 BLAKE2B 0349de254a56a9a375f734981326b46a8798a553842fb0030344f09ea797a4cba421dd29bba2a7af7116cac27c5f0290161a694539989c9148daf46610102262 SHA512 8eb0e3189d38b9432d8a879faa96a98536f034743194ceb27ec282562693bd547e4da8bcf162f6e6d0674c555854fcae355f1f7c4b31d1f4fbdfe675fea02342
 EBUILD libreswan-4.4-r4.ebuild 3298 BLAKE2B d580c97b4da77e574ab25a8b163942c302f19c22823799ba780bf9340f34a0cffe7ed2a6cf800891dafebbe564cda92a7b6399a1a4bf9dcfbdbfd028f8bc61fb SHA512 0c075d4992460e9731e183780e11d99f3dc303fff2410b90c019f08c2b317c8a0b6e2ac444044c5570d6578e91275ee0fca57c5a3793fa31d0d9a95ef110a87b
 EBUILD libreswan-4.4-r5.ebuild 3322 BLAKE2B 72d157245c7d6759d704df541614a6194b277b064e631d1d41ba76f9781c50c5b04d8a453787582ab4df58f28773ca55e9e8f8523d84db6da2df25260c5ee7ea SHA512 a6386f61655bc2afb438ec6a10b8d07de6b14d1088ffe7ad7685ecc75e3b409af08c92c046423c2faef3d1ef2066218128f5888d10a1d420024e5b8ea5ebcb29
+EBUILD libreswan-4.5.ebuild 3322 BLAKE2B 72d157245c7d6759d704df541614a6194b277b064e631d1d41ba76f9781c50c5b04d8a453787582ab4df58f28773ca55e9e8f8523d84db6da2df25260c5ee7ea SHA512 a6386f61655bc2afb438ec6a10b8d07de6b14d1088ffe7ad7685ecc75e3b409af08c92c046423c2faef3d1ef2066218128f5888d10a1d420024e5b8ea5ebcb29
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/libreswan-3.32-r5.ebuild b/net-vpn/libreswan/libreswan-3.32-r5.ebuild
deleted file mode 100644
index fbf53aa5227f..000000000000
--- a/net-vpn/libreswan/libreswan-3.32-r5.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
-HOMEPAGE="https://libreswan.org/"
-SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD-4 RSA DES"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="caps curl dnssec ldap pam seccomp selinux systemd test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libevent:0=
-	dev-libs/nspr
-	>=dev-libs/nss-3.42
-	>=sys-kernel/linux-headers-4.19
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap-ng )
-	curl? ( net-misc/curl )
-	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd:0= )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	dev-libs/nss
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	test? ( dev-python/setproctitle )
-"
-RDEPEND="${DEPEND}
-	dev-libs/nss[utils(+)]
-	sys-apps/iproute2
-	!net-vpn/strongswan
-	selinux? ( sec-policy/selinux-ipsec )
-"
-
-usetf() {
-	usex "$1" true false
-}
-
-PATCHES=( "${FILESDIR}/${PN}-3.30-ip-path.patch" "${FILESDIR}/${P}-nss-compat.patch" )
-
-src_prepare() {
-	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
-	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
-	default
-}
-
-src_configure() {
-	tc-export AR CC
-	export INC_USRLOCAL=/usr
-	export INC_MANDIR=share/man
-	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
-	export FINALDOCDIR=/usr/share/doc/${PF}/html
-	export INITSYSTEM=openrc
-	export INC_RCDIRS=
-	export INC_RCDEFAULT=/etc/init.d
-	export USERCOMPILE=
-	export USERLINK=
-	export USE_DNSSEC=$(usetf dnssec)
-	export USE_LABELED_IPSEC=$(usetf selinux)
-	export USE_LIBCAP_NG=$(usetf caps)
-	export USE_LIBCURL=$(usetf curl)
-	export USE_LINUX_AUDIT=$(usetf selinux)
-	export USE_LDAP=$(usetf ldap)
-	export USE_SECCOMP=$(usetf seccomp)
-	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
-	export SD_WATCHDOGSEC=$(usex systemd 200 0)
-	export USE_XAUTHPAM=$(usetf pam)
-	export DEBUG_CFLAGS=
-	export OPTIMIZE_CFLAGS=
-	export WERROR_CFLAGS=
-}
-
-src_compile() {
-	emake all
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
-}
-
-src_test() {
-	: # integration tests only that require set of kvms to be set up
-}
-
-src_install() {
-	default
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
-
-	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
-	fperms 0600 /etc/ipsec.secrets
-
-	dodoc -r docs
-
-	find "${D}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process libreswan.conf
-
-	local IPSEC_CONFDIR=${ROOT}/etc/ipsec.d
-	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
-		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
-		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
-		eend $?
-		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
-	fi
-}
diff --git a/net-vpn/libreswan/libreswan-4.2-r2.ebuild b/net-vpn/libreswan/libreswan-4.2-r2.ebuild
deleted file mode 100644
index ef6abcc59657..000000000000
--- a/net-vpn/libreswan/libreswan-4.2-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
-HOMEPAGE="https://libreswan.org/"
-SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD-4 RSA DES"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libevent:0=
-	dev-libs/nspr
-	>=dev-libs/nss-3.42
-	>=sys-kernel/linux-headers-4.19
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap-ng )
-	curl? ( net-misc/curl )
-	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd:0= )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	dev-libs/nss
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	test? ( dev-python/setproctitle )
-"
-RDEPEND="${DEPEND}
-	dev-libs/nss[utils(+)]
-	sys-apps/iproute2
-	!net-vpn/strongswan
-	selinux? ( sec-policy/selinux-ipsec )
-"
-
-usetf() {
-	usex "$1" true false
-}
-
-PATCHES=( "${FILESDIR}/${PN}-4.2-ip-path.patch" )
-
-src_prepare() {
-	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
-	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
-	default
-}
-
-src_configure() {
-	tc-export AR CC
-	export PREFIX=/usr
-	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
-	export FINALDOCDIR=/usr/share/doc/${PF}/html
-	export INITSYSTEM=openrc
-	export INITDDIRS=
-	export INITDDIR_DEFAULT=/etc/init.d
-	export USERCOMPILE=${CFLAGS}
-	export USERLINK=${LDFLAGS}
-	export USE_DNSSEC=$(usetf dnssec)
-	export USE_LABELED_IPSEC=$(usetf selinux)
-	export USE_LIBCAP_NG=$(usetf caps)
-	export USE_LIBCURL=$(usetf curl)
-	export USE_LINUX_AUDIT=$(usetf selinux)
-	export USE_LDAP=$(usetf ldap)
-	export USE_NM=$(usetf networkmanager)
-	export USE_SECCOMP=$(usetf seccomp)
-	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
-	export SD_WATCHDOGSEC=$(usex systemd 200 0)
-	export USE_XAUTHPAM=$(usetf pam)
-	export DEBUG_CFLAGS=
-	export OPTIMIZE_CFLAGS=
-	export WERROR_CFLAGS=
-}
-
-src_compile() {
-	emake all
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
-}
-
-src_test() {
-	: # integration tests only that require set of kvms to be set up
-}
-
-src_install() {
-	default
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
-
-	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
-	fperms 0600 /etc/ipsec.secrets
-
-	keepdir /var/lib/ipsec/nss
-	fperms 0700 /var/lib/ipsec/nss
-
-	dodoc -r docs
-
-	find "${D}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process libreswan.conf
-
-	local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss
-	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
-		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
-		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
-		eend $?
-		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
-	fi
-}
diff --git a/net-vpn/libreswan/libreswan-4.5.ebuild b/net-vpn/libreswan/libreswan-4.5.ebuild
new file mode 100644
index 000000000000..06f4baa533ab
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-4.5.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
+HOMEPAGE="https://libreswan.org/"
+SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD-4 RSA DES"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libevent:0=
+	dev-libs/nspr
+	>=dev-libs/nss-3.42
+	>=sys-kernel/linux-headers-4.19
+	virtual/libcrypt:=
+	caps? ( sys-libs/libcap-ng )
+	curl? ( net-misc/curl )
+	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-libs/nss
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-python/setproctitle )
+"
+RDEPEND="${DEPEND}
+	dev-libs/nss[utils(+)]
+	sys-apps/iproute2
+	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
+"
+
+usetf() {
+	usex "$1" true false
+}
+
+PATCHES=( "${FILESDIR}/${PN}-4.2-ip-path.patch" )
+
+src_prepare() {
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export AR CC
+	export PREFIX=/usr
+	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
+	export FINALDOCDIR=/usr/share/doc/${PF}/html
+	export INITSYSTEM=$(usex systemd systemd openrc)
+	export INITDDIRS=
+	export INITDDIR_DEFAULT=/etc/init.d
+	export USERCOMPILE=${CFLAGS}
+	export USERLINK=${LDFLAGS}
+	export USE_DNSSEC=$(usetf dnssec)
+	export USE_LABELED_IPSEC=$(usetf selinux)
+	export USE_LIBCAP_NG=$(usetf caps)
+	export USE_LIBCURL=$(usetf curl)
+	export USE_LINUX_AUDIT=$(usetf selinux)
+	export USE_LDAP=$(usetf ldap)
+	export USE_NM=$(usetf networkmanager)
+	export USE_SECCOMP=$(usetf seccomp)
+	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
+	export SD_WATCHDOGSEC=$(usex systemd 200 0)
+	export USE_AUTHPAM=$(usetf pam)
+	export DEBUG_CFLAGS=
+	export OPTIMIZE_CFLAGS=
+	export WERROR_CFLAGS=
+}
+
+src_compile() {
+	emake all
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
+}
+
+src_test() {
+	: # integration tests only that require set of kvms to be set up
+}
+
+src_install() {
+	default
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
+
+	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
+	fperms 0600 /etc/ipsec.secrets
+
+	keepdir /var/lib/ipsec/nss
+	fperms 0700 /var/lib/ipsec/nss
+
+	dodoc -r docs
+
+	find "${D}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process libreswan.conf
+
+	local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss
+	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
+		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
+		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
+		eend $?
+		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
+	fi
+}
diff --git a/net-vpn/networkmanager-openconnect/Manifest b/net-vpn/networkmanager-openconnect/Manifest
index 89f00dfabbe4..f74a8845c05f 100644
--- a/net-vpn/networkmanager-openconnect/Manifest
+++ b/net-vpn/networkmanager-openconnect/Manifest
@@ -1,3 +1,3 @@
 DIST NetworkManager-openconnect-1.2.6.tar.xz 713464 BLAKE2B 7837d2e825b8e962a960bfd00d3e9a9ed247d20d3628d8242c86cb145f8aa3fa8e748126785f067f348a661867436fa5f6e529e4dfefdcb07eec273a807206b0 SHA512 8e6f0af6bcc275d5afff6388b75700c35a5b65773118876203a30ad42a5758cef5d27af8954e8c47bdc46c2b5dfd70262d894aca3d3a62bcab6d240c03eb6fb2
-EBUILD networkmanager-openconnect-1.2.6-r1.ebuild 948 BLAKE2B de63d4917e5c832cb4ceb67adc8e54c78a676de017c8c4e411a73eda2f25722fc79bc04a02b9b57bc12974ac3b81e34e73dc90e42398745ac913052a98e9b604 SHA512 d3e6092eaa041501d4848fdf1dd9e99eb4eabe766652c405ff578af17a22325c6be76378bb590c3f8ecd3a7ed2c4557c69e0a41719bb07c15ded8508e86c3aa8
+EBUILD networkmanager-openconnect-1.2.6-r1.ebuild 955 BLAKE2B 82f2db460538780d49cb2c2b74952e57d5e8278f826bc1d68f97ecff8c4ce2e7d1178e00349ffb52bf3f8d8060ffe0a590e04353256b2872edd59a5672b0f20c SHA512 eaec4389ac3b33bef9ff0fce60a3a122ff26bf8b454ae8b4a4e87e22a0d1b7b2881e9113dec7c53f045f7f62cdebf0c78cb4ca8f86d57cb4a1f0a51cc3af8450
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6-r1.ebuild b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6-r1.ebuild
index b03a1ae535e8..8aed1039aeed 100644
--- a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6-r1.ebuild
+++ b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 IUSE="gtk"
 
 DEPEND="
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index a2eeaa1e2cca..160044d5af1d 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -7,11 +7,8 @@ AUX tor.service 1050 BLAKE2B 7f6553b9f4b928f0c924d73ee6f9df8a99ee75ec1801f6b865a
 AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9d1fee71aa3b4faa425274437f8a7c2f9c608b4f8f9be6d4dd7c7bc4a58bd1ea096353e698 SHA512 7cf8c81e2e84b12bfc1242782b370335041f566165be6d9742d10768f0541d921caa378c6429fdb55f2c3e1433141f65bc936795126e677cc0921ce82de22bc2
 DIST tor-0.4.5.10.tar.gz 7870323 BLAKE2B cb0b1ee9c997a8837837b5a21e3a18e3efc52f8c056dea65625059b694f5ba76660462510311b1abd30d2659e6c5c5d3f999d42e269d7d7d464676b3f8f8d4d0 SHA512 a6970623696bdd0b3138e51ad3c6eaba13533d537560e1615deb90e41ca508d71282ad526ae6206604889c5a795097a71133bd0e0a9b490f544bff78d9dfa7f0
 DIST tor-0.4.5.10.tar.gz.asc 833 BLAKE2B 8b42bf8e2276ad9f83acf344ddba7db73c8dd3446074980bac339b9021112161944364b5f3d05eae81231ec92846a22fab081bb881133f259a715e242878d64f SHA512 87a60a51c29b8a3ae43b47f0f16e966911e1712ab276cd3da0f8e3194839c6b5c074bd43290a00ff401efd376a7d3100031f8d8e683d9ffa2a35ad709bcaf4b8
-DIST tor-0.4.5.9.tar.gz 7840294 BLAKE2B 75babcbf7929fa34034ad706df1189ca7988e8c5db30f7051a5a006d8bb61afa7ebf7d0f7441e3ef1df1bc777cd80dc165c1d481d65a695c315b8820f8be392a SHA512 b3c3b5cce30c881fb1e705ec6183513f625ddb9d076671b9cd6299e81a410bc12f59a30677636371c336e397211432f0831bdcb2105c9aed8dcb608eae54e2b2
-DIST tor-0.4.5.9.tar.gz.asc 833 BLAKE2B fca3769b683e8bb90540026dda6d2f302d499262c806f7c7215e7a30908cd46b807717fd130380d114660380166852f6a0cbb702966c6930004d04098718d582 SHA512 df538981aa19a2fa730a1e357f277f22b3cae769a1d13fa1d920a5e949d5b3770a8de9883eeaf2522c8b24327f73505569ac0f6ecf77139ddb5ef1e2418924b6
 DIST tor-0.4.6.7.tar.gz 7790727 BLAKE2B da6b0fe0de6a334713cf881dece6ef5a932b0f4374a7dde1e1cb78b4b43944fd6156d84bd98c8be734a7cf81b99cb36187544028c3e4800d38d11d7286d19e12 SHA512 e5f9e235fc4b96f5e63e0bfa4ca412d0d11299a31cb77cae1c199b276d0dfbf3656657ddf910b22625dd49eb726d487666e80e8889db78c9edebbab0d80d9e03
 DIST tor-0.4.6.7.tar.gz.asc 833 BLAKE2B 2054c094cc8ce28bfc8822fa6b0ac5a028b41c96160d135da53112c4fcb7ae048e8d48b58f164dd33c6c7dd851aaa71173b2aa36f70411fc7cc2b67d346ce00b SHA512 d45caaa4795d05f1f1a558192c5eedff608c74be0ef933e0ff7a4f68123a109e38e7fe26222c66dfc8966a07f458eeadf77d7f4731d88389595b59413140e9a3
 EBUILD tor-0.4.5.10.ebuild 2544 BLAKE2B 840d53158ed06452c125ac933253d01f79996b73a24293890dcd25011c969da7dd6e6a8b87bd94f7c0e9426a180e74515a29cade4702dcd14e946a6be2134cc6 SHA512 76f2944e47441bc85be06bdf05c943f5032f344d6aaa28710c79c26ff4f293879e40d463764cb03e44319d6ca7faa743456084d51f8ae3476e912b4daca00266
-EBUILD tor-0.4.5.9-r1.ebuild 2544 BLAKE2B 840d53158ed06452c125ac933253d01f79996b73a24293890dcd25011c969da7dd6e6a8b87bd94f7c0e9426a180e74515a29cade4702dcd14e946a6be2134cc6 SHA512 76f2944e47441bc85be06bdf05c943f5032f344d6aaa28710c79c26ff4f293879e40d463764cb03e44319d6ca7faa743456084d51f8ae3476e912b4daca00266
 EBUILD tor-0.4.6.7.ebuild 2742 BLAKE2B f76a7e441ced00d2c5f8e935468b27c79eac0c15689c84cd6dd3946ab604d481f808b110d5854d7e4a6e6496e656595169b79c7e348a19999fa619a3bb747091 SHA512 1c2aed487ca4c116216ece04af1a71806f51c4858737b2aead93d3be2d40daeb56eeee5c15b5e68e127f6224646a77f8a2eb8b856f8d4aded89df4bddd45a4fb
 MISC metadata.xml 549 BLAKE2B af6257c0e04c7487b23edb1f5c6fce91fbb76aedf9c0357bb4f214ff4af9d6055e0c6bb32fef5c9906f461f34b5631891a681a039612c73feecff8ff77a0a3c2 SHA512 2b9d9c20a9691dd67cb5ef98e386bea8cff9ba79208373922c5a379ca8c96e021e94748d7b85e860a24063f1fc439a3adee59b3dde70cf6b35401d18518b5689
diff --git a/net-vpn/tor/tor-0.4.5.9-r1.ebuild b/net-vpn/tor/tor-0.4.5.9-r1.ebuild
deleted file mode 100644
index 7ffede47e2de..000000000000
--- a/net-vpn/tor/tor-0.4.5.9-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic readme.gentoo-r1 systemd verify-sig
-
-MY_PV="$(ver_rs 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
-	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz
-	verify-sig? ( https://dist.torproject.org/${MY_PF}.tar.gz.asc )"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86 ~ppc-macos"
-IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
-
-BDEPEND="verify-sig? ( app-crypt/openpgp-keys-tor )"
-DEPEND="
-	dev-libs/libevent:=[ssl]
-	sys-libs/zlib
-	caps? ( sys-libs/libcap )
-	man? ( app-text/asciidoc )
-	dev-libs/openssl:0=[-bindist(-)]
-	lzma? ( app-arch/xz-utils )
-	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
-	systemd? ( sys-apps/systemd )
-	zstd? ( app-arch/zstd )"
-RDEPEND="
-	acct-user/tor
-	acct-group/tor
-	${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-	"${FILESDIR}"/${PN}-0.4.5.5_rc1-LDFLAGS-typo.patch
-)
-
-DOCS=()
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING )
-	export ac_cv_lib_cap_cap_init=$(usex caps)
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--disable-all-bugs-are-fatal \
-		--enable-system-torrc \
-		--disable-android \
-		--disable-html-manual \
-		--disable-libfuzzer \
-		--enable-missing-doc-warnings \
-		--disable-module-dirauth \
-		--enable-pic \
-		--disable-rust \
-		--disable-restart-debugging \
-		--disable-zstd-advanced-apis  \
-		$(use_enable man asciidoc) \
-		$(use_enable man manpage) \
-		$(use_enable lzma) \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable server module-relay) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable test unittests) \
-		$(use_enable test coverage) \
-		$(use_enable zstd)
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r9 tor
-	systemd_dounit "${FILESDIR}"/tor.service
-
-	keepdir /var/lib/tor
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r2 torrc
-}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index ee7bcf69cfbd..ad09db64eea6 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index d759ace6e345..d8df84a46a36 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,11 +1,14 @@
 AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060719bfe0038ca75d9b0e79d78a234627a15c53da16151094c6cc6d48a049ae6ac3c9b1714a2 SHA512 1b39b25736a11870f5e740b5702b6f18b1714cc06df7e3462cd74d116cfaa82175801f336141f3fdf86be33aa97fcebf32d9c080d80419bbc548ad540ab7bd7d
+AUX iwd-1.17-fix-tests.patch 1358 BLAKE2B f399c13ce1c8594bcbe5a4bb84c7cbcf51121cd431dea492ff559b2b768bec56a2e6025771449838ad2a8929fa0a2c8e52495a44d6b7adb5ccaf4b52ecfc8486 SHA512 f63886a0844619442d0c9c662629a46c8075c859fb6fc614c09900ff3ea18335ec5369b50427983f34e8fe86ec13546f5a179770b1482cda0326a041c50ad1da
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
 DIST iwd-1.14.tar.xz 933764 BLAKE2B edc6a925872afb6b98f5bbe16fc1cb6b8459a1aff33ec1f9e2d6bd45e605e34debaffa3048b6506cd3e8006c57d6efc9ae341f73050668454ad85fe7e6b4f256 SHA512 bff9b5a744e8eb4e285f28d976e9335d2c85b57fc1eb023c3aa9442e451523b3b9f080d2c02fc5432735c398857b64d115ed2929dd4bb910925cbf18df0b0874
 DIST iwd-1.15.tar.xz 940724 BLAKE2B 6dae8a71e15136bcc9d8bb44cc6b152848207d89af2f447f48e834a3feda72a0a018dd1db3cb3a0e92c834cb2a19d8f9e4a9c900d91f96df378772d220205d65 SHA512 71e1f5f1b9d4e09a158b9bf801cee8af5ed8a19a3e80ad677e28ccab29ae10a79ebb7dbeaed60dd24283b6a40dbda8c212400b6d5ac659ed6056588a8663f0d4
 DIST iwd-1.16.tar.xz 949692 BLAKE2B 6063f0fe79cfe61f68fd2d1acc4c67cd9b907bcf728da072b5845a60c6032db472428fa5ea7f203d840a7934c58fcb73d23805c5f3d4336a7ebb795575233260 SHA512 4cbf548421f7f5be6e73cea29802cf5757aece92fa2ce36257a608346bca0280338130915a974c895d3b865e0621a3ffe22228487d2552e407dacdd7d7eb9109
+DIST iwd-1.17.tar.xz 954428 BLAKE2B 2758b7c82afa94a90d2cb067e6ef63699e99e92101e35174d6976eee11a6057ce4d2324eda103a07f102a4d07d274d7f78888a5929928adcaefebe450b00298e SHA512 1dd04959a82c6a96b273479d604c989e246dea557190e3c936a21eea3041c3370c4c29b963171664e5e11fc43d0daf2ab5b62f325edc96f62a5a47259a733ed1
 EBUILD iwd-1.14.ebuild 4928 BLAKE2B a562a3ec297608b899413a35973b37da935260225be99a7eb864deaa0c2d960edf07e7d98620d68868c660e964a0a93daf179531c1caf3f1e687160c984e7cc2 SHA512 cbca49ef774352a05f7fc52e285d7ef494838a281c08d2c2f9276187e38dd8450c28ba5243fed7a4a2515b37562b21bc3bc013bc2333769b04f89fe2a4ab31cc
 EBUILD iwd-1.15.ebuild 4928 BLAKE2B bbaf00a83a66e02df79499ebefd5591750f27daadf1c7b98c34c6095ef8281d1de08066e7f92b87f798b1b777dd9d398978e6b2a390b57da748cfbfe93a4822c SHA512 99df966cf16d483672803644533d9efcbd69521f8f5eb31cc5c96698fd05f617299cf1648259dfa09b81800060d591dc108de1dd31843c48e76e00d3890716a7
 EBUILD iwd-1.16.ebuild 4941 BLAKE2B f5b284e9436df970998ea651d16870c7b05e789508832ef6f17234e16cc8162c5cd2166afa0331c580ae070c946a2b8df9f16ae38f2ae4246ad52cf2a7e789d4 SHA512 dd995e795aa7fde7635649aad4aeb1ead8940ef5dcae7d04a06561fa76d2745416b79dc3fecd0960fee6eb6b63d2a13be12ce8cc2dec4e06a2acc860d9d4fcfc
+EBUILD iwd-1.17.ebuild 4993 BLAKE2B 2f1615084b551a8e616452946e57b76707025f6a8ed64619fdd71d52a0fb7321e4209c079916d927a03aa940ef9378ecba6e194f3aeea3745bf7b8eda14a7f78 SHA512 632279d5eb37fa52b81b58711d644ed71c2d34574c81b983173a0bbb07901d16dc75d4d4b77d12eba1610e12886b8f87257f4199e731a7ba7c81dafcacbc26b9
 EBUILD iwd-9999.ebuild 4930 BLAKE2B ef4e6abb91312e52edc376f99664863d83ff87340a7a83e617b826d48fd85c8b70c95e0929a1c3461ec03bc45724ace0f287ce5b03cb381e6221b9414f38b93e SHA512 485aaca5116e7f13b5a76816bf0b98731c95f305b69e40ae717bad2da2760b8759eb2043c8f6888fa790854ed5f8b0039d920572af5e6396fd297aa2e2d06256
 MISC metadata.xml 832 BLAKE2B 904ff92a3b4e243fe9780fcb0ca0376c33f93669a77dbc8cfb345257dfec77057a54a41688b0cf5a9230a058d4e258096fa9664867b1c43dbc1bdc9662441838 SHA512 f8b8cb1b2d49159a23b8bfc27b6e54c0fd5509c16b6425881dd80f833586dde918f9a2d94a608b61689e30891c10780318197f10e703d9587a12179f98121442
diff --git a/net-wireless/iwd/files/iwd-1.17-fix-tests.patch b/net-wireless/iwd/files/iwd-1.17-fix-tests.patch
new file mode 100644
index 000000000000..cf3de4c1d38f
--- /dev/null
+++ b/net-wireless/iwd/files/iwd-1.17-fix-tests.patch
@@ -0,0 +1,35 @@
+From ed10b00afa3f4c087b46d7ba0b60a47bd05d8b39 Mon Sep 17 00:00:00 2001
+From: Denis Kenzior <denkenz@gmail.com>
+Date: Mon, 23 Aug 2021 08:51:35 -0500
+Subject: unit: Fix eapol IP Allocation test failure
+
+This test was failing due to a change introduced in commit
+5c9de0cf23f9 which changed handshake state storage of IPs from host
+order to network byte order.  Update the test to set IPs in network
+byte-order.
+
+Fixes: 5c9de0cf23f9 ("eapol: Store IP address in network byte order")
+---
+ unit/test-eapol.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/unit/test-eapol.c b/unit/test-eapol.c
+index b6a6adcb..470e0e9f 100644
+--- a/unit/test-eapol.c
++++ b/unit/test-eapol.c
+@@ -3802,9 +3802,9 @@ static void eapol_ap_sta_handshake_ip_alloc_ok_test(const void *data)
+ 	handshake_state_set_ssid(s.ap_hs, (void *) ssid, strlen(ssid));
+ 	handshake_state_set_pmk(s.ap_hs, psk, 32);
+ 	s.ap_hs->support_ip_allocation = true;
+-	s.ap_hs->client_ip_addr = 0x01020304;
+-	s.ap_hs->subnet_mask = 0xffff0000;
+-	s.ap_hs->go_ip_addr = 0x01020305;
++	s.ap_hs->client_ip_addr = L_CPU_TO_BE32(0x01020304);
++	s.ap_hs->subnet_mask = L_CPU_TO_BE32(0xffff0000);
++	s.ap_hs->go_ip_addr = L_CPU_TO_BE32(0x01020305);
+ 
+ 	handshake_state_set_authenticator(s.sta_hs, false);
+ 	handshake_state_set_event_func(s.sta_hs, test_ap_sta_hs_event, &s);
+-- 
+cgit 1.2.3-1.el7
+
diff --git a/net-wireless/iwd/iwd-1.17.ebuild b/net-wireless/iwd/iwd-1.17.ebuild
new file mode 100644
index 000000000000..91b133c1eb32
--- /dev/null
+++ b/net-wireless/iwd/iwd-1.17.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic linux-info systemd
+
+#Set this variable to the required external ell version
+ELL_REQ="0.43"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	MYRST2MAN="RST2MAN=:"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3
+standalone systemd"
+
+DEPEND="
+	sys-apps/dbus
+	client? ( sys-libs/readline:0= )
+"
+
+[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
+
+RDEPEND="
+	${DEPEND}
+	net-wireless/wireless-regdb
+	crda? ( net-wireless/crda )
+	standalone? (
+		systemd? ( sys-apps/systemd )
+		!systemd? ( virtual/resolvconf )
+	)
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils"
+
+PATCHES=( "${FILESDIR}"/iwd-1.17-fix-tests.patch )
+
+pkg_setup() {
+	CONFIG_CHECK="
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~CFG80211
+		~CRYPTO_AES
+		~CRYPTO_CBC
+		~CRYPTO_CMAC
+		~CRYPTO_DES
+		~CRYPTO_ECB
+		~CRYPTO_HMAC
+		~CRYPTO_MD4
+		~CRYPTO_MD5
+		~CRYPTO_RSA
+		~CRYPTO_SHA1
+		~CRYPTO_SHA256
+		~CRYPTO_SHA512
+		~CRYPTO_USER_API_HASH
+		~CRYPTO_USER_API_SKCIPHER
+		~KEY_DH_OPERATIONS
+		~PKCS7_MESSAGE_PARSER
+		~RFKILL
+		~X509_CERTIFICATE_PARSER
+	"
+	if use crda;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
+		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
+	fi
+
+	if use amd64;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
+		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_aes;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
+		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_ssse3 && use amd64; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
+		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
+	fi
+
+	if use kernel_linux && kernel_is -ge 4 20; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
+	fi
+
+	check_extra_config
+
+	if ! use crda; then
+		if use kernel_linux && kernel_is -lt 4 15; then
+			ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
+			ewarn "Regulatory domain support for kernels older than 4.15 requires crda."
+		fi
+		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
+			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
+		then
+			ewarn ""
+			ewarn "REGULATORY DOMAIN PROBLEM:"
+			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
+			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
+			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
+			ewarn ""
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
+		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == *9999* ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	append-cflags "-fsigned-char"
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
+		$(use_enable client)
+		$(use_enable monitor)
+		$(use_enable ofono)
+		$(use_enable wired)
+		--enable-systemd-service
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
+		--with-systemd-networkdir="$(systemd_get_utildir)/network"
+	)
+	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake ${MYRST2MAN}
+}
+
+src_install() {
+	emake DESTDIR="${D}" ${MYRST2MAN} install
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/iwd.initd-r1" iwd
+
+	if use wired;then
+		newinitd "${FILESDIR}/ead.initd" ead
+	fi
+
+	if [[ ${PV} == *9999* ]] ; then
+		exeinto /usr/share/iwd/scripts/
+		doexe test/*
+	fi
+
+	if use standalone ; then
+		local iwdconf="${ED}/etc/iwd/main.conf"
+		dodir /etc/iwd
+		echo "[General]" > "${iwdconf}"
+		echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
+		echo "[Network]" >> "${iwdconf}"
+		echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
+		dodir /etc/conf.d
+		echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd
+	fi
+}
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 4fe695188713..29bbf265b4b4 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -3,10 +3,10 @@ AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 DIST unifi-6.2.26.zip 152767218 BLAKE2B 8351b9c0b2088006560ca3896df0b05d78cb9ca669ad32b1d1a73ef22f4329618b44585bff9a26a841b3d28997bc345708df9820149de91b3fc1df99693c3a74 SHA512 fccffca9bcb31a1da2c389e83ea9a48e4cde6d958368d4d623d459bae095b57a4d7946086b0ac0e4dff5c4c565961ed2c11f7bc2dfbf8b5c6d590fb32af351e8
 DIST unifi-6.3.51.zip 158093467 BLAKE2B d2d2f87edff6b4a1d6e9fffd49e45c062f0e8cc8e8cba82229cecb8fbea847ed92d08ad8362763dd1476f2ba625d3ab3d9e392eca3f87cf2cce4573867985b8d SHA512 87dd0bfddba6716dd3a42f75b17e71253d33864b32b473083b8302f9deeb22f67b310366c0a768d9a2d8648038386bb3df926c333fd6bdd200b90740dd6c7b08
-DIST unifi-6.4.47.zip 159107424 BLAKE2B 60edb5b7454abaad94929eb25ace1216bf650f9bd0d089e8259c9e5233b6eae74a6068787a951f7fd424c1c99fc385299ccf0b237b106bac91fd0f308b57a41c SHA512 a0ded5114ffdd69814d2d535e11d6a332de37c00f726858b08ba2764d973c8898d9a621d595c7bce62036afebe0364a1d9ff4cb348cf39fe5fad9f2d6b1a495f
 DIST unifi-6.4.50.zip 158881298 BLAKE2B 652110bf3f54322721137c45594b407151ecd7b977795b8ec5d7c84db772342f0b270b868a597210df9f379682eca932a209e3bbd97e2ef2a4ab25c3b9de2b49 SHA512 63ff0e1603ebe3d16d0abce1eeab785a9912730c877ebfafb351e219bf1d449d8c5a61590a7ae5a87faab6ca587782e59b29d02a016202ed2c0a417e452f9af3
+DIST unifi-6.4.51.zip 158897176 BLAKE2B 9d3acdf5e0ba25bac4e701906519faf82c754a489c5fdec64f63a11b161ef99f223e2b2b4637208f85d9a2026472bb02356f6a008822b66fac0174936e7e533a SHA512 1ba504d96b604947021d42cde6cd0c9bad8e11ed499dbc11ceca59c0da449ac4d5ed6d80cfc1e1d48edbad0fa1921feccaf9ff57986a41ec39039e987e729120
 EBUILD unifi-6.2.26.ebuild 1576 BLAKE2B 36813058f867c56385f3bae6345e4a743f44d0ec8615bb5091e7ebd1d5d800a19a3b0f6c4bdaabed27d66c22041685565e2866b54148dfff41dafb89d70d4693 SHA512 0b411bc8df77d3cdae4ccc44991e6e5148f2479ae2389991abded23c4d182a8fa42c46c5a1134ba8311478026c86342be20af86767aafa57888c9938f228c6f7
 EBUILD unifi-6.3.51.ebuild 1577 BLAKE2B 75be5fa72e7b0b640e15298e657f93650cdb0c456684d66847fb1f1fbfcfe78a5ec27046b7076faa26954dc4d7b76535abac0323e56f8da931ecf3060f7481b2 SHA512 cdb50d024827efe3960dc62686ca022663c7124820813766e21404a5dab36335ab24c6dbe2efd88dd6c105c854764f41a9248de363bc30d1dd33d97f6a98019e
-EBUILD unifi-6.4.47.ebuild 1577 BLAKE2B ff98111e64a9a133c475d354f2fb7638fb222f09a9fbe0e180fbf6e6def057328b0a909fc403341672786472b1a0f5e36d785b37b40ab3338da430e0062c07ae SHA512 26ab07605435692fd5b3b00b837e2846c4aedd0e00c964de625db1e6be99b99218ce38a064b97690b497c48ba703942aa2334da8df99a1051964dda517698ce7
 EBUILD unifi-6.4.50.ebuild 1577 BLAKE2B fe30f77da7cc9b09359dec7e38aa4cbe606b315cbdc0ad022bf6a6cee6dc6e141a55dc01b2287fe5a8989a2a747e452583a6e72d5cd8fa2a3e35cb1c798e81f1 SHA512 c8d13a7e52df489375cf835b7e6af060be96b64edb683f3b98db842804959290afb591a778c28d0c3fef951d12cb999ffbe8ede45eb3742dd948eeddd7bbfebe
+EBUILD unifi-6.4.51.ebuild 1577 BLAKE2B 9d8d8cddfda54a76cbbe0d4e21fb4005629231f989742753ee46eff4dd979d8e6a670bdb214f9c754209a038f79c577d358d50bc225bb56503cb168c19c19617 SHA512 8816e2c877a2decd00f4ed2344393e2f8581d140b6050ba58d488e7739340b9eb899efa4453e2023bc6e045e62ee9bb4cbaacd255d6a3db1ff90394feefab1fa
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-6.4.47.ebuild b/net-wireless/unifi/unifi-6.4.47.ebuild
deleted file mode 100644
index 599f728622aa..000000000000
--- a/net-wireless/unifi/unifi-6.4.47.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Set this var for any releases except stable
-RC_SUFFIX="-8c13da2a29"
-
-inherit systemd
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="systemd"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	dev-db/mongodb
-	virtual/jre:1.8
-"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-	if ! use systemd; then
-		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
-	fi
-
-	default
-}
-
-src_install() {
-	insinto /usr/lib/unifi
-	doins -r bin dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-6.4.51.ebuild b/net-wireless/unifi/unifi-6.4.51.ebuild
new file mode 100644
index 000000000000..455c8fb34d81
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.4.51.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Set this var for any releases except stable
+RC_SUFFIX="-56f5e9d9a5"
+
+inherit systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="systemd"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:1.8
+"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+	if ! use systemd; then
+		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+	fi
+
+	default
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r bin dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f210ab306032..6d7d01e17bb2 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index c375bcdc9f57..f247b2e74c1a 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -1,9 +1,31 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Lars Wendler <polynomial-c@gentoo.org> (2021-07-09)
-# dev-libs/libbpf is not keyworded for m68k (yet?)
-sys-apps/iproute2 bpf
+# James Le Cuirot <chewi@gentoo.org> (2021-08-21)
+# Avoid having to keyword dev-python/sphinx and friends for now.
+dev-python/more-itertools doc
+dev-python/pexpect doc
+dev-python/cython doc
+dev-python/cffi doc
+dev-python/cssselect doc
+dev-python/execnet doc
+dev-python/jinja doc
+dev-python/lxml doc
+dev-python/py doc
+dev-python/pyasn1 doc
+dev-python/pygments doc
+
+# James Le Cuirot <chewi@gentoo.org> (2021-08-21)
+# Avoid lots of unkeyworded dependencies of Python tests.
+dev-python/argcomplete test
+dev-python/nose test
+dev-python/requests test
+dev-python/setuptools test
+dev-python/urllib3 test
+
+# James Le Cuirot <chewi@gentoo.org> (2021-08-20)
+# The CLI requires many unkeyworded dependencies.
+dev-python/hypothesis cli
 
 # Matt Turner <mattst88@gentoo.org> (2020-12-05)
 # dev-python/parameterized is not keyworded
@@ -34,10 +56,6 @@ net-libs/gnutls test-full
 # Needs libepoxy keywording, bug #510940
 x11-base/xorg-server wayland
 
-# Mikle Kolyada <zlogene@gentoo.org> (2013-07-11)
-# Tests for dev-perl/Error require >=dev-perl/Test-Pod-Coverage-1.40.0 (bug #351636)
-dev-perl/Error test
-
 # Raúl Porcel <armin76@gentoo.org> (2013-01-23)
 # Architecture is unsupported
 dev-libs/libpcre jit
@@ -47,10 +65,3 @@ dev-libs/libpcre2 jit
 # graphite requires dev-libs/ppl & dev-libs/cloog-ppl
 # (bugs #269087 and #269088)
 sys-devel/gcc graphite awt
-
-# Mike Frysinger <vapier@gentoo.org> (2011-02-10)
-# Waiting for keywording #354309
-net-firewall/iptables netlink
-
-# Masking these to keep repoman happy
-media-gfx/graphviz perl
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index de86bafc3fc2..be156ba36b61 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -4,6 +4,22 @@
 # Unmask the flag which corresponds to ARCH.
 -m68k
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-08-22)
+# app-arch/zstd is broken
+zstd
+
+# James Le Cuirot <chewi@gentoo.org> (2021-08-20)
+# There is a community effort to bring Rust to m68k but it's not ready yet.
+rust
+
+# James Le Cuirot <chewi@gentoo.org> (2021-08-20)
+# Qt is not keyworded or tested.
+qt5
+
+# James Le Cuirot <chewi@gentoo.org> (2021-08-20)
+# dev-libs/efl has many unkeyworded dependencies.
+efl
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-23)
 # valgrind has no m68k port.
 valgrind
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index e19e84d3ba85..d1c3e6c4b929 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,22 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-08-25)
+# sys-fabric/infinipath-psm does not support riscv
+sys-cluster/openmpi openmpi_fabrics_psm
+sys-fabric/ofed ofed_drivers_psm
+
+# Marek Szuba <marecki@gentoo.org> (2021-08-23)
+# sys-cluster/ceph keywording blocked by libatomic issues in dev-libs/rocksdb-6.14,
+# see Bug #809830.
+net-analyzer/rrdtool rados
+
+# Marek Szuba <marecki@gentoo.org> (2021-08-22)
+# net-fs/openafs does not support riscv
+app-crypt/heimdal afs
+# app-editors/xemacs reports arch as unknown, fails to build
+dev-lang/ruby xemacs
+
 # Yixun Lan <dlan@gentoo.org> (2021-08-20)
 # dependencies not keyworded/tested
 net-misc/networkmanager ofono
@@ -12,21 +28,15 @@ media-sound/jack2 ieee1394
 
 # Alex Fan <alexfanqi@yahoo.com> (2021-08-17)
 # dependencies not keyworded/tested
-sys-apps/xdg-desktop-portal screencast
 kde-plasma/powerdevil wireless
-kde-plasma/plasma-vault networkmanager
 kde-plasma/plasma-desktop emoji
-kde-plasma/ksystemstats networkmanager
 kde-plasma/libksysguard webengine
 kde-frameworks/kfilemetadata ffmpeg
 kde-plasma/plasma-workspace appstream screencast gps geolocation
 kde-plasma/kdeplasma-addons webengine
-kde-plasma/plasma-meta networkmanager accessibility grub plymouth pulseaudio
+kde-plasma/plasma-meta accessibility grub plymouth pulseaudio
 kde-plasma/discover firmware flatpak
 kde-plasma/kwin accessibility screencast
-kde-plasma/plasma-firewall firewalld
-# vlc has libatomic issue, bug #803473
-media-libs/phonon vlc gstreamer
 
 # Marek Szuba <marecki@gentoo.org> (2021-08-17)
 # sys-libs/libfaketime does not work properly on this arch
@@ -51,10 +61,6 @@ dev-ruby/webmock test
 # does not support riscv. Hopefully temporary, see Bug #807772.
 net-libs/libproxy spidermonkey
 
-# Alex Fan <alexfanqi@yahoo.com> (2021-08-12)
-# lua requires specifically luajit for gimp
-media-gfx/gimp lua unwind
-
 # Alex Fan <alexfanqi@yahoo.com> (2021-08-09)
 # ipython[qt5] depends on qtconsole, which depends on QtPy.
 # QtPy cannot be tested atm because QtPy[test] has a hard
@@ -66,6 +72,8 @@ dev-python/ipython qt5
 # These USE flags depend on java, not (sustainably) supported yet
 #  - dev-tex/pdfannotextractor
 app-text/texlive pdfannotextractor
+#  - JDK
+media-libs/rubberband jni
 #  - dev-java/jackcess
 sci-libs/gdal mdb
 
@@ -97,10 +105,12 @@ kde-frameworks/solid ios
 # though.
 <sci-libs/hdf5-1.12.1 fortran debug
 
+# Alex Fan <alexfanqi@yahoo.com> (2021-08-12)
 # Marek Szuba <marecki@gentoo.org> (2021-07-14)
 # LuaJIT does not support riscv
 app-text/texlive-core luajittex
 dev-texlive/texlive-basic luajittex
+media-gfx/gimp lua
 www-servers/nginx nginx_modules_http_lua
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-11)
@@ -121,65 +131,33 @@ dev-python/ipython nbconvert notebook
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-05)
 # Dependencies not keyworded here yet:
-#  - net-fs/openafs
-app-crypt/heimdal afs
-#  - gnome-base/gconf, dev-libs/libotf & dev-libs/m17n-lib
-app-editors/emacs gconf m17n-lib
-#  - dev-embedded/libftdi, app-misc/inputlircd
-app-misc/lirc ftdi inputlirc
-#  - app-xemacs/ruby-modes (and by extension xemacs itself)
-dev-lang/ruby xemacs
 #  - dev-ruby/asciidoctor
 dev-libs/nanomsg doc
-#  - app-text/dblatex & media-gfx/transfig
-dev-util/ragel doc
-#  - Qt5 & KDE
-dev-vcs/subversion kwallet
-#  - kde-frameworks/bluez-qt
-kde-frameworks/purpose bluetooth
 #  - kde-plasma/bluedevil
 kde-plasma/plasma-meta bluetooth
-#  - media-libs/dumb
-media-libs/allegro dumb
 #  - media-gfx/nvidia-texture-tools
 media-libs/devil nvtt
 #  - dev-lang/php
 media-libs/libvpx doc
+#  - dev-cpp/glog, sci-libs/vtk
+media-libs/opencv contribsfm glog vtk
 #  - net-misc/ofono
 media-sound/pulseaudio ofono-headset
-#  - media-libs/vo-amrwbenc, media-libs/libbs2b, dev-libs/libcdio-paranoia,
-#    media-libs/codec2, media-plugins/frei0r-plugins,
-#    media-libs/kvazaar, media-libs/libilbc,
-#    app-text/tesseract, media-libs/lv2 & media-libs/lilv, media-libs/rubberband,
-#    media-libs/vidstab, media-libs/xvid, media-libs/zimg
-media-video/ffmpeg amrenc bs2b cdio codec2 frei0r kvazaar libilbc libtesseract lv2 rubberband vidstab xvid zimg
-#  - media-libs/libquicktime, media-libs/sdl-gfx
-media-video/mjpegtools quicktime sdlgfx
-#  - sys-cluster/ceph
-net-analyzer/rrdtool rados
 #  - net-wireless/iwd, net-misc/ofono
 net-misc/connman iwd ofono
 #  - dev-util/aruba
 sys-block/thin-provisioning-tools test
-#  - sys-cluster/knem, sys-fabric/infinipath-psm
-sys-cluster/openmpi openmpi_fabrics_knem openmpi_fabrics_psm
 #  - sys-fabric/ofed
 sys-cluster/slurm ofed
 
 # Yixun Lan <dlan@gentoo.org> (2021-05-24)
 # Dependencies not keyworded, not tested
-dev-libs/libdbusmenu test
-virtual/notification-daemon gnome kde
-media-libs/libcaca doc imlib
-dev-libs/libbytesize test
-sys-libs/libblockdev dmraid escrow
-gnome-base/gvfs bluray cdda mtp ios
-sys-power/upower ios
+virtual/notification-daemon gnome
 net-libs/gnome-online-accounts gnome
-net-libs/libproxy kde
-xfce-extra/tumbler epub ffmpeg odf pdf raw
+xfce-extra/tumbler epub
 xfce-base/xfce4-meta pulseaudio
 
+# Alex Fan <alexfanqi@yahoo.com> (2021-08-17)
 # Ye Cao <ye.c@rioslab.org> (2021-07-31)
 # Piotr Karbowski <slashbeast@gentoo.org> (2021-06-22)
 # Yixun Lan <dlan@gentoo.org> (2021-05-21)
@@ -189,6 +167,7 @@ xfce-base/xfce4-meta pulseaudio
 dev-libs/efl unwind
 dev-util/perf unwind
 dev-util/strace unwind
+media-gfx/gimp unwind
 media-libs/gstreamer unwind
 media-libs/mesa unwind
 net-libs/zeromq unwind
@@ -196,17 +175,6 @@ net-mail/dovecot unwind
 x11-base/xorg-server unwind
 x11-base/xwayland unwind
 
-# Alex Fan <alexfanqi@yahoo.com> (2021-07-22)
-# Yixun Lan <dlan@gentoo.org> (2021-05-24)
-# net-misc/networkmanager fails tests on this arch (Bug #807553)
-dev-qt/qtnetwork networkmanager
-net-libs/libproxy networkmanager
-xfce-extra/xfce4-power-manager networkmanager
-
-# Joonas Niilola <juippis@gentoo.org> (2021-01-15)
-# Dependency not keyworded on this arch.
-app-text/enchant voikko
-
 # This doesn't work for (any) riscv yet.
 dev-libs/libpcre2 jit
 dev-libs/libpcre jit
diff --git a/profiles/base/packages b/profiles/base/packages
index f8229f7a0b63..e0cee163af99 100644
--- a/profiles/base/packages
+++ b/profiles/base/packages
@@ -24,6 +24,7 @@
 # of the minimum set of packages needed for any Gentoo based system.
 
 *>=sys-apps/baselayout-2
+*app-admin/eselect
 *app-arch/bzip2
 *app-arch/gzip
 *app-arch/tar
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 889fb1a16ebc..d5ff47743a6e 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -8,10 +8,6 @@
 # Mask Ruby 2.5 as EOL
 ruby_targets_ruby25
 
-# Aaron W. Swenson <titanofold@gentoo.org> (2021-07-05)
-# PostgreSQL 9.5 masked for removal
-postgres_targets_postgres9_5
-
 # Brian Evans <grknight@gentoo.org> (2021-01-07)
 # PHP 7.2 is security vulnerable and end-of-life
 # Please upgrade to a newer slot
diff --git a/profiles/default/linux/packages.build b/profiles/default/linux/packages.build
index 6add4b8900c6..6075223d5e16 100644
--- a/profiles/default/linux/packages.build
+++ b/profiles/default/linux/packages.build
@@ -7,6 +7,7 @@
 # While shadow could be in here, it breaks stage 1 and stage 2 building for the
 # releases.  PLEASE DO NOT ENABLE THIS UNLESS YOU HAVE THOROUGHLY TESTED IT!
 
+app-admin/eselect
 app-arch/bzip2
 app-arch/gzip
 app-arch/xz-utils
diff --git a/profiles/desc/postgres_targets.desc b/profiles/desc/postgres_targets.desc
index 6cddcb149b7d..a6e6798121fa 100644
--- a/profiles/desc/postgres_targets.desc
+++ b/profiles/desc/postgres_targets.desc
@@ -3,9 +3,6 @@
 
 # This file contains descriptions of POSTGRES_TARGETS USE_EXPAND flags.
 
-postgres9_3 - Build against PostgreSQL 9.3
-postgres9_4 - Build against PostgreSQL 9.4
-postgres9_5 - Build against PostgreSQL 9.5
 postgres9_6 - Build against PostgreSQL 9.6
 postgres10 - Build against PostgreSQL 10
 postgres11 - Build against PostgreSQL 11
diff --git a/profiles/package.mask b/profiles/package.mask
index 650a631bfada..83298c102397 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -285,89 +285,6 @@ dev-java/jgoodies-forms
 # breaks if not all at least many revdeps. #805011 for tracker bug.
 >=net-libs/mbedtls-3.0.0
 
-# Sam James <sam@gentoo.org> (2021-07-26)
-# Fails to build with GCC 11. No activity upstream.
-# Removal on 2021-08-26. bug #740536, bug #624746.
-media-sound/tapestrea
-
-# Sam James <sam@gentoo.org> (2021-07-26)
-# Rather out of date, several open bugs, fails to build with GCC 11.
-# Removal in 2021-08-26.
-# bug #793020, bug #692976, bug #741600, bug #703948, bug #674334.
-sci-misc/tango
-
-# Sam James <sam@gentoo.org> (2021-07-26)
-# Fails to build with GCC 11.
-# Removal on 2021-08-26. bug #788577.
-net-im/minbif
-
-# Sam James <sam@gentoo.org> (2021-07-26)
-# No activity upstream. No reverse dependencies (library).
-# Fails to build with GCC 11.
-# Removal on 2021-08-26. bug #787113, bug #735714, bug #657510.
-dev-cpp/libxsd-frontend
-dev-cpp/libcutl
-dev-util/build
-
-# John Helmert III <ajak@gentoo.org> (2021-07-26)
-# Open security bug, service backing it seems to be dead, making these
-# packages useless. Old EAPIs. Removal on 2021-08-26. Bug #630814
-app-portage/getdelta
-app-portage/deltup
-
-# John Helmert III <ajak@gentoo.org> (2021-07-26)
-# Maintained needed, open security bug, uninterested upstream.
-# No revdeps. Removal on 2021-08-26. Bug #752408.
-app-text/lout
-
-# David Seifert <soap@gentoo.org> (2021-07-26)
-# Fails to build with GCC 11, terrible codebase, tests fail with
-# modern ImageMagick, last release over 12 years ago.
-# Bug #725436, #786915, removal in 30 days.
-sci-electronics/drawtiming
-
-# Sam James <sam@gentoo.org> (2021-07-25)
-# No activity upstream since 2014. Fails to build with GCC 11.
-# Only one reverse dependency (media-libs/openexr_ctl) which
-# is uninstallable.
-# Removal on 2021-08-25. bug #789792, bug #715298.
-media-libs/openexr_ctl
-
-# Michał Górny <mgorny@gentoo.org> (2021-07-25)
-# Conflicts with dev-python/pyxdg.  Upstream is unwilling to resolve
-# this.  The only revdep has been patched to use pyxdg.
-# Removal on 2021-08-24.  Bug #804127.
-dev-python/xdg
-
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-07-24)
-# API, its only consumer is last-rited
-# removal in 30 days
-dev-java/jsr101
-
-# Michał Górny <mgorny@gentoo.org> (2021-07-23)
-# Abandoned.  All versions are vulnerable to CVE-2021-33909.
-# sys-kernel/gentoo-kernel{,-bin} are the suggested replacements.
-# Removal on 2021-08-06.  Bug #803212.
-sys-kernel/bliss-kernel-bin
-
-# Conrad Kostecki <conikost@gentoo.org> (2021-07-23)
-# Outdated and multiple bugs open.
-# Other alternatives in tree available.
-# Removal in 30 days (2021-08-22)
-www-servers/resin
-
-# Alfredo Tupone <tupone@gentoo.org> (2021-07-23)
-# Requirements conflicts so it is not buildable
-# No revdep. Retire in 30 days (2021-08-22)
-dev-ml/cstruct
-
-# Hans de Graaff <graaff@gentoo.org> (2021-07-18)
-# Compatibility package for ruby 1.8. No longer maintained upstream.
-# Last release in 2016, but current release in gentoo is from 2012.
-# No reverse dependencies.
-# Masked for removal in 30 days.
-dev-ruby/sfl
-
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2021-07-12)
 # Version 3.3.0 suffers from ridiculously high CPU usage, this version has
 # therefore been retracted upstream.
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index b06b52c76822..70b202547e6d 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,8 +1,3 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (2021-01-10)
-# fails to compile on regex and nonull definitions in
-# gnulib/malloc/dynarray-skeleton.c
-=net-misc/wget-1.21.1
-=sys-apps/findutils-4.8.0
diff --git a/profiles/prefix/make.defaults b/profiles/prefix/make.defaults
index cf9a80a85256..ae8d46ef32d6 100644
--- a/profiles/prefix/make.defaults
+++ b/profiles/prefix/make.defaults
@@ -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
 
 # Some USE-flags that only die-hards don't want:
diff --git a/profiles/targets/desktop/plasma/make.defaults b/profiles/targets/desktop/plasma/make.defaults
index 1a55f5454a26..443e5705c4c6 100644
--- a/profiles/targets/desktop/plasma/make.defaults
+++ b/profiles/targets/desktop/plasma/make.defaults
@@ -1,4 +1,4 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-USE="activities declarative dri kde kipi kwallet phonon plasma policykit qml semantic-desktop widgets"
+USE="activities declarative dri kde kipi kwallet plasma policykit qml semantic-desktop widgets"
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index b65158ad3832..caaffc9ab3c8 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -54,3 +54,11 @@ sys-libs/zlib minizip
 
 # Required by kde-plasma/kwin; >=1.20.13-r1 has dropped the flag
 <x11-base/xorg-server-1.20.13-r1 wayland
+
+# Keep existing defaults after dropping IUSE=phonon from make.defaults
+<kde-frameworks/knotifications-5.85 phonon
+<kde-frameworks/knotifyconfig-5.85 phonon
+<app-office/calligra-3.3 phonon
+kde-apps/kio-extras phonon
+kde-apps/marble phonon
+
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3c9fb298ef18..288ea845df62 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2431,8 +2431,6 @@ dev-python/msgpack:native-extensions - Compiles native "C" extensions (speedups,
 dev-python/nbdime:webtools - Install web-based diff and merge tools.
 dev-python/netaddr:cli - Enable netaddr shell with dev-python/ipython
 dev-python/networkx:extras - Provide graph drawing and graph layout algorithms along with shapefile format reading and writing
-dev-python/networkx:pandas - Provides a DataFrame, which is a tabular data structure with labeled axes
-dev-python/networkx:scipy - Enables scipy backend
 dev-python/networkx:yaml - Provides YAML format reading and writing
 dev-python/nltk-data:extra - Install the complete set of data files. Otherwise, only files required by tests are installed.
 dev-python/numexpr:mkl - Enable support for Intel Vector Math Library, part of sci-libs/mkl.
@@ -2624,6 +2622,7 @@ dev-qt/qtgui:eglfs - Build the EGL Full Screen/Single Surface platform plugin
 dev-qt/qtgui:evdev - Enable support for input devices via evdev
 dev-qt/qtgui:ibus - Build the IBus input method plugin
 dev-qt/qtgui:libinput - Enable support for input devices via dev-libs/libinput
+dev-qt/qtgui:linuxfb - Enable Linux framebuffer support for embedded devices
 dev-qt/qtgui:tslib - Enable support for touchscreen devices via x11-libs/tslib
 dev-qt/qtgui:tuio - Build plugin to receive touch events over the TUIO protocol
 dev-qt/qtgui:vulkan - Enable support for Vulkan
@@ -2642,6 +2641,7 @@ dev-qt/qtquickcontrols:widgets - Enable QtWidgets support
 dev-qt/qtquickcontrols2:widgets - Enable QtWidgets support
 dev-qt/qtscript:scripttools - Build the QtScriptTools module (requires QtWidgets)
 dev-qt/qtsensors:qml - Build QML bindings
+dev-qt/qtspeech:flite - Enable text-to-speech synthesizer plugin using app-accessibility/flite engine
 dev-qt/qtvirtualkeyboard:handwriting - Adds handwriting recognition integration support
 dev-qt/qtwayland:vulkan - Enable support for Vulkan-based server buffer integration
 dev-qt/qtwebchannel:qml - Build QML/QtQuick bindings and imports
@@ -2811,6 +2811,7 @@ dev-util/google-perftools:minimal - Only build the tcmalloc_minimal library, ign
 dev-util/google-perftools:optimisememory - To build libtcmalloc with smaller internal caches.
 dev-util/heaptrack:gui - Install Qt5-based analyzer tool
 dev-util/hfstospell:clang - Use different logic in ebuild when clang is used
+dev-util/intel-graphics-system-controller:cli - Build CLI tools for flashing manually a firmware upgrade.
 dev-util/intel-ocl-sdk:android - Install android related files
 dev-util/intel-ocl-sdk:system-boost - Use system boost (dev-libs/boost) instead of bundled one
 dev-util/intel-ocl-sdk:system-tbb - Use system Thread Building Blocks (dev-cpp/tbb) instead of bundled one
@@ -3203,7 +3204,6 @@ games-simulation/simutrans:pak192-comic - Install comic-like scenario data
 games-simulation/train-valley:gui - Install the GUI for configuring screen resolution and input
 games-sports/speed-dreams:osggraph - Enable the new work-in-progress 3D engine using dev-games/openscenegraph
 games-sports/speed-dreams:webstats - Enable support for sending racing statistics to a web server (experimental)
-games-sports/speed-dreams:xrandr - Enable support for the X xrandr extension
 games-sports/xmoto:double-precision - more precise calculations at the expense of speed
 games-strategy/0ad:editor - Include Atlas scenario editor projects
 games-strategy/0ad:lobby - Enable the use of net-libs/gloox and the multiplayer lobby
@@ -3369,8 +3369,6 @@ gui-wm/hikari:layershell - add support for wayland apps using layer shell
 gui-wm/hikari:screencopy - add support for screen grabbing
 gui-wm/hikari:virtual-io - enable virtual input/output support, needed for remote I/O in VNC
 gui-wm/sway:X - Enable support for X11 applications (XWayland)
-gui-wm/sway:elogind - Enable support for rootless session via elogind
-gui-wm/sway:seatd - Enable support for rootless session via sys-auth/seatd
 gui-wm/sway:swaybar - Install 'swaybar': sway's status bar component
 gui-wm/sway:swaybg - Install 'swaybg': allows to set a desktop background image
 gui-wm/sway:swayidle - Install 'swayidle': idle manager to run commands when user is inactive
@@ -3536,7 +3534,7 @@ kde-frameworks/kitemviews:designer - Build plugins for dev-qt/designer
 kde-frameworks/knewstuff:opds - Enable support for the Open Publication Distribution System via kde-frameworks/syndication
 kde-frameworks/knotifications:phonon - Play notification sounds via media-libs/phonon instead of media-libs/libcanberra
 kde-frameworks/knotifications:speech - Enable text-to-speech notification support
-kde-frameworks/knotifyconfig:phonon - Add sound support via media-libs/phonon
+kde-frameworks/knotifyconfig:phonon - Play notification sounds via media-libs/phonon instead of media-libs/libcanberra
 kde-frameworks/kplotting:designer - Build plugins for dev-qt/designer
 kde-frameworks/krunner:activities - Enable search runner for KDE Activities history
 kde-frameworks/ktexteditor:editorconfig - Enable support for EditorConfig configuration files
@@ -3557,6 +3555,7 @@ kde-misc/kdeconnect:wayland - Enable remote input mousepad plugin using kde-fram
 kde-misc/kimtoy:scim - Enable Smart Common Input Method support
 kde-misc/kio-gdrive:kaccounts - Use kde-apps/kaccounts-integration backend (default) instead of dev-libs/qtkeychain
 kde-misc/kio-gdrive:share - Enable support for a share menu using kde-frameworks/purpose
+kde-misc/tellico:bibtex - Add support for bibtex importing using btparse from dev-perl/Text-BibTeX
 kde-misc/tellico:discid - Add support for reading disc IDs from audio CDs
 kde-misc/tellico:yaz - Add support for searching Z39.50 databases
 kde-plasma/discover:firmware - Enable support for firmware upgrades using sys-apps/fwupd
@@ -5815,6 +5814,7 @@ net-im/telepathy-connection-managers:yahoo - Enable Yahoo! messaging support.
 net-im/telepathy-connection-managers:zeroconf - Enable Link-Local Messaging via the zeroconf or Bonjour protocol.
 net-im/tkabber:plugins - Enables installation the extra plugins
 net-im/toxic:audio-notify - Enables native sound notifications
+net-im/toxic:games - Enables some small mini-games
 net-im/toxic:llvm - Enables support for LLVM Address Sanitizer
 net-im/toxic:notification - Enables desktop notifications with libnotify, with sound support.
 net-im/toxic:qrcode - Enables QR code support
@@ -6341,6 +6341,7 @@ net-misc/curl:mbedtls - Enable mbedtls ssl backend
 net-misc/curl:metalink - Enable metalink support
 net-misc/curl:nghttp3 - Enable HTTP/3.0 support using net-libs/nghttp3 and net-libs/ngtcp2
 net-misc/curl:nss - Enable nss ssl backend
+net-misc/curl:ntlm - Enable ntlm support
 net-misc/curl:openssl - Enable openssl ssl backend
 net-misc/curl:pop3 - Enable Post Office Protocol 3 support
 net-misc/curl:progress-meter - Enable the progress meter
@@ -6468,20 +6469,24 @@ net-misc/mrouted:rsrr - Enable Routing Support for Resource Reservations, for RS
 net-misc/mulk:checksum - Enable checksum verification for Metalink from dev-libs/openssl
 net-misc/mulk:metalink - Enable support for media-libs/libmetalink
 net-misc/netkit-bootparamd:libtirpc - Build against net-libs/libtirpc for RPC support
+net-misc/networkmanager:concheck - Enable connectivity checking support
 net-misc/networkmanager:connection-sharing - Support connection sharing (uses net-dns/dnsmasq)
 net-misc/networkmanager:dhclient - Use dhclient from net-misc/dhcp for getting an IP via DHCP
 net-misc/networkmanager:dhcpcd - Use net-misc/dhcpcd for getting an IP
 net-misc/networkmanager:elogind - Use sys-auth/elogind for session tracking
 net-misc/networkmanager:iptables - Use net-firewall/iptables for connection sharing
 net-misc/networkmanager:iwd - Use net-wireless/iwd instead of net-wireless/wpa_supplicant for wifi support by default
+net-misc/networkmanager:lto - Build using Link Time Optimizations (LTO)
 net-misc/networkmanager:modemmanager - Enable support for mobile broadband devices using net-misc/modemmanager
 net-misc/networkmanager:nftables - Use net-firewall/nftables for connection sharing
 net-misc/networkmanager:nss - Use dev-libs/nss for cryptography
 net-misc/networkmanager:ofono - Use net-misc/ofono for telephony support.
 net-misc/networkmanager:ovs - Enable OpenVSwitch support
 net-misc/networkmanager:ppp - Enable support for mobile broadband and PPPoE connections using net-dialup/ppp
+net-misc/networkmanager:psl - Use public suffix list via net-libs/libpsl
 net-misc/networkmanager:resolvconf - Use net-dns/openresolv for managing DNS information in /etc/resolv.conf. Generally, a symlink to /run/NetworkManager/resolv.conf is simpler. On systems running systemd-resolved, disable this flag and create a symlink to /run/systemd/resolve/stub-resolv.conf.
 net-misc/networkmanager:teamd - Enable Teamd control support
+net-misc/networkmanager:tools - Build cli tools such as nmcli, nmtui and nm_cloud_setup
 net-misc/networkmanager:wext - Enable support for the deprecated Wext (Wireless Extensions) API; needed for some older drivers (e.g. ipw2200, ndiswrapper)
 net-misc/networkmanager:wifi - Enable support for wifi and 802.1x security
 net-misc/nextcloud-client:dolphin - Install the kde-apps/dolphin extension
@@ -6643,11 +6648,11 @@ net-misc/wget:metalink - Enable support for media-libs/libmetalink
 net-misc/wget:ntlm - Enable support for NTLM (Windows-based) authorization
 net-misc/wget:uuid - Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)
 net-misc/wget2:brotli - Enable support for brotli compression
-net-misc/wget2:gpgme - Build gpgme backend
-net-misc/wget2:http2 - Enable HTTP/2.0 support
+net-misc/wget2:gpgme - Build app-crypt/gpgme backend
+net-misc/wget2:http2 - Enable HTTP/2.0 support via net-libs/nghttp2
 net-misc/wget2:openssl - Enable crypto support via dev-libs/openssl
-net-misc/wget2:psl - Use public suffix list via media-libs/libnspsl
-net-misc/wget2:valgrind - Depend on dev-util/vagrind for test suite
+net-misc/wget2:psl - Use public suffix list via net-libs/libpsl
+net-misc/wget2:valgrind - Depend on dev-util/valgrind for test suite
 net-misc/whois:xcrypt - Enable crypt through sys-libs/libxcrypt package
 net-misc/x2goserver:fuse - Use net-fs/sshfs to allow shared folders
 net-misc/xmrig:donate - Set the default donation level to 1% instead of 0
@@ -7522,9 +7527,6 @@ sci-misc/h5utils:octave - Build Octave plugins
 sci-misc/nco:dap - Support for remote data access with the NETCDF DAP client
 sci-misc/nco:ncap2 - Build next generation netcdf arithmetic processor (needs dev-java/antlr)
 sci-misc/nco:udunits - Add sci-libs/udunits files support
-sci-misc/tango:dbserver - Enable build of tango dbserver
-sci-misc/tango:mariadb - Use dev-db/mariadb
-sci-misc/tango:zeromq - Allow to use ZeroMQ broker via net-libs/zeromq
 sci-physics/bullet:double-precision - Build libraries in double precision
 sci-physics/bullet:extras - Build the extras
 sci-physics/bullet:tbb - Enable multithreading with the Intel Threads Building Block dev-cpp/tbb
@@ -8269,7 +8271,6 @@ sys-fs/zfs:test-suite - Install regression test suite
 sys-fs/zfs-auto-snapshot:cron - Install /etc/cron.* files
 sys-fs/zfs-auto-snapshot:default-exclude - Only take snapshots of datasets with com.sun:auto-snapshot=true property set
 sys-fs/zfs-kmod:rootfs - Install zfs-shutdown script to support exporting a pool containing rootfs
-sys-kernel/bliss-kernel-bin:initramfs - Build initramfs along with the kernel.
 sys-kernel/genkernel:firmware - Prefer system firmware sys-kernel/linux-firmware over local copy.
 sys-kernel/gentoo-kernel:hardened - Use selection of hardening options recommended by Kernel Self Protection Project
 sys-kernel/gentoo-kernel:initramfs - Build initramfs along with the kernel.
@@ -8642,7 +8643,6 @@ www-servers/nginx-unit:php7-3 - Support for PHP 7.3
 www-servers/nginx-unit:php7-4 - Support for PHP 7.4
 www-servers/pshs:magic - Enable automatic detection of Content-Type using libmagic (sys-apps/file)
 www-servers/pshs:qrcode - Enable generating QRCodes for server URL
-www-servers/resin:admin - Enable Resin admin webapp
 www-servers/sniproxy:dns - Enable DNS resolver via net-libs/udns
 www-servers/sniproxy:largefile - Enable large file support (so we can log more than 2GB)
 www-servers/sniproxy:rfc3339 - Use RFC3339 timestamp format in log.
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 1be341788cfa..ef5ed336ca9a 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/mrbayes/Manifest b/sci-biology/mrbayes/Manifest
index faf3dab4cfed..160f7b2aef62 100644
--- a/sci-biology/mrbayes/Manifest
+++ b/sci-biology/mrbayes/Manifest
@@ -1,4 +1,4 @@
-AUX mb_readline_312.patch 1108 BLAKE2B 4413b4193ee7c0c51a1ad7a422474f137682151f932b28fc6ee98390a228a4e5bbabcf30f3d78fc56a79a665ffc40bf05376fbbf14b68ff43bc10a9001ec8e6e SHA512 0a169b8560853dbff87c983bf8220384dcf22f53106ce5711bf3b1fc76d8a9adbf1860618176dde65a8657abe3ad888521bf5485fc00d4014adf1acb7ba3f114
+AUX mb_readline_312.patch 586 BLAKE2B 6505a8d9fc40c0470264b6e293f2f4e51a5d6b4a73dfeaff747e2f4acd122369d810cdc86ae0d7cead3a3741cfffc02080c07618c2847985553322a1c9bf79b5 SHA512 8427c83ccb98c0b57274914d8f0d0f539ace7dbc475eb10bd586762efa3465b595b91907b55d6809b94e6b9c4f65aa139bc16a7d81b1c76f7623eae46d495aa8
 DIST mrbayes-3.1.2.tar.gz 545968 BLAKE2B f4c5bbdde765fb9e596c17d5fd890b168c22cefb0d24b67c1c68623e1dcfa4df716a896fe120f7a1cac4234125b6ed524973506e47492ba3ec26e389783d618a SHA512 2fb0ee7224cbb69c1acf2ffb0c6c8974f63002cda4f39a626eadf80fad9cfc23861f8c03f5545970f3a81e02093d62b6a0549ab7d7f7080557e91e21b2c3ee14
-EBUILD mrbayes-3.1.2-r2.ebuild 1344 BLAKE2B f0b52d8b615dabe59d1d1e2dedbeb3f86513127fd3b2112783e64c38b812a3a998f5b33c397b7d9f1b333ed58bcc8ecdce8d5d5c4f73d2abe29ba631c3929d48 SHA512 d64b835015f70b4c28c3bfe37438be5e27c42b4546e24f8f4c40089f9ca98d5b29b7340fa88efa7fb9f764cb46c4396ced213ca9d35c3d64f33454b6a4854f9b
+EBUILD mrbayes-3.1.2-r2.ebuild 1346 BLAKE2B 282f7f2bf6abb8370b5a007a8e680009f3f5e8e839d7817a1cb3b83e515b2909d5a9c7aa3eae6355ab59c4e1e2e4b9a7f8694076d50b019232fa367cd93df231 SHA512 60541b7af0243c4263d302d69ea38c6f1fcee96739eba121a48bf42e2b46f210efa971d65d0d517ed6b383fb6ce337008b13655c4f52e2783d456a04b43b9eb7
 MISC metadata.xml 916 BLAKE2B 511d932eff0de935a1c8634cc6398bfe6cceb7f2766534e5486f5ff2aa4c900b8d48d7dabc5cee2506061c36421f0ef336f43b5df5d23a03ab5911a1fef87b1b SHA512 ab6be2e4111088bc13e6da5f65d11437dc05dbcdeab83e5d3899b913ff9ad3dc1f22ec81f2fe73f60bf991d01f0a8691eaa124ba24bd7ebb17d995fdd271bfef
diff --git a/sci-biology/mrbayes/files/mb_readline_312.patch b/sci-biology/mrbayes/files/mb_readline_312.patch
index 2f8bab1e7665..d41986704708 100644
--- a/sci-biology/mrbayes/files/mb_readline_312.patch
+++ b/sci-biology/mrbayes/files/mb_readline_312.patch
@@ -1,25 +1,13 @@
-Index: Makefile
-===================================================================
-RCS file: /cvsroot/mrbayes/mrbayes/Makefile,v
-retrieving revision 3.23
-retrieving revision 3.24
-diff -U2 -r3.23 -r3.24
---- Makefile	22 Dec 2005 16:13:06 -0000	3.23
-+++ Makefile	3 Jan 2006 16:43:13 -0000	3.24
+--- a/Makefile
++++ b/Makefile
 @@ -50,4 +50,5 @@
  ifeq  ($(strip $(USEREADLINE)),yes)
      CFLAGS += -DUSE_READLINE
 +#   CFLAGS += -DCOMPLETIONMATCHES
  	LIBS += -lncurses -lreadline 
  endif
-Index: bayes.c
-===================================================================
-RCS file: /cvsroot/mrbayes/mrbayes/bayes.c,v
-retrieving revision 3.39
-retrieving revision 3.40
-diff -U2 -r3.39 -r3.40
---- bayes.c	23 Dec 2005 16:26:28 -0000	3.39
-+++ bayes.c	3 Jan 2006 16:43:13 -0000	3.40
+--- a/bayes.c
++++ b/bayes.c
 @@ -382,9 +382,11 @@
  char **readline_completion(const char *text, int start, int stop) {
  	char **matches = (char **) NULL;
diff --git a/sci-biology/mrbayes/mrbayes-3.1.2-r2.ebuild b/sci-biology/mrbayes/mrbayes-3.1.2-r2.ebuild
index ecc44fe43454..cee9e0f2d286 100644
--- a/sci-biology/mrbayes/mrbayes-3.1.2-r2.ebuild
+++ b/sci-biology/mrbayes/mrbayes-3.1.2-r2.ebuild
@@ -1,26 +1,29 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Bayesian Inference of Phylogeny"
 HOMEPAGE="http://mrbayes.csit.fsu.edu/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="debug mpi readline"
 
 DEPEND="
-	sys-libs/ncurses:0=
+	sys-libs/ncurses:=
 	mpi? ( virtual/mpi )
-	readline? ( sys-libs/readline:0= )"
+	readline? ( sys-libs/readline:= )
+"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
+
 	if use mpi; then
 		sed -e "s:MPI ?= no:MPI=yes:" -i Makefile || die "Patching MPI support."
 	fi
@@ -30,7 +33,7 @@ src_prepare() {
 	else
 		# Only needed for OSX with an old (4.x) version of
 		# libreadline, but it doesn't hurt for other distributions.
-		epatch "${FILESDIR}"/mb_readline_312.patch
+		eapply "${FILESDIR}"/mb_readline_312.patch
 	fi
 	sed -e 's:-ggdb::g' -i Makefile || die
 }
diff --git a/sci-biology/plink/Manifest b/sci-biology/plink/Manifest
index c7a81385ede8..ba6392685d12 100644
--- a/sci-biology/plink/Manifest
+++ b/sci-biology/plink/Manifest
@@ -1,3 +1,3 @@
 DIST plink-1.90_pre140514.zip 822157 BLAKE2B 3c29670862de99c9715bc37d8cffc2b02c0cb25ad746975f253ca1e8094b24668cc6739943c68bfa407471f30835a74c6ad027eaa56a92f13445e0a02854cad3 SHA512 679f1e136b11f35f1d49636bc44ffd17e72e4e38edc5daa270cd963ca39f7b8a80f31905a94de517059e5b3ea7a6bf518ae34a5c2af8a05c530bd6df771606c4
-EBUILD plink-1.90_pre140514.ebuild 1131 BLAKE2B 48e491bcd929d9e126bcc26d1d4c60c8bd6f036ba0b7e8fe0824eece4ad7a4b7c4681918c9dc12af5f247a77b3675fad3dfb10e7fc1152dbb5b651993eb03c4a SHA512 f2058ddd233397fffc694be06cc683020a620a4239e864f5abd1d14456c50fbc11721bd649b4c80185991cb954ddf308edc394ef88e966fa0200435c8f1e8c29
+EBUILD plink-1.90_pre140514.ebuild 1165 BLAKE2B 0b8e58c958acde62b0f59fd81917b088ec997ab877e1c8d83fe917d9d2df5b715a9634d5f69c1263a51090829a8eaa88a553e2980bbcc6d3b6936336705af03e SHA512 c73fccf66c5d11a72657985172c8fbf1b89107fd46a519474dad167f1279c0f6a976b0096e3d550fb2b9835980aa02ad81c68a819b3aec036faf60b341acf9d2
 MISC metadata.xml 261 BLAKE2B 3768c926bca545090342a947ba83e706a8954c51b99a5e7b3476ba5198cd326fe1c3b8efb51dfd6be1800682556b8ceea065e388981463ab32f3d687951872f3 SHA512 537da0d3aa2741ebe4442d5dd9b53409decfc9d12ca8e5af8e737c4deb2910c884207e2d441025d19469816100889f04c11038bdffd6a1a15c6217495445090a
diff --git a/sci-biology/plink/plink-1.90_pre140514.ebuild b/sci-biology/plink/plink-1.90_pre140514.ebuild
index 578881ac0f59..2595c3ab7983 100644
--- a/sci-biology/plink/plink-1.90_pre140514.ebuild
+++ b/sci-biology/plink/plink-1.90_pre140514.ebuild
@@ -1,36 +1,36 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Whole genome association analysis toolset"
 HOMEPAGE="http://pngu.mgh.harvard.edu/~purcell/plink/"
 SRC_URI="http://pngu.mgh.harvard.edu/~purcell/static/bin/plink140514/plink_src.zip -> ${P}.zip"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	sys-libs/zlib
 	virtual/cblas
 	virtual/lapack
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/unzip
 	virtual/pkgconfig
 "
 
-S="${WORKDIR}/"
-
 # Package collides with net-misc/putty. Renamed to p-link following discussion with Debian.
 # Package contains bytecode-only jar gPLINK.jar. Ignored, notified upstream.
 
 src_prepare() {
+	default
+
 	sed \
 		-e 's:zlib-1.2.8/zlib.h:zlib.h:g' \
 		-i *.{c,h} || die
@@ -47,6 +47,7 @@ src_compile() {
 	emake \
 		CXX=$(tc-getCXX) \
 		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
 		ZLIB="$($(tc-getPKG_CONFIG) --libs zlib)" \
 		BLASFLAGS="$($(tc-getPKG_CONFIG) --libs lapack cblas)"
 }
diff --git a/sci-biology/velvet/Manifest b/sci-biology/velvet/Manifest
index c1f07d33f7b9..7698aa2dbbc3 100644
--- a/sci-biology/velvet/Manifest
+++ b/sci-biology/velvet/Manifest
@@ -1,3 +1,3 @@
 DIST velvet_1.2.10.tgz 18818559 BLAKE2B 5723c9c040e570cd88b774e5b0044dd04def88778fe2b137ec7c007ab83fc98e5423ad1d9d0499780cf6d3152347ca1a4e4e6b6c1900ce4adfc4930f1f6d3c34 SHA512 a6f3e35cebceb22cc10e83088b8cd9758492da78866237cae63d8826d6f5cfb44d82dd8bfcb1185d37cd434d4c7a0f2ac7135bb80a51db86e754afd6156ea874
-EBUILD velvet-1.2.10.ebuild 2096 BLAKE2B 3a85f8e1a24af2e9794be70bfe691f7df2e2321619af96b5fcac5b8b0d445b96d258b2b9cd6d4474e05fb60559fc1e3015229d1fc933378974ec795129f15aed SHA512 96bc66027211a3700bcac197fc7c2de3bec34b44f5a39bee4ef7d25f2247617351fca293ebfde1c64f4b7931b41cc5bda87515a3b05d1fe5d308d3879fabe89d
+EBUILD velvet-1.2.10.ebuild 2085 BLAKE2B f0aa88a145341553ad74006189dec738a05a29620a4f90843daf4f4e3fd2bce857836b1332c2fee4764db63a202c6b5a908f97dd7ae1e654f24c51e04c865065 SHA512 4a61a2df8715691deba0dfb22b6e8ca049e655e55e82e620a25af4de625b6e43757963942304983145c9b7a29751dbc90aa3854fdb9496a50622d4b5b0d677ed
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-biology/velvet/velvet-1.2.10.ebuild b/sci-biology/velvet/velvet-1.2.10.ebuild
index b4d8ae8641b2..ea0b3630b78b 100644
--- a/sci-biology/velvet/velvet-1.2.10.ebuild
+++ b/sci-biology/velvet/velvet-1.2.10.ebuild
@@ -1,28 +1,25 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit flag-o-matic toolchain-funcs
 
-MY_P=${PN}_${PV}
-
+MY_P="${PN}_${PV}"
 DESCRIPTION="A sequence assembler for very short reads"
 HOMEPAGE="https://www.ebi.ac.uk/~zerbino/velvet/"
 SRC_URI="https://www.ebi.ac.uk/~zerbino/velvet/${MY_P}.tgz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc openmp"
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S="${WORKDIR}"/${MY_P}
+BDEPEND="doc? ( virtual/latex-base )"
 
 src_prepare() {
+	default
 	if ! use doc; then
 		sed -i -e '/default :/ s/doc//' "${S}"/Makefile || die
 	fi
@@ -48,7 +45,7 @@ src_prepare() {
 	tc-export CC
 
 	MAKE_XOPTS=(
-		CC=$(tc-getCC)
+		CC="$(tc-getCC)"
 		CFLAGS="${CFLAGS}"
 		OPT="${CFLAGS}"
 	)
diff --git a/sci-biology/wise/Manifest b/sci-biology/wise/Manifest
index 36db61e514cd..5c4fc9140392 100644
--- a/sci-biology/wise/Manifest
+++ b/sci-biology/wise/Manifest
@@ -1,4 +1,5 @@
+AUX wise-api.tex.patch 2166 BLAKE2B 94cb69ddb9b751cf1efd7d4b98520144dc067c0dae83b2431d35f40c29d2c1d915335c610711f4a7225b3838991f8abce3bb9502aa8d540157afaddb5f389d70 SHA512 e01a902b46f00d6219d549f355b3e1f4373585baf104ff9a2193d6ac981e0aa277b0162307e0c3da17587e10138ad848da5439a0d407266c38f1ab8c7bedca4c
 DIST wise-2.4.0_alpha-patchset.tar.bz2 7244 BLAKE2B 3c921b61e6a30515d790abd8168b5fbc4f8add44f1133cf7d163a98a6935a74ae7c9f79b72874a509bb743aa5b340c92a049ad091380f9cd33b0b9154cca5974 SHA512 ca73f1b03e14cef44d84484c64d06c4856d6ef33b7434de5ac58725cea1d071d875a7b073fc181da33a7490c4f086f674a9a52db4d36e78f4f5b75b28b855cfe
 DIST wise2.4.0alpha.tar.gz 3296399 BLAKE2B a7fbac022c62606ce865250f4091497e9c86331d2d2050fc4f69614aa5e95313eac3a0fcd49451c724c9b50bc6ac63700cd44828736b7a4d15eff2bc21fc29ec SHA512 a2288d7304e7768328689514a986aeff62a0ca6538ee61177a434fb08065f83ab5db39e0cb9101dd8ae9a91f7d95d05528d7ad23df0c394587717c584bf2341c
-EBUILD wise-2.4.0_alpha.ebuild 1737 BLAKE2B 29ae17532ef9a4919db09b4f6b71b92f3b89d1a03b75b1ce90a1defe49ea9d572d9e902620a6d267ad8fc77506a25fda84ede0804f4f0676ba8a0eb41df049c9 SHA512 b73b8fd3a78cdcdda2c39326bbd4dfd99c2828c38ae78537b33c8ea50291323841d0d348eb2b6965cfe1986d808f26ef83e115715fa7c14e31cb7a7e337d867c
+EBUILD wise-2.4.0_alpha-r1.ebuild 1409 BLAKE2B 317764cdd23ecd59b6eeddcfe3efdab6a358a65a33166b504a98c05f7919864c7670e4c8516b70c98f85957ca4e9aff9700e75f6559e1718663b8535b2df6d89 SHA512 1c4910efb4a82c2ae703220cfdcf4fd9e51a38d23aa29e111559cc604d51185dd584fc33d473eec0fcd80ba177ced507eac230e4c60b589ef12f968a5aefe772
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-biology/wise/files/wise-api.tex.patch b/sci-biology/wise/files/wise-api.tex.patch
new file mode 100644
index 000000000000..d6d56888dfb3
--- /dev/null
+++ b/sci-biology/wise/files/wise-api.tex.patch
@@ -0,0 +1,38 @@
+--- a/api.tex.old
++++ b/api.tex
+@@ -204,7 +204,7 @@
+ \item Build two Sequence objects, from a file or strings (\ref{object_Sequence})
+ \item Optionally convert the Sequence objects into Protein objects (\ref{object_Protein}). This ensures you have proteins
+ \item Read in the comparison matrix using CompMat (\ref{object_CompMat})
+-\item Use one of the algorithm calls in sw_wrap module (\ref{module_sw_wrap})
++\item Use one of the algorithm calls in sw\_wrap module (\ref{module_sw_wrap})
+ \item Show the alignment using a call in the seqaligndisaply module (\ref{module_seqaligndisplay})
+ \end{itemize}
+ 
+@@ -213,7 +213,7 @@
+ \item Read in a sequence object and convert it to a protein object (\ref{object_Protein},\ref{object_Sequence})
+ \item Make a protein database from the single protein object (\ref{object_ProteinDB})
+ \item Make a protein database from a single fasta file (\ref{object_ProteinDB})
+-\item Using one of the calls to the sw_wrap module, make a Hscore object (\ref{module_sw_wrap})
++\item Using one of the calls to the sw\_wrap module, make a Hscore object (\ref{module_sw_wrap})
+ \item Show the Hscore object using a show function (\ref{object_Hscore})
+ \item Retrieve individual protein objects from the database by taking out the
+ DataEntry objects (\ref{object_DataEntry}) and passing them into the ProteinDB object (\ref{object_ProteinDB}), giving you a protein object
+@@ -232,7 +232,7 @@
+ \item Read in a codon table (\ref{object_CodonTable})
+ \item Make a random DNA model (\ref{object_RandomModelDNA})
+ \item Make an algorithm type (\ref{module_gwrap})
+-\item Build an entire parameter set for genewise using Wise2::GeneParameter21_wrap (\ref{module_gwrap})
++\item Build an entire parameter set for genewise using Wise2::GeneParameter21\_wrap (\ref{module_gwrap})
+ \item Run the actual algorithm (\ref{module_gwrap})
+ \item show the alignment using genedisplay (\ref{module_gwrap})
+ \end{itemize}
+@@ -5055,7 +5055,7 @@
+ Member functions of RandomModel
+ 
+ \section{sequence\_codon}
+-\label{module_sequence\_codon}
++\label{module_sequence_codon}
+ This module only contains factory methods
+ 
+ \subsection{sequence\_codon factory methods}
diff --git a/sci-biology/wise/wise-2.4.0_alpha-r1.ebuild b/sci-biology/wise/wise-2.4.0_alpha-r1.ebuild
new file mode 100644
index 000000000000..a033ffd011bb
--- /dev/null
+++ b/sci-biology/wise/wise-2.4.0_alpha-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PV="${PV/_}"
+MY_P="${PN}${MY_PV}"
+DESCRIPTION="Intelligent algorithms for DNA searches"
+HOMEPAGE="http://www.ebi.ac.uk/Wise2/"
+SRC_URI="
+	ftp://ftp.ebi.ac.uk/pub/software/${PN}2/${MY_P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="~sci-biology/hmmer-2.3.2"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-shells/tcsh
+	dev-lang/perl
+	virtual/latex-base
+"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-patchset/${P}-glibc-2.10.patch
+	"${WORKDIR}"/${P}-patchset/${P}-cflags.patch
+)
+
+src_prepare() {
+	default
+	cd docs || die
+	cat ../src/models/*.tex ../src/dynlibsrc/*.tex | perl gettex.pl > temp.tex || die
+	cat wise2api.tex temp.tex apiend.tex > api.tex || die
+	eapply "${FILESDIR}"/${PN}-api.tex.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake -C src all
+
+	if use doc; then
+		cd docs || die
+		for i in api appendix dynamite wise2 wise3arch; do
+			latex ${i} || die
+			latex ${i} || die
+			dvips ${i}.dvi -o || die
+		done
+	fi
+}
+
+src_test() {
+	cd src || die
+	WISECONFIGDIR="${S}/wisecfg" emake test
+}
+
+src_install() {
+	dobin src/bin/* src/dynlibsrc/testgendb
+
+	insinto /usr/share/${PN}
+	doins -r wisecfg
+
+	use doc && dodoc docs/*.ps
+	newenvd "${WORKDIR}"/${P}-patchset/${PN}-env 24wise
+}
diff --git a/sci-biology/wise/wise-2.4.0_alpha.ebuild b/sci-biology/wise/wise-2.4.0_alpha.ebuild
deleted file mode 100644
index c37a8972e84e..000000000000
--- a/sci-biology/wise/wise-2.4.0_alpha.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch toolchain-funcs versionator
-
-DESCRIPTION="Intelligent algorithms for DNA searches"
-HOMEPAGE="http://www.ebi.ac.uk/Wise2/"
-SRC_URI="ftp://ftp.ebi.ac.uk/pub/software/${PN}2/${PN}$(delete_version_separator 3).tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
-
-RDEPEND="~sci-biology/hmmer-2.3.2"
-DEPEND="
-	${RDEPEND}
-	app-shells/tcsh
-	dev-lang/perl
-	virtual/latex-base"
-
-S="${WORKDIR}"/${PN}$(delete_version_separator 3)
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${P}-patchset/${P}-glibc-2.10.patch \
-		"${WORKDIR}"/${P}-patchset/${P}-cflags.patch
-	cd "${S}"/docs || die
-	cat "${S}"/src/models/*.tex "${S}"/src/dynlibsrc/*.tex | perl gettex.pl > temp.tex || die
-	cat wise2api.tex temp.tex apiend.tex > api.tex || die
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-api.tex.patch
-}
-
-src_compile() {
-	emake \
-		-C src \
-		CC="$(tc-getCC)" \
-		all
-	if use doc; then
-		cd "${S}"/docs || die
-		for i in api appendix dynamite wise2 wise3arch; do
-			latex ${i} || die
-			latex ${i} || die
-			dvips ${i}.dvi -o || die
-		done
-	fi
-}
-
-src_test() {
-	cd "${S}"/src || die
-	WISECONFIGDIR="${S}/wisecfg" emake test
-}
-
-src_install() {
-	dobin "${S}"/src/bin/* "${S}"/src/dynlibsrc/testgendb
-	use static-libs && \
-		dolib.a \
-			"${S}"/src/base/libwisebase.a \
-			"${S}"/src/dynlibsrc/libdyna.a \
-			"${S}"/src/models/libmodel.a
-
-	insinto /usr/share/${PN}
-	doins -r "${S}"/wisecfg
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins "${S}"/docs/*.ps
-	fi
-	newenvd "${WORKDIR}"/${P}-patchset/${PN}-env 24wise || die "Failed to install env file"
-}
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 7771279063cb..a0d4f2205b62 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index d49f82a99357..7a70ba0f3780 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -19,7 +19,7 @@ EBUILD gromacs-2018.8.ebuild 6943 BLAKE2B bd0a58000cf2c669bc4871f2f68d06b4ef7b4e
 EBUILD gromacs-2019.6.ebuild 7264 BLAKE2B 6196f750a81562c82f1004ba3e4be05193aa9100de0d5a917df242c1287989e83992a5574812f332639c95fc009b860fcfd4b563b5e5148dfa650ce82e861f5b SHA512 ac84483eeb66765b7ae0e5489d5c3b8d293dca6108b79dfcdc35674e033af1a487d0db0bcfc7ad1158fd3ae3aedef236a6549f8ade85483ef6dfb8309cccb05a
 EBUILD gromacs-2020.4.ebuild 10134 BLAKE2B efc77b2cb0981ebf3f90fbe531d54020be2e82b464dace3ab8d07d41cae060c5e073a8a3f641b4bb0431ec2717a5f990a2a6f08ceed6a805bde82742b9eba487 SHA512 f7af8d31c43abe23b9c92ce6afd0dbea4219fe48dad3d91bf19f50f80a520cb0ab98949d4f2653679de751853755e793fd0e84ad73ebf13bef17fc255d693001
 EBUILD gromacs-2020.6.ebuild 10137 BLAKE2B e5f058493f7757ffcff53c892445a3ea2dd15ebb83bbd7fd186a56d85e785be75277e8329487a182d27e23f7756b02618c227ef40c2aaf0243f2a1fbeda232c6 SHA512 37df9d310ab597ce4bb69bd3d77ec20d4b6e0b825b341e5fe78b139164fd02a43b5e3d012530fd9a62500d4a63d2efa05fcbc1219ef5edcb93bf232d563af821
-EBUILD gromacs-2021.2.ebuild 10359 BLAKE2B e14d69500a56fb7650a96b61bc7aeec186d61446eeea1d5d8ac4c983321997a31ddaf5f23644ff4bc44950e86387052a24c6261934ebb8a247ac139840e63e7d SHA512 099b68c19cd9e0c9d205471b38804cfe07cd71f232a24ffc40b02301150afd8674eb016a09987d0ffe4e2d0ebf36a2e5ecb6883c95731474327772755d97b621
-EBUILD gromacs-2021.9999.ebuild 10269 BLAKE2B 325e9c8bc349775cffa58a7767a9b5ca020bf6b9caf8b589d80379744327409ed45bd21fe138bd8e52b0a9eaf61b030e20b0b6b6be42bb15b3cd96cd59142f6c SHA512 52f6e758d518c8472c3c05c3b5d2c3a555e5aabd303ee94cc43675ff17b93b01c70b669b8a016b09b753085a7ac82df9e0002f2dc4bf9295107e7c92f4e1a45a
-EBUILD gromacs-9999.ebuild 10269 BLAKE2B 325e9c8bc349775cffa58a7767a9b5ca020bf6b9caf8b589d80379744327409ed45bd21fe138bd8e52b0a9eaf61b030e20b0b6b6be42bb15b3cd96cd59142f6c SHA512 52f6e758d518c8472c3c05c3b5d2c3a555e5aabd303ee94cc43675ff17b93b01c70b669b8a016b09b753085a7ac82df9e0002f2dc4bf9295107e7c92f4e1a45a
+EBUILD gromacs-2021.2.ebuild 10361 BLAKE2B 925ad220aa14d1e0ec8ad0bc2a1b5f887c2dc7e3e419ef54b009026fa8dd251ef91821acd82e12a3126a065d709dde9a9df14f026323373d0b2909b750795b50 SHA512 15e159486ff136633fc6de6f32a5efd14b7d7276197db7bd0e83dfdf8c57ecc2374c8021783726de9b0d99512ccb8f0980506ceb53cdaaee1cecd847a699caf0
+EBUILD gromacs-2021.9999.ebuild 10271 BLAKE2B 59d6173d1c82cfa1c084528edf2e9cf9bab8e6eefb5e3cc7c05fc43654c7be9463a24cd62a8c764afcddb9fe29fad2643cf60222608f0cdbe72eedd6c41337f2 SHA512 8434cfaf918264c8ad1e0c87f2876c6531a70d330c1205378ac65f537a562e2a72208cffca41bc85773ff1f2eb73653a4c5b1cb992f007c03bab125aa13ae4f6
+EBUILD gromacs-9999.ebuild 10271 BLAKE2B 59d6173d1c82cfa1c084528edf2e9cf9bab8e6eefb5e3cc7c05fc43654c7be9463a24cd62a8c764afcddb9fe29fad2643cf60222608f0cdbe72eedd6c41337f2 SHA512 8434cfaf918264c8ad1e0c87f2876c6531a70d330c1205378ac65f537a562e2a72208cffca41bc85773ff1f2eb73653a4c5b1cb992f007c03bab125aa13ae4f6
 MISC metadata.xml 1223 BLAKE2B 9e48794b267cdb031dcc680ecce38c0d9727c2706d95a0a52d3502d4aa73d245db419a77823d10c5022d65628390b2fd476e489ec764cdd1721c9dd8295a8232 SHA512 d9320e5896bd32e892a9be573da92943236d0cf912f3417b823a415c5470ad9e37a934eafcede6ab7487197854c515ef81270e44c8503540b14dc13356beb3de
diff --git a/sci-chemistry/gromacs/gromacs-2021.2.ebuild b/sci-chemistry/gromacs/gromacs-2021.2.ebuild
index 4a9c41ff8ac9..c9f47113b4e8 100644
--- a/sci-chemistry/gromacs/gromacs-2021.2.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.2.ebuild
@@ -49,7 +49,7 @@ CDEPEND="
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] )
 	opencl? ( virtual/opencl )
 	fftw? ( sci-libs/fftw:3.0 )
-	hwloc? ( sys-apps/hwloc )
+	hwloc? ( sys-apps/hwloc:= )
 	lapack? ( virtual/lapack )
 	lmfit? ( sci-libs/lmfit )
 	mkl? ( sci-libs/mkl )
diff --git a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
index cbac7d70f6b4..ebd3a798340c 100644
--- a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
@@ -49,7 +49,7 @@ CDEPEND="
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] )
 	opencl? ( virtual/opencl )
 	fftw? ( sci-libs/fftw:3.0 )
-	hwloc? ( sys-apps/hwloc )
+	hwloc? ( sys-apps/hwloc:= )
 	lapack? ( virtual/lapack )
 	lmfit? ( sci-libs/lmfit )
 	mkl? ( sci-libs/mkl )
diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild
index cbac7d70f6b4..ebd3a798340c 100644
--- a/sci-chemistry/gromacs/gromacs-9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-9999.ebuild
@@ -49,7 +49,7 @@ CDEPEND="
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] )
 	opencl? ( virtual/opencl )
 	fftw? ( sci-libs/fftw:3.0 )
-	hwloc? ( sys-apps/hwloc )
+	hwloc? ( sys-apps/hwloc:= )
 	lapack? ( virtual/lapack )
 	lmfit? ( sci-libs/lmfit )
 	mkl? ( sci-libs/mkl )
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 8f78a104d3af..753e629ba612 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/drawtiming/Manifest b/sci-electronics/drawtiming/Manifest
deleted file mode 100644
index b7918d552b7b..000000000000
--- a/sci-electronics/drawtiming/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX drawtiming-0.7.1-gcc43.patch 279 BLAKE2B 63595887c90acdcd5055e502dae85cf2b94c5108b2e555a84561cf34ebb7009ca4f47dbb6c568dc149d211e3de511a153ee86df65a1c5a34fcdec139991add58 SHA512 73306c65e8e3ce4227626734952e107f0b518b1e7af3ca77efe00fa9afe813567a631b401569173a643927143807b9ff5add1996f25b82922d5a174b00543c1a
-AUX drawtiming-0.7.1-imagemagick-7.patch 5615 BLAKE2B 4b51bedeec295dd9bcef64ad1c8e34f6183c75532333e0b44eb15e86f13e9700e93b966b14e44beffa2e050e94d96ef2a5079602b11bfc014cf28ecbd00db6dc SHA512 1bf07304353c538ba24777613f12fd887d6d911d45488b37318e34c081381c1b4c2005bfc1135fd28f7b5fc26897078809aeabfcd77f7ef4ffb5dbdbd9381721
-AUX drawtiming-0.7.1-ldflags.patch 1290 BLAKE2B 38081c0b2daff6c2f1ab3c5718188d9b3285c3f4cd7efb252893877a25f97ae232257bead08dd53a33e6a193086469de3288d3c8ba2b12c54e59cda13aec7015 SHA512 cc77a8fed890e7d9a1713667c818437a8cfafc96d3efa328df77b1bf660e3536460da4e899e158c4515c4ecec07319cad05a4ecac5f3e13b0eb004c11d042076
-DIST drawtiming-0.7.1.tar.gz 123714 BLAKE2B 60e5f4c741d5a273860d5bddd872d1df01be4c256531b1cbfe3baeab46ce569618bc371f6d65959d77071ac66946f3a934b351841d643ac154ee59ad5fb23052 SHA512 f474ee372967f05abfa49a15d635279ee23715f1472a82aab8890f8144eab3fdb7fc0529510ed7f92b7073097d77ee2266e5a97f55e755292416e126537fcbbd
-EBUILD drawtiming-0.7.1-r2.ebuild 869 BLAKE2B 113fb531a7c606525ba5c7b2cb0848fb5b2b2076cc7ba37b79a06072fce64116635d7c910abe30aa5ec27a86cd8991b0e5065ce57ada963274df87917d67cedc SHA512 281a8ac57020dc63141138f22eecc51dceb42ca43564155bc5481177fc8c3965d96aaa0f02acb5a9db75f304cb437973cfb5deff18683d6dd3816d8d82f7c80c
-MISC metadata.xml 798 BLAKE2B daa9a0033fc7e8a5a2a688f461906f1b991f4245d51143e02ce17f1b9c20dfba2af967d4853c70649634b9866468adc5b362925a6d6796c21cfce9fac1fd30da SHA512 ebe66f645447adf66360697448c77c066a80adaf08a58d9c4dbbd323014ed73d990c71d5c88f3dfbf87ea1a6ada8e72267a25ea9c746f27440afd07a8f36b1fb
diff --git a/sci-electronics/drawtiming/drawtiming-0.7.1-r2.ebuild b/sci-electronics/drawtiming/drawtiming-0.7.1-r2.ebuild
deleted file mode 100644
index 5982ce19dcd1..000000000000
--- a/sci-electronics/drawtiming/drawtiming-0.7.1-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch
-
-DESCRIPTION="Command line tool for drawing timing diagrams"
-HOMEPAGE="http://drawtiming.sourceforge.net/index.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-DEPEND="media-gfx/imagemagick[cxx]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	mv "${S}"/configure.in "${S}"/configure.ac
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
-	    "${FILESDIR}"/${P}-ldflags.patch
-	if has_version ">=media-gfx/imagemagick-7.0.5.7" ;then
-	    epatch "${FILESDIR}"/${P}-imagemagick-7.patch
-	fi
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README THANKS
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins samples/*.txt
-	fi
-}
diff --git a/sci-electronics/drawtiming/files/drawtiming-0.7.1-gcc43.patch b/sci-electronics/drawtiming/files/drawtiming-0.7.1-gcc43.patch
deleted file mode 100644
index 4249c79aa6e1..000000000000
--- a/sci-electronics/drawtiming/files/drawtiming-0.7.1-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/timing.cc.old	2011-06-01 18:27:42.000000000 +0000
-+++ src/timing.cc	2011-06-01 18:28:09.000000000 +0000
-@@ -23,6 +23,7 @@
- #include "timing.h"
- #include <map>
- #include <fstream>
-+#include <cstring>
- using namespace std;
- using namespace timing;
- using namespace Magick;
diff --git a/sci-electronics/drawtiming/files/drawtiming-0.7.1-imagemagick-7.patch b/sci-electronics/drawtiming/files/drawtiming-0.7.1-imagemagick-7.patch
deleted file mode 100644
index 8f075a57200a..000000000000
--- a/sci-electronics/drawtiming/files/drawtiming-0.7.1-imagemagick-7.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -u drawtiming-0.7.1.old/configure.in drawtiming-0.7.1/configure.in
---- drawtiming-0.7.1.old/configure.ac	2009-04-03 02:59:52.000000000 +0000
-+++ drawtiming-0.7.1/configure.ac	2017-06-01 15:20:15.168508458 +0000
-@@ -15,7 +15,7 @@
-   [], [with_magick=check])
- 
- AS_IF([test "x$with_magick" != "xno"],
--  [PKG_CHECK_MODULES([MAGICK], [ImageMagick++])],
-+  [PKG_CHECK_MODULES([MAGICK], [Magick++])],
-   [AC_DEFINE([LITE],[1],[Build without ImageMagick])])
- 
- AC_OUTPUT(Makefile drawtiming.spec src/Makefile doc/Makefile samples/Makefile)
-diff -u -r drawtiming-0.7.1.old/src/timing.cc drawtiming-0.7.1/src/timing.cc
---- drawtiming-0.7.1.old/src/timing.cc	2017-06-05 15:36:36.603638861 +0000
-+++ drawtiming-0.7.1/src/timing.cc	2017-06-02 12:48:03.523309638 +0000
-@@ -517,7 +517,7 @@
- // ------------------------------------------------------------
- 
- static void draw_dependency (gc &gc, int x0, int y0, int x1, int y1) {
--  list<Coordinate> shaft, head;
-+  vector<Coordinate> shaft, head;
- 
-   gc.push ();
-   gc.stroke_color ("blue");
-@@ -571,7 +571,7 @@
- 
- static void draw_delay (gc &gc, int x0, int y0, int x1, int y1, int y2,
- 			const string &text) {
--  list<Coordinate> head;
-+  vector<Coordinate> head;
- 
-   gc.push ();
-   gc.stroke_color ("blue");
-@@ -688,7 +688,7 @@
- 
- // ------------------------------------------------------------
- 
--void magick_gc::bezier (const std::list<Magick::Coordinate> &points) {
-+void magick_gc::bezier (const std::vector<Magick::Coordinate> &points) {
-   drawables.push_back (DrawableBezier (points));
- }
- 
-@@ -724,7 +724,7 @@
- 
- // ------------------------------------------------------------
- 
--void magick_gc::polygon (const std::list<Magick::Coordinate> &points)
-+void magick_gc::polygon (const std::vector<Magick::Coordinate> &points)
- {
-   drawables.push_back (DrawablePolygon (points));
- }
-diff -u -r drawtiming-0.7.1.old/src/timing.h drawtiming-0.7.1/src/timing.h
---- drawtiming-0.7.1.old/src/timing.h	2009-04-03 03:02:40.000000000 +0000
-+++ drawtiming-0.7.1/src/timing.h	2017-06-02 12:49:35.780468543 +0000
-@@ -129,13 +129,13 @@
-     gc (void) : width(0), height(0) { }
-     virtual ~gc() { }
- 
--    virtual void bezier (const std::list<Magick::Coordinate> &points) = 0;
-+    virtual void bezier (const std::vector<Magick::Coordinate> &points) = 0;
-     virtual void fill_color (const std::string &name) = 0;
-     virtual void fill_opacity (int op) = 0;
-     virtual void font (const std::string &name) = 0;
-     virtual void line (int x1, int y1, int x2, int y2) = 0;
-     virtual void point_size (int size) = 0;
--    virtual void polygon (const std::list<Magick::Coordinate> &points) = 0;
-+    virtual void polygon (const std::vector<Magick::Coordinate> &points) = 0;
-     virtual void pop (void) = 0;
-     virtual void push (void) = 0;
-     virtual void scaling (double hscale, double vscale) = 0;
-@@ -146,18 +146,18 @@
- 
- #ifndef LITE
-   class magick_gc : public gc {
--    std::list<Magick::Drawable> drawables;
-+    std::vector<Magick::Drawable> drawables;
- 
-   public:
-     ~magick_gc (void);
- 
--    void bezier (const std::list<Magick::Coordinate> &points);
-+    void bezier (const std::vector<Magick::Coordinate> &points);
-     void fill_color (const std::string &name);
-     void fill_opacity (int op);
-     void font (const std::string &name);
-     void line (int x1, int y1, int x2, int y2);
-     void point_size (int size);
--    void polygon (const std::list<Magick::Coordinate> &points);
-+    void polygon (const std::vector<Magick::Coordinate> &points);
-     void pop (void);
-     void push (void);
-     void scaling (double hscale, double vscale);
-diff -u -r drawtiming-0.7.1.old/src/timing.cc drawtiming-0.7.1/src/timing.cc
---- drawtiming-0.7.1.old/src/timing.cc	2017-06-05 15:36:36.603638861 +0000
-+++ drawtiming-0.7.1/src/timing.cc	2017-06-02 12:48:03.523309638 +0000
-@@ -790,8 +790,8 @@
- 
- // ------------------------------------------------------------
- 
--void postscript_gc::bezier (const std::list<Magick::Coordinate> &points) {
--  std::list<Magick::Coordinate>::const_iterator i = points.begin();
-+void postscript_gc::bezier (const std::vector<Magick::Coordinate> &points) {
-+  std::vector<Magick::Coordinate>::const_iterator i = points.begin();
- 
-   ps_text << "newpath\n";
-   ps_text << i->x () << ' ' << (height - i->y ()) << " moveto\n";
-@@ -840,9 +840,9 @@
- 
- // ------------------------------------------------------------
- 
--void postscript_gc::polygon (const std::list<Magick::Coordinate> &points) {
-+void postscript_gc::polygon (const std::vector<Magick::Coordinate> &points) {
-   static const char *ops[] = {"stroke", "fill"};
--  std::list<Magick::Coordinate>::const_iterator i;
-+  std::vector<Magick::Coordinate>::const_iterator i;
-   int j;
- 
-   for (j = 0; j < 2; j++) {
-diff -u -r drawtiming-0.7.1.old/src/timing.h drawtiming-0.7.1/src/timing.h
---- drawtiming-0.7.1.old/src/timing.h	2009-04-03 03:02:40.000000000 +0000
-+++ drawtiming-0.7.1/src/timing.h	2017-06-02 12:49:35.780468543 +0000
-@@ -176,13 +176,13 @@
-     postscript_gc (void);
-     ~postscript_gc (void);
- 
--    void bezier (const std::list<Magick::Coordinate> &points);
-+    void bezier (const std::vector<Magick::Coordinate> &points);
-     void fill_color (const std::string &name);
-     void fill_opacity (int op);
-     void font (const std::string &name);
-     void line (int x1, int y1, int x2, int y2);
-     void point_size (int size);
--    void polygon (const std::list<Magick::Coordinate> &points);
-+    void polygon (const std::vector<Magick::Coordinate> &points);
-     void pop (void);
-     void push (void);
-     void scaling (double hscale, double vscale);
diff --git a/sci-electronics/drawtiming/files/drawtiming-0.7.1-ldflags.patch b/sci-electronics/drawtiming/files/drawtiming-0.7.1-ldflags.patch
deleted file mode 100644
index d50621f76796..000000000000
--- a/sci-electronics/drawtiming/files/drawtiming-0.7.1-ldflags.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Switch LDADD with LDFLAGS
- This change is to move the objects before the libs. to fix an FTBFS when 
- --as-needed is passed to gcc.
-Author: �حمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org>
-Forwarded: yes
---- drawtiming-0.7.1.orig/src/Makefile.am
-+++ drawtiming-0.7.1/src/Makefile.am
-@@ -3,7 +3,7 @@
- 
- bin_PROGRAMS = drawtiming
- drawtiming_SOURCES = main.cc globals.h parser.yy scanner.ll timing.cc timing.h
--drawtiming_LDFLAGS = @MAGICK_LIBS@
-+drawtiming_LDADD   = @MAGICK_LIBS@
- 
- EXTRA_DIST = parser.h
- BUILT_SOURCES = parser.h
---- drawtiming-0.7.1.orig/src/Makefile.in
-+++ drawtiming-0.7.1/src/Makefile.in
-@@ -51,7 +51,7 @@
- am_drawtiming_OBJECTS = main.$(OBJEXT) parser.$(OBJEXT) \
- 	scanner.$(OBJEXT) timing.$(OBJEXT)
- drawtiming_OBJECTS = $(am_drawtiming_OBJECTS)
--drawtiming_LDADD = $(LDADD)
-+drawtiming_LDADD = @MAGICK_LIBS@ $(LDADD)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -159,7 +159,7 @@
- AM_CXXFLAGS = @MAGICK_CFLAGS@ -DYYDEBUG=1
- AM_YFLAGS = -d
- drawtiming_SOURCES = main.cc globals.h parser.yy scanner.ll timing.cc timing.h
--drawtiming_LDFLAGS = @MAGICK_LIBS@
-+drawtiming_LDFLAGS = @LDFLAGS@
- EXTRA_DIST = parser.h
- BUILT_SOURCES = parser.h
- all: $(BUILT_SOURCES)
diff --git a/sci-electronics/drawtiming/metadata.xml b/sci-electronics/drawtiming/metadata.xml
deleted file mode 100644
index 74ef293ca5d2..000000000000
--- a/sci-electronics/drawtiming/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-electronics@gentoo.org</email>
-		<name>Gentoo Electronics Project</name>
-	</maintainer>
-	<longdescription>
-	This package provides a command line tool for documenting hardware
-	and software designs through timing diagrams.  It reads signal descriptions
-	from a text file with an intuitive syntax, and outputs a timing diagram to
-	an image file.  Notation typical of timing diagrams found in the Electrical
-	Engineering discipline is used, including arrows indicating causal
-	relationships between signal transitions. 
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">drawtiming</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-electronics/eagle/Manifest b/sci-electronics/eagle/Manifest
index 79982ed7acf0..7da5eb41ffd7 100644
--- a/sci-electronics/eagle/Manifest
+++ b/sci-electronics/eagle/Manifest
@@ -4,5 +4,5 @@ DIST eagle-lin32-7.7.0.run 51488593 BLAKE2B e1556b7abe6fb405632015f39bdd8e8c6189
 DIST eagle-lin64-7.3.0.run 48248700 BLAKE2B e7d8a7a23e0023159d626203bba2cf195fad3eac54b9b72947c9e72e7bb3f3534ce2545857ce76e70302eb1d2042cc30f9c327fc2a5a4dd4287e82aef4393dc6 SHA512 bd158b25ed682c63405b90358f82ffcb0903c7f5e5ae81737efcb56b6074a78125de31909c64f31a5f4bab7727c63b6aa0c7af0f6440793010f7f6de3f92f681
 DIST eagle-lin64-7.7.0.run 51108322 BLAKE2B 1458199821328e811632cdb7457f256b9d97c40005c0ce71eb65d9c3f75049618e76e0c7e3cbb2e3171649bb412270409fd601bfe6f51c79c6cc3d01c12fcf66 SHA512 1f0b38be16b87f67f64709e7e39b888592240d98cdcb7b81ee77f236d9cdea5127e661db5cff470d9673f8247bea49732be3b443cdc5fbd1dca34e26896a6770
 EBUILD eagle-7.3.0-r1.ebuild 3578 BLAKE2B 5eb7ae0701afd9547b6431344327809e6ca1cd2cb505a59261481531d2ffcf1766d9ecfd7c82633b2e445adbf2199a20b2ed605e5e6adc33cca3d97dc11d70bc SHA512 f20a8a5cb4ebfb2c6bb64458288e1896594eec5add05465fe7b42a2da383cd4a598e3a47790c68215d84267d66b7f22fe2ad6c59aba38be80646297b1193d36f
-EBUILD eagle-7.7.0-r1.ebuild 3580 BLAKE2B 8375385083919c05e572911bd1f6c079dbfaf842a2517d0a08f1deba2c13f9c1ebf3f8fb5bbdcf04c42005aa93cb6c1d3eab11ce377966b979b9c326cf61d6d3 SHA512 1c5ac0e9437f83d74ed5bc4809a5ccdcf9219fc89f7262eee4928a24d49d88029f0b19df041a55153daeec9e0c8b4868580bdfa44b0db8ac51298ff37c8aaa1c
+EBUILD eagle-7.7.0-r1.ebuild 3579 BLAKE2B b06d493126ab36ba3eee3f29c6fe24512090d5bab4a9088023962e5d1f250e728b6b01f6760e9078d8115629ca67c47b7acf2afe1ab1c142d3c3daed1b19b1d3 SHA512 aa6160dad1a535dae47fbeab44f13173958f3246b4784a52205c38aeb82529ad7b647be36653405a31e381520beeb1cf2f36a66e8ea1a64a94e58407d38fcdaa
 MISC metadata.xml 671 BLAKE2B fe104f5979bd1c3443983d0dd04b14fbce7c9f07b789a3faca57b3aacd3031855dd3eeda11775179f44a86b6f96274c235a574affb7b02abc21db34ce2e4c770 SHA512 e45c4c1d534e47500ad9a1354d568b879ba0b098f792c7bce74638148b153089fb85f2e5eb8198fe15406ded94981622be00db5572ec2d53dfca3d46f163d960
diff --git a/sci-electronics/eagle/eagle-7.7.0-r1.ebuild b/sci-electronics/eagle/eagle-7.7.0-r1.ebuild
index f723b0377c57..fb11538a4b6d 100644
--- a/sci-electronics/eagle/eagle-7.7.0-r1.ebuild
+++ b/sci-electronics/eagle/eagle-7.7.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="cadsoft-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 IUSE="doc"
 
 QA_PREBUILT="opt/eagle/bin/eagle"
diff --git a/sci-electronics/electronics-menu/Manifest b/sci-electronics/electronics-menu/Manifest
index a38be7ea17db..6b4c8fe040c8 100644
--- a/sci-electronics/electronics-menu/Manifest
+++ b/sci-electronics/electronics-menu/Manifest
@@ -1,3 +1,3 @@
 DIST electronics-menu-1.0.tar.gz 12284 BLAKE2B 767aa286375b509879d784f82290f3fac8bad0614466a566405ce67f2f06e5b04272cbd58410655dd258dfee9eb6b4cf3af0e9b5a00a247cd79165968dd06dd6 SHA512 c4619d6dfd0641da772a7026af50b0ba1ededee6a5be84ede1c058671764f8c9a7d55e44a018f6bd42bbef0a29d513df5e9056a9a345999a2493fa62d2300b0a
-EBUILD electronics-menu-1.0-r1.ebuild 568 BLAKE2B 6995fc46c4660d61cb0702811acb0e0e566a3fce4f50ea502f9b7417fffd2ad85f45bfa0cdef699020f462eea229704bc5ece14b689c43dc4dc63871cd408c20 SHA512 10e0f5415bb97bcf86b8f2832af10567a98b6fa39bd1be767f8c41b6e30f1ea1a6586582e4fb8ddf8dedc03147e4be974e747d3f2626aaaede2a88b118aaf105
+EBUILD electronics-menu-1.0-r1.ebuild 332 BLAKE2B 80537b2de0f607889f7b4b8b5eba373f67f9f177403988b6e2f75d58a9b22a7abe99788577f7f89ace0838603e6ccec02a4a55512f3f8632ed62eaf53aa18a59 SHA512 99c635dd7f7a5c8e931c5e3ba570bfcaa6e4e82ac8bd4f3cc9f9b8f38fb3d6fc02f508c65c03da4f17537d280913552a675c7b6837bb7ced7ae16f1b4c50b577
 MISC metadata.xml 510 BLAKE2B 6345a1d48e8b0c75e2a02bda8615f73f5923796762f62fa08b75a36855ce7e51ca7d4a3d92875b7345892c5003f724b9f6a9542d55ac774090ca0a2131ea1fcf SHA512 2a79ec82566c1493a1f25cdbb30ed4c970d96989caae79614ee40febaa642bb6db96c1bdf4ce3ea081448d0d8550aaa8ce385f5c2ae4060a42842ba6b3b11232
diff --git a/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild b/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
index ed84cdc627fc..04593c37fc4f 100644
--- a/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
+++ b/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit gnome2-utils
+inherit xdg
 
 DESCRIPTION="Creates an \"Electronics\" desktop menu"
 HOMEPAGE="http://www.gpleda.org/"
@@ -12,24 +12,3 @@ SRC_URI="http://geda.seul.org/dist/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	dodoc README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/gsmc/Manifest b/sci-electronics/gsmc/Manifest
index 0e34119576fa..9ae48888e6e9 100644
--- a/sci-electronics/gsmc/Manifest
+++ b/sci-electronics/gsmc/Manifest
@@ -1,4 +1,4 @@
 AUX gsmc-1.1-autotools.patch 1271 BLAKE2B 05eec2b3d68c813411fb7b43b6a75a7215d9051eb67cca758265034d117c08905f8efed98b1dba326de122d6c0ff5eaa19d7a4a9816b7d7e759fb6311eac1435 SHA512 440798845fdd9fe7cc38a226961c83b38e75b5c39338341b327fd9b29e074323531dd3413aa6375052ac4741e98a12115c545b128a026f44704f72ceded0f217
 DIST gsmc-1.1.tar.gz 122726 BLAKE2B 540ac5fcb2057990f1b95c6be844bd3b84c7f0bca8064bf65d93d67dffacfc7dd4197b8de5477518674a8876fe7e69e0ba1e5a24e278c2d8422b35f64343f422 SHA512 ea9db9e4917d82e0d9fa40318a971b63443611ab91b2321115d68fa4083de1879086e5c3392607347e3222fabb9efd5f8175ebb8cd122da479fac1ce7e2d9696
-EBUILD gsmc-1.1-r2.ebuild 653 BLAKE2B cd928b97cfacb569c7cfa9d532d035c93eef74962caaefff35d03df794359033b66662af00ad33c1361828bb9e6065e5a7a7ef49eaf55c55ce8cbd8e7273ccfc SHA512 8bac043e1a66b062df81a9a5e21d2946fd5cf0e0e7ed7aa374e7a83f1213ea7bdb766660998fe1d3b10de9d1e812c358d9e9c408e64df4832489dfbe7a628300
+EBUILD gsmc-1.1-r2.ebuild 639 BLAKE2B 8a3c20fbadf0fb66059e765fe900f2e73080783bbf60aa90e25dbaf157459a66ec5b7e6f8f35767567539a71ec6c6f5a90b934e025fac9c9692c3d6890aa065f SHA512 6100313e7c2555dc25b7636b20da6364335104c79f4a768cb014a870ef9cc85d6924ad7d783ca7d3c42e8aabd242fddde5a7c491b09ee9515821e340b5a455b0
 MISC metadata.xml 265 BLAKE2B 4a63b8e6f06e5a84e96b45b0873124bb88226e83380ca4b23b73c4583fab34aa3472804d04acf269f2952cb03a2b500a020acc219c2176587200ffc92daa49c3 SHA512 21c421dc2864d898fdf1e5b723e323a6dbbd72cfd32b57eb14776345aba19611c7c64305c63f058fc4767fbd937c9a6252a3b296354739cde07bcc50dc48b756
diff --git a/sci-electronics/gsmc/gsmc-1.1-r2.ebuild b/sci-electronics/gsmc/gsmc-1.1-r2.ebuild
index ee9e8125fd81..a3da3ce6921a 100644
--- a/sci-electronics/gsmc/gsmc-1.1-r2.ebuild
+++ b/sci-electronics/gsmc/gsmc-1.1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
-inherit autotools epatch
+inherit autotools
 
 DESCRIPTION="A GTK program for doing Smith Chart calculations"
 HOMEPAGE="https://www.qsl.net/ik5nax/"
@@ -12,17 +12,20 @@ SRC_URI="https://www.qsl.net/ik5nax/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-CDEPEND="
+DEPEND="
 	dev-libs/glib:2
-	x11-libs/gtk+:2"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}"
+	x11-libs/gtk+:2
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-autotools.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-autotools.patch"
+	default
 	eautoreconf
 }
 
diff --git a/sci-electronics/irsim/Manifest b/sci-electronics/irsim/Manifest
index f56f3f313689..d2ce35abb0f6 100644
--- a/sci-electronics/irsim/Manifest
+++ b/sci-electronics/irsim/Manifest
@@ -1,5 +1,5 @@
-AUX irsim-9.7.72-ldflags.patch 1855 BLAKE2B cb99e706e01c41d35d3e02f7f946d206bee2197738ab8be75e414059625118dbeb5e7949a30302773495005beff58b1d35c16325437817b17c93dfb4240ae197 SHA512 8ead19ef40e93353d158c8bd5794b1e71278d49386e1f7becbe0f33ffb31ca91906fd7c967fd77b8735d25ab723dbe52ec81931d751380908969a0517ca9637b
-AUX irsim-9.7.79-datadir.patch 757 BLAKE2B d00b871b4f6d2c6a0f99e3d9e80d8ad11bc61973e05d287f69b1bc7ec9dac305741e5058fe7e0a1914def1740703a4aaa92e5d60308a967effa1a4b98653fdae SHA512 28104437434073079b875e4590bd1aaeff8246a785460e136327c8e428f5d13826cd586d9b69b41e1138f2d7357c0b9d8fc56784347e98117e1838bd8a6aa94e
+AUX irsim-9.7.72-ldflags.patch 1567 BLAKE2B f9045d363b3f7f25a7d03039f01343745402dcb1652583060448d8cc1db89d242d763c1cd3c9aa18882634ebf9f3cb03c9505f7648e15145902da9ff53bf678d SHA512 1a19a2c5aa951396b79b657fa45d8ec2787d47aab31b62b699693029475a4444bbbf5a57c687dd2becb9d89c73e9446822a4d57984c59fa09dcc526bc84532b5
+AUX irsim-9.7.79-datadir.patch 735 BLAKE2B 31e0b55f97f36d5b65965e67ce6e7879148e3f620c838c00c370d6229beb705c2040507dd741c8aac6051ff8d9e4a1634641a19e6292594f6f1dc667553e52aa SHA512 0bd832b47d47898bd167f2ae309892fe6ab55bb5dd60321c1bf3861d1ffcbf7f72d49d9f291693de8ca0558b5df6f725d671393870c33697f03e36256fbc40a6
 DIST irsim-9.7.93.tgz 465721 BLAKE2B f40e1216f51a51a38ee52628532989ee307db1ff3b0daa4f047a1a3eb04bd49d903382f67c1c4bae4366147f4448eb9699cdc47cffe712fa70a9d34c5bf13d00 SHA512 441a803935c178bdd663360df058142c07d91aecd158d6be8f10b670fc2a295e79839914de6a85ced58a79591625c514e2ceabe87486092d8a1784c7e47a02b3
-EBUILD irsim-9.7.93.ebuild 1083 BLAKE2B 1e27d80b5d881581f3b3693499e687aa23d1e6b469c03573936640162bf9afc52d53bb0a12b2b72179a44eabc66cd059a301a94145874ac87ded422b3ac237e8 SHA512 b1a6798848cae5bb938aee5e011730eb2c72a7db4ab82c2cfd8bf5b672b4ba56f24dee33cc254fd656013b6175e9c2c3b2d4eaaa708d616778f758b742cf56e1
+EBUILD irsim-9.7.93.ebuild 958 BLAKE2B 3528559abf9b9f366eaa1c960f4dc5640c3d19e9e8c76f209866f8a58b682c45946a03f6908d2d43114247f2ad739d9d737d4df27e1ea3b8e07dd871b97fb330 SHA512 a9527de34b8f2e5c76d66d02e3c61d8ce51c4504dbc5cac1a34d21bf649f59276faaed9ada9ff8ef2ace014852ebf8a71b9b8c8cf4bb20c4360177bd4b9cd7b2
 MISC metadata.xml 644 BLAKE2B de25bee0f8d6f5186f163c94504e8693ffab983b8a7957945f11086c5d9be2c8b054c7b212cc289852aa603d7702b39f98f4e348212171a0e3bbb0e269fd298c SHA512 3251cd8e81a1ff0d440718fd39a6f8cd8334ed71f04c44235a8946388e3ead12b879bd1bb964688749291e5146082b4c51bd570efafc271516e72eb28a85e414
diff --git a/sci-electronics/irsim/files/irsim-9.7.72-ldflags.patch b/sci-electronics/irsim/files/irsim-9.7.72-ldflags.patch
index d219415eb5e8..8c50e2ea2b17 100644
--- a/sci-electronics/irsim/files/irsim-9.7.72-ldflags.patch
+++ b/sci-electronics/irsim/files/irsim-9.7.72-ldflags.patch
@@ -1,5 +1,5 @@
---- tcltk/Makefile.old	2011-04-26 17:40:36.000000000 +0000
-+++ tcltk/Makefile	2011-04-26 17:41:05.000000000 +0000
+--- a/tcltk/Makefile
++++ b/tcltk/Makefile
 @@ -26,7 +26,7 @@
  	${CP} irsimexec $(DESTDIR)${TCLDIR}/irsimexec
  
@@ -9,8 +9,8 @@
  		${LIBS} ${LIB_SPECS}
  
  irsim.tcl: irsim.tcl.in
---- irsim/Makefile.old	2011-04-26 17:46:38.000000000 +0000
-+++ irsim/Makefile	2011-04-26 17:47:21.000000000 +0000
+--- a/irsim/Makefile
++++ b/irsim/Makefile
 @@ -22,7 +22,7 @@
  tclirsim${SHDLIB_EXT}: ${EXTRA_LIBS}
  	@echo --- making irsim Tcl library \(tclirsim${SHDLIB_EXT}\)
@@ -20,8 +20,8 @@
  		${EXTRA_LIBS} -lc ${LIBS} ${LD_EXTRA_LIBS}
  
  $(DESTDIR)${BINDIR}/irsim:
---- random/Makefile.old	2011-04-26 17:48:46.000000000 +0000
-+++ random/Makefile	2011-04-26 17:49:02.000000000 +0000
+--- a/random/Makefile
++++ b/random/Makefile
 @@ -21,7 +21,7 @@
  random${SHDLIB_EXT}: randwrap.o
  	@echo --- making random Tcl library
@@ -31,8 +31,8 @@
  		${MAC_SHARED} -lc ${LIBS} ${LD_EXTRA_LIBS}
  
  install-tcl: $(DESTDIR)${TCLDIR}/random${SHDLIB_EXT}
---- tclsubckt/Makefile.old	2011-04-26 17:50:23.000000000 +0000
-+++ tclsubckt/Makefile	2011-04-26 17:50:45.000000000 +0000
+--- a/tclsubckt/Makefile
++++ b/tclsubckt/Makefile
 @@ -22,7 +22,7 @@
  diglib${SHDLIB_EXT}: diglib.o
  	@echo --- making diglib subcircuit shared library
diff --git a/sci-electronics/irsim/files/irsim-9.7.79-datadir.patch b/sci-electronics/irsim/files/irsim-9.7.79-datadir.patch
index ca4fd4628575..12ee3ba00964 100644
--- a/sci-electronics/irsim/files/irsim-9.7.79-datadir.patch
+++ b/sci-electronics/irsim/files/irsim-9.7.79-datadir.patch
@@ -1,5 +1,5 @@
---- irsim-9.7.79/scripts/defs.mak.in
-+++ irsim-9.7.79/scripts/defs.mak.in
+--- a/scripts/defs.mak.in
++++ b/scripts/defs.mak.in
 @@ -12,6 +12,7 @@
  exec_prefix = @exec_prefix@
  bindir = @bindir@
diff --git a/sci-electronics/irsim/irsim-9.7.93.ebuild b/sci-electronics/irsim/irsim-9.7.93.ebuild
index 967389cbcee7..c2ea4a864883 100644
--- a/sci-electronics/irsim/irsim-9.7.93.ebuild
+++ b/sci-electronics/irsim/irsim-9.7.93.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit epatch multilib
+EAPI=8
 
 DESCRIPTION="IRSIM is a \"switch-level\" simulator"
 HOMEPAGE="http://opencircuitdesign.com/irsim/"
@@ -12,29 +10,25 @@ SRC_URI="http://opencircuitdesign.com/irsim/archive/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="dev-lang/tcl:0
-	dev-lang/tk:0"
-DEPEND="${RDEPEND}
-	app-shells/tcsh"
+RDEPEND="
+	dev-lang/tcl:=
+	dev-lang/tk:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-shells/tcsh"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-9.7.72-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-9.7.79-datadir.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.7.72-ldflags.patch
+	"${FILESDIR}"/${PN}-9.7.79-datadir.patch
+)
 
 src_configure() {
 	# Short-circuit top-level configure script to retain CFLAGS
-	cd scripts
+	cd scripts || die
 	econf
 }
 
-src_install() {
-	emake DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install
-	dodoc README
-}
-
 pkg_postinst() {
 	einfo
 	einfo "You will probably need to add to your ~/.Xdefaults"
diff --git a/sci-electronics/petrify/Manifest b/sci-electronics/petrify/Manifest
index 08a5a75a2d45..10d0723d8531 100644
--- a/sci-electronics/petrify/Manifest
+++ b/sci-electronics/petrify/Manifest
@@ -1,3 +1,3 @@
 DIST petrify-4.2-linux.tgz 1117093 BLAKE2B 9768610f253944f7c64a4566b25dcc9997799f459c015c1231b3f25ef94025652855fcd6399b32afb34f5a08d6c832a11e271901c0deda3170ae22664f9eb12b SHA512 d3cdc4991ec5084ec5b676d74a2af935459fadfa3479d09871f5a4723205b576ab8f3f91e44cd37a4c47c7ae687ead7e25c7aae3d6eae29d2896b3a215cb1980
-EBUILD petrify-4.2-r1.ebuild 751 BLAKE2B 1ee541e9f0941a390d41cb52930479f2d79729dbd573dca38bb95a28721d0c30e4d85618b1c4316661ab699aa45185ae131f47463c7a0ffc791580dcd518b9c6 SHA512 5d2a93f4f0e743b22a28f92c0fbed919fdd1f121188664025ad8c8ea99cfad1ee1cd6e52f8fb8a44ff60619dda52ee2e38ff8c9dce3dd3905fccd43762a2edc7
+EBUILD petrify-4.2-r1.ebuild 738 BLAKE2B 941920bcfd2b93615944d1df7cfdc447a8b7316c9615ac892a56be1b9c7a515a0b9e6bcb0ef849cf8e672e137f56f212a7e6715b92c01f49271a745131cd184e SHA512 dc3f52aa6bab2538b376034686a0fe4b993102959592b48b290550af43dbd3c61b2b8346709c7c3f48648fef29b968528dafabf4e446ebff90667ea4eea06508
 MISC metadata.xml 773 BLAKE2B 9f5936ba1824cbfc9fc90ef30a26f42b32cc13507672793a8603d0daf24d9f01d55a528a85aa24db99383489654773ea985fc3996e5d88830ae3211bd3cc3279 SHA512 adf3f72fff9efed5f9a715940d1068ca390bd2095e8b4e89e611ca571cfd79b3882c8753552e1ded63f9beec2774d945bc541ac162f9532c4a6b35a217325ca4
diff --git a/sci-electronics/petrify/petrify-4.2-r1.ebuild b/sci-electronics/petrify/petrify-4.2-r1.ebuild
index 2782e4be8402..4620813921eb 100644
--- a/sci-electronics/petrify/petrify-4.2-r1.ebuild
+++ b/sci-electronics/petrify/petrify-4.2-r1.ebuild
@@ -1,25 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="Synthesize Petri nets into asynchronous circuits"
 HOMEPAGE="http://www.lsi.upc.edu/~jordicf/petrify/"
 SRC_URI="http://www.lsi.upc.edu/~jordicf/petrify/distrib/petrify-4.2-linux.tgz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="Old-MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="media-gfx/graphviz"
-DEPEND=""
 
 RESTRICT="strip"
 
-QA_PREBUILT="/opt/petrify/petrify"
-
-S="${WORKDIR}"/${PN}
+QA_PREBUILT="opt/petrify/petrify"
 
 src_install() {
 	exeinto /opt/petrify
@@ -27,9 +24,11 @@ src_install() {
 	dosym petrify /opt/petrify/draw_astg
 	dosym petrify /opt/petrify/write_sg
 
-	dodoc doc/*
+	dodoc -r doc/.
 	doman man/man1/*
 
 	dodir /etc/env.d
-	echo "PATH=${EPREFIX}/opt/petrify" > "${ED}"/etc/env.d/00petrify
+	newenvd - 00petrify <<- _EOF_
+		PATH="${EPREFIX}/opt/petrify"
+	_EOF_
 }
diff --git a/sci-electronics/splat/Manifest b/sci-electronics/splat/Manifest
index e2663e144dc4..7db09c2feb4f 100644
--- a/sci-electronics/splat/Manifest
+++ b/sci-electronics/splat/Manifest
@@ -1,4 +1,4 @@
-AUX splat-1.2.2-gcc43.patch 205 BLAKE2B f145e08d07cf755914700690737f6ebc4230c598083495d1abe99586fa4302fd5e361c5277fe3daf494686e2ea551941f4a32c953f2f4c407474f2ba2ebac357 SHA512 ce99a5688305cc0bc53544b8c57cd73d3a9ccaaa7bce1115f63ee79c93c06f9ec80d694fcedcbded35b1f12d9b8b1d79022de7afb7fa43980710c4928c6dcf21
+AUX splat-1.2.2-gcc43.patch 180 BLAKE2B 9f6101e7fc1625e0660f871079da0d072b12d6514f57afd71be8c7c521f0098768ae70dfc103831803dcc7a96d545c897abca4ca110d49e310eb983a18292225 SHA512 01ecd4cd08575d354c94d78e02c9117ef613e71664f7fed9b64239907051f4170e56dc9dc9368ec08fa67d81fdc9bb67805e3eacb7c40a9663e52dd2d81d0638
 DIST splat-1.4.2.tar.bz2 356823 BLAKE2B 7e4fe835128ae88b6d44d87159a5eab8652eed26876a637e613f57177ebfca8df7433455b53124318a2a0277bd09ca2cb9ce74ab205f5c6d1417fa736934b3fa SHA512 223b6184b1df35052709ba3b0e8679b9f6a2933c98ac433b0f07cd93b07213f55399a6eeb8e955a86fb59d13e09d891fc085ac17594f561268da239c30e885bb
-EBUILD splat-1.4.2.ebuild 2406 BLAKE2B 172d56cfcbd32ffa51e442f8ce3e9af80c6e6b78bec38c7808c7ba4eb9f2241c4def7fb5f981a9970193b738cfcd16b230a99ba2eb5a90ca148de7983eed9ec4 SHA512 ad5ae8dfcf7db3356bf958ad99be9faaf14ffb61299334cc46c74d4ad73cba8d8bd5c2ee1be9d36235afada02373fff3ae0c1a0943f19872852369653202dc81
+EBUILD splat-1.4.2.ebuild 2114 BLAKE2B cc1973f7cdb66137addc32f89f32f5349819110f8c41a21c49cdfd9fe354bc591fcbbabfe1214a433244da51f050d8f478872dc8ffe2c48730c37f67c7530c9e SHA512 5812f517eae1bea8c5a222adbd56a7b0f0a2f4fd94bc5032bb6d179d460650fe41621b45e7ee354c7ef0427fe3c8af7fe1f4b5fc12e07738392d996d9f12a499
 MISC metadata.xml 740 BLAKE2B 20f01ab6e9fb164deaf70b2e0442a3d5c0df7131197da4e9a07c9928f14124e2d803a7779ddbd43d2d714ee57b48086ddd04c86bbe1dd4e565395f9eeede9a29 SHA512 7aae74c935e1a47b38e5bcbc08348e954625c5eb21fee593ab5d2662bcc2724f40ca4c62bc58145c9856b1a4167f23ce4b27c930f43eea4089f0edddcb1e82ee
diff --git a/sci-electronics/splat/files/splat-1.2.2-gcc43.patch b/sci-electronics/splat/files/splat-1.2.2-gcc43.patch
index 11e65e77f14a..be906150b9fd 100644
--- a/sci-electronics/splat/files/splat-1.2.2-gcc43.patch
+++ b/sci-electronics/splat/files/splat-1.2.2-gcc43.patch
@@ -1,5 +1,5 @@
---- splat-1.2.1.orig/utils/fontdata.c
-+++ splat-1.2.1/utils/fontdata.c
+--- a/utils/fontdata.c
++++ b/utils/fontdata.c
 @@ -32,6 +32,7 @@
  #include <string.h>
  #include <stdlib.h>
diff --git a/sci-electronics/splat/splat-1.4.2.ebuild b/sci-electronics/splat/splat-1.4.2.ebuild
index d9bb7221cd65..8a0b78e7f312 100644
--- a/sci-electronics/splat/splat-1.4.2.ebuild
+++ b/sci-electronics/splat/splat-1.4.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="RF Signal Propagation, Loss, And Terrain analysis tool"
 HOMEPAGE="https://www.qsl.net/kd2bd/splat.html"
@@ -14,18 +14,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc hires l10n_es"
 
-DEPEND="sys-libs/zlib
-	app-arch/bzip2"
+DEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.2-gcc43.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.2-gcc43.patch
+)
 
 src_configure() {
 	# fake resulting file from interactive configuration script
 	# using default resolution
-	cat <<- EOF > "${S}/splat.h"
+	cat <<- EOF > "${S}/splat.h" || die
 		/* Parameters for 3 arc-second standard resolution mode of operation */
 		#define MAXPAGES 9
 		#define HD_MODE 0
@@ -33,7 +35,7 @@ src_configure() {
 	if use hires; then
 		# fake resulting file from interactive configuration script
 		# using default resolution
-		cat <<- EOF > "${S}/hires.h"
+		cat <<- EOF > "${S}/hires.h" || die
 			/* Parameters for 3 arc-second hires resolution mode of operation */
 			#define MAXPAGES 9
 			#define HD_MODE 1
@@ -42,20 +44,21 @@ src_configure() {
 }
 
 src_compile() {
-	local CC=$(tc-getCC) CXX=$(tc-getCXX)
+	tc-export CC CXX
 
-	${CXX} -Wall ${CXXFLAGS} ${LDFLAGS} itwom3.0.cpp splat.cpp -o rfsplat -lm -lbz2 || die
+	cp {splat,rfsplat}.cpp || die
+	emake LDLIBS="-lm -lbz2" -E "rfsplat: itwom3.0.o"
 	if use hires; then
-		cp "${S}/hires.h" "${S}/splat.h"
-		${CXX} -Wall ${CXXFLAGS} ${LDFLAGS} itwom3.0.cpp splat.cpp -o rfsplat-hd -lm -lbz2 || die
+		cp {hires,splat}.h || die
+		cp {splat,rfsplat-hd}.cpp || die
+		emake LDLIBS="-lm -lbz2" -E "rfsplat-hd: itwom3.0.o"
 	fi
 
-	cd utils
-	${CC} -Wall ${CFLAGS} ${LDFLAGS} citydecoder.c -o citydecoder
-	${CC} -Wall ${CFLAGS} ${LDFLAGS} usgs2sdf.c    -o usgs2sdf
-	${CC} -Wall ${CFLAGS} ${LDFLAGS} srtm2sdf.c    -o srtm2sdf   -lbz2
-	#${CC} -Wall ${CFLAGS} ${LDFLAGS} fontdata.c    -o fontdata   -lz
-	${CC} -Wall ${CFLAGS} ${LDFLAGS} bearing.c     -o bearing    -lm
+	cd utils || die
+
+	emake citydecoder usgs2sdf
+	emake LDLIBS=-lbz2 srtm2sdf
+	emake LDLIBS=-lm bearing
 }
 
 src_install() {
@@ -63,9 +66,8 @@ src_install() {
 	use l10n_es && SPLAT_LANG="spanish"
 	# splat binary
 	dobin rfsplat
-	if use hires; then
-		dobin rfsplat-hd
-	fi
+
+	use hires && dobin rfsplat-hd
 
 	# utilities
 	dobin utils/{citydecoder,usgs2sdf,srtm2sdf,postdownload,bearing}
@@ -74,17 +76,16 @@ src_install() {
 	dodoc CHANGES README utils/fips.txt
 	newdoc utils/README README.UTILS
 
-	if use doc; then
-		dodoc docs/${SPLAT_LANG}/{pdf/splat.pdf,postscript/splat.ps}
-	fi
+	use doc && dodoc docs/${SPLAT_LANG}/{pdf/splat.pdf,postscript/splat.ps}
+
 	#sample data
 	docinto sample_data
-	dodoc sample_data/*
+	dodoc -r sample_data/.
 }
 
 pkg_postinst() {
 	elog "The original SPLAT! command got renamed to 'rfsplat' to avoid"
-	elog "filename collission with app-portage/splat."
+	elog "filename collision with app-portage/splat."
 	elog ""
 	elog "Be aware that it is still referenced as 'splat' in the documentation."
 }
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 70a4bf5b0476..412018a5443a 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 78c0bd7e2735..1e07d521d25f 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -5,6 +5,6 @@ AUX gpsd.init-2 825 BLAKE2B 340bd992093d81067cef4329e50e4daa6e663ae214e560080ee5
 DIST gpsd-3.21.tar.xz 2620396 BLAKE2B 366d1857f7ff63e087ac1bec8c95d997cd8d48a60d5548c1644748e1ed20334f45a4fb279bc26c61481cc3dea0244eb0aaca0ba562838a3b5de15da5d1d82502 SHA512 a45416c31ee891a84203aea786b6385ea5f557a406d898a8facdde78d120199b7e7db8f86ab8c395f6ca90965940355fa19413b2b918642fd8c7df219745233e
 DIST gpsd-3.23.tar.gz 4893363 BLAKE2B 502c1f2103f3b4224f3bc654bfe6e08e7ddf84707a0db6369e52608c095d5d082da020091ebca27d403cf74fa0bee5ebe1550068263d8d7a55143da2bc1a7350 SHA512 967cc9801271418023630df02b457b76108968992151f6e80b569e99b856bd79cc3d0369d2088f3bc609b2ab22b29dba87639bf466bf262ab80b2b3f04055f8b
 EBUILD gpsd-3.21.ebuild 5674 BLAKE2B 34fb21d6a888469285112e33e10ae44685871a447999de76c87d2eddb7055603a76e6aa4a68c414f134dbcbdca8294ae07e3079bfb51c5032885261c800e1ea5 SHA512 414db9434056c76c1e0b6ce04926c79f9be7ee74aaebcaecaa2a3230d8d93c817c112280cec95574dade27f7ed4b4c614dd698f24b8dfa4caca6c792e7f79ef6
-EBUILD gpsd-3.23-r2.ebuild 6083 BLAKE2B 7da49280dc9f322b5836fb72e1f9affc3dd8e5223398b29f055e174a21253969ebc270d1d05a205c1487b095a68245bb8bab10dc65157853ad207aca6e4d72c5 SHA512 e61fefd9e7e40958cc6c94127cdaa9a82618bcf8ceaafd16ea7d22c4566ff9ac2e274acffbba32f9a21c1c752e09cbc37a4c1141dd2734b9f29a68a2af316e80
-EBUILD gpsd-9999.ebuild 6083 BLAKE2B 7da49280dc9f322b5836fb72e1f9affc3dd8e5223398b29f055e174a21253969ebc270d1d05a205c1487b095a68245bb8bab10dc65157853ad207aca6e4d72c5 SHA512 e61fefd9e7e40958cc6c94127cdaa9a82618bcf8ceaafd16ea7d22c4566ff9ac2e274acffbba32f9a21c1c752e09cbc37a4c1141dd2734b9f29a68a2af316e80
+EBUILD gpsd-3.23-r2.ebuild 6113 BLAKE2B 570b165646a4857982c63558068910747e0cf79097f28f138da97fd870b8ea3bf8453fbcb3c207bbe833ab93ee3724f42a85eac43134ea0955859f86ac52292e SHA512 4ded93264347958f0eddb717154ec6ffe801502cf6f0183550b6939f338147ffa65de79523f5c44e71c2e64c8b887f6818926bccbfe399afe27288aff6cc5e96
+EBUILD gpsd-9999.ebuild 6113 BLAKE2B 570b165646a4857982c63558068910747e0cf79097f28f138da97fd870b8ea3bf8453fbcb3c207bbe833ab93ee3724f42a85eac43134ea0955859f86ac52292e SHA512 4ded93264347958f0eddb717154ec6ffe801502cf6f0183550b6939f338147ffa65de79523f5c44e71c2e64c8b887f6818926bccbfe399afe27288aff6cc5e96
 MISC metadata.xml 950 BLAKE2B 1187055e96b7b5f0288f76fafbe2b1afd29729365fbf30b7e8120830db76193aa544815fd348058ef59351d1c097747684ae022b0ec7df0f655c0a9e3f4d7449 SHA512 87fdd329ffe13ec6aee16b877b355b2aac2267e8262b30ab5ab04307bc50797e1e3da8328a540a0484b06cbbd2f643f084e556ce32cc01b37c97d0f8f1b6be2a
diff --git a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
index 96a5705d5db6..550576d658a5 100644
--- a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
@@ -179,6 +179,9 @@ src_configure() {
 	for protocol in ${GPSD_PROTOCOLS[@]} ; do
 		scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
 	done
+
+	# bug #809260
+	python_setup
 }
 
 src_compile() {
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 96a5705d5db6..550576d658a5 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -179,6 +179,9 @@ src_configure() {
 	for protocol in ${GPSD_PROTOCOLS[@]} ; do
 		scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
 	done
+
+	# bug #809260
+	python_setup
 }
 
 src_compile() {
diff --git a/sci-geosciences/gshhs-data/Manifest b/sci-geosciences/gshhs-data/Manifest
index a65c605e76ea..48be78daf2f0 100644
--- a/sci-geosciences/gshhs-data/Manifest
+++ b/sci-geosciences/gshhs-data/Manifest
@@ -1,3 +1,3 @@
 DIST gshhs+wdbii_2.2.0.zip 114563504 BLAKE2B db631f4670eb99dd42ad22feae5c4f9aa776a105fb5373ee6ae33fd96f4eb6078b169efe038fb8c8434ef4b5016768a1ab21b2af20d4067f361d0305a060e300 SHA512 fa7011a0008cd81e551ff89dc9b3c51f165824cb15926069eaba0eb42b126d51be4874ce515fde3746217138b093f392d02bf4a1db25cd894ad5bd43cf6ae9d0
-EBUILD gshhs-data-2.2.0.ebuild 568 BLAKE2B d675ef598792b60967d86a1b18a635208574c31670730f324bf3c6d5a54f2109e64cdbb73c02b6da82291fff66101cfefb4a0a52f09bbd5a66153dce2449064d SHA512 af9ec70bde6b51f1707e59af78f79bfa49e463b41462a931b7cb8d5558fe6ec942fe9f96dd9a1b9a38a05a57aa6a3d0dc803016512d04f10f6fac01be6407418
+EBUILD gshhs-data-2.2.0.ebuild 594 BLAKE2B 8f05ba1fc384cda6b13c5e46323de7a249757201862a02833eb3f0c4f083478eced66332583a8d2b7def7b988a313653f3cf57e6fcee3e6853170fa4cff017b8 SHA512 bb5c6cae5e1b08ccd1213fd0bdfc49ccf36cb2937ab969ea3dd6ffdd77ebc67804b5150cb1baf8f411101e7f019718207f5e9b63d40e12edfc66f6a7a6ebe060
 MISC metadata.xml 792 BLAKE2B 386af871abe7a142f708d291cce70826f1347bf84c3dcdcbcfd5e6778f13e63929ac64d54c9725c5ebf3d9c32d71240a850a50e4df3b010d2bd7f7f600db6a7a SHA512 d1fc22ba6fddd7ec3e586b6334ec106f64fac8c05901052a41b2474f1bcdae31f629533e2e9f5577b3f4084f1abf92be39c1fd8385b10ef93e5cd483ddcdb4c3
diff --git a/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild b/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild
index f4ec0dab6349..37c8476bd8c1 100644
--- a/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild
+++ b/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="Global Self-consistent, Hierarchical, High-resolution Shoreline programs data"
 HOMEPAGE="https://www.ngdc.noaa.gov/mgg/shorelines/gshhs.html"
@@ -12,6 +12,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
+BDEPEND="app-arch/unzip"
+
 src_install() {
 	dodoc gshhs/README.TXT
 	rm gshhs/README.TXT || die
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 2cc9c8590375..a5701981f113 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest
index 00d5b0182d75..2a389a8cbb24 100644
--- a/sci-libs/med/Manifest
+++ b/sci-libs/med/Manifest
@@ -1,5 +1,6 @@
 AUX med-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch 1412 BLAKE2B 50602ca4a76ba4d15072d6bb96f9ce8576ac819c36b2a2a30268b506e1f453966e2846ea81ab8919d59c47e5f2ca41bc433b9fddee13797834f3a0c11a8fbb0f SHA512 cf810b8f8f2466d0b2bbf6fae1167faf57ce0b01812630ab165401432fee474b6ce80b50e122c36c61f0c347f89a1975cb91ac7ea3939eee2c15bf9e1a1dcdbe
 AUX med-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch 1061 BLAKE2B 1856be8c2189e5d7541f041182e48315d686cadfeb409872eee25a90ff657cf1b6a5c76a4632a6d3d12af29b2f7ee67201d67c40cbc98927702ce1c905aa2509 SHA512 c40235bed175f84615115c899fad9f78a03205a7192bdf68f1b79a1711a7a15c58145102fce9850898f463d6d7ad16bbb89416f689d4013364955036628e7263
+AUX med-4.1.0-0003-build-against-hdf5-1.12.patch 4749 BLAKE2B 3a606c27bce6130e83989dd4e16733ced50da0ef21dd40226ffb6f64abbd5f2eca2174f971b4bbf3204df0e6040b86706c007dbf6b821a5bb287b648078d9113 SHA512 ba2fa24e3aeb2be6fa1e7365d7ac57c9ebd8706dd19de7dba67507baafe1f48b7b00051169f27164b4a9e749816220619490d5f0796a0c02f25644569b26f366
 DIST med-4.1.0.tar.gz 50375039 BLAKE2B 514ca19baf15e349ecbce870b318b37c51bfb57ac9b03c2b2c1b28836fec7fcf2dce573b9ea155f358d5e0bcee120c12a31598cd4f1e44837eca787553bb70d4 SHA512 94d07663c2f6a3cd497f54b480c3d742476d2a25172feb567980c9e75d49f4661aa2c6aaf570470938265997154e348bc1608065b86d42afda52d4e6361fedf8
-EBUILD med-4.1.0.ebuild 3231 BLAKE2B 336bfbfba073d30dd9ef1efb0b00ef5cdc90f53ab3de07002219f3750d433c8aabccdd02c439ef262058cfc3ce9676562e808863ce09af741671b2a107953c73 SHA512 d45cc92458137499e6f735fb4f440d5f823710dd0167c71302dbdea59e0d1938e009fe25d23d60f0aef9eb5df785f9288ea6faedcf30f65c31cda71aa65294c1
+EBUILD med-4.1.0.ebuild 3342 BLAKE2B fde2ce1741442e953a4d141a58b71226cf9e209d7b2941cbb859144dffcf3895740a1aa3b664738b6d0f34a6d450ea2a6f4c87258af557324c21daa694ce1c23 SHA512 8db224906fee79e35308b0445e450e239d34f73717370da0db6bfeb22084b5a99fc4b8fbd6c11fc1cb49352d088aaf74752a8e9b304a63286330d2b9491ee95c
 MISC metadata.xml 635 BLAKE2B 679b3111d148b77df38d08e07223c25390b3e0dbff3661fc1ff88084556979db955b990c9998f84dbc9782773728e73d22c28e534d45a33857d72f36585a7c30 SHA512 f19b5ade75301ed6985a00bbd5e074523bce2601dc992e27a472be17e958f45db4549cb6f88946862204840c2c70bb06e64683716157051769a785763d571908
diff --git a/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.12.patch b/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.12.patch
new file mode 100644
index 000000000000..46d7ed21af8d
--- /dev/null
+++ b/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.12.patch
@@ -0,0 +1,117 @@
+From 5c9c1ce9911290283d39e16b1ed4c1d4ea5a5678 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 24 Aug 2021 08:32:13 +0200
+Subject: [PATCH] build against hdf5-1.12
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ config/cmake_files/medMacros.cmake | 4 ++--
+ src/ci/MEDfileCompatibility.c      | 2 +-
+ src/hdfi/_MEDfileCreate.c          | 2 +-
+ src/hdfi/_MEDfileOpen.c            | 2 +-
+ src/hdfi/_MEDmemFileOpen.c         | 2 +-
+ src/hdfi/_MEDparFileCreate.c       | 2 +-
+ src/hdfi/_MEDparFileOpen.c         | 2 +-
+ 7 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/config/cmake_files/medMacros.cmake b/config/cmake_files/medMacros.cmake
+index 957c59b..d73c7af 100644
+--- a/config/cmake_files/medMacros.cmake
++++ b/config/cmake_files/medMacros.cmake
+@@ -447,13 +447,13 @@ MACRO(MED_FIND_HDF5)
+     ##
+     ## Requires 1.10.x version
+     ##
+-    IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1)
++    IF(HDF5_VERSION VERSION_LESS 1.10.2)
+         MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")
+     ENDIF()
+     ##
+     ##
+ 
+-    ADD_DEFINITIONS(-DH5_USE_16_API)  
++    ADD_DEFINITIONS(-DH5_USE_18_API -DH5_USE_16_API)
+     IF(WIN32 AND MEDFILE_BUILD_SHARED_LIBS)
+       ADD_DEFINITIONS(-D_HDF5USEDLL_ -DH5_BUILT_AS_DYNAMIC_LIB=1)   
+     ENDIF()
+diff --git a/src/ci/MEDfileCompatibility.c b/src/ci/MEDfileCompatibility.c
+index 1d6cabf..43b5b50 100644
+--- a/src/ci/MEDfileCompatibility.c
++++ b/src/ci/MEDfileCompatibility.c
+@@ -113,7 +113,7 @@ MEDfileCompatibility(const char* const filename,
+ #if MED_NUM_MAJEUR != 4
+ #error "Don't forget to update the test version here when you change the major version of the library !"
+ #endif
+-#if H5_VERS_MINOR > 10
++#if H5_VERS_MINOR > 12
+ #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
+ #error "Cf. _MEDfileCreate ..."
+ #endif
+diff --git a/src/hdfi/_MEDfileCreate.c b/src/hdfi/_MEDfileCreate.c
+index 4bc9551..b670c92 100644
+--- a/src/hdfi/_MEDfileCreate.c
++++ b/src/hdfi/_MEDfileCreate.c
+@@ -159,7 +159,7 @@ med_idt _MEDfileCreate(const char * const filename, const med_access_mode access
+    * En HDF5-1.10.0p1 cela n'a aucun effet ! 
+    * Un test autoconf permet de fixer un intervalle de version HDF à MED.
+    */
+-#if H5_VERS_MINOR > 10
++#if H5_VERS_MINOR > 12
+ #error "Don't forget to change the compatibility version of the library !"
+ #endif
+    
+diff --git a/src/hdfi/_MEDfileOpen.c b/src/hdfi/_MEDfileOpen.c
+index 8ace00e..ebd875b 100644
+--- a/src/hdfi/_MEDfileOpen.c
++++ b/src/hdfi/_MEDfileOpen.c
+@@ -72,7 +72,7 @@ med_idt _MEDfileOpen(const char * const filename,const med_access_mode accessmod
+ 
+    •   The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order). 
+   */
+-#if H5_VERS_MINOR > 10
++#if H5_VERS_MINOR > 12
+ #error "Don't forget to change the compatibility version of the library !"
+ #endif
+ /* L'avantage de bloquer le modèle interne HDF5 
+diff --git a/src/hdfi/_MEDmemFileOpen.c b/src/hdfi/_MEDmemFileOpen.c
+index ae92ba7..4a929ff 100644
+--- a/src/hdfi/_MEDmemFileOpen.c
++++ b/src/hdfi/_MEDmemFileOpen.c
+@@ -434,7 +434,7 @@ med_idt _MEDmemFileOpen(const char * const filename, med_memfile * const memfile
+     goto ERROR;
+   }
+ 
+-#if H5_VERS_MINOR > 10
++#if H5_VERS_MINOR > 12
+ #error "Don't forget to change the compatibility version of the library !"
+ #endif
+   if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) {
+diff --git a/src/hdfi/_MEDparFileCreate.c b/src/hdfi/_MEDparFileCreate.c
+index f0b77be..b7d1b78 100644
+--- a/src/hdfi/_MEDparFileCreate.c
++++ b/src/hdfi/_MEDparFileCreate.c
+@@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * const filename, const med_access_mode acc
+    * En HDF5-1.10.0p1 cela n'a aucun effet ! 
+    * Un test autoconf permet de fixer un intervalle de version HDF à MED.
+    */
+-#if H5_VERS_MINOR > 10
++#if H5_VERS_MINOR > 12
+ #error "Don't forget to change the compatibility version of the library !"
+ #endif
+    
+diff --git a/src/hdfi/_MEDparFileOpen.c b/src/hdfi/_MEDparFileOpen.c
+index 0a9700d..4933692 100644
+--- a/src/hdfi/_MEDparFileOpen.c
++++ b/src/hdfi/_MEDparFileOpen.c
+@@ -55,7 +55,7 @@ med_idt _MEDparFileOpen(const char * const filename,const med_access_mode access
+     MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG);
+     goto ERROR;
+   }
+-#if H5_VERS_MINOR > 10
++#if H5_VERS_MINOR > 12
+ #error "Don't forget to change the compatibility version of the library !"
+ #endif
+   if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {
+-- 
+2.32.0
+
diff --git a/sci-libs/med/med-4.1.0.ebuild b/sci-libs/med/med-4.1.0.ebuild
index ab5056e4a4d7..ec6eef42dc1e 100644
--- a/sci-libs/med/med-4.1.0.ebuild
+++ b/sci-libs/med/med-4.1.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake fortran-2 python-single-r1
 
@@ -30,9 +30,11 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="python? ( >=dev-lang/swig-3.0.8 )"
 
+#	"${FILESDIR}/${P}-0003-fix-hdf5-version-check.patch"
 PATCHES=(
 	"${FILESDIR}/${P}-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch"
 	"${FILESDIR}/${P}-0002-Re-add-option-for-building-Fortran-library.patch"
+	"${FILESDIR}/${P}-0003-build-against-hdf5-1.12.patch"
 )
 
 DOCS=( AUTHORS ChangeLog NEWS README README.CMAKE TODO )
diff --git a/sci-libs/profnet/Manifest b/sci-libs/profnet/Manifest
index ff60d88bc798..b343c4e2d63f 100644
--- a/sci-libs/profnet/Manifest
+++ b/sci-libs/profnet/Manifest
@@ -1,3 +1,3 @@
 DIST profnet-1.0.22.tar.gz 203676 BLAKE2B ecee0347d711784c37b71cc3b0812bbd871d2438716a4fa2fb1e2b9c1fe3a9801073fcff3432203feed226325db36d4246d0be64487c57f2f643a192ae33840e SHA512 11c6d180219b60df7c5e144719354b7fbd5845e4ab6e52027315ee80d820c89fca9bce5b9e9e49314aa64058f93196f0cd35089604b53721fee3c050e45d9555
-EBUILD profnet-1.0.22.ebuild 660 BLAKE2B 2b0c724f2c9d33f14ed7a72e60562f4fa15efcff97f69474073755927726c434e92e81a341eb6af17bf421fab914a4b9e06af313fde06be8ee0ece13d3b3da2f SHA512 89452bb3149a8124ccd60d866ae0afc6c1132126d83d33f2aefe53a3179a4f51fd90885cbf93eda417527ea6874c73daf511eb713cc27d390c0690150517ff94
+EBUILD profnet-1.0.22.ebuild 844 BLAKE2B ad85ec69fb1b95d081ae97a4cae612c82310cc52114cd3c86e9c489e2bd03b837c5f9b59cfc6e7a1f41751832c64dc5f6f0a55ec8af2cb5a5e5b62b87a3cb98a SHA512 d169cd5861636652395a8a83e068ff26ff838637780224137f48e1a3db00ee271e47f11a6d0552c95f061e6a8f83ef41519acdbda705deae56a1ecc90b680d96
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-libs/profnet/profnet-1.0.22.ebuild b/sci-libs/profnet/profnet-1.0.22.ebuild
index df450e7e8d39..5488f1435dec 100644
--- a/sci-libs/profnet/profnet-1.0.22.ebuild
+++ b/sci-libs/profnet/profnet-1.0.22.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit fortran-2 toolchain-funcs
+inherit flag-o-matic fortran-2 toolchain-funcs
 
 DESCRIPTION="Neural network architecture for profacc"
 HOMEPAGE="https://rostlab.org/"
 SRC_URI="ftp://rostlab.org/profnet/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-3"
+SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="sys-libs/libunwind"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	default
 	sed \
 		-e '/$@/s:-o:$(LDFLAGS) -o:g' \
 		-i src-phd/Makefile || die
 }
 
 src_compile() {
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
 	emake \
 		F77=$(tc-getF77) \
 		FFLAGS="${FFLAGS}"
@@ -34,4 +35,7 @@ src_install() {
 		DESTDIR="${D}" \
 		prefix="${EPREFIX}/usr" \
 		install
+
+	# Don't install compressed man pages
+	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
 }
diff --git a/sci-libs/profphd-utils/Manifest b/sci-libs/profphd-utils/Manifest
index 4418a8171e50..f22b3eace865 100644
--- a/sci-libs/profphd-utils/Manifest
+++ b/sci-libs/profphd-utils/Manifest
@@ -1,3 +1,3 @@
 DIST profphd-utils-1.0.10.tar.gz 388222 BLAKE2B 1985bb9b93a502911f0d3b5c7de9031d633f6060e9ae0b7531d248436b1dacf6f3462bab1bc127add341dc00a8200a88860197dd6515c1430395b840c44b98ca SHA512 c8a777e20bd721e53610ec28da01771300b06f3d284d40b0681ac0e38e8e0b3c7507e1aec7ddc627808d6ce7ccf8d3db94bf87449b958647e00a9c9d98a4300c
-EBUILD profphd-utils-1.0.10-r1.ebuild 570 BLAKE2B 6acb29b2d981d320297858f7ebd0c8fb629576a06f60f19d67d5561e285ba36daf3b5dcfbe939882ccdbec1ee44d45f8099079d8920e5c531e9042c000e88db7 SHA512 9066e8bb37c5b12ed8312e2807470657e63c6b054d3d0f96eb0e52a5fc70c57f836e1f56506ba64123df6c1eda816708f37231c35cd23364599fe027644c8fc8
+EBUILD profphd-utils-1.0.10-r1.ebuild 549 BLAKE2B 9f44502246efdbb5ac63dae09476a96d0e02d22bddb9e14bf48ce563561d66d593ddbd9e7c33af72c8d90d39448d697803e3812ec149c18535efd5f3e3824b2e SHA512 d862b24738f61d6cfd418079a937817ad972d6ca560473762cd7f275aeef3b056225ded19d6b63bb16de1a5ac15a0d3dbd0530c267b1b477d9afbfcae9453871
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-libs/profphd-utils/profphd-utils-1.0.10-r1.ebuild b/sci-libs/profphd-utils/profphd-utils-1.0.10-r1.ebuild
index 83d0f8485e02..288f583f6598 100644
--- a/sci-libs/profphd-utils/profphd-utils-1.0.10-r1.ebuild
+++ b/sci-libs/profphd-utils/profphd-utils-1.0.10-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit fortran-2 toolchain-funcs
 
@@ -9,13 +9,11 @@ DESCRIPTION="Additional utils for profphd"
 HOMEPAGE="https://rostlab.org/"
 SRC_URI="ftp://rostlab.org/profphd-utils/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-3"
+SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
-RDEPEND=""
-DEPEND="dev-lang/perl"
+BDEPEND="dev-lang/perl"
 
 src_compile() {
 	emake \
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index de4827fd48e3..fe05e2555072 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/tango/Manifest b/sci-misc/tango/Manifest
deleted file mode 100644
index e2626e0cc215..000000000000
--- a/sci-misc/tango/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tango-9.2.5a.tar.gz 65888551 BLAKE2B 73ac78c4cce5f98bff108ae01d669d7654f8d11d1fcc5621b4268511c713f5ed6087c268a6d4c620e4aa41692ecd96f9676a48038c036cb0896c2acd007a3e3a SHA512 f372ea8b261d345fac5dbd198b1d5f28ff346796ba91191e752cea5b9fb9155b43bfada89032c29a51fa9b4f5e3a4f16d1b1ca9e73530dc7f60eb10103531d3e
-EBUILD tango-9.2.5a.ebuild 968 BLAKE2B 99837e3f98071932aedee338c88d1c78b5bb82063a56e96a13ed799ea65e25c8157e0e7587794efefd2a14fe0d5efbe68d15929a38ce2e00d3f56e3081213437 SHA512 fd561dc3985247035f3409331e5528999f3021741787c9239304dc58569f25f04bb24ade7e32c10fef6c1b9a2ec030b54644042306f00c2d0cd88ffedc3ec27b
-MISC metadata.xml 1086 BLAKE2B b0f79dc60fb750a2096f21eb9f9897e3a5e56ea91a0d5eddc52e49785f8e75cdfb1b6a3d2e55db08755680671a81c85cfec74b411a16d6ca1293f35b8dcfa630 SHA512 b42c372a91066486afedd67f6f72bb994a3179710905149deee78cf62d2b27aac68a012ea5ebdb397b478f9057a1befa1299fc8f20925ec1413cc9e4e67e2d6b
diff --git a/sci-misc/tango/metadata.xml b/sci-misc/tango/metadata.xml
deleted file mode 100644
index 5e6d8ba6b6ac..000000000000
--- a/sci-misc/tango/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
-	<longdescription lang="en">
-		Tango is an Open Source solution for SCADA and DCS. Open Source means you get all the source code under an Open Source free licence (LGPL and GPL). Supervisory Control and Data Acquisition (SCADA) systems are typically industrial type systems using standard hardware. Distributed Control Systems (DCS) are more flexible control systems used in more complex environments.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">tango-cs</remote-id>
-	</upstream>
-	<use>
-		<flag name="dbserver">Enable build of tango dbserver</flag>
-		<flag name="mariadb">Use <pkg>dev-db/mariadb</pkg></flag>
-		<flag name="zeromq">Allow to use ZeroMQ broker via <pkg>net-libs/zeromq</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/sci-misc/tango/tango-9.2.5a.ebuild b/sci-misc/tango/tango-9.2.5a.ebuild
deleted file mode 100644
index 5493a00e359d..000000000000
--- a/sci-misc/tango/tango-9.2.5a.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tango is an Open Source solution for SCADA and DCS"
-HOMEPAGE="https://www.tango-controls.org/"
-SRC_URI="mirror://sourceforge/tango-cs/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+dbserver java +mariadb +zeromq"
-
-DEPEND="
-	net-misc/omniORB
-	mariadb? ( dev-db/mariadb-connector-c )
-	!mariadb? ( dev-db/mysql-connector-c )
-	dbserver? (
-		mariadb? ( dev-db/mariadb:*[server] )
-		!mariadb? ( >=virtual/mysql-5.6[server] )
-	)
-	java? ( virtual/jdk:* )
-	zeromq? ( net-libs/zeromq )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="${DEPEND}"
-
-src_configure() {
-	local MYCONF
-	if use mariadb; then
-		MYCONF+=(
-			$(use_enable mariadb)
-			--with-mariadbclient-include="${EPREFIX}/usr/include/mysql"
-		)
-	fi
-
-	econf \
-		--with-omni="${EPREFIX}/usr" \
-		$(use_enable zeromq zmq) \
-		$(use_enable java) \
-		$(use_enable dbserver) \
-		${MYCONF[@]}
-}
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 42b0067360f8..2f6e066c3550 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index ec0978c161be..086d40c8afc8 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,9 +1,10 @@
+AUX geant4.10.7-hdf5.patch 2733 BLAKE2B 58b2da9a27d09dbd16048b3da34397b49abd28fe12238d400a86d64fb02799b294c1b4313297de4397d6f8e5fc0feb735f8fc9352ff5b4c34721a445a33d2354 SHA512 a1f64e1e21b09e7b7335eb06110cd2c76f7bbbab80f0dd87bb1139c5d45ee5392f2f03a0466c27e8d796aa24e3b5400fe44f5c260969aa64f1e5e506393b0080
 DIST geant4.10.07.p01.tar.gz 36217226 BLAKE2B 3bc5868db1328ac08582fef4a5246e2f3fc1b2d34bca668d27c6c272af3de230f680cff02c3a8b53ab5abc4186645935b042b456cdff3cba01bc180e0646a50d SHA512 d314d649bf349a4fc5dd09229897d3e4ca3bfba071daeb67ab4d4bde187ec59c120b2478d2b28d1c88615189bd38097666bf4a0c25ce5cb4bc3cf0d9815bea5d
 DIST geant4.10.07.p02.tar.gz 35729676 BLAKE2B 1727ab4e35f4dafe0b406bb189a008955c660922a4fc855a765a269ec8837242ba2372b346c189de6bd6d36c434e0636c483c292f90573726fa6d3b4cc67eb12 SHA512 fe5a387880218782570ff2b28cf8f6abc1457437652f349b8b81ac1045bdec7ee51fa2930451c1271708c02914ac60effd0ee8933d42c29d05819fe320356092
 DIST geant4.10.07.tar.gz 36422877 BLAKE2B d81a37e0968f3c13bb846efc252b1b31cb01a8642610b079bcf6ec1741e7f5da09d50f4abe4054b7a06433dc7d9b611110c4f9a1f971a5f1df27580d49b8906d SHA512 057ab2c6ee5d5ad7012bd889bf883faa3ef1fa72a93190d00d1320f250b7b52e21cbae552cbc35065ad5f5bd46cd91fd1536dd4d5e620afa0abb6b065bd7c86b
 DIST geant4.11.00.b01.tar.gz 35617362 BLAKE2B 654679f3876081931a80b8ee8dbf579ef45cbd8edb4e8a641ad1facc2edab470ff19f557672e901321e1993453110b4f1f5c5d7a6b0bb293e710def2d5871d12 SHA512 abc39b33d0570bc07db0e957a2e33db91b47e8ebe650bb79cb8f6fdf6f0e4938607a96011f9b0fba0294828afcf7e6f3ee20367e319f2b388f3b315bd615a6db
-EBUILD geant-4.10.7-r2.ebuild 2973 BLAKE2B 0804d23fee3f47903249a1ad800621421c608fecf5379c4116077563da17ea0e484ee6b17620a9894dcf2f468c02849bed0790fbe25e7f036511bf771a0e3efe SHA512 7072276b508c6b9afcc1d3d46fdd49ea5090445b1da1a7bfa6fadd8adb22fda3b782b7bbaaa0b9c2255727a999142fdc708c34ca31d19cfc39f3dc1d412e27a0
-EBUILD geant-4.10.7.1-r2.ebuild 2973 BLAKE2B 0804d23fee3f47903249a1ad800621421c608fecf5379c4116077563da17ea0e484ee6b17620a9894dcf2f468c02849bed0790fbe25e7f036511bf771a0e3efe SHA512 7072276b508c6b9afcc1d3d46fdd49ea5090445b1da1a7bfa6fadd8adb22fda3b782b7bbaaa0b9c2255727a999142fdc708c34ca31d19cfc39f3dc1d412e27a0
-EBUILD geant-4.10.7.2-r2.ebuild 2978 BLAKE2B a3afb598bdb82415dec02e6856ee09693b323122b6837890421baecf48365003c64abc6e20b592458a2a7bf1390ceae237720e8489b5ca2f9f48768af98e068b SHA512 0faf72fe2fc6ec9c6e48dfc32b33c00bc3a56409c84e2d0b82e2a686fcd161c356bbc5d05a9fd85976c4a32dde6b4860e13536a141049264f159310c46c1e3bd
-EBUILD geant-4.11.0_beta1-r1.ebuild 2931 BLAKE2B bbb9b29863bc1fb4037bcf3baaeb395f07f3222c8db14bcbe21c32955e1015bf5ade95a1269a9ad4deb4a965c0bc45173130c8ef91578cf2991c4b2ae2ad8979 SHA512 094a4a83080ca56cb93f5103ce37cd2865267b23193c88bb9ec27f7eede218181b261974f15935847449f60383768c3f3dc54f9b4990db1301fbbe23f93138dc
+EBUILD geant-4.10.7-r3.ebuild 3023 BLAKE2B fc6736cd84396a2b3150e4cb11257e0a2f8a796b71bee008a2c9dc495f2804c19037b647c1f9a562b300455f793d3ab4d846c9bd47a336bbd04b05b3fab3ac2a SHA512 4965ff7ec1f669239c4fd8ba86323ad7d559db830141823351f14df6046896f5f54397b59276ebd512c0c8098a9dddcc06b8bc1f3aa9b6b1a89dfa1f3eff189f
+EBUILD geant-4.10.7.1-r3.ebuild 3023 BLAKE2B fc6736cd84396a2b3150e4cb11257e0a2f8a796b71bee008a2c9dc495f2804c19037b647c1f9a562b300455f793d3ab4d846c9bd47a336bbd04b05b3fab3ac2a SHA512 4965ff7ec1f669239c4fd8ba86323ad7d559db830141823351f14df6046896f5f54397b59276ebd512c0c8098a9dddcc06b8bc1f3aa9b6b1a89dfa1f3eff189f
+EBUILD geant-4.10.7.2-r3.ebuild 3028 BLAKE2B 94bf246880007086975506be8f42c614c935ec30ec26e341b717407c16f26dd521ceb939703808df3cc4ed224fc9843ce38a5d95506a2bb81c158f5ff3da2a46 SHA512 e2f5b172e01ab6267d1c80948b4183ce91c1b2ad033fdd5d8c951bde7a596734eee35da3a8b232392f255450a50026650e9ef8beb8e3e151013a5c168ca9aaad
+EBUILD geant-4.11.0_beta1-r2.ebuild 2981 BLAKE2B 975509af637085168c64325f43e6da45e388bb324de80b9d044aa3a5f682923467edb7835b43216c0137db93b4baaf0141e9572f242e42bc914cd4d23a3999ec SHA512 99b3414f41db5af7971a8fad4512aeb4b7205dd3b1622efc948ea19f6f3f9ccf11b8bb8d4b2fc72477e119a651e82776bddf511a9a64afa1b6fdadaea563dba6
 MISC metadata.xml 1616 BLAKE2B 3f098e0f66943474a142c2c05859f83449ab45296ba4e38c0de3f958517f626464f7b45d2f79ed273946c91b7e36fbd6d8d1e2f29da975a6212faf36126289b7 SHA512 fe5f63bde72af132440e8c76cfb864caf3fde1872a7a3e71f9b308b96778eaf47b7ac2e829c83bf5d81fc9c221bc50f04d4f0dd4303003a049d0dcf206c1020c
diff --git a/sci-physics/geant/files/geant4.10.7-hdf5.patch b/sci-physics/geant/files/geant4.10.7-hdf5.patch
new file mode 100644
index 000000000000..679cdfbed9d6
--- /dev/null
+++ b/sci-physics/geant/files/geant4.10.7-hdf5.patch
@@ -0,0 +1,70 @@
+From 4e86e523e7f0e419b990520a15ef7d524102cd06 Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@gentoo.org>
+Date: Mon, 23 Aug 2021 13:18:25 +0200
+Subject: [PATCH] Rename Geant4::HDF5 to hdf5::hdf5
+
+Needed to be compatible with CMake 3.20, which now provides imported
+targets for HDF5 (https://cmake.org/cmake/help/v3.20/module/FindHDF5.html).
+---
+ cmake/Modules/G4HDF5Shim.cmake           | 16 ++++++++--------
+ cmake/Modules/G4OptionalComponents.cmake |  2 +-
+
+diff --git a/cmake/Modules/G4HDF5Shim.cmake b/cmake/Modules/G4HDF5Shim.cmake
+index 963a7bb5be..97d97248d8 100644
+--- a/cmake/Modules/G4HDF5Shim.cmake
++++ b/cmake/Modules/G4HDF5Shim.cmake
+@@ -1,10 +1,10 @@
+- # - G4HDF5Shim
++# - G4HDF5Shim
+ #
+ # Geant4's Geant4Config.cmake file aims to support CMake 3.8 and newer
+ # The HDF5 dependency is located through CMake's builtin FindHDF5
+-# module, but this does not supply imported targets as of CMake 3.16.
++# module, but this does not supply imported targets until CMake 3.20.
+ # It may use HDF5's hdf5-config.cmake file if available, so create
+-# custom imported target Geant4::HDF5 to allow both cases to be handled
++# custom imported target hdf5::hdf5 to allow both cases to be handled
+ # without interference with either.
+  
+ if(HDF5_FOUND)
+@@ -24,18 +24,18 @@ if(HDF5_FOUND)
+    endif()
+  endif()
+ 
+- # As FindHDF5 does not yet supply imported targets, we
++ # If FindHDF5 does not yet supply imported targets, we
+  # create an internal INTERFACE target to wrap these.
+  # This still hard-codes include/library paths, but limits it
+  # to one place. Later, we'll create proper imported targets
+  # with re-finds but for now this is the best minimally invasive proceedure
+- if(NOT TARGET Geant4::HDF5)
+-   add_library(Geant4::HDF5 IMPORTED UNKNOWN)
+-   set_target_properties(Geant4::HDF5 PROPERTIES
++ if(NOT TARGET hdf5::hdf5)
++   add_library(hdf5::hdf5 IMPORTED UNKNOWN)
++   set_target_properties(hdf5::hdf5 PROPERTIES
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+      IMPORTED_LOCATION "${HDF5_C_LIBRARY_hdf5}"
+      INTERFACE_INCLUDE_DIRECTORIES "${HDF5_C_INCLUDE_DIRS}"
+      INTERFACE_LINK_LIBRARIES "${HDF5_C_LIBRARIES}"
+      )
+  endif()
+-endif()
+\ No newline at end of file
++endif()
+diff --git a/cmake/Modules/G4OptionalComponents.cmake b/cmake/Modules/G4OptionalComponents.cmake
+index c0639a538b..77b3c91241 100644
+--- a/cmake/Modules/G4OptionalComponents.cmake
++++ b/cmake/Modules/G4OptionalComponents.cmake
+@@ -369,7 +369,7 @@ if(GEANT4_USE_HDF5)
+   find_package(HDF5 1.8 REQUIRED)
+   include("${CMAKE_CURRENT_LIST_DIR}/G4HDF5Shim.cmake")
+   # Backward compatibility
+-  set(HDF5_LIBRARIES Geant4::HDF5)
++  set(HDF5_LIBRARIES hdf5::hdf5)
+ 
+   # May have found via config mode...
+   if(HDF5_DIR)
+-- 
+2.33.0
+
diff --git a/sci-physics/geant/geant-4.10.7-r2.ebuild b/sci-physics/geant/geant-4.10.7-r2.ebuild
deleted file mode 100644
index fcc836682744..000000000000
--- a/sci-physics/geant/geant-4.10.7-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
-
-case ${PV} in
-*_beta*)
-	MY_P+=.b$(printf %02d $(ver_cut 5))
-	DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
-	;;
-*)
-	if [[ $(ver_cut 4) -gt 0 ]]; then
-		MY_P+=.p$(printf %02d $(ver_cut 4))
-		DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
-	fi
-	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
-	;;
-esac
-
-DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="https://geant4.web.cern.ch/"
-SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 c++14 +c++17 +data dawn doc examples freetype gdml geant3 hdf5
-	inventor motif opengl qt5 raytracerx static-libs threads vrml"
-
-REQUIRED_USE="
-	^^ ( c++11 c++14 c++17 )
-	inventor? ( opengl )
-	motif? ( opengl )
-	qt5? ( opengl )
-"
-
-RDEPEND="
-	dev-libs/expat
-	>=sci-physics/clhep-2.4.4.0:2=[threads?]
-	data? ( ~sci-physics/geant-data-${PV} )
-	dawn? ( media-gfx/dawn )
-	doc? ( =app-doc/geant-docs-$(ver_cut 1-3)* )
-	gdml? ( dev-libs/xerces-c )
-	hdf5? ( sci-libs/hdf5[threads?] )
-	inventor? ( media-libs/SoXt )
-	motif? ( x11-libs/motif:0 )
-	opengl? ( virtual/opengl )
-	qt5? (
-		dev-qt/qt3d:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raytracerx? (
-		x11-libs/libX11
-		x11-libs/libXmu
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
-		-DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
-		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
-		-DGEANT4_BUILD_STORE_TRAJECTORY=OFF
-		-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
-		-DGEANT4_BUILD_VERBOSE_CODE=OFF
-		-DGEANT4_INSTALL_DATA=OFF
-		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
-		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
-		-DGEANT4_INSTALL_PACKAGE_CACHE=OFF
-		-DGEANT4_USE_FREETYPE=$(usex freetype)
-		-DGEANT4_USE_G3TOG4=$(usex geant3)
-		-DGEANT4_USE_GDML=$(usex gdml)
-		-DGEANT4_USE_HDF5=$(usex hdf5)
-		-DGEANT4_USE_INVENTOR=$(usex inventor)
-		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
-		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
-		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
-		-DGEANT4_USE_QT=$(usex qt5)
-		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
-		-DGEANT4_USE_SYSTEM_CLHEP=ON
-		-DGEANT4_USE_SYSTEM_EXPAT=ON
-		-DGEANT4_USE_SYSTEM_ZLIB=ON
-		-DGEANT4_USE_XM=$(usex motif)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		${EXTRA_ECONF}
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	# adjust clhep linking flags for system clhep
-	# binmake.gmk is only useful for legacy build systems
-	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
-	cmake_src_install
-	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
-
-	einstalldocs
-}
diff --git a/sci-physics/geant/geant-4.10.7-r3.ebuild b/sci-physics/geant/geant-4.10.7-r3.ebuild
new file mode 100644
index 000000000000..085e5abcf44a
--- /dev/null
+++ b/sci-physics/geant/geant-4.10.7-r3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
+
+case ${PV} in
+*_beta*)
+	MY_P+=.b$(printf %02d $(ver_cut 5))
+	DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
+	;;
+*)
+	if [[ $(ver_cut 4) -gt 0 ]]; then
+		MY_P+=.p$(printf %02d $(ver_cut 4))
+		DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
+	fi
+	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
+	;;
+esac
+
+DESCRIPTION="Toolkit for simulation of passage of particles through matter"
+HOMEPAGE="https://geant4.web.cern.ch/"
+SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="c++11 c++14 +c++17 +data dawn doc examples freetype gdml geant3 hdf5
+	inventor motif opengl qt5 raytracerx static-libs threads vrml"
+
+REQUIRED_USE="
+	^^ ( c++11 c++14 c++17 )
+	inventor? ( opengl )
+	motif? ( opengl )
+	qt5? ( opengl )
+"
+
+RDEPEND="
+	dev-libs/expat
+	>=sci-physics/clhep-2.4.4.0:2=[threads?]
+	data? ( ~sci-physics/geant-data-${PV} )
+	dawn? ( media-gfx/dawn )
+	doc? ( =app-doc/geant-docs-$(ver_cut 1-3)* )
+	gdml? ( dev-libs/xerces-c )
+	hdf5? ( sci-libs/hdf5[threads?] )
+	inventor? ( media-libs/SoXt )
+	motif? ( x11-libs/motif:0 )
+	opengl? ( virtual/opengl )
+	qt5? (
+		dev-qt/qt3d:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raytracerx? (
+		x11-libs/libX11
+		x11-libs/libXmu
+	)"
+
+PATCHES=( "${FILESDIR}"/geant4.10.7-hdf5.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
+		-DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
+		-DGEANT4_BUILD_STORE_TRAJECTORY=OFF
+		-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
+		-DGEANT4_BUILD_VERBOSE_CODE=OFF
+		-DGEANT4_INSTALL_DATA=OFF
+		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
+		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
+		-DGEANT4_INSTALL_PACKAGE_CACHE=OFF
+		-DGEANT4_USE_FREETYPE=$(usex freetype)
+		-DGEANT4_USE_G3TOG4=$(usex geant3)
+		-DGEANT4_USE_GDML=$(usex gdml)
+		-DGEANT4_USE_HDF5=$(usex hdf5)
+		-DGEANT4_USE_INVENTOR=$(usex inventor)
+		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
+		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
+		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
+		-DGEANT4_USE_QT=$(usex qt5)
+		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
+		-DGEANT4_USE_SYSTEM_CLHEP=ON
+		-DGEANT4_USE_SYSTEM_EXPAT=ON
+		-DGEANT4_USE_SYSTEM_ZLIB=ON
+		-DGEANT4_USE_XM=$(usex motif)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		${EXTRA_ECONF}
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	# adjust clhep linking flags for system clhep
+	# binmake.gmk is only useful for legacy build systems
+	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
+	cmake_src_install
+	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
+
+	einstalldocs
+}
diff --git a/sci-physics/geant/geant-4.10.7.1-r2.ebuild b/sci-physics/geant/geant-4.10.7.1-r2.ebuild
deleted file mode 100644
index fcc836682744..000000000000
--- a/sci-physics/geant/geant-4.10.7.1-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
-
-case ${PV} in
-*_beta*)
-	MY_P+=.b$(printf %02d $(ver_cut 5))
-	DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
-	;;
-*)
-	if [[ $(ver_cut 4) -gt 0 ]]; then
-		MY_P+=.p$(printf %02d $(ver_cut 4))
-		DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
-	fi
-	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
-	;;
-esac
-
-DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="https://geant4.web.cern.ch/"
-SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 c++14 +c++17 +data dawn doc examples freetype gdml geant3 hdf5
-	inventor motif opengl qt5 raytracerx static-libs threads vrml"
-
-REQUIRED_USE="
-	^^ ( c++11 c++14 c++17 )
-	inventor? ( opengl )
-	motif? ( opengl )
-	qt5? ( opengl )
-"
-
-RDEPEND="
-	dev-libs/expat
-	>=sci-physics/clhep-2.4.4.0:2=[threads?]
-	data? ( ~sci-physics/geant-data-${PV} )
-	dawn? ( media-gfx/dawn )
-	doc? ( =app-doc/geant-docs-$(ver_cut 1-3)* )
-	gdml? ( dev-libs/xerces-c )
-	hdf5? ( sci-libs/hdf5[threads?] )
-	inventor? ( media-libs/SoXt )
-	motif? ( x11-libs/motif:0 )
-	opengl? ( virtual/opengl )
-	qt5? (
-		dev-qt/qt3d:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raytracerx? (
-		x11-libs/libX11
-		x11-libs/libXmu
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
-		-DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
-		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
-		-DGEANT4_BUILD_STORE_TRAJECTORY=OFF
-		-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
-		-DGEANT4_BUILD_VERBOSE_CODE=OFF
-		-DGEANT4_INSTALL_DATA=OFF
-		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
-		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
-		-DGEANT4_INSTALL_PACKAGE_CACHE=OFF
-		-DGEANT4_USE_FREETYPE=$(usex freetype)
-		-DGEANT4_USE_G3TOG4=$(usex geant3)
-		-DGEANT4_USE_GDML=$(usex gdml)
-		-DGEANT4_USE_HDF5=$(usex hdf5)
-		-DGEANT4_USE_INVENTOR=$(usex inventor)
-		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
-		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
-		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
-		-DGEANT4_USE_QT=$(usex qt5)
-		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
-		-DGEANT4_USE_SYSTEM_CLHEP=ON
-		-DGEANT4_USE_SYSTEM_EXPAT=ON
-		-DGEANT4_USE_SYSTEM_ZLIB=ON
-		-DGEANT4_USE_XM=$(usex motif)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		${EXTRA_ECONF}
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	# adjust clhep linking flags for system clhep
-	# binmake.gmk is only useful for legacy build systems
-	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
-	cmake_src_install
-	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
-
-	einstalldocs
-}
diff --git a/sci-physics/geant/geant-4.10.7.1-r3.ebuild b/sci-physics/geant/geant-4.10.7.1-r3.ebuild
new file mode 100644
index 000000000000..085e5abcf44a
--- /dev/null
+++ b/sci-physics/geant/geant-4.10.7.1-r3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
+
+case ${PV} in
+*_beta*)
+	MY_P+=.b$(printf %02d $(ver_cut 5))
+	DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
+	;;
+*)
+	if [[ $(ver_cut 4) -gt 0 ]]; then
+		MY_P+=.p$(printf %02d $(ver_cut 4))
+		DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
+	fi
+	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
+	;;
+esac
+
+DESCRIPTION="Toolkit for simulation of passage of particles through matter"
+HOMEPAGE="https://geant4.web.cern.ch/"
+SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="c++11 c++14 +c++17 +data dawn doc examples freetype gdml geant3 hdf5
+	inventor motif opengl qt5 raytracerx static-libs threads vrml"
+
+REQUIRED_USE="
+	^^ ( c++11 c++14 c++17 )
+	inventor? ( opengl )
+	motif? ( opengl )
+	qt5? ( opengl )
+"
+
+RDEPEND="
+	dev-libs/expat
+	>=sci-physics/clhep-2.4.4.0:2=[threads?]
+	data? ( ~sci-physics/geant-data-${PV} )
+	dawn? ( media-gfx/dawn )
+	doc? ( =app-doc/geant-docs-$(ver_cut 1-3)* )
+	gdml? ( dev-libs/xerces-c )
+	hdf5? ( sci-libs/hdf5[threads?] )
+	inventor? ( media-libs/SoXt )
+	motif? ( x11-libs/motif:0 )
+	opengl? ( virtual/opengl )
+	qt5? (
+		dev-qt/qt3d:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raytracerx? (
+		x11-libs/libX11
+		x11-libs/libXmu
+	)"
+
+PATCHES=( "${FILESDIR}"/geant4.10.7-hdf5.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
+		-DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
+		-DGEANT4_BUILD_STORE_TRAJECTORY=OFF
+		-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
+		-DGEANT4_BUILD_VERBOSE_CODE=OFF
+		-DGEANT4_INSTALL_DATA=OFF
+		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
+		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
+		-DGEANT4_INSTALL_PACKAGE_CACHE=OFF
+		-DGEANT4_USE_FREETYPE=$(usex freetype)
+		-DGEANT4_USE_G3TOG4=$(usex geant3)
+		-DGEANT4_USE_GDML=$(usex gdml)
+		-DGEANT4_USE_HDF5=$(usex hdf5)
+		-DGEANT4_USE_INVENTOR=$(usex inventor)
+		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
+		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
+		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
+		-DGEANT4_USE_QT=$(usex qt5)
+		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
+		-DGEANT4_USE_SYSTEM_CLHEP=ON
+		-DGEANT4_USE_SYSTEM_EXPAT=ON
+		-DGEANT4_USE_SYSTEM_ZLIB=ON
+		-DGEANT4_USE_XM=$(usex motif)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		${EXTRA_ECONF}
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	# adjust clhep linking flags for system clhep
+	# binmake.gmk is only useful for legacy build systems
+	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
+	cmake_src_install
+	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
+
+	einstalldocs
+}
diff --git a/sci-physics/geant/geant-4.10.7.2-r2.ebuild b/sci-physics/geant/geant-4.10.7.2-r2.ebuild
deleted file mode 100644
index 2b4f8cd92a19..000000000000
--- a/sci-physics/geant/geant-4.10.7.2-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
-
-case ${PV} in
-*_beta*)
-	MY_P+=.b$(printf %02d $(ver_cut 5))
-	DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
-	;;
-*)
-	if [[ $(ver_cut 4) -gt 0 ]]; then
-		MY_P+=.p$(printf %02d $(ver_cut 4))
-		DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
-	fi
-	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
-	;;
-esac
-
-DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="https://geant4.web.cern.ch/"
-SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 c++14 +c++17 +data dawn doc examples freetype gdml geant3 hdf5
-	inventor motif opengl qt5 raytracerx static-libs threads vrml"
-
-REQUIRED_USE="
-	^^ ( c++11 c++14 c++17 )
-	inventor? ( opengl )
-	motif? ( opengl )
-	qt5? ( opengl )
-"
-
-RDEPEND="
-	dev-libs/expat
-	>=sci-physics/clhep-2.4.4.0:2=[threads?]
-	data? ( ~sci-physics/geant-data-4.10.7.1 )
-	dawn? ( media-gfx/dawn )
-	doc? ( =app-doc/geant-docs-$(ver_cut 1-3)* )
-	gdml? ( dev-libs/xerces-c )
-	hdf5? ( sci-libs/hdf5[threads?] )
-	inventor? ( media-libs/SoXt )
-	motif? ( x11-libs/motif:0 )
-	opengl? ( virtual/opengl )
-	qt5? (
-		dev-qt/qt3d:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raytracerx? (
-		x11-libs/libX11
-		x11-libs/libXmu
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
-		-DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
-		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
-		-DGEANT4_BUILD_STORE_TRAJECTORY=OFF
-		-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
-		-DGEANT4_BUILD_VERBOSE_CODE=OFF
-		-DGEANT4_INSTALL_DATA=OFF
-		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
-		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
-		-DGEANT4_INSTALL_PACKAGE_CACHE=OFF
-		-DGEANT4_USE_FREETYPE=$(usex freetype)
-		-DGEANT4_USE_G3TOG4=$(usex geant3)
-		-DGEANT4_USE_GDML=$(usex gdml)
-		-DGEANT4_USE_HDF5=$(usex hdf5)
-		-DGEANT4_USE_INVENTOR=$(usex inventor)
-		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
-		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
-		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
-		-DGEANT4_USE_QT=$(usex qt5)
-		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
-		-DGEANT4_USE_SYSTEM_CLHEP=ON
-		-DGEANT4_USE_SYSTEM_EXPAT=ON
-		-DGEANT4_USE_SYSTEM_ZLIB=ON
-		-DGEANT4_USE_XM=$(usex motif)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		${EXTRA_ECONF}
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	# adjust clhep linking flags for system clhep
-	# binmake.gmk is only useful for legacy build systems
-	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
-	cmake_src_install
-	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
-
-	einstalldocs
-}
diff --git a/sci-physics/geant/geant-4.10.7.2-r3.ebuild b/sci-physics/geant/geant-4.10.7.2-r3.ebuild
new file mode 100644
index 000000000000..32f62303ec77
--- /dev/null
+++ b/sci-physics/geant/geant-4.10.7.2-r3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
+
+case ${PV} in
+*_beta*)
+	MY_P+=.b$(printf %02d $(ver_cut 5))
+	DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
+	;;
+*)
+	if [[ $(ver_cut 4) -gt 0 ]]; then
+		MY_P+=.p$(printf %02d $(ver_cut 4))
+		DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
+	fi
+	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
+	;;
+esac
+
+DESCRIPTION="Toolkit for simulation of passage of particles through matter"
+HOMEPAGE="https://geant4.web.cern.ch/"
+SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="c++11 c++14 +c++17 +data dawn doc examples freetype gdml geant3 hdf5
+	inventor motif opengl qt5 raytracerx static-libs threads vrml"
+
+REQUIRED_USE="
+	^^ ( c++11 c++14 c++17 )
+	inventor? ( opengl )
+	motif? ( opengl )
+	qt5? ( opengl )
+"
+
+RDEPEND="
+	dev-libs/expat
+	>=sci-physics/clhep-2.4.4.0:2=[threads?]
+	data? ( ~sci-physics/geant-data-4.10.7.1 )
+	dawn? ( media-gfx/dawn )
+	doc? ( =app-doc/geant-docs-$(ver_cut 1-3)* )
+	gdml? ( dev-libs/xerces-c )
+	hdf5? ( sci-libs/hdf5[threads?] )
+	inventor? ( media-libs/SoXt )
+	motif? ( x11-libs/motif:0 )
+	opengl? ( virtual/opengl )
+	qt5? (
+		dev-qt/qt3d:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raytracerx? (
+		x11-libs/libX11
+		x11-libs/libXmu
+	)"
+
+PATCHES=( "${FILESDIR}"/geant4.10.7-hdf5.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
+		-DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
+		-DGEANT4_BUILD_STORE_TRAJECTORY=OFF
+		-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
+		-DGEANT4_BUILD_VERBOSE_CODE=OFF
+		-DGEANT4_INSTALL_DATA=OFF
+		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
+		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
+		-DGEANT4_INSTALL_PACKAGE_CACHE=OFF
+		-DGEANT4_USE_FREETYPE=$(usex freetype)
+		-DGEANT4_USE_G3TOG4=$(usex geant3)
+		-DGEANT4_USE_GDML=$(usex gdml)
+		-DGEANT4_USE_HDF5=$(usex hdf5)
+		-DGEANT4_USE_INVENTOR=$(usex inventor)
+		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
+		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
+		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
+		-DGEANT4_USE_QT=$(usex qt5)
+		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
+		-DGEANT4_USE_SYSTEM_CLHEP=ON
+		-DGEANT4_USE_SYSTEM_EXPAT=ON
+		-DGEANT4_USE_SYSTEM_ZLIB=ON
+		-DGEANT4_USE_XM=$(usex motif)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		${EXTRA_ECONF}
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	# adjust clhep linking flags for system clhep
+	# binmake.gmk is only useful for legacy build systems
+	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
+	cmake_src_install
+	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
+
+	einstalldocs
+}
diff --git a/sci-physics/geant/geant-4.11.0_beta1-r1.ebuild b/sci-physics/geant/geant-4.11.0_beta1-r1.ebuild
deleted file mode 100644
index 19e28827a13d..000000000000
--- a/sci-physics/geant/geant-4.11.0_beta1-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
-
-case ${PV} in
-*_beta*)
-	MY_P+=.b$(printf %02d $(ver_cut 5))
-	DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
-	;;
-*)
-	if [[ $(ver_cut 4) -gt 0 ]]; then
-		MY_P+=.p$(printf %02d $(ver_cut 4))
-		DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
-	fi
-	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
-	;;
-esac
-
-DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="https://geant4.web.cern.ch/"
-SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+c++17 c++20 +data dawn doc examples freetype gdml geant3 hdf5 inventor motif opengl
-	qt5 raytracerx static-libs threads vrml"
-
-REQUIRED_USE="
-	^^ ( c++17 c++20 )
-	inventor? ( opengl )
-	motif? ( opengl )
-	qt5? ( opengl )
-"
-
-RDEPEND="
-	dev-libs/expat
-	>=sci-physics/clhep-2.4.4.2:2=[threads?]
-	data? ( ~sci-physics/geant-data-${PV} )
-	dawn? ( media-gfx/dawn )
-	doc? ( app-doc/geant-docs )
-	gdml? ( dev-libs/xerces-c )
-	hdf5? ( sci-libs/hdf5[threads?] )
-	inventor? ( media-libs/SoXt )
-	motif? ( x11-libs/motif:0 )
-	opengl? ( virtual/opengl )
-	qt5? (
-		dev-qt/qt3d:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raytracerx? (
-		x11-libs/libX11
-		x11-libs/libXmu
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
-		-DCMAKE_CXX_STANDARD=$((usev c++17 || usev c++20) | cut -c4-)
-		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
-		-DGEANT4_BUILD_STORE_TRAJECTORY=OFF
-		-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
-		-DGEANT4_BUILD_VERBOSE_CODE=OFF
-		-DGEANT4_INSTALL_DATA=OFF
-		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
-		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
-		-DGEANT4_INSTALL_PACKAGE_CACHE=OFF
-		-DGEANT4_USE_FREETYPE=$(usex freetype)
-		-DGEANT4_USE_G3TOG4=$(usex geant3)
-		-DGEANT4_USE_GDML=$(usex gdml)
-		-DGEANT4_USE_HDF5=$(usex hdf5)
-		-DGEANT4_USE_INVENTOR=$(usex inventor)
-		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
-		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
-		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
-		-DGEANT4_USE_QT=$(usex qt5)
-		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
-		-DGEANT4_USE_SYSTEM_CLHEP=ON
-		-DGEANT4_USE_SYSTEM_EXPAT=ON
-		-DGEANT4_USE_SYSTEM_ZLIB=ON
-		-DGEANT4_USE_XM=$(usex motif)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		${EXTRA_ECONF}
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	# adjust clhep linking flags for system clhep
-	# binmake.gmk is only useful for legacy build systems
-	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
-	cmake_src_install
-	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
-
-	einstalldocs
-}
diff --git a/sci-physics/geant/geant-4.11.0_beta1-r2.ebuild b/sci-physics/geant/geant-4.11.0_beta1-r2.ebuild
new file mode 100644
index 000000000000..0b9fdfbf25e5
--- /dev/null
+++ b/sci-physics/geant/geant-4.11.0_beta1-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
+
+case ${PV} in
+*_beta*)
+	MY_P+=.b$(printf %02d $(ver_cut 5))
+	DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
+	;;
+*)
+	if [[ $(ver_cut 4) -gt 0 ]]; then
+		MY_P+=.p$(printf %02d $(ver_cut 4))
+		DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
+	fi
+	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
+	;;
+esac
+
+DESCRIPTION="Toolkit for simulation of passage of particles through matter"
+HOMEPAGE="https://geant4.web.cern.ch/"
+SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+c++17 c++20 +data dawn doc examples freetype gdml geant3 hdf5 inventor motif opengl
+	qt5 raytracerx static-libs threads vrml"
+
+REQUIRED_USE="
+	^^ ( c++17 c++20 )
+	inventor? ( opengl )
+	motif? ( opengl )
+	qt5? ( opengl )
+"
+
+RDEPEND="
+	dev-libs/expat
+	>=sci-physics/clhep-2.4.4.2:2=[threads?]
+	data? ( ~sci-physics/geant-data-${PV} )
+	dawn? ( media-gfx/dawn )
+	doc? ( app-doc/geant-docs )
+	gdml? ( dev-libs/xerces-c )
+	hdf5? ( sci-libs/hdf5[threads?] )
+	inventor? ( media-libs/SoXt )
+	motif? ( x11-libs/motif:0 )
+	opengl? ( virtual/opengl )
+	qt5? (
+		dev-qt/qt3d:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raytracerx? (
+		x11-libs/libX11
+		x11-libs/libXmu
+	)"
+
+PATCHES=( "${FILESDIR}"/geant4.10.7-hdf5.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
+		-DCMAKE_CXX_STANDARD=$((usev c++17 || usev c++20) | cut -c4-)
+		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
+		-DGEANT4_BUILD_STORE_TRAJECTORY=OFF
+		-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
+		-DGEANT4_BUILD_VERBOSE_CODE=OFF
+		-DGEANT4_INSTALL_DATA=OFF
+		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
+		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
+		-DGEANT4_INSTALL_PACKAGE_CACHE=OFF
+		-DGEANT4_USE_FREETYPE=$(usex freetype)
+		-DGEANT4_USE_G3TOG4=$(usex geant3)
+		-DGEANT4_USE_GDML=$(usex gdml)
+		-DGEANT4_USE_HDF5=$(usex hdf5)
+		-DGEANT4_USE_INVENTOR=$(usex inventor)
+		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
+		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
+		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
+		-DGEANT4_USE_QT=$(usex qt5)
+		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
+		-DGEANT4_USE_SYSTEM_CLHEP=ON
+		-DGEANT4_USE_SYSTEM_EXPAT=ON
+		-DGEANT4_USE_SYSTEM_ZLIB=ON
+		-DGEANT4_USE_XM=$(usex motif)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		${EXTRA_ECONF}
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	# adjust clhep linking flags for system clhep
+	# binmake.gmk is only useful for legacy build systems
+	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
+	cmake_src_install
+	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
+
+	einstalldocs
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 56cb5502eb51..279f275f1178 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index e83c856101af..5fd7d195d2ad 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1,4 +1,6 @@
 AUX bubblewrap-0.3.1-selinux-configure.patch 5208 BLAKE2B 69db3066eebae54d34f02a02aa053a6bf5ed675329b3d18a4f261529a434d1c9dbfb637a3f96f4079a6adba586b666d7890370c8761c92dc9450f096a8368bbe SHA512 f6515a25c6b311c9b8336761c7daea2440964982f8a7a6587b6707ef9e9a5705ec380e13982b0765af205c221724ef418b44c3efd1b6e5f0c1788b143a88ef17
 DIST bubblewrap-0.4.1.tar.xz 214496 BLAKE2B bdbff50cc4e28c91d83c814df7f2ee15702962d26a9316bd841b1e63bf5976c4549c88e20869e8cc236a8a0c9a065518f945c356fa7a058f8831f5b1e9d4eb0d SHA512 0ff46dc0fda2d0cffbb36cc52ff43951b30cbd835a42cc56806acbbbd827796bfadbb1cfafc84d6b47a72c031ca44abe1c377acc0cc25fe3b33e854f5f687d35
+DIST bubblewrap-0.5.0.tar.xz 137796 BLAKE2B 36aef94335d61ae55076a0a94cd6f2c335a87f8df9900c0c603c7ee870cf84c617a0c2ad99a5979cc1dd22740d652155fa6049e717eb210c9a83afe516daa107 SHA512 b1f5bde9562bf3176c51fdc22304b901e00e1de5189d9b5479aed7b651b84bed5539fc5bb3b1db58a05da4a57d69c9f41c40e15aa5a575746630e015674a02b7
 EBUILD bubblewrap-0.4.1.ebuild 1143 BLAKE2B c8c40f0826442f2bb172d447dc94cbecef5e2edad9e453aff70caaf2e013099bb6890f6134ed4d93c15ac037c5d410f8f3432597d56c704dcd9b27da636f9150 SHA512 bd1f3b217a33d8089b765bbb7b0f1ec1b823e40bf80ea1e614ea997c969376686594a464c07c8f34cc23518e767162d783ba0af3d52ff60a0a497cab059f5863
+EBUILD bubblewrap-0.5.0.ebuild 1068 BLAKE2B 068a6b618680d53dacb398ac83416722556890ae44fc8c97e2a53ca31333d3a4765bfa6dcf3fd0f9d6940222e5758ed4e7cc6d8b12fe26018b30ef473a573035 SHA512 c6af2bf510dd4b3e20d2b6286e9b893eed61ea7c06db77e9a9cc233b6cdcf397b51f2f44a7b7e8934ed44e6b76929b546b565ab4d2942bac547c597bb2587c92
 MISC metadata.xml 452 BLAKE2B c11d7134d3623de9f970ddcb4782d1312f89b17955090ee7d4c56a1acb9b45f1c5ae0d08d091b57be21b696cceda0ed7d747c10aa6765c927df8dae81233d66c SHA512 3e6ec22d7109fdf7772edba88f6f76783df8ee233d9f927b6e5570d1453f611f93627c2ea3dfcbe9ae1259d1c23692b26d5403fef02558dcf296f569702c5103
diff --git a/sys-apps/bubblewrap/bubblewrap-0.5.0.ebuild b/sys-apps/bubblewrap/bubblewrap-0.5.0.ebuild
new file mode 100644
index 000000000000..3066ed7e1305
--- /dev/null
+++ b/sys-apps/bubblewrap/bubblewrap-0.5.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 linux-info
+
+DESCRIPTION="Unprivileged sandboxing tool, namespaces-powered chroot-like solution"
+HOMEPAGE="https://github.com/containers/bubblewrap/"
+SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="selinux +suid"
+
+RDEPEND="
+	sys-libs/libseccomp
+	sys-libs/libcap
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+# tests require root priviledge
+RESTRICT="test"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		CONFIG_CHECK="~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable selinux) \
+		"--enable-man" \
+		"--with-bash-completion-dir=$(get_bashcompdir)" \
+		"--with-priv-mode=$(usex suid setuid none)"
+}
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 12a2ff21b349..524fb14aeef4 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,3 +1,3 @@
 DIST findutils-4.8.0.tar.xz 1983096 BLAKE2B e1f030ef11c252d33e92bf58dca20a6dd681938aad74b1bbd2bf64a0d175d64c8edac1edce71d13379e04a27e47ffa6099e105bb731957cf5247ffe01d856538 SHA512 eaa2da304dbeb2cd659b9210ac37da1bde4cd665c12a818eca98541c5ed5cba1050641fc0c39c0a446a5a7a87a8d654df0e0e6b0cee21752ea485188c9f1071e
-EBUILD findutils-4.8.0.ebuild 1631 BLAKE2B 13f6868c1b87322043b67dafd8db552861b474bebff4e640b45b863f85621f26d724554119a6ddb3264cb939893111fadd440b7f01274d8e2c58a1029fa4e973 SHA512 f0c157053b92999d3de34c65fbab680baa5b6b3a686088b23af3902a7fb773c23217976bfd7bb30e98463bbb6e7f71ac0acffb191bf1dc8d2597ff05d7bb921d
+EBUILD findutils-4.8.0.ebuild 1863 BLAKE2B 7e463fd8ff4115740d91e97fc9a74c2dd998665c632ffe956a51ac43f52b8a0cb843513fdc4b6464809544de013f0288eaad0bf475358ef1d82bd1c153442866 SHA512 fa42b34ec7d561a5e4143f3690f0df99e53b678722c58ba83f7f286d9fea0e2bf248e7c10ecb630b907d406858c87e5292d21b34c414ca201b76fb951c97f33d
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/findutils-4.8.0.ebuild b/sys-apps/findutils/findutils-4.8.0.ebuild
index 47dbdb5d3142..9e47fcc65275 100644
--- a/sys-apps/findutils/findutils-4.8.0.ebuild
+++ b/sys-apps/findutils/findutils-4.8.0.ebuild
@@ -47,6 +47,12 @@ src_configure() {
 		append-ldflags -static
 	fi
 
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html
+		# https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html
+		append-cppflags '-D__nonnull\(X\)='
+	fi
+
 	program_prefix=$(usex userland_GNU '' g)
 	local myeconfargs=(
 		--with-packager="Gentoo"
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 320198d571a0..b7b04f70d6cc 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,6 +1,8 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
 DIST help2man-1.48.3.tar.xz 211504 BLAKE2B 407cc87b1238242c202d37c0c4cd394e0efba95759b86a88026aef7c05d6a097d1946614547ebfab45f7fe0c1ddd057724234629246d32e94862c3d633b78c31 SHA512 e000e7380604c0986b14cb64b852d55eff48595884bddd389e876056dde6ce72b37aa16d92230e6f8f6e128003b819954bae4aa90933a58b51d3665d3c0ba356
 DIST help2man-1.48.4.tar.xz 204592 BLAKE2B 0625af5a0a65daeb459a7445ef6e5a8c9ddbac4ebad5c31134bfbbd5abdc1d05cd5e682d2d1f0d4df36de4fdbbbe22ac7bbbb2c1c5fca4d53ee0c6bfefd63dfb SHA512 fa3f3eabc6010a4a34dc108bfa3b9456b9ea66b343ff2913c32cd6da52ddcf3aa8cb9c05a8b14585f314198aa4ef6f1eebbb185b90a2fb923ab3b2ee7b5e57a9
+DIST help2man-1.48.5.tar.xz 204672 BLAKE2B 6d96f5f65f8c637d524e5c373f2b89f114adf544c1d3508a9cb51115279b9bf6399c8ebb0a8d831de12ef8cdaca40b6e75412a221efc5d2dd1794e9c9643196f SHA512 800eb0daa9daef8e423d52ede55eee2960122ea0269865295afada4cf4fcc1c6791da8429c3a57c0fc1bf0a14c8a77953952325413a8faa5dd07b1bc5bc0edd1
 EBUILD help2man-1.48.3.ebuild 1035 BLAKE2B 2bdcaea0a0b2256abf60dabc5f212b586ff59113f8d3ae541ce21d2f5c7c9a294b18280d741f116ea9dd75d9bdb24480ae6bfd5ac332456174d4ce942ffb997d SHA512 d1bfe5663fe13784f5d08e077f216f3155e44bcddba456413fc495dea90e799703a866f0210c690e4764f8826fb7f2732f8912df095b6e9c1f209432911aae0f
 EBUILD help2man-1.48.4.ebuild 1043 BLAKE2B a409c6688242306b58aa9b395c4800166b31a301bd356cd93505e522169ebb4e1b1b82b61b3f2ed737691956fae33516faf69dd9819b8b07abe4bbc981ab7f23 SHA512 68652e40fd2ab4e8ffd862c9783bc7aa891e76a30419b955891134a7a96f8e132ce08dcb4b1be32937398970dfff57c6a09b401fad7cb6207c16a99a12a2a491
+EBUILD help2man-1.48.5.ebuild 1043 BLAKE2B a409c6688242306b58aa9b395c4800166b31a301bd356cd93505e522169ebb4e1b1b82b61b3f2ed737691956fae33516faf69dd9819b8b07abe4bbc981ab7f23 SHA512 68652e40fd2ab4e8ffd862c9783bc7aa891e76a30419b955891134a7a96f8e132ce08dcb4b1be32937398970dfff57c6a09b401fad7cb6207c16a99a12a2a491
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.48.5.ebuild b/sys-apps/help2man/help2man-1.48.5.ebuild
new file mode 100644
index 000000000000..2f5c10989e9b
--- /dev/null
+++ b/sys-apps/help2man/help2man-1.48.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GNU utility to convert program --help output to a man page"
+HOMEPAGE="https://www.gnu.org/software/help2man/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="dev-lang/perl
+	nls? ( dev-perl/Locale-gettext )"
+DEPEND="${RDEPEND}"
+
+DOCS=( debian/changelog NEWS README THANKS ) #385753
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
+)
+
+src_prepare() {
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i \
+			-e 's/-shared/-bundle/' \
+			Makefile.in || die
+	fi
+	default
+}
+
+src_configure() {
+	# Disable gettext requirement as the release includes the gmo files #555018
+	local myeconfargs=(
+		ac_cv_path_MSGFMT=$(type -P false)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 479b0e68194f..16be3bf329f8 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -4,6 +4,6 @@ AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6
 DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
 DIST openrc-0.43.5.tar.gz 242146 BLAKE2B 993d3895588e8f1383049006834f944faaae0f889d3afcae5bff697db9f26383712f18aba52ce07d835f1d2bbe8ef19ef116ad60141d1eb0650767430d1d9967 SHA512 680c1549a8a37eb3a719f3e026888d045d26c98357d6e6eaf09069a23a001272deaca8cac4a9b8fd79f489c4cfb4fe2c7b5d481d1469798a8f5ec470d0cadbe3
 EBUILD openrc-0.42.1-r1.ebuild 5471 BLAKE2B a3749af382add50151e08b679ac8548f4a229784de8ca796c1c5d113ea190c42980e18ad8bd5598fee43a049538e4d806398aabe7bdfa27a79361529bfdd5445 SHA512 638ff01c5c1de288e462790dbc9c5801b326768051933a96a9338278b36208a39934be4e7b9605ca286e30baa9e83dab58075e50ee9de112ce4e117cc0767b97
-EBUILD openrc-0.43.5.ebuild 5009 BLAKE2B 69c7f7e9ed945ca13fa059720f978b08cb27f8d97845ade1aa558b361a8edd500243787f0f252690ae231b7a927aa5f8e98395aa069d0fc59352187bfb666b24 SHA512 ba7575aca85f8423a8de32e38186694368a589b565d7aca0ccae07695ae51bc23eb01075320065fc3c88f003caf69b66dc2195818852af622159618b41747eef
+EBUILD openrc-0.43.5.ebuild 5005 BLAKE2B a3725838bfd17681923474879383e3ec0b08cea121ea1e0c7ec62c83f726ac5deb35d82143217f7a2ffca3190ee058accfe770b89c1a3294be65a394c7c3b5e3 SHA512 f0fe7ceaf9a2066abe235fc6bd857045c354a4e33c2e9e41c2a65f02e03364ff6fc331a1b6f41627da9edcddf4b9f72bc2af1f31c711a9dafe3d6c3b4c8ae277
 EBUILD openrc-9999.ebuild 5013 BLAKE2B eba47aae6e1d07c2ccd925f2e380268a6ab96aec37e245b3ccf0474d30fc19811a5f45c610a6fd68760a4695f48040733aa524f41c86a9149bcdbb97195ba4a0 SHA512 24970d1219d2fc2c93ecd6ddc22200af0a3e70decb506f06ffd2f3be15a7b3a37398e150f26d6c2477b59f3ece72babf61056ddd3c6e86233b7576f081460cd3
 MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1
diff --git a/sys-apps/openrc/openrc-0.43.5.ebuild b/sys-apps/openrc/openrc-0.43.5.ebuild
index c69f3f7a40b3..27177b3a37a2 100644
--- a/sys-apps/openrc/openrc-0.43.5.ebuild
+++ b/sys-apps/openrc/openrc-0.43.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/pcmciautils/Manifest b/sys-apps/pcmciautils/Manifest
index 61bce1990981..a553f60d6e89 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -1,5 +1,5 @@
 AUX pcmciautils-018_p8-flex-2.6.3-fix.patch 593 BLAKE2B bff765ae6c80daf3d2413528c4d42aefb7af7e3823590d33315c7089a5221d99c82802378cf9b51502b53bd920e0b5b4b68aaa82d50a92e83f5dfe7207c39a49 SHA512 b96f9bc3176f1eeb936a31f8fab5a495ce14218e92fbae2350aa970328b53bd6732ade90721f1ca55d80a94436189773f83a300aa8af7c43ecc5ed62c95f3557
 DIST pcmciautils_018-8.debian.tar.gz 11213 BLAKE2B cf28ecf71ebfd5c4ad7d882cbadab71b787f407adb2d20258cdc1157ca7d542bf398ff09207037d1d6e933d43e477b50b28ca3f0ac0e557fbaefb9f31656843e SHA512 8a00d776e208b43d01fe22b9d4e889bc1b2c5982aa1bf225bdd613ffb0f5b37f5266ccc1cb91df9ac49c4ee3e3653ebb29807b61fff53c585e2cfed5aa2cd9e9
 DIST pcmciautils_018.orig.tar.gz 48516 BLAKE2B 0b197cdd7d0940e5c0eee2da961f0f4dd972a3178ba5d07a6492185d0ab156cd61f5343c8f9d812cff402f04af76a15baa3db564d14317d3817e5325dd8811fb SHA512 f0af1fc6155686ae61c1c85a6451b032088a3880dfbc05c1d1ed33ca8e975745f9d4bedb0f3ee0a1252461aa008bed8014c73ff850cddd89d930524a6d68d47d
-EBUILD pcmciautils-018_p8-r3.ebuild 1559 BLAKE2B cb31e5636739ff7887728729f4bbf7ca128c22272646edc62222a922dd477b0472c795cee88e1f4145d502648e16f177994cb0387d59ac036c5d3c3d3ba302f1 SHA512 cd8a207d30f4ca09f48f35a91bd6152996b2e178d7947a6656be683437b297382d7bf2aecb1126288c1255c9fcc6bcb7f790bbed7f9cfbb8250920d99f86200e
+EBUILD pcmciautils-018_p8-r3.ebuild 1557 BLAKE2B 90448cde1db5171cf70625a282053eae80e81a98b853a451082abedb2159acf374d27291580ec89ed6d2801799aaea3361d47ce50a45a24417de6c586d0f45d6 SHA512 504430423b2080260abe11f0010e92f54d8782ae03e230ac993647a405d8fa492fc8ca0dcc6942cc6324be7db2cba27188329ea47e5ca4fc968c247a84c6b2a1
 MISC metadata.xml 244 BLAKE2B 98282e1c41cb6f5c3e984cc3d0558218b91a7eaf13774ab9f7e3eec7351fb18831088c0ecf1422ec6bac434b1c46654cf253f41bd3a748f4c724bfed2b35e82f SHA512 5c9aa921d361b670fdacbc49e93fb5e3a8ed161e0866ebc08ec0940c480a6bed654059642675e37596d1ede56f0ca5b55ae31ed96040fcf8d01f9f683ce444f6
diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
index 927b43039600..d27c8288425f 100644
--- a/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
@@ -44,7 +44,6 @@ pkg_setup() {
 		STRIP=true
 		RANLIB="$(tc-getRANLIB)"
 		OPTIMIZATION="${CFLAGS} ${CPPFLAGS}"
-		DESTDIR="${D}"
 		)
 
 	use debug && append-cppflags -DDEBUG
@@ -69,7 +68,7 @@ src_compile() {
 }
 
 src_install() {
-	emake "${mypcmciaopts[@]}" install
+	emake "${mypcmciaopts[@]}" DESTDIR="${D}" install
 
 	dodoc doc/*.txt
 }
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index ccf5b21eb71f..d1a4f35dbd75 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,18 +1,4 @@
-AUX pkgcore-0.10.18-sighdlr-r1.patch 2832 BLAKE2B d0287d3279cacc63f2a81b0bf1e5d325de707e4d0ee2b44da27346bc8b81bfe325296ebd3e05d7af76fd9d21e0663186dfa0f5fad4f2355700f606857ca3ad94 SHA512 361449061fa9f1ad77607757dd1557abc52d5e07b682473524209094e2ce2ba3648fd0824f1775a213d10ca609914a50f51764c0ca39360c989cabb78de3a927
-AUX pkgcore-0.10.18-sighdlr.patch 1660 BLAKE2B 4e66dff8988cccfcaae4246ae47c3d9bcb6edabd822d1e1d4224da261d5d7e8e33a9ce69e0f664cc6be536415a79f355ee06be9b10b4da0f6224d614769662fc SHA512 5d87c4a741a24e5e6322bf7034ecb1bdb10cf5a010063b861e710d06bb3b3637ee1b0a1587597721ddcf7274d465239b99c0cf05c6e9b81546059e96d6409013
-DIST pkgcore-0.11.6.tar.gz 634191 BLAKE2B c06f24006be697771dd3d7569e3a27310dca56c05047ac991c2db359838dddd5eec78c8d424e826b39968cc496be6e7eb366668bfa45082aac438b663015cb8a SHA512 e556d20100c0234d319ed2e15686a3bb9f388f1cdefd7188958c3c0b32d741dd531cbbe8d377b0736662f66b3241e633491a72a1ce84dd86790e9f543b3d0800
-DIST pkgcore-0.11.8.tar.gz 631665 BLAKE2B 1e33ce394c1df9418d22fc8653fca4da1b4e27d53325167e3b7231fb8382f3c81daa7a93587ab2226116865546d4ca1ae1dd4265ccc2adc9cb9b27106d9c352b SHA512 42ed7c54db5fa48dffa5e3927afae32d1b4db92da41eff99c8eaa10232fdeae4e0f3f4d39b1e1b4e3881304523822a9a99575648809c554e3bdcf59d9eab485b
-DIST pkgcore-0.12.0.tar.gz 621376 BLAKE2B d58390ad7251fc48465d744a0b0694210d1f1cf505b072c06dc9731819b327b1edfa60d0f89db113852c87109c6340c8c13c72ae2d89b517d5fca34b53632b6b SHA512 d066a2f2deb4f654b04f9e78d37bf88a97f67f0396f5867ffe3a18f8c0d6459d73721b66cad52a50581ee10420694a1fd195b28a013b3a97cb1ebf08bc59598b
-DIST pkgcore-0.12.1.tar.gz 621918 BLAKE2B aa3bedaf4d58d8e604b19ce3e6f97242d29eadbbeab85b7de029d0230a5ea77e2ee96b128381964afe92a327674d64878f833d8c1ddc983c0fe1381b008e2d62 SHA512 a78f3ffd5610f14adb07e2adce07c8446012e742c777d08bbc7ac711bf194508d66a14d21aa56f5d0c9353bd10354fdd34bc6eb4b6017c03bff5d1b565a53575
-DIST pkgcore-0.12.2.tar.gz 621604 BLAKE2B 15964d9a73727028010b7267a61802566aa59f28769f4ac67aa91ccd32708b1a27914ba14957e1da848dc1a2a24ee9fbf92a7b4cee055a7cff22dd1f0d204f58 SHA512 192532dcee696e7ce159efad2f90597aa68801759ceb5ae85484a99a11242c1da98b73290ce1e4c9e29f2c92607989991b3802c4d0fb9bd1f4a866dd80f13cde
-DIST pkgcore-0.12.3.tar.gz 621912 BLAKE2B 629c42b9d0236196d018302b0941d05d36d15d2bdf31f51ef0d212ab0aad2968ff58aa938d22ff8ba65d115e5a1e80e0f444959c2c63aa227f34bd2da3868165 SHA512 6942d13aecfbf0af2969b71b92fcf4e8e938c367fe61e4a748cae14eeeb4ba831b7ac50deb04f4afa8a7f1a6dc31a893ce4106e54b188ff0a1036f7afd6798a4
 DIST pkgcore-0.12.4.tar.gz 622553 BLAKE2B fc9df4f9499ad20cec439275880e469e1ffd8204b894c0a523ed27a3e55748e58634fca2af693fcc453e8aec068733a944331f7cea52e983e50981374239d534 SHA512 bc9eccd8d903e987df97354de008826dd52a7db0d9def064c56bb9425d1aa69e8fdf15dcfd0f86057c98a3c0adefee633a3c1cc9b689a334c126730cbdeafd0c
-EBUILD pkgcore-0.11.6-r1.ebuild 1127 BLAKE2B 044d792557c997a47814f18ef40a27b4136df40247a7ccd11c20bdf4baf5b2ac3cbb287c185ded8709409ce5d709a5fd4bfde145f1dd1e5f9a9350b7efa2162e SHA512 8795d3194db29c36862dd4d1ecf46e323f163a331b5aae2182aeca4e68838b446e64a1be7653e03662af18cac10e9849d9d736693df771828cc435e25f18a106
-EBUILD pkgcore-0.11.8-r3.ebuild 1155 BLAKE2B 09ed92f9990d2e99b7eff0d5f3795a185ddd009bd4f03222f597dac5414c10e57705dc670804aac445cbf722a3f81d8bba1316da51d7353080354d0170f8e3c4 SHA512 19e75c4edab78c28189a321d5ed19fb4b1ba85f84de43e9b3e1d7f397ae5517259fe8e7c277f071fefe98362ff2eefdd86602c9b9ae28a4159cad61e7e1929b2
-EBUILD pkgcore-0.12.0.ebuild 1155 BLAKE2B 09ed92f9990d2e99b7eff0d5f3795a185ddd009bd4f03222f597dac5414c10e57705dc670804aac445cbf722a3f81d8bba1316da51d7353080354d0170f8e3c4 SHA512 19e75c4edab78c28189a321d5ed19fb4b1ba85f84de43e9b3e1d7f397ae5517259fe8e7c277f071fefe98362ff2eefdd86602c9b9ae28a4159cad61e7e1929b2
-EBUILD pkgcore-0.12.1-r1.ebuild 1112 BLAKE2B 142795b861489cedd1abccd333803e814eda9356e32412dc5bcb6f68b17b5a5739f38eb53e9dd9faf2a2cdc170ccea9d0b1dcbca92b7dd196c1b16776a1d2199 SHA512 ce0e5e62ceb954ffe48ec510ddb658c2b43b3ce5b684c716a97ca9c2f61340bb1a1cbdace1fb2a24bb92fd4b7c7df5226814846195cbba3c6685fec18a89aa80
-EBUILD pkgcore-0.12.2.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6
-EBUILD pkgcore-0.12.3.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6
-EBUILD pkgcore-0.12.4.ebuild 1114 BLAKE2B 76af86e9a7684a0a29c105f7b56e57f9910488740231752dbf0717d1182ed1bd63c47580db8a5b7a965bbce293d719d233627e71b1176347e93726e8062fffd2 SHA512 6dbc20fbb8d19d94f28e87dff469dc99881892b6c34de97c99a7e5433a86fa48cc7e9a66acc63df1a344b10da13420363b583f01bd3cd1c45363338dc5ee4b69
+EBUILD pkgcore-0.12.4.ebuild 1113 BLAKE2B 707e98f4ffdd8b2487c805d08ffe8953c95fc59e2a29e9756effa6dbb4eaafa457687a96032604594b121c32252242400c9a7609ee6be6f1cd61e50b2a67eba7 SHA512 18e5e6ea67c0c476a2232fc427d74ff52c0b92225f03d874f4018fa5b59c23a7a4ac79c4f11f50634e29ee09416f71801565fd26a48039bbf1c2078df09aeb10
 EBUILD pkgcore-9999.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr-r1.patch b/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr-r1.patch
deleted file mode 100644
index a48bfc5873bb..000000000000
--- a/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr-r1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 303826ceb22985cfa1dfbf1e7a68ed327ffc741b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 15 May 2021 09:30:58 +0200
-Subject: [PATCH] pytest: Delay loading pkgcore modules until fixtures are used
-
-Delay loading pkgcore modules until the EbuildRepo-based fixtures are
-actually used.  This prevents the pkgcore signal handlers from being
-enabled on all packages using pytest while keeping the old behavior
-of setting them upon import in packages using pkgcore directly.
----
- src/pkgcore/pytest/plugin.py | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/src/pkgcore/pytest/plugin.py b/src/pkgcore/pytest/plugin.py
-index 082538ab..bdc89e4b 100644
---- a/src/pkgcore/pytest/plugin.py
-+++ b/src/pkgcore/pytest/plugin.py
-@@ -1,3 +1,4 @@
-+import importlib
- import os
- import subprocess
- import textwrap
-@@ -5,8 +6,6 @@ from collections.abc import MutableSet
- from datetime import datetime
- 
- import pytest
--from pkgcore.ebuild import cpv as cpv_mod
--from pkgcore.ebuild import repo_objs, repository
- from snakeoil import klass
- from snakeoil.fileutils import touch
- from snakeoil.osutils import pjoin
-@@ -169,6 +168,12 @@ class EbuildRepo:
-     """Class for creating/manipulating ebuild repos."""
- 
-     def __init__(self, path, repo_id='fake', eapi='5', masters=(), arches=()):
-+        # load pkgcore modules late to avoid overriding signal handlers
-+        # when the plugin is not actually used
-+        self.cpv_mod = importlib.import_module('pkgcore.ebuild.cpv')
-+        self.repo_objs = importlib.import_module('pkgcore.ebuild.repo_objs')
-+        self.repository = importlib.import_module('pkgcore.ebuild.repository')
-+
-         self.path = path
-         self.arches = _FileSet(pjoin(self.path, 'profiles', 'arch.list'))
-         self._today = datetime.today()
-@@ -194,8 +199,8 @@ class EbuildRepo:
- 
-     def sync(self):
-         """Forcibly create underlying repo object avoiding cache usage."""
--        repo_config = repo_objs.RepoConfig(location=self.path, disable_inst_caching=True)
--        self._repo = repository.UnconfiguredTree(self.path, repo_config=repo_config)
-+        repo_config = self.repo_objs.RepoConfig(location=self.path, disable_inst_caching=True)
-+        self._repo = self.repository.UnconfiguredTree(self.path, repo_config=repo_config)
- 
-     def create_profiles(self, profiles):
-         for p in profiles:
-@@ -215,7 +220,7 @@ class EbuildRepo:
-                     f.write(f'{p.eapi}\n')
- 
-     def create_ebuild(self, cpvstr, data=None, **kwargs):
--        cpv = cpv_mod.VersionedCPV(cpvstr)
-+        cpv = self.cpv_mod.VersionedCPV(cpvstr)
-         self._repo.notify_add_package(cpv)
-         ebuild_dir = pjoin(self.path, cpv.category, cpv.package)
-         os.makedirs(ebuild_dir, exist_ok=True)
--- 
-2.31.1
-
diff --git a/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr.patch b/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr.patch
deleted file mode 100644
index 30cec9114f56..000000000000
--- a/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 533f1edd70054a5479ee85719d3cbef0d15627fd Mon Sep 17 00:00:00 2001
-From: Tim Harder <radhermit@gmail.com>
-Date: Sun, 28 Mar 2021 17:18:16 -0600
-Subject: [PATCH] ebuild.processor: register SIGINT and SIGTERM signal handlers
- on ebd init
-
-Rather than at a global, module level to avoid issues with inadvertent
-issues during 3rd party imports, e.g. the pkgcore pytest plugin getting
-autoloaded by some other project's testsuite.
----
- src/pkgcore/ebuild/processor.py | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/src/pkgcore/ebuild/processor.py b/src/pkgcore/ebuild/processor.py
-index e8c3c2cd4..65437efcf 100644
---- a/src/pkgcore/ebuild/processor.py
-+++ b/src/pkgcore/ebuild/processor.py
-@@ -275,9 +275,6 @@ def chuck_KeyboardInterrupt(*args):
-     raise KeyboardInterrupt("ctrl+c encountered")
- 
- 
--signal.signal(signal.SIGINT, chuck_KeyboardInterrupt)
--
--
- def chuck_TermInterrupt(ebp, *args):
-     """Event handler for SIGTERM."""
-     if ebp is None:
-@@ -292,9 +289,6 @@ def chuck_TermInterrupt(ebp, *args):
-         ebp.shutdown_processor()
- 
- 
--signal.signal(signal.SIGTERM, partial(chuck_TermInterrupt, None))
--
--
- def chuck_UnhandledCommand(ebp, line):
-     """Event handler for unhandled commands."""
-     raise UnhandledCommand(line)
-@@ -332,6 +326,9 @@ def __init__(self, userpriv, sandbox, fd_pipes=None):
-         self._outstanding_expects = []
-         self._metadata_paths = None
- 
-+        signal.signal(signal.SIGTERM, partial(chuck_TermInterrupt, None))
-+        signal.signal(signal.SIGINT, chuck_KeyboardInterrupt)
-+
-         if userpriv:
-             self.__userpriv = True
-             spawn_opts.update({
diff --git a/sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild
deleted file mode 100644
index 2ff367e894b1..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/pkgcore-0.10.18-sighdlr.patch"
-)
-
-distutils_enable_tests setup.py
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.11.8-r3.ebuild b/sys-apps/pkgcore/pkgcore-0.11.8-r3.ebuild
deleted file mode 100644
index cb4367497c7a..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.11.8-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/pkgcore-0.10.18-sighdlr-r1.patch"
-)
-
-distutils_enable_tests setup.py
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.12.0.ebuild b/sys-apps/pkgcore/pkgcore-0.12.0.ebuild
deleted file mode 100644
index cb4367497c7a..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.12.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/pkgcore-0.10.18-sighdlr-r1.patch"
-)
-
-distutils_enable_tests setup.py
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.12.1-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.12.1-r1.ebuild
deleted file mode 100644
index 05d8679fb96f..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.12.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="
-	>=app-shells/bash-5.0
-	dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.12.2.ebuild b/sys-apps/pkgcore/pkgcore-0.12.2.ebuild
deleted file mode 100644
index 5c7eeb03645d..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.12.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="
-	>=app-shells/bash-5.0
-	dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.12.3.ebuild b/sys-apps/pkgcore/pkgcore-0.12.3.ebuild
deleted file mode 100644
index 5c7eeb03645d..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.12.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="
-	>=app-shells/bash-5.0
-	dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.12.4.ebuild b/sys-apps/pkgcore/pkgcore-0.12.4.ebuild
index b580d6124a7d..94ce676970ca 100644
--- a/sys-apps/pkgcore/pkgcore-0.12.4.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.12.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index 75031cd30f04..a0c4cb0e414d 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -1,7 +1,10 @@
+AUX plocate-1.1.10-meson-use-feature-option-for-libiouring.patch 1833 BLAKE2B 4aba8c5ff0e5aade451ef02e60db223ff00f53c8d8e0761a83ae8a306348df0c42bb25549396684e75b4f1ae6d62b7b18972f2890291ba1643481c2401548c76 SHA512 8b8a08f0cbbe9455f5c2c88c609cab602bcb15f2f162c9ca597c779b550067ff430556df0d16f90221b615582e1d637e08b0cf29e013ef103fec0ccebb5b4c7e
 AUX plocate-1.1.5-no-systemd-check.patch 764 BLAKE2B f2a97b7c85339e7b7de663e1097e98178913766f88fdcea68b25f3285b14ff8791d668ca2a608ed6bcdf5f9b5b3c2cfedb2e76ad5c674bba03664ee19232e5bb SHA512 440b96a621c9f39f3b9a846342d5dc1d95ef7a8b5253e1c569582bddd6e1a544767996885c5f19a5bcc78cfc48f522f93631c382d2cd360a528141bc8a029aa2
 AUX plocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc16a4662b606f5a0c6c62e4b1475a02ec3f244dde1ff73fe0ad16e0850aec53e6e8836fd0ba1273ad07 SHA512 ab055b052980783b5c63c716d7c12dcb19961a9f990c077e4f8c9bef4ca591bd281ac3941f872659a558a18b81c014dbc0655ff0a1872310670d8efc1d27cb00
 AUX plocate.cron 1392 BLAKE2B 89f7eb05879c0c1a6c30376d36dc469dde0b94df3758ae659012cf9fb6e9fb2783a0d8e53ea5f79d99e2f00be72ef24a254f2d91038a30dc9e19cd2b250782f9 SHA512 b15583e98e253c2fcb658bd9c1c589bacddb8b033eb565333d9f990b1fd320fcfbe1d950657c8b5823d4cb034ccad369bdd2178ef955e42aa9c2f8e8a0268b3f
 AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
+DIST plocate-1.1.10.tar.gz 72222 BLAKE2B 2d84177454380c9e806a46a6e7057aca15b65c9d83179ba35062d0b8772e7cb3ff50d594c294d73157e7705d4b2eea3f12d07e614076e6a6c7a9b532f42640f5 SHA512 eee4a8982b8fff18793cd06c35cdea501226fae6409df02e8bed3d14feb3ed4ba6c29e907f36f5efb74202e8926547def83379b03aeb6348e1a6e7b51f12fdb9
 DIST plocate-1.1.8.tar.gz 71569 BLAKE2B 06ad0e9535b76bf0102cdeeb6014e2d84f85f51f5926520566e9c6871f04ac09651bb0674ed679d2a4c0d4e516e55dfef35a7021112fad3549bf76993554aeb5 SHA512 a685347df64ac1a3eb7789cb7023b4d0ffed5fb7435a4bd88c3943991e145a387829532ec0c01d30d851b97b8d3173ff4c7c274775e639b75f0b1b45e5bca2a6
+EBUILD plocate-1.1.10.ebuild 2077 BLAKE2B 91d876de6fedc8a7ddca2fdc69c15c2621b3bf68f9cd0b99ed5cde99f79d34e60c1455aeed18d41abc6fe3f7ba0c3192e1c79066ccd06504218076fd5d7cade6 SHA512 b3df2ccd26728d8b186ffe9ac29f876f3c3fa1df2ee2aaa8437e7808140ed21884cb4401af22556d20bf5d5d9d6548f17533fa59c8da534bd7ef64e14886d425
 EBUILD plocate-1.1.8.ebuild 2063 BLAKE2B 35011f66c0957b50861f4a8e4c658ac6457e1d64bc3171713dd7627fcb358a6dd55d9d270966cfaf928bd007d5897e1c0fffa639d00065d2de06450a57dce0b4 SHA512 24b7f3f25aceba3661c38b60a76d6e4229d8bc57c1ce45e00461bd4f264d43bab8432a592ca9abb0b662bad77e0c8072c6243164f0f395a07abda602b8de3d1d
 MISC metadata.xml 1392 BLAKE2B b0e97157995ec77af0df5fe42d8bfe2949163b3f1ac9631e5b79942786491a3f9c2e29d004901abe994735373cef5cbe4f31646847e9cde1d26620b229396e81 SHA512 35cfb62bc7d28abb528835566018b03a724a1c4fa0a68661478007f924a685f42c5b43a2661e7a0b27548d3feae1f64223ac0f9be1c6d3ff600a57aadde69dcf
diff --git a/sys-apps/plocate/files/plocate-1.1.10-meson-use-feature-option-for-libiouring.patch b/sys-apps/plocate/files/plocate-1.1.10-meson-use-feature-option-for-libiouring.patch
new file mode 100644
index 000000000000..183c9f8e7fff
--- /dev/null
+++ b/sys-apps/plocate/files/plocate-1.1.10-meson-use-feature-option-for-libiouring.patch
@@ -0,0 +1,38 @@
+From 562128212376305bac8edd10d80c24f1223f1870 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Thu, 19 Aug 2021 12:03:39 +0200
+Subject: [PATCH plocate] meson: use feature option for libiouring
+
+source-based distributions would prefer to allow this option to be
+disabled without a hack, regardless of is libiouring installed or not,
+and meson already supports feature options for this purpose.
+---
+ meson.build       | 2 +-
+ meson_options.txt | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6fb0f74..fb79e3f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -10,7 +10,7 @@ add_project_arguments('-DPACKAGE_VERSION="' + meson.project_version() + '"', lan
+ add_project_arguments('-DPACKAGE_BUGREPORT="steinar+plocate@gunderson.no"', language: 'cpp')
+ 
+ cxx = meson.get_compiler('cpp')
+-uringdep = dependency('liburing', required: false)
++uringdep = dependency('liburing', required: get_option('use_libiouring'))
+ zstddep = dependency('libzstd')
+ threaddep = dependency('threads')
+ atomicdep = cxx.find_library('atomic', required: false)
+diff --git a/meson_options.txt b/meson_options.txt
+index 8ac13c5..9c90bf0 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -3,3 +3,4 @@ option('install_systemd', type: 'boolean', value: true, description: 'Install sy
+ option('systemunitdir', type: 'string', description: 'Where to install systemd units to (default: autodetect)')
+ option('locategroup', type: 'string', value: 'plocate', description: 'Group that the install script will use for the .db file')
+ option('updatedb_progname', type: 'string', value: 'updatedb', description: 'Binary name of updatedb')
++option('use_libiouring', type: 'feature', value: 'auto', description: 'Enable libiouring dependency (default: autodetect)')
+-- 
+2.31.1
+
diff --git a/sys-apps/plocate/plocate-1.1.10.ebuild b/sys-apps/plocate/plocate-1.1.10.ebuild
new file mode 100644
index 000000000000..d198d630c595
--- /dev/null
+++ b/sys-apps/plocate/plocate-1.1.10.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info meson systemd
+
+DESCRIPTION="Posting locate is a much faster locate"
+HOMEPAGE="https://plocate.sesse.net/"
+SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
+
+# GPL-2 for updatedb
+# GPL-2+ for plocate itself
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+io-uring"
+
+RDEPEND="
+	acct-group/locate
+	app-arch/zstd:=
+	io-uring? ( sys-libs/liburing:= )
+	!sys-apps/mlocate
+"
+DEPEND="${RDEPEND}"
+
+CONFIG_CHECK="~IO_URING"
+ERROR_IO_URING="required for USE=io-uring"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.10-meson-use-feature-option-for-libiouring.patch
+)
+
+src_prepare() {
+	# We'll install the manpage ourself to locate.1
+	sed -i "/install_man('plocate.1')/d" meson.build || die
+
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dlocategroup=locate
+		-Dinstall_systemd=true
+		-Dinstall_cron=false
+		-Dsystemunitdir="$(systemd_get_systemunitdir)"
+		"$(meson_feature io-uring use_libiouring)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dodoc README NEWS
+	newman "${S}"/${PN}.1 locate.1
+	dosym plocate /usr/bin/locate
+
+	insinto /etc
+	doins "${FILESDIR}"/updatedb.conf
+	doins "${FILESDIR}"/plocate-cron.conf
+	fperms 0644 /etc/{updatedb,plocate-cron}.conf
+
+	insinto /etc/cron.daily
+	# Ensure that the cron file has the same name as the
+	# systemd-timer, to avoid plocate being run twice daily on systems
+	# with a systemd compatiblity layer. See also bug #780351.
+	newins "${FILESDIR}"/plocate.cron plocate-updatedb
+	fperms 0755 /etc/cron.daily/plocate-updatedb
+
+	systemd_dounit "${BUILD_DIR}"/${PN}-updatedb.service "${S}"/${PN}-updatedb.timer
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog "The database for the locate command is generated daily by a cron job,"
+		elog "if you install for the first time you can run the updatedb command manually now."
+		elog
+		elog "Note that the ${EROOT}/etc/updatedb.conf file is generic,"
+		elog "please customize it to your system requirements."
+	fi
+}
diff --git a/sys-apps/ripgrep-all/Manifest b/sys-apps/ripgrep-all/Manifest
index 5b6d2824a723..ad6ed865ecb5 100644
--- a/sys-apps/ripgrep-all/Manifest
+++ b/sys-apps/ripgrep-all/Manifest
@@ -159,5 +159,5 @@ DIST zip-0.5.5.crate 33064 BLAKE2B b10857e79c0548ce0aec9d1d7689e4b9c9d78756c7eaa
 DIST zstd-0.5.1+zstd.1.4.4.crate 26509 BLAKE2B 909a36290f48e65147f43a2a08edcfca42471efb28f2ef28f2e45246f91498d184749fc19a56aeddc0db3ff91a003cc39909e92fe3f899879fc9aa8b32f26ce1 SHA512 565a3898c24eb5efac75df6b76d327ce8a2e62f261e63c4e307ad8583604333d9e3ba6567b3d83c7eb771a1117b743e594dacfe3fdf7542800da921ec0ebef2d
 DIST zstd-safe-2.0.3+zstd.1.4.4.crate 16090 BLAKE2B afa8563797ea2684972c5d440cba2bea070a487d182d782bd1a14eab6d2cfded1bfd6634b1ac3e39a5548d24e90415d0d9a77c951572f9c3657a7f81fcabbd56 SHA512 05f45aa3440e84e72f9a2bc647a5c1b146399dc5424767fc6371aadb8f48cab24dcac5fbd1c856b770c9c777b983382482d76ab8b10b99ae9569f5ffda852ae5
 DIST zstd-sys-1.4.15+zstd.1.4.4.crate 2014730 BLAKE2B ac978e2103688671f1dccb30da144a144e76a5aa054aca4a46e9fa18070e432e0498cf36d6e6294b21b1f4d30fca46a3c1df2eed5841674ce81f2d90b4021391 SHA512 523eb1f4183deca8be3cb018e43b9e51f1910b9e04b42795fb23e036c6f13e2b81ac70ea11837200dc3061622562d360499ed3b939fd8ff23c486fbcc35ec779
-EBUILD ripgrep-all-0.9.6.ebuild 3596 BLAKE2B 5f249d1cc8f0f1b323aa9f2d43db45c1c059d78638cc59ef03385b9bb5a39a59e8f81f400acfce251b4b8e5e6ac3eca570112456d19fdc1f8b2486bafe210bbd SHA512 3503bbad9bb449d8be8e444366ffd83a2a1e82d72ce62e77057fda3b7bc87aede7c888bf4af69068e09bd437152c1bf3028e2f3d2ef3f112ee6ab86cd15f2df8
+EBUILD ripgrep-all-0.9.6-r1.ebuild 3735 BLAKE2B 5141452486afa52cddd86ed2cd7afd63a9d101e13637e29e182f47dccd2efd69c7c0df2deb36a2aa7d39cfc56fac6607ae2c4b13b6f97dce45d8e5cd4f398940 SHA512 6d8f75092431b0024a25a0e9f234275eac6e47112900e405005ccffd1be53c6c57e2749f315d36d41d8185d9f471a9f65767f9137897cf3dc9e94e7c70eed938
 MISC metadata.xml 246 BLAKE2B efcbb4db7ac6eb97dc4625930f11c2d780be8fb04e89f2a6d7ef4a853f07b59b3058542d61769f3185b626f35bbe09bd6ee9e34323cef4239f1241dc3ff160ca SHA512 92d34b6d6b6116064cbdd8c79bba97e2f60f56a078c70efbbe87c9cd90cb96bf4522fcf437075bf30417e2ef20f696e6cd4e586203e85a00269aca13f1fb23be
diff --git a/sys-apps/ripgrep-all/ripgrep-all-0.9.6-r1.ebuild b/sys-apps/ripgrep-all/ripgrep-all-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..f3c4070d21b4
--- /dev/null
+++ b/sys-apps/ripgrep-all/ripgrep-all-0.9.6-r1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Partially auto-generated by cargo-ebuild 0.3.1
+
+EAPI=7
+
+inherit optfeature
+
+CRATES="
+	addr2line-0.12.0
+	adler32-1.0.4
+	aho-corasick-0.7.10
+	ansi_term-0.11.0
+	arrayref-0.3.6
+	atty-0.2.14
+	autocfg-0.1.7
+	autocfg-1.0.0
+	backtrace-0.3.48
+	bincode-1.2.1
+	bitflags-1.2.1
+	byteorder-1.3.4
+	bzip2-0.3.3
+	bzip2-sys-0.1.8+1.0.8
+	cachedir-0.1.1
+	cc-1.0.53
+	cfg-if-0.1.10
+	chrono-0.4.11
+	clap-2.33.1
+	cloudabi-0.0.3
+	crc32fast-1.2.0
+	crossbeam-0.7.3
+	crossbeam-channel-0.4.2
+	crossbeam-deque-0.7.3
+	crossbeam-epoch-0.8.2
+	crossbeam-queue-0.2.1
+	crossbeam-utils-0.7.2
+	encoding_rs-0.8.23
+	encoding_rs_io-0.1.7
+	env_logger-0.7.1
+	exitfailure-0.5.1
+	failure-0.1.8
+	failure_derive-0.1.8
+	fallible-iterator-0.2.0
+	fallible-streaming-iterator-0.1.9
+	filetime-0.2.10
+	fixedbitset-0.1.9
+	flate2-1.0.14
+	fnv-1.0.7
+	fuchsia-cprng-0.1.1
+	generic-array-0.12.3
+	getrandom-0.1.14
+	gimli-0.21.0
+	glob-0.3.0
+	heck-0.3.1
+	hermit-abi-0.1.13
+	humantime-1.3.0
+	idna-0.2.0
+	itoa-0.4.5
+	jobserver-0.1.21
+	lazy_static-1.4.0
+	libc-0.2.70
+	libsqlite3-sys-0.18.0
+	linked-hash-map-0.5.3
+	lmdb-rkv-0.14.0
+	lmdb-rkv-sys-0.11.0
+	lock_api-0.2.0
+	log-0.4.8
+	lru-cache-0.1.2
+	lzma-sys-0.1.16
+	matches-0.1.8
+	maybe-uninit-2.0.0
+	memchr-2.3.3
+	memoffset-0.5.4
+	miniz_oxide-0.3.6
+	nom-2.2.1
+	num-0.2.1
+	num-complex-0.2.4
+	num-integer-0.1.42
+	num-iter-0.1.40
+	num-rational-0.2.4
+	num-traits-0.2.11
+	object-0.19.0
+	ordered-float-1.0.2
+	ordermap-0.3.5
+	parking_lot-0.8.0
+	parking_lot_core-0.5.0
+	paste-0.1.12
+	paste-impl-0.1.12
+	path-clean-0.1.0
+	percent-encoding-2.1.0
+	petgraph-0.4.13
+	pkg-config-0.3.17
+	podio-0.1.6
+	ppv-lite86-0.2.8
+	proc-macro-error-1.0.2
+	proc-macro-error-attr-1.0.2
+	proc-macro-hack-0.5.15
+	proc-macro2-1.0.13
+	quick-error-1.2.3
+	quote-1.0.6
+	rand-0.6.5
+	rand-0.7.3
+	rand_chacha-0.1.1
+	rand_chacha-0.2.2
+	rand_core-0.3.1
+	rand_core-0.4.2
+	rand_core-0.5.1
+	rand_hc-0.1.0
+	rand_hc-0.2.0
+	rand_isaac-0.1.1
+	rand_jitter-0.1.4
+	rand_os-0.1.3
+	rand_pcg-0.1.2
+	rand_xorshift-0.1.1
+	rdrand-0.4.0
+	redox_syscall-0.1.56
+	regex-1.3.7
+	regex-syntax-0.6.17
+	remove_dir_all-0.5.2
+	rkv-0.10.4
+	rusqlite-0.23.1
+	rustc-demangle-0.1.16
+	rustc_version-0.2.3
+	ryu-1.0.4
+	scopeguard-1.1.0
+	semver-0.9.0
+	semver-parser-0.7.0
+	serde-1.0.110
+	serde_derive-1.0.110
+	serde_json-1.0.53
+	size_format-1.0.2
+	smallvec-0.6.13
+	smallvec-1.4.0
+	strsim-0.8.0
+	structopt-0.3.14
+	structopt-derive-0.4.7
+	syn-1.0.22
+	syn-mid-0.5.0
+	synstructure-0.12.3
+	tar-0.4.26
+	tempfile-3.1.0
+	term_size-0.3.2
+	termcolor-1.1.0
+	textwrap-0.11.0
+	thread_local-1.0.1
+	time-0.1.43
+	tree_magic_fork-0.2.2
+	typenum-1.12.0
+	unicode-bidi-0.3.4
+	unicode-normalization-0.1.12
+	unicode-segmentation-1.6.0
+	unicode-width-0.1.7
+	unicode-xid-0.2.0
+	url-2.1.1
+	uuid-0.8.1
+	vcpkg-0.2.8
+	vec_map-0.8.2
+	version_check-0.9.1
+	wasi-0.9.0+wasi-snapshot-preview1
+	winapi-0.3.8
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	xattr-0.2.2
+	xz2-0.1.6
+	zip-0.5.5
+	zstd-0.5.1+zstd.1.4.4
+	zstd-safe-2.0.3+zstd.1.4.4
+	zstd-sys-1.4.15+zstd.1.4.4
+"
+
+inherit cargo
+
+DESCRIPTION="Like ripgrep, but also search in PDFs, E-Books, Office documents, archives, etc."
+HOMEPAGE="https://github.com/phiresky/ripgrep-all"
+SRC_URI="
+	https://github.com/phiresky/ripgrep-all/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})
+"
+
+LICENSE="AGPL-3+ Apache-2.0 BSD-2 ISC MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-arch/xz-utils
+	sys-apps/ripgrep
+"
+DEPEND="${RDEPEND}"
+
+QA_FLAGS_IGNORED="
+	usr/bin/rga
+	usr/bin/rga-preproc
+"
+
+pkg_postinst() {
+	optfeature "pandoc support" app-text/pandoc
+	optfeature "pdf support" app-text/poppler
+	optfeature "media support" media-video/ffmpeg
+}
diff --git a/sys-apps/ripgrep-all/ripgrep-all-0.9.6.ebuild b/sys-apps/ripgrep-all/ripgrep-all-0.9.6.ebuild
deleted file mode 100644
index 42c4e92f3cf4..000000000000
--- a/sys-apps/ripgrep-all/ripgrep-all-0.9.6.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Partially auto-generated by cargo-ebuild 0.3.1
-
-EAPI=7
-
-CRATES="
-	addr2line-0.12.0
-	adler32-1.0.4
-	aho-corasick-0.7.10
-	ansi_term-0.11.0
-	arrayref-0.3.6
-	atty-0.2.14
-	autocfg-0.1.7
-	autocfg-1.0.0
-	backtrace-0.3.48
-	bincode-1.2.1
-	bitflags-1.2.1
-	byteorder-1.3.4
-	bzip2-0.3.3
-	bzip2-sys-0.1.8+1.0.8
-	cachedir-0.1.1
-	cc-1.0.53
-	cfg-if-0.1.10
-	chrono-0.4.11
-	clap-2.33.1
-	cloudabi-0.0.3
-	crc32fast-1.2.0
-	crossbeam-0.7.3
-	crossbeam-channel-0.4.2
-	crossbeam-deque-0.7.3
-	crossbeam-epoch-0.8.2
-	crossbeam-queue-0.2.1
-	crossbeam-utils-0.7.2
-	encoding_rs-0.8.23
-	encoding_rs_io-0.1.7
-	env_logger-0.7.1
-	exitfailure-0.5.1
-	failure-0.1.8
-	failure_derive-0.1.8
-	fallible-iterator-0.2.0
-	fallible-streaming-iterator-0.1.9
-	filetime-0.2.10
-	fixedbitset-0.1.9
-	flate2-1.0.14
-	fnv-1.0.7
-	fuchsia-cprng-0.1.1
-	generic-array-0.12.3
-	getrandom-0.1.14
-	gimli-0.21.0
-	glob-0.3.0
-	heck-0.3.1
-	hermit-abi-0.1.13
-	humantime-1.3.0
-	idna-0.2.0
-	itoa-0.4.5
-	jobserver-0.1.21
-	lazy_static-1.4.0
-	libc-0.2.70
-	libsqlite3-sys-0.18.0
-	linked-hash-map-0.5.3
-	lmdb-rkv-0.14.0
-	lmdb-rkv-sys-0.11.0
-	lock_api-0.2.0
-	log-0.4.8
-	lru-cache-0.1.2
-	lzma-sys-0.1.16
-	matches-0.1.8
-	maybe-uninit-2.0.0
-	memchr-2.3.3
-	memoffset-0.5.4
-	miniz_oxide-0.3.6
-	nom-2.2.1
-	num-0.2.1
-	num-complex-0.2.4
-	num-integer-0.1.42
-	num-iter-0.1.40
-	num-rational-0.2.4
-	num-traits-0.2.11
-	object-0.19.0
-	ordered-float-1.0.2
-	ordermap-0.3.5
-	parking_lot-0.8.0
-	parking_lot_core-0.5.0
-	paste-0.1.12
-	paste-impl-0.1.12
-	path-clean-0.1.0
-	percent-encoding-2.1.0
-	petgraph-0.4.13
-	pkg-config-0.3.17
-	podio-0.1.6
-	ppv-lite86-0.2.8
-	proc-macro-error-1.0.2
-	proc-macro-error-attr-1.0.2
-	proc-macro-hack-0.5.15
-	proc-macro2-1.0.13
-	quick-error-1.2.3
-	quote-1.0.6
-	rand-0.6.5
-	rand-0.7.3
-	rand_chacha-0.1.1
-	rand_chacha-0.2.2
-	rand_core-0.3.1
-	rand_core-0.4.2
-	rand_core-0.5.1
-	rand_hc-0.1.0
-	rand_hc-0.2.0
-	rand_isaac-0.1.1
-	rand_jitter-0.1.4
-	rand_os-0.1.3
-	rand_pcg-0.1.2
-	rand_xorshift-0.1.1
-	rdrand-0.4.0
-	redox_syscall-0.1.56
-	regex-1.3.7
-	regex-syntax-0.6.17
-	remove_dir_all-0.5.2
-	rkv-0.10.4
-	rusqlite-0.23.1
-	rustc-demangle-0.1.16
-	rustc_version-0.2.3
-	ryu-1.0.4
-	scopeguard-1.1.0
-	semver-0.9.0
-	semver-parser-0.7.0
-	serde-1.0.110
-	serde_derive-1.0.110
-	serde_json-1.0.53
-	size_format-1.0.2
-	smallvec-0.6.13
-	smallvec-1.4.0
-	strsim-0.8.0
-	structopt-0.3.14
-	structopt-derive-0.4.7
-	syn-1.0.22
-	syn-mid-0.5.0
-	synstructure-0.12.3
-	tar-0.4.26
-	tempfile-3.1.0
-	term_size-0.3.2
-	termcolor-1.1.0
-	textwrap-0.11.0
-	thread_local-1.0.1
-	time-0.1.43
-	tree_magic_fork-0.2.2
-	typenum-1.12.0
-	unicode-bidi-0.3.4
-	unicode-normalization-0.1.12
-	unicode-segmentation-1.6.0
-	unicode-width-0.1.7
-	unicode-xid-0.2.0
-	url-2.1.1
-	uuid-0.8.1
-	vcpkg-0.2.8
-	vec_map-0.8.2
-	version_check-0.9.1
-	wasi-0.9.0+wasi-snapshot-preview1
-	winapi-0.3.8
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	xattr-0.2.2
-	xz2-0.1.6
-	zip-0.5.5
-	zstd-0.5.1+zstd.1.4.4
-	zstd-safe-2.0.3+zstd.1.4.4
-	zstd-sys-1.4.15+zstd.1.4.4
-"
-
-inherit cargo
-
-DESCRIPTION="Like ripgrep, but also search in PDFs, E-Books, Office documents, archives, etc."
-HOMEPAGE="https://github.com/phiresky/ripgrep-all"
-SRC_URI="
-	https://github.com/phiresky/ripgrep-all/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})
-"
-
-LICENSE="AGPL-3+ Apache-2.0 BSD-2 ISC MIT ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-text/pandoc
-	app-text/poppler
-	sys-apps/ripgrep
-	media-video/ffmpeg
-"
-DEPEND="${RDEPEND}"
-
-QA_FLAGS_IGNORED="
-	usr/bin/rga
-	usr/bin/rga-preproc
-"
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index 1fd9354e2987..4e40868e4e40 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -9,5 +9,5 @@ DIST systemd-musl-patches-249.1-r1.tar.xz 24536 BLAKE2B 25135519112b2a1c638046ad
 DIST systemd-stable-249.2.tar.gz 10591728 BLAKE2B fb24c681cf2328aa26fa49a8ba20cccd1ee0fae82ec9f9931a69eaa377fc01b2ece12fdf407444514d494b8ac1418f155b0fceeff4925bebaba691f0b8a2acc8 SHA512 4f42a0b93156529a464545361436fa98193e12a7e0809315b9fdedbcf33b81dd2037acac27fb0dfefcb2679bc49ebb6da4d152ecb4b15db797c81f7ca4588a11
 DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7
 EBUILD systemd-tmpfiles-246.ebuild 4802 BLAKE2B cea13522b54ef9644dc274e4ccf3c3f2532f93eec3b7edb467e0505479a42463576dd971377407067f59f34edcc0e6a5f994ed16a6b9a0a532ee23241d80ffde SHA512 1cbf46e13a8a48e9e6659e580dfa81c356337ed63baae7a8ebae055e60932ad83283de1be9922104f57d61fc44dab9750fb7cad37a5e5f4896544e3c932453cd
-EBUILD systemd-tmpfiles-249.2.ebuild 5910 BLAKE2B 040f11ac201f67fad61449f848bd8df4eb14b12fbb77596b88ad074a27372eab05a714e7cea1f3f2eff904555f2fd939b601cf2047f3c03c3efe92f71f1685be SHA512 edff3dd451bd6132b1757100e414bace0e99f241c03be525219e8596ee90c5af7cbcdcd5b6c0c55ce1b54b958fd0912ed1ac7efd13b93f07f54f0774256ac5cf
+EBUILD systemd-tmpfiles-249.2.ebuild 5916 BLAKE2B e56e41a686d34a09c983adb961064bfa35e20a0f4cd05761f83fb1135a6845dc2213c3e4233a0e83ea433791eef84712fe34a6e148de75849a815ad1699b2da1 SHA512 cdc27c4ab3188011bdb32f76cbad3f3425fb30a19fcec55d554203bec6199dce97b04df14197ae884b8de278cab1607bd4d11075e0eeabb20c804fae93560e42
 MISC metadata.xml 360 BLAKE2B 88025ee1295db8e637c6cbffcaee94574e8573a884b109bdb1793c1ab8ccb7da0f6ef654c4f1ac045071c1f4af04e6b2a0f5dab096b6ea97ce1d93a230eb89e7 SHA512 e3a37b3af90a3ba1ab0ce4efaf41dec616c50f6905da76e9e5919243134057494da6674cf56a8b1811d71ada2a619113167154086f4aaeaeeab94185e4de8ab0
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild
index 66a216552215..e7dfd08d456d 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-$
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="selinux test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest
index 245a28071a51..3a162bda5bd3 100644
--- a/sys-apps/usbguard/Manifest
+++ b/sys-apps/usbguard/Manifest
@@ -4,5 +4,5 @@ AUX usbguard-1.0.0-bash-completion-configure.patch 3598 BLAKE2B 7b8ed24d698c37a6
 AUX usbguard-1.0.0-pthreads-link.patch 1013 BLAKE2B 78daa200908b47e3db9b779383958711add034c521a5cf95718b62ef89259007dafc7318df0a9722228ba36419593636383a7dea069947c99baeddc3449f046b SHA512 a5634f6ca80d46d37af803106d3c44313408f7fdaaa160ce713562210cbb28cb4d3f9180cda0855c73bf85410b0d77b0c1758803adc757888c7876db9fb761e7
 DIST usbguard-1.0.0.tar.gz 1260374 BLAKE2B ea9b48f14a4091f4ce61b6c171947cf2412c47e9aa3edb816e933f7aad6247b32e89bee90675ca5a0136b460fef8f2d423c0c81ad49d52453d0d3803b881503a SHA512 068a9be8bd5ea05efcdad79e2c4beb5e8b646b4703fbe1f8bb262e37ae9a6284a6eeb811a6bd441250a38bce1e45b7f44ad15726aa5963da2e1b56e85f5e16fd
 EBUILD usbguard-1.0.0-r2.ebuild 2375 BLAKE2B ae31b853b32157a6b5e654f2e3fc792f228fd190e96c3f67261751e6748b6908902ac1d22c315f17892082d164ff1e8c168bd167e7284361b33be7d367b63b15 SHA512 08fd0ac7e120c6cbc10decabdc42957a44fd3c00a0dac307dfa4d1e8d9e4da2950de1c6a47c793fcfa037894f00670baa8e084a3812ca1a4dec8e215e989899e
-EBUILD usbguard-1.0.0-r3.ebuild 2431 BLAKE2B 9ed210d336f64af706c3aeac55bdc2d9a1cdb80309c4014d6ab9f49101255efe8cf8179224111677a2544dbbe0fd4275137c32becf5818e45af048980cd59e91 SHA512 3f92bad4f2737bdaef596b105e5a1082b0dae0ad7451a58f0b474f56f71729e39b00f238479ef61715f6c83abbe2af10ffd189fe823f9d0dc314107b3c637bc2
+EBUILD usbguard-1.0.0-r4.ebuild 2511 BLAKE2B 0a75cbee4fa70f07e3fa8d38316ec679f54b08f35cdc85832e53da69d16b9e1b648f1703d9b6b99a4482abb1a35d5d71d5909c58b65a3fddf9d990d2e3cc687a SHA512 3b3a1fc45429735fd0f6b78b4edec726526a292071098722b513915b923341c910b7f5102c438e8599b14cf0031702b8a69047e9f69a2a88b7be244db350e65f
 MISC metadata.xml 344 BLAKE2B ccb8c1c611694dea10c4d0809ab46ccdc30efeadcd60904ffe6aa98420d489ea64bf8b1f0f46caea3d77ef448bd2b8d510f355aeee6ce98e5f3a3f76c6fbe141 SHA512 a661530757754d0640302d966aaa1156dfdda95430a3c0d80cf178ec4ffcfdcc13e9c19de7a22fd5269bc877d177d7a80fd15e9875247ea1f829601c2be19777
diff --git a/sys-apps/usbguard/usbguard-1.0.0-r3.ebuild b/sys-apps/usbguard/usbguard-1.0.0-r3.ebuild
deleted file mode 100644
index 2f0a8eeb9d46..000000000000
--- a/sys-apps/usbguard/usbguard-1.0.0-r3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1
-
-DESCRIPTION="Daemon protecting your computer against BadUSB"
-HOMEPAGE="https://github.com/USBGuard/usbguard"
-SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/1"  # due to libusbguard.so.<1>.0.0
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus ldap policykit static-libs systemd test umockdev"
-
-REQUIRED_USE="policykit? ( dbus )"
-
-# https://github.com/USBGuard/usbguard/issues/449
-# https://bugs.gentoo.org/769692
-REQUIRED_USE+=" test? ( static-libs )"
-
-CDEPEND="
-	<dev-libs/pegtl-3
-	>=dev-libs/libsodium-0.4.5:=
-	>=dev-libs/protobuf-2.5.0:=
-	>=sys-cluster/libqb-0.16.0:=
-	sys-devel/gcc:*[cxx]
-	>=sys-libs/libcap-ng-0.7.0
-	>=sys-libs/libseccomp-2.0.0
-	>=sys-process/audit-2.7.7
-	dbus? (
-		dev-libs/glib:2
-		sys-apps/dbus
-		policykit? ( sys-auth/polkit[introspection] )
-	)
-	ldap? ( net-nds/openldap )
-	systemd? ( sys-apps/systemd )
-	umockdev? ( dev-util/umockdev )
-	"
-RDEPEND="${CDEPEND}
-	virtual/udev
-	"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	dev-cpp/catch:1
-	dbus? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		dev-util/gdbus-codegen
-	)
-	"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.0-pthreads-link.patch
-	"${FILESDIR}"/${PN}-1.0.0-bash-completion-configure.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myargs=(
-		--with-bash-completion-dir=$(get_bashcompdir)
-		$(use_with dbus)
-		$(use_with ldap)
-		$(use_with policykit polkit)
-		$(use_enable static-libs static)
-		$(use_enable systemd)
-		$(use_enable umockdev)
-	)
-
-	econf "${myargs[@]}"
-}
-
-src_install() {
-	default
-
-	keepdir /etc/usbguard/IPCAccessControl.d  # bug 808801
-	keepdir /var/lib/log/usbguard
-
-	newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard.openrc usbguard
-	use dbus && newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard-dbus.openrc usbguard-dbus
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn 'BEFORE STARTING USBGUARD please be sure to create/generate'
-	ewarn '                         a rules file at /etc/usbguard/rules.conf'
-	ewarn '                         so that you do not'
-	ewarn '                                            GET LOCKED OUT'
-	ewarn "                         of this system (\"$(hostname)\")."
-	ewarn
-	ewarn 'This command may be of help:'
-	ewarn '  sudo sh -c "usbguard generate-policy > /etc/usbguard/rules.conf"'
-	ewarn
-}
diff --git a/sys-apps/usbguard/usbguard-1.0.0-r4.ebuild b/sys-apps/usbguard/usbguard-1.0.0-r4.ebuild
new file mode 100644
index 000000000000..6ce52a2cf93e
--- /dev/null
+++ b/sys-apps/usbguard/usbguard-1.0.0-r4.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="Daemon protecting your computer against BadUSB"
+HOMEPAGE="https://github.com/USBGuard/usbguard"
+SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/1"  # due to libusbguard.so.<1>.0.0
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus ldap policykit static-libs systemd test umockdev"
+
+REQUIRED_USE="policykit? ( dbus )"
+
+# https://github.com/USBGuard/usbguard/issues/449
+# https://bugs.gentoo.org/769692
+REQUIRED_USE+=" test? ( static-libs )"
+
+CDEPEND="
+	<dev-libs/pegtl-3
+	>=dev-libs/libsodium-0.4.5:=
+	>=dev-libs/protobuf-2.5.0:=
+	>=sys-cluster/libqb-0.16.0:=
+	sys-devel/gcc:*[cxx]
+	>=sys-libs/libcap-ng-0.7.0
+	>=sys-libs/libseccomp-2.0.0
+	>=sys-process/audit-2.7.7
+	dbus? (
+		dev-libs/glib:2
+		sys-apps/dbus
+		policykit? ( sys-auth/polkit[introspection] )
+	)
+	ldap? ( net-nds/openldap )
+	systemd? ( sys-apps/systemd )
+	umockdev? ( dev-util/umockdev )
+	"
+RDEPEND="${CDEPEND}
+	virtual/udev
+	"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	dev-cpp/catch:1
+	dbus? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		dev-util/gdbus-codegen
+	)
+	"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.0-pthreads-link.patch
+	"${FILESDIR}"/${PN}-1.0.0-bash-completion-configure.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myargs=(
+		--with-bash-completion-dir=$(get_bashcompdir)
+		$(use_with dbus)
+		$(use_with ldap)
+		$(use_with policykit polkit)
+		$(use_enable static-libs static)
+		$(use_enable systemd)
+		$(use_enable umockdev)
+	)
+
+	econf "${myargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /etc/usbguard/IPCAccessControl.d  # bug 808801
+	keepdir /var/lib/log/usbguard
+	chmod 0600 "${ED}"/etc/usbguard/IPCAccessControl.d/.keep* || die  # bug 808801
+
+	newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard.openrc usbguard
+	use dbus && newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard-dbus.openrc usbguard-dbus
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn 'BEFORE STARTING USBGUARD please be sure to create/generate'
+	ewarn '                         a rules file at /etc/usbguard/rules.conf'
+	ewarn '                         so that you do not'
+	ewarn '                                            GET LOCKED OUT'
+	ewarn "                         of this system (\"$(hostname)\")."
+	ewarn
+	ewarn 'This command may be of help:'
+	ewarn '  sudo sh -c "usbguard generate-policy > /etc/usbguard/rules.conf"'
+	ewarn
+}
diff --git a/sys-apps/xdg-desktop-portal-gtk/Manifest b/sys-apps/xdg-desktop-portal-gtk/Manifest
index 4ca10725fa52..9bc3e6f23f2c 100644
--- a/sys-apps/xdg-desktop-portal-gtk/Manifest
+++ b/sys-apps/xdg-desktop-portal-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-desktop-portal-gtk-1.8.0.tar.xz 370196 BLAKE2B d15a054e8fbc74718db7ad2d0f7b53c86b392e729fb4d5b8bdd87b16c0ebbf4feb11b29bc27da12990b351f520faa23bde694721819589513b6cfd1e4ea2f092 SHA512 832b3c4cb9ea738f2ab7641fbd7e14beaa5f6a1ae88f012cd44b12f4bc51588f61868b5982301e3dfd67965d6a69fd8669a9832b6ec7017168d611c87d76689b
-EBUILD xdg-desktop-portal-gtk-1.8.0.ebuild 976 BLAKE2B eda583623e17a090c59186deac0e4800a09bb374edb16ed209184dba2e4ee63bfd33f78eec4ef4032f3d42d5c535022e0be600889310b74e63c5771498189504 SHA512 bd9fd5813cc033e901c799c8c4e552100729ca7d075041528066860d20e5525ad5293a3d561cdd7b1526c3d1b9810fe4c365b6cea6efd5cd2486ff9d1ce052e1
+EBUILD xdg-desktop-portal-gtk-1.8.0.ebuild 983 BLAKE2B a08a593be0d458d342b1a4b00abd38f6a20e09812b5219d75fe268c02908e9f2abd26727e220c8da1808341144e17ea000f9fb7136b45ba13418eb76effd24a4 SHA512 666f331b55f8c55475e559576c5321bdd998f413cc6e1ac9b4ba5e6fadbd993cc4f69878af5663ddd41331e98e87606e02899499ff22a1ee75500a3252ddcf33
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild
index e3dcc6c26696..99bf5c983063 100644
--- a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild
+++ b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${MY_PV}/${MY_P}.tar
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="wayland X"
 
 BDEPEND="
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 7221ea38e9a0..3506df0d350c 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 314c07f51ef8..15df2902ae8c 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -16,7 +16,7 @@ DIST glusterfs-9.3.tar.gz 8167846 BLAKE2B 119e2c089ef250fafb2b2dfdcf71f40cc25fdd
 EBUILD glusterfs-7.9-r1.ebuild 5918 BLAKE2B 30a380db21aa976157cffa6da38443b5466ca014e6088915cc7b251671e0d218505938110a10caaab4f68d920920429fc768b7bd4fdc40fa43adbee5e430a1c4 SHA512 d04251b216950f23b5d4a7c95dc62f665da1af04073e9f5a647146411918d377e3152e90023daed81ad6f8e6358b3f43e9901943751ee6ab42baf6903267d1bd
 EBUILD glusterfs-8.3-r1.ebuild 5432 BLAKE2B 82e9ee097997352a86510a7ca3c8a7d450899a6ed96044f7e707fdaa952ad6a6c43fee6e4a557732f3f12dc2173146edbf4ae42d544494e8b659d6edf9146cd5 SHA512 ac49472d7d75eeecc7ee8f005a8d5f5be25eae6458888bb5b083c2e78bb764b31592f058907bdd44da148995900991e0fc0ab2923677c433959f9f2a3d427daf
 EBUILD glusterfs-8.4-r1.ebuild 5432 BLAKE2B 82e9ee097997352a86510a7ca3c8a7d450899a6ed96044f7e707fdaa952ad6a6c43fee6e4a557732f3f12dc2173146edbf4ae42d544494e8b659d6edf9146cd5 SHA512 ac49472d7d75eeecc7ee8f005a8d5f5be25eae6458888bb5b083c2e78bb764b31592f058907bdd44da148995900991e0fc0ab2923677c433959f9f2a3d427daf
-EBUILD glusterfs-8.5-r1.ebuild 5435 BLAKE2B b6927b8bf21012364e6f3d68f44793caa690c8d6e2efebda13facc3b167c36676ad7a18c0ec33e448d01f8ce0d0f7d5cab083a5bec23df3386c297f4f8e3cc45 SHA512 6770dae5eb113af3ab3f614fce8e3b48f924b6a227053bd42a9f3fbe65bbd2c905826f60345a8e7a9d5ab40215a1736e4da4dd18cd6d7aedd0b0b1163e4a1104
+EBUILD glusterfs-8.5-r1.ebuild 5434 BLAKE2B 7b819c7b98e882752f3c76a4df20d2c197c6d6b2bcdf6419972ce0a4bec33a6af72d9ae62307f87faf79b62980ab0a9d9aaaf221131625c3662c6e8e949881a6 SHA512 03a396e9b1c76ed932e8039945f007f71a137bd9966d598af6a3831a1af6b8e8c6a20b02ead72c896e1d312e221700c5843e507694e4189453e5c029b9986c4a
 EBUILD glusterfs-9.1-r1.ebuild 5457 BLAKE2B e9f8b7201eacc9705295a498e0e136742b9cd414f4492e99609d26c3adfa1ea76b62856596a3c30c1349fd25afb19bd502d643ad5cb857b9fab8d6b6db8dbb04 SHA512 746d669c2f0cfb6d996a5128b3c604ab83c39f9a552b26c6e3a7131b564624d25623bb152248e22033046c236efb669c66236c0499f927fe4c098d4eeb14ad66
 EBUILD glusterfs-9.2-r1.ebuild 5458 BLAKE2B f44b0f014e5ae10f939ba1dec4815ca886ca4de737a69a45450089eb082c8d1d8eaf0ab70bcb0d741926c0daccb9faaf276c1e1a035da48d2a590a26707e7f41 SHA512 14ad8f4703bd2ee433a76f6b41e1740afcb7675ed16515845b092ce082619502b5b7305712a8c3531460f94310b4fa891aa22758f2d7b0182cd1b568ca9930bb
 EBUILD glusterfs-9.3.ebuild 5458 BLAKE2B f44b0f014e5ae10f939ba1dec4815ca886ca4de737a69a45450089eb082c8d1d8eaf0ab70bcb0d741926c0daccb9faaf276c1e1a035da48d2a590a26707e7f41 SHA512 14ad8f4703bd2ee433a76f6b41e1740afcb7675ed16515845b092ce082619502b5b7305712a8c3531460f94310b4fa891aa22758f2d7b0182cd1b568ca9930bb
diff --git a/sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild b/sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild
index 4b6e8a174620..7bac633316a7 100644
--- a/sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0/${PV%%.*}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 
 IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml"
 
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 9bd7e38ad5ff..d48910220a03 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,5 +1,5 @@
-AUX hpx-1.7.0-python.patch 873 BLAKE2B 825d41a28c2e97633d9dfbdb5efd2d2a2d92f7a064c92d709391f672dae7e01b14de8e60b9aed3b6dd72ec07f17ebd78831e35b76c3e57808d58c3d4cf1ffe11 SHA512 ce200541f91642a44a2d5c019e822fe2bc358bf6d9e362b75d2713c651a01aed07a6c46e8ca571d49b805c1bcadd6aa7eb39ad0e65e201d18d02c9884683818b
-DIST hpx-1.7.0.tar.gz 4729879 BLAKE2B 05be1461eb0867b690a8f34a7ddf46d4fa19e05b5666df6cf5a3dfd28fa6a6ecacf6305bf2eaa42a669f18264b61c9690988695b8748ba09a27011001b543952 SHA512 052b3278710d8047c8e0e0979a668aa5161c495fcd12b089dd5039c64bd414b4ec0b96dfcd414d68e0db5b31c360dffb84374413c53794f37ce77d9cabc89518
-EBUILD hpx-1.7.0.ebuild 2212 BLAKE2B a576d3f1c6a5ddbe1e6206e0a32ceed4eb11c485e6bc1ed87c34db13dace98239abdf3c473b343885ee66d341d0924eafc518e0f1825d383ea018670019f754c SHA512 b9c1eff106beae95826d1c27d2243b72cb9aef80be2463fa25472a675da8aeb23bd55a306b85a59eea0861f8938482ac1782ac4d831407224f7dbd3ddd6cd72f
+AUX hpx-1.7.1-python.patch 873 BLAKE2B 825d41a28c2e97633d9dfbdb5efd2d2a2d92f7a064c92d709391f672dae7e01b14de8e60b9aed3b6dd72ec07f17ebd78831e35b76c3e57808d58c3d4cf1ffe11 SHA512 ce200541f91642a44a2d5c019e822fe2bc358bf6d9e362b75d2713c651a01aed07a6c46e8ca571d49b805c1bcadd6aa7eb39ad0e65e201d18d02c9884683818b
+DIST hpx-1.7.1.tar.gz 4751163 BLAKE2B 21e417dab5c118b16ab8d2955b0d65a95ca7d0e2f777496306855e4098cfb400962dd9e0cf03ebbab5e3348f2f985d1053d0a70124c0925c77859e8ada209cec SHA512 6bdb294da393a198abf81d5f63799a066334755eed0fda40bbfc4e9a774b6e19a3e5ad7ab45c989d31f3797e7b547bb552c29f51b552d9a79d166f86aee375a3
+EBUILD hpx-1.7.1.ebuild 2212 BLAKE2B a576d3f1c6a5ddbe1e6206e0a32ceed4eb11c485e6bc1ed87c34db13dace98239abdf3c473b343885ee66d341d0924eafc518e0f1825d383ea018670019f754c SHA512 b9c1eff106beae95826d1c27d2243b72cb9aef80be2463fa25472a675da8aeb23bd55a306b85a59eea0861f8938482ac1782ac4d831407224f7dbd3ddd6cd72f
 EBUILD hpx-9999.ebuild 2166 BLAKE2B 140771daafdbe48c992eac7c0672112ed738e7f71a8e837e5cf9a329adbd9ff026af6f3cba0e68f318f859500a8675f74d0384882eb2a584ae50c4dea80e08d7 SHA512 177ac7e60273d1b0a7eddb115f2ac5acd40c703bd3899f6dfa4bf69953bd1d8f68dc606615edd1cf9cdb7623f6403521d18bea79d25a2a00b9252df45ce78da2
 MISC metadata.xml 1219 BLAKE2B de2e75ab303cc78d91a327e4887bcb312095757503a93ecd646abbc7e8e44c9d9872768bdc5bdd8200894d904e6306cd6540edf5579a64e686ceed9694701715 SHA512 d696bba0202c159da2a1b887cb66838f1a967a0053ebce6d131dd3dc670a69cf6313ca027a3e2fe9f7c302fbcd1cafb1b3ffe7b057b8d268056640c44b2e3776
diff --git a/sys-cluster/hpx/files/hpx-1.7.0-python.patch b/sys-cluster/hpx/files/hpx-1.7.1-python.patch
index 21b7ce3ceeff..21b7ce3ceeff 100644
--- a/sys-cluster/hpx/files/hpx-1.7.0-python.patch
+++ b/sys-cluster/hpx/files/hpx-1.7.1-python.patch
diff --git a/sys-cluster/hpx/hpx-1.7.0.ebuild b/sys-cluster/hpx/hpx-1.7.1.ebuild
index 2ab8ea741f30..2ab8ea741f30 100644
--- a/sys-cluster/hpx/hpx-1.7.0.ebuild
+++ b/sys-cluster/hpx/hpx-1.7.1.ebuild
diff --git a/sys-cluster/knem/Manifest b/sys-cluster/knem/Manifest
index 7f03bdc68766..7da37d88729b 100644
--- a/sys-cluster/knem/Manifest
+++ b/sys-cluster/knem/Manifest
@@ -1,6 +1,6 @@
 AUX 45-knem.rules 28 BLAKE2B 4f7eb2b4c84bc786998ac8ad610626b6ca3e384777aeecd7bb18fb657ff095f7311670bb388d6e7c5f1da944428d6d088bd65d333d27cf67f3d1d532354aaaf6 SHA512 fc819a12ad7432cbf08450ebc36b469402753d8d363d72a46b71efb916391d320591eac0be9498a37a7bbc5ebe1b2725a2cbf37c7c69ed7d5c6e1ccf9ce0e51b
 AUX knem-1.1.3-setup_timer.patch 1965 BLAKE2B b70774ca235d159c4054a496e23e7e5205f504815878b0045ff80f91f7cda1fb3748d1fde16a6da6c6c67f2d8acfc4310a7e0cfa3ad1d461b89bc73d41af8f10 SHA512 ab87faded049f999638d4092a9758a542836e2c373c43e4f00141f54b8aa38ab2bbd288edf95a67f087b949864e4a00163cf2eff13f2b41a71677b72c4f9eb01
 DIST knem-1.1.3.tar.gz 330109 BLAKE2B 0aa5a2b5cd329e7183800b8b4e6b76297c85325cef218dc0ae27293ffb3aaf8a6896bc237ca745bb8df97a446c2ecc5542b96fc9eb4bbead6a1c9b894dd38f51 SHA512 ab72b3a803898c8de1bb775857da346e16ade285cdf17b9339eef3dc939c5d50ef5b3442e96418e414d64cd3e1e1a922b5e8c74462c5d6866b842ee9749db3eb
-EBUILD knem-1.1.3-r2.ebuild 1652 BLAKE2B 7a17cbcb0a7d402fe1b7dec93821b33f57e2f85051ea566ce2296182e03699f35c0172fc05ceafba35f8d2db81838a65758bd7ddb9fc9f12ce64af5600f81078 SHA512 1d00d34bafff7cfbbd05d376818464a5708d9cb25ac9754b10af3af14a9b7396e3405402e610509f8a9dd21b4a7c6b2600d79d94232df30133f4c372de79637b
+EBUILD knem-1.1.3-r2.ebuild 1659 BLAKE2B a9362bf290014fc4002b77a5ccef1cf55b13acdc4df50cfb5a71e8320d4ac8e8aa6eee3fabdaf8ad5c43cf56d231b90c85599f874050082e9eb67de8226ec7dc SHA512 a11a9966e2692009f2d42fbe56ee928d30e23bae60375296d5f6a0f660d4b7b26312288d8f88667da24daf35545e1ed81ac5d32495e33159e42bf63e9861cfd6
 EBUILD knem-9999.ebuild 1603 BLAKE2B 76fa233a4080f9008965cf4efd9a543ce3a14836835ff254c5d82bd7b85a748a9c8402e3a4e65b0fb478f9f4ec9c701f17e6f2a9be561e4d07cf1eeb0fa7adfb SHA512 402fa67950338e0eeb736df7c7ffedb49ccef06e31fd32975eed227166d786868ef6239745a45c0e4b9241e834579ec400372023c494dbd70b12184d40ead4ce
 MISC metadata.xml 365 BLAKE2B ceba315f0fbd74cfc6ec310a70126108f304deef94ba49cc1a9f8291b9827fdea3e3224cd7a52265d98ec55e240496d943874301e7a51f29eef2d5f03a26842d SHA512 debd6bb734810af46390ed76b73151e5729999aff31956951cf9482e06ae6d08e4d642f9fc27ff99f0947b0b63214dc9ca6514e760d0d93a79bcd9ea79b60743
diff --git a/sys-cluster/knem/knem-1.1.3-r2.ebuild b/sys-cluster/knem/knem-1.1.3-r2.ebuild
index 5eff8ce1fc91..11a20117f633 100644
--- a/sys-cluster/knem/knem-1.1.3-r2.ebuild
+++ b/sys-cluster/knem/knem-1.1.3-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="http://gforge.inria.fr/frs/download.php/37186/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2 LGPL-2"
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 41c097e21d43..6ce95407032d 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -25,6 +25,6 @@ EBUILD openmpi-3.1.4.ebuild 5356 BLAKE2B 2330d221b4b6f8cfb83abddd5c9d0ea62c733bf
 EBUILD openmpi-4.0.2.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
 EBUILD openmpi-4.0.3.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
 EBUILD openmpi-4.0.4.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
-EBUILD openmpi-4.0.5-r1.ebuild 5448 BLAKE2B cda6b9132f05442c9c53ea7bf762a1ac0d837b4f68ec97be0ad05a87628542cd34093cb2e18a72ca6ecda1cd60689095cf1ffc3349d865c957a6726f1e35360c SHA512 8bf6600f871a4c2421f41c6b12d8542247382b012c62a9e873c86d392d4809f75323cf5c4c1de0fdc2f3e1700b73f2eae80d67b121bc9487c4c0b7a82c34fb5c
+EBUILD openmpi-4.0.5-r1.ebuild 5497 BLAKE2B 90af6a25648bf252c54055438260b229aa5b8a122dec07ec5649f8bec89aa04c041a2a5a18d887d9ca894ccabe8fadab64dda82ac89051e1498dd9d661bddfdd SHA512 29c5cf9d8109f8736cd966b7f26c175973ee5c0cbc4b4c8eadfc58da0dda0e83191226c86a85a7af3c2a93945c7f1df3aee1ead76a4a1c8859be2501131704a8
 EBUILD openmpi-4.0.5.ebuild 5379 BLAKE2B 4f710429ea2e112c0c1500371c199e990da8b15aed1df010372efcef84cc09b740f1ed39cac64170136f7f6831e475cc4643ec4424abde0501744f9c34667174 SHA512 da2d5951249ae7c4c191c8aef70bd092dae49593db86f675578d182b4e04888b9db5d13bea062ccf2e9702a5bf210b3f51658de4770d71c97cc13246995a841a
 MISC metadata.xml 960 BLAKE2B 6b4a60bb64814ddf030e39210ea97c613e2777a665355a5228bf30f128f1a51f958113093c071a9d4e89e40019eade71c68a5c2c32abfca5fa5f050fdb080c10 SHA512 e0c3b2fb31a353bebb1aaf752dee4a376aa8694522321d91851cd806a874ff20879ec2f1a1258c9379fcabdf5b75007900aa1073a3dd26f41070d9f02b4c042e
diff --git a/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild b/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild
index a0d9dbe3129a..6c1ca2a4c165 100644
--- a/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild
@@ -59,14 +59,15 @@ CDEPEND="
 	openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) )"
 
 RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.6 )"
+	java? ( >=virtual/jre-1.8:* )"
 
 DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.6 )"
+	java? ( >=virtual/jdk-1.8:* )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/mpi.h
 	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
+	/usr/include/openmpi/mpiext/mpiext_cuda_c.h
 )
 
 pkg_setup() {
diff --git a/sys-fabric/Manifest.gz b/sys-fabric/Manifest.gz
index c5d35d3ce864..8b3e07c19ac3 100644
--- a/sys-fabric/Manifest.gz
+++ b/sys-fabric/Manifest.gz
diff --git a/sys-fabric/infinipath-psm/Manifest b/sys-fabric/infinipath-psm/Manifest
index fbf2eba75d3d..31bc8b817b78 100644
--- a/sys-fabric/infinipath-psm/Manifest
+++ b/sys-fabric/infinipath-psm/Manifest
@@ -1,5 +1,5 @@
 AUX 42-infinipath-psm.rules 85 BLAKE2B fc740e6f5399879060a6f37f4a862fc398e0163e176d8f20e5dbec6c953b6febe49afd848135966eedec7da09ebeabb0e63cb2729618ccb2822e274b39829b24 SHA512 2113118500c9dce4d1faf2a9f5da1e540be82ed6cfbe5ad5edd2927f266d77a698f628ade289716e5f992b4d5a9ad49c6b1f522a2c2a9eda087953f9a082f6fc
 AUX infinipath-psm-3.2-fno-common.patch 2518 BLAKE2B 4cabe6924788235bbac230f0d5486d0ff713839dc48dd6ed673071d1f728497e0cfcd79660cac3468f43c731754947a0b4c293a7709a7cbd72ac35cfb9bca7d0 SHA512 125651c5527f0da432ab0fd3ee4fc6c866d2310ca8a2bf6f00a14056f80671f14ed4deffbec90950b23c2eeeed752c6e45103a5b225b1641ea7843d6a9757d3f
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD infinipath-psm-3.2.ebuild 732 BLAKE2B 8c318c33c349b62637dbb0c8dd84d73a3d3b4bef4cabada7677b508da2d13ea944513166ede6e60fba498f975a6cb4a20308662eb67d0f5878fbe498c62304e5 SHA512 3cf2d40cd5a596f0e84286cfb6cddbe7fcee5a79d27790f8f6aaa923b59e1956aade3c954c55c0bb4f9f3f46336e0d74b96b255ad8aef691ccdae4629a0287fc
+EBUILD infinipath-psm-3.2.ebuild 739 BLAKE2B 40cdfc09b226eade86a0dcfe200ee760a3cbc3b69dc7d0cdc7d7ec3dd9dde60fbd9a3eb2b4fc65fd348764d6bc8b3c7e21176ce310e1ff7d97a91df567b24e8d SHA512 b3f3b265c954ff215f52260198f04cec75c8134e13c104e33c692bfc9b717d3037ae1ac9bd1b38e7712e2047d09a3c7b573b16c4c6d7ff8ebc5486f378adc289
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild b/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
index f6ba003caf62..95ebd19a5ffc 100644
--- a/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
+++ b/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
@@ -13,7 +13,7 @@ OFED_SRC_SNAPSHOT="1"
 inherit epatch openib udev
 
 DESCRIPTION="OpenIB userspace driver for the PathScale InfiniBand HCAs"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 -riscv x86 ~amd64-linux"
 
 RDEPEND="sys-fabric/libibverbs:${SLOT}"
 DEPEND="${RDEPEND}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 35b007745f46..37b071f92134 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/copyfs/Manifest b/sys-fs/copyfs/Manifest
index 33afceb38b23..cd0e16d6b205 100644
--- a/sys-fs/copyfs/Manifest
+++ b/sys-fs/copyfs/Manifest
@@ -1,5 +1,5 @@
 AUX copyfs-1.0-unlink.patch 4383 BLAKE2B 5d73f8ef5985f801d4f9b9f400189db080d1d4010cbd59ca2640ba782d9d48af74afb5a22b8a65b29b35855f204e4b59d0aa306402eff672677861af5cd78064 SHA512 dc4a665e98f5250f36ff5dffb4b1ebe58ce9939724d58a0f99f6b21a7d7440947bc90bd6f07f471774cbcca9da5cc0b9f621081e2384797cf47302cb2769b0bb
 AUX copyfs-1.0.1-gentoo.patch 999 BLAKE2B 4ed27bf399a21e6ae0d949a5e3c0e7dca77784d7691a3be1e0cfc6099ee89330f919e8f386220266a91b582b84d85c81da4f457e10eb3b1f447f390a4b59c59e SHA512 45cf7dd29ef8deb2421177cf513906fd40864b93192a5cb2556ed3cd85227d173f7fd9a24e1c4ac78426f1059ffa5a05e348bf64ad6759575774f60407d31143
 DIST copyfs-1.0.1.tar.bz2 38429 BLAKE2B d10909762e95cd48ac24f7a93cfd388e911412c157bf74b85a32cff020b4e5fa3e86d4ff4577b4488507574a8f699004c6b0f01dc967e5e557eabdf301b2b825 SHA512 abe1a125913f35d8390385562d56a5a1aa238ec03bfa044d61ac8f514a4986bfa70502d30af9dbc90e58910dab7f0ab5e230de0b4fa2eb45fe3a2f6514be0a07
-EBUILD copyfs-1.0.1-r1.ebuild 927 BLAKE2B 022c64057e46a8ce96066eb3770983428bb7e88ccb52330f36ece6e72b405c70cf4bc7b562662919d5a8c8583cc83f046a53d826f48306687f3c0c0c457e1f0e SHA512 13a6d62d9d9987a01672f5788015f6dc52eaed1c1029004c29297c9b4c33ff96cfcc88563989b75abd7ae6786b3f5a84cecfb38519b305cdc91c8c20b7735dfa
+EBUILD copyfs-1.0.1-r1.ebuild 926 BLAKE2B fe265673681fd518b8b24b845e389b81712ba872476ba9ed3b1ba7666ffcf8e00e31805ef2615d41cc75dd614949d77fa69f82ee21f73805b13cee5beda5bd28 SHA512 6d036bb2a452c50f654f03fb1adc6f437906ce5f3ef016254fd1b73b1a18b3cc4135b613d2fa699e6798ac75abd5b3cfb7952dc3651abb3a7fc0d885a5b593b3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-fs/copyfs/copyfs-1.0.1-r1.ebuild b/sys-fs/copyfs/copyfs-1.0.1-r1.ebuild
index ec53bab73be8..543302c45eb9 100644
--- a/sys-fs/copyfs/copyfs-1.0.1-r1.ebuild
+++ b/sys-fs/copyfs/copyfs-1.0.1-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=7
@@ -33,10 +33,10 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	econf --bindir="${D}/usr/bin" --mandir="${D}/usr/share/man"
-}
-
 src_compile() {
 	emake CC=$(tc-getCC)
 }
+
+src_install() {
+	emake bindir="${D}"/usr/bin mandir="${D}"/usr/share/man install
+}
diff --git a/sys-fs/dmraid/Manifest b/sys-fs/dmraid/Manifest
index b65898871ffa..b2a6fb53a875 100644
--- a/sys-fs/dmraid/Manifest
+++ b/sys-fs/dmraid/Manifest
@@ -5,5 +5,5 @@ AUX dmraid-1.0.0_rc16-return-all-sets.patch 283 BLAKE2B 5278f1df08db2a63519b6d31
 AUX dmraid-1.0.0_rc16-static-build-fixes.patch 3840 BLAKE2B 713e255890dfbfd7ded83cc914a136cf88a40943ac310f10e574f6ee3683e4cd61b1e369a38ddfb6ad767c904b95b2a04c04b1a38833998485aa4b1e29006870 SHA512 ff2aaebec2be1ace40377a4bcd91c802c190ac4047643478d6f99e3023cf69b4a5e8230519ce2f3febe5d6419a54557184739bcbeaa08047354ca93f27e4ec67
 AUX dmraid-1.0.0_rc16-undo-p-rename.patch 531 BLAKE2B eef9d2ef5f2766773bf83bba93d44a02a450a03b1e338f3120473512fe60d7a5f60d4bb2ae25ed019e0c58b89c5e67fd81426ae0fd5e06220976640b84d29d67 SHA512 b5b93d49e716c585284dfd89fe4651fd5bb6921196a053797aeec9cf5654f11da7b2ed1ad93f2df15fd3ef47c95efd67aeecc196fcfd3feb22f7903ad103a8c6
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
-EBUILD dmraid-1.0.0_rc16-r5.ebuild 3372 BLAKE2B d483d9c2c76c3dbf38ef53e0fe593023eab9af678320e20636fb0ba0124b67d02d4eab77d170192d602fac3bb0f6c03825e1b36b38121bb68de932adeedc9805 SHA512 68ac1079bb6b6970c35a84a8f8004e0a92690669e5d493c2c7fe1d702d925b6d8fa00cc247864923d930f97f9f38e953bf2e81a8b7b9dd98685dae3864ba5bf0
+EBUILD dmraid-1.0.0_rc16-r5.ebuild 3379 BLAKE2B 52b613cafcb6e96c324c272e4a416cba8322cd1eaeb3751ab4b8516b215f22fb039786f06f2231e15d1b3ded94542d6406c0e5168ccc32e07934e3dc78b58058 SHA512 0ecea9a88585faf1b4a01f48b639bcb1ba5124836e387bd67f880b90fd87e02fd918f2513ee435b890d4e9b8b8ff042f75dea2258f5db2c936c8a15c9085241f
 MISC metadata.xml 544 BLAKE2B 8a100ed92851488b9a8c722769ea1d5a443ebf1220698b8de3de05f2b6cb282d4cf1d9849d5f86ceabfc6f70fab0d610853b084f8adaf938c48625be5db87191 SHA512 002f647c3c87349f1d56a1180e90e5746c5e94dc1b2e118aa2737b5d5b1dd72b4c3dbe808cdb56c2db6d47a6eb224784542ae7b005f100818979177c7e1d1898
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
index 246c90731c0b..7751241ce571 100644
--- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}/${MY_PV}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="intel_led led mini static"
 
 RDEPEND=">=sys-fs/lvm2-2.02.45"
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index ec416f5c1ae4..f5564995b7c0 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,10 +1,7 @@
 AUX lxcfs-4.0.0.confd 221 BLAKE2B 18924acc45506885e0f1795ffd4dd666d341abc2957c22a241909004ea988f1464b817939b450741bc77e413fb37d2e2dcd8f85405ab69f27d475567f48df2db SHA512 ebccfce0f865c8dbc1cff67712be4ac625b91ccc42aa78971c6619cf32553abe15ae82c6b3f320600cf3605f8b8c7ccbbcac3a399c6ae8261a08ea2793992e58
 AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061decfdf327a24cb1360dd08184d8cdc3936db26b6a50c47748f146414a1ae1ab61f963a9c7740c0ec3919 SHA512 755356e2a4f1e92803d8864c4edc223c183c81592562d6492d4b374174d4e5ca2d30fcdeb9861c46df795e6373ecf5f14c089c7ad22465d02516748c2c18aed7
 AUX lxcfs-4.0.0.service 427 BLAKE2B 4a681cfe9f856f0a2986fc2934ee3712f02af2ba3b085ff1c9fe4bdb80195ea943e4c9d1640410b9302c7c42d697d3483a0d8e4942a1f494695199bdfd6dfeca SHA512 592847d97ec6afd69de670918fdf5e7e8ef4ba730d917cd78a177c164d69c5d80417fed1b2a41849e08f5b9f3bbe28e3ad99887c195db6fd0ebeb559f23214bf
-DIST lxcfs-4.0.8.tar.gz 458975 BLAKE2B 19ac81c36c3aad0ee3301eda73aa29399304dff1c827041678be73c4134181667a4d92b3efa37a44b2853b825031fef2e07e7cbfcaf552676a01f5f9faedf9c3 SHA512 830a4a25583a645b59c75327701af24c239323bfe822180c2cb7cb7cc284f50e8bb7c38e771ea869b4449370af1ab1a4fed9611c6495883d193f5a0f6f71380e
-DIST lxcfs-4.0.8.tar.gz.asc 833 BLAKE2B da4ef0f8d6dea59d83f708b6aa7c1835773537e3111d8e9aaf4a7c111d21a0b57486cc9828919bea55ea06ee6bf3e03eeae89eb26199e287066b309d6d798c8d SHA512 f8fc10e52472fff599df7e008d34346489754d64347d005794a4b280949130bb0370ade0d65c9eb182914cae3a6c55f9872bc38481b0b64ea1218c8d1640a74f
 DIST lxcfs-4.0.9.tar.gz 453383 BLAKE2B 06694218d45d93baa9041aeae39e52d827ca1b53d616284d0ee04ddfe98436a15b3cf900c7b58f14e506a0726f30679b0a04e6b5047087201ad2a9c35f0cc09e SHA512 c8d02cefb42dee82ea9467631e8e59243a6cb06d4ea53f0ce8da0a9bbc9018480bb0f12723091da672446a75ba200cca044b84c2f13388009dde9e5ad0ca3ebe
 DIST lxcfs-4.0.9.tar.gz.asc 833 BLAKE2B fa71f7a6a7a35fbc7613ec2d7549197fe0d33c9584aea86fe3db959848eeb1b0e69a75ca2d596578f3c7f3a9deca5cec1badce428b4aa52e6f112cf3fe544b3b SHA512 fd9feac31469db7785c8b486ddc4f5c0431ab2aa52aed715e853fcab322e8c6ee755aa87d9bdee7a969a8030be1956863662f8b2db09bfe4b8ba69ef8f2fbb3e
-EBUILD lxcfs-4.0.8.ebuild 1446 BLAKE2B 7c7eb6eb44f3cdeb5c38be49dc36b34f6fe77b23283b4928ab5b0d13edfc21c6d0b29b366f8d771dba608ad5970bee4b9ceebfbf37ccda82aea9c977d2583189 SHA512 549ce7620931289cfba89a89aff9bdf4cc62759e67fc96df29d0227718751ca4b2743b0d981d1c484038996eabb2402653abf93ae88bb037c49d1da4e1acbc76
 EBUILD lxcfs-4.0.9.ebuild 1453 BLAKE2B 54fe1e2941c705f198e943b6dc02928ff837133534fb220e896ae0accbd463aacafc928a5e4e9166fb9817a141fb4d6aa41576b6e2a7dbc3be2f48e343e52753 SHA512 7b8a11da167e5c4ef5ce53afc2e7f9be88fff47631346cf70b65f037765e3936ac1c591820ce3b7bdebf534c8018034fd40363ba25fdf582c7cfbf0596fce37f
 MISC metadata.xml 709 BLAKE2B 7c053869dc93fb8eea0b63604fa137736820ff1e2b8e6ee7d500ffd2a46ab381dc1321f2df0268d8f34eef10935f98959089b9f983c112b6809880b27f93eeb6 SHA512 bba720236a7d3fb0c4e71f624575c14a79abacea4441d672a151a3fe16c220fde0c03fa4bbdb2f7d0171920ccb787e1357a0c7aaa54bea4244e8e6771423f19c
diff --git a/sys-fs/lxcfs/lxcfs-4.0.8.ebuild b/sys-fs/lxcfs/lxcfs-4.0.8.ebuild
deleted file mode 100644
index b652ae461b57..000000000000
--- a/sys-fs/lxcfs/lxcfs-4.0.8.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 autotools systemd verify-sig
-
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
-SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
-	verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="dev-libs/glib:2
-	sys-fs/fuse:3"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-apps/help2man
-	verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-# Test files need to be updated to fuse:3, #764620
-RESTRICT="test"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Without the localstatedir the filesystem isn't mounted correctly
-	# Without with-distro ./configure will fail when cross-compiling
-	econf --localstatedir=/var --with-distro=gentoo --disable-static
-}
-
-src_test() {
-	cd tests/ || die
-	emake tests
-	./main.sh || die "Tests failed"
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
-	newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
-
-	# Provide our own service file (copy of upstream) due to paths being different from upstream,
-	# #728470
-	systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 288687494bcc..0b47335877b2 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -5,6 +5,6 @@ DIST systemd-248.tar.gz 10306883 BLAKE2B 3cb25d6101136a5f57e841d3f464f0d7649f6c1
 DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c
 DIST systemd-musl-patches-249.1-r1.tar.xz 24536 BLAKE2B 25135519112b2a1c638046addb6971ea1997fc7dd8626de90d162a4beb6383b5724df78a14c73be1283df58632fb4a0fcb32f90f50f1886f31a1aded15e9567c SHA512 4655f2a06e1b3310cb27b839360353dfbfdbdaa86f4392aeebf63f63efd441d1953f7ac108be7fed7ea721596d191988ed999e34443e47922afca92db779175a
 EBUILD udev-248-r1.ebuild 5468 BLAKE2B 65d07077600d16deb4970920dd728698f3d4b8c58f457e8df7167a2fe3c31ae4b8ad2a45b4d3fac4480c1a3a90e4376c22996d94909463df018543af09333fef SHA512 f73fefbcca00081271756322c19fe959cf2548a4e4a27af88e5b6eece368e0760b98465659106c884f8c16cba3f7a337e7b8c22c82ff575eebd7a6c38f5e0ab9
-EBUILD udev-249-r2.ebuild 7586 BLAKE2B 91103e7e0becceffbfd958d346f143b35c7413626cc1447968c84d9e73fdc712df8ff2427d0ab6757457ea8043e658c6163dcecb78464cb5c0cc45608be17502 SHA512 2c11bca33c78db60613499445d3a05b0aaca60c64df35c2e53e6ab1dbf6fea3544be2f72a380891ef3ee716c9a0f12071b35f60a983fdedfbd491c555d9dc38c
+EBUILD udev-249-r2.ebuild 7585 BLAKE2B 6a712f1047d91050a198049b02dc8259c62eacdfe351374c42ca2e9edca55fa5cbc57783456b7ec35df8974f8f61dfd3fb1fed9e3a23853c5b3d2f57467b3272 SHA512 485092a46d655dbf47ffa22d01f8d2a4af87a04b7e82fcd91740bc240565b59dc04508b2fe2f78cb8d86cf1fb0acd3ebc9429b21b87e52f6cf95a60d395f9e69
 EBUILD udev-9999.ebuild 7460 BLAKE2B 404739190a89c5011d11227ea42f068d4031b245f9afdd5f4e2f7ef606dc7a6553c60e4f4afe3653c2964e4eb3e8ce257b17d68386ac202ab91ca7f848b32787 SHA512 d8bf83a672516d1f12536952c178c72713c9945d62cfe520cc3688a35e7a2a8556917df28c9b07de1572e9e730baa781d4a23cce1d4b1b182096231ca6b3858a
 MISC metadata.xml 474 BLAKE2B b657acb428f66f11e028db59d50ff5c52c8f14d092c6f2a66307fca668e300823a9727ab33d02f3337953988b600dbc257019fd333a8c34ff3d5039fea6b0ee3 SHA512 b8610952420e4cc28a58402da8ef9e1c0a9c409eff47c92253ad745f2a2121eaf68380cd3122113b792332e23aa9f7bcae4ccebb1ad6ffb26a38d266cb47b060
diff --git a/sys-fs/udev/udev-249-r2.ebuild b/sys-fs/udev/udev-249-r2.ebuild
index a2a87d450291..d4a8800599fe 100644
--- a/sys-fs/udev/udev-249-r2.ebuild
+++ b/sys-fs/udev/udev-249-r2.ebuild
@@ -29,7 +29,7 @@ else
 		https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${PV}.1-r1.tar.xz
 	)"
 
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index f69823a306fb..598a87e54ce2 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/bliss-kernel-bin/Manifest b/sys-kernel/bliss-kernel-bin/Manifest
deleted file mode 100644
index 8875e6a421c0..000000000000
--- a/sys-kernel/bliss-kernel-bin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST kernel-4.14.178-FC.01.tar.xz 96524864 BLAKE2B 21b526fc49ced62e1268e497ea0eba581ab1e8662900b404237c30fb3887e13ca19b4af402f6b8f13690838a451bb06c295ca014d7bba3e6c73ecbd11b773f39 SHA512 10b2da503652b4fb0cb465a121c471a9a22d14b51e1abce132f29291ee6c933807af77d8112054bc5bfa92c04b4288749e35af3f029724b7e2e2b679b77a7989
-DIST kernel-5.4.51-FB.01.tar.xz 117299856 BLAKE2B 3677a667ba72d0d57db9643deb2325bf539ed56aaf903842973fd063982aa5e9ea4030892988f7efac5848d5f29f00053ceceaa305cec47e64112d59310a3186 SHA512 baeb2d0d46d69c1690d1a295ea41f00067fa28a80053fbe5fc8f52863fb16ac4becbb3199fb8568fdfbf9bc01c4925cd8fea7f4436f73f4028378ab1c3af2774
-EBUILD bliss-kernel-bin-4.14.178.ebuild 785 BLAKE2B 03b1c6ed6ce9aa588f8ac38935016b17de22d956d856b7fe8d7ae0d0ba6cd5fd8b761203b7d54674b6eb6b3b33f01646c2b92f75238496864d4fa0da4edeeffa SHA512 36977c444fa941709fd5054f3a76f0c17433852f574699d1b323e3be5f81653a47729ff9768012f193054a3362db32c15f9fb4211821f8c17dc454c03927f5b5
-EBUILD bliss-kernel-bin-5.4.51.ebuild 785 BLAKE2B 918ee89dc0136406f43d73ac21a2dab72d80bc52778993c0664690af08815fc41a3511fe47c169d516f95bca528de08d84bc149f35a6f020674bdf889fec51d4 SHA512 c9b822c19e32d2a814dc74144f5c3c404d361f08a3be118c5a7778e4c2bf004b025a6c449d3a7ba9d947bc855d3243c790f086bbe7d7cffbc24dd82dd7f4b6bd
-MISC metadata.xml 266 BLAKE2B dda66d01e64ee82e1fab929036c56301ebb0d04362951d114ec79141eefc065a70181f5b1106de9b1af00dddfdabec79db049ff56cec55c31a133881dbb7373d SHA512 1b2f92cb5799caa15e63c618caf9664afc10540a120ffeb0e7e29cc09f09c8b2e5494e895eeab86353313e22fef1bdf85bcd6f75e0e77a57c1a3acdadb566234
diff --git a/sys-kernel/bliss-kernel-bin/bliss-kernel-bin-4.14.178.ebuild b/sys-kernel/bliss-kernel-bin/bliss-kernel-bin-4.14.178.ebuild
deleted file mode 100644
index 5f3098080b2d..000000000000
--- a/sys-kernel/bliss-kernel-bin/bliss-kernel-bin-4.14.178.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-# Variables
-_LV="FC.01"                     # Local Version
-_PLV="${PV}-${_LV}"             # Package Version + Local Version (Module Dir)
-
-# Main
-DESCRIPTION="Precompiled Vanilla Kernel (Kernel Ready-to-Eat [KRE])"
-HOMEPAGE="https://wiki.gentoo.org/wiki/User:Fearedbliss"
-SRC_URI="https://xyinn.org/gentoo/kernels/${_PLV}/kernel-${_PLV}.tar.xz"
-
-RESTRICT="strip test"
-LICENSE="GPL-2"
-SLOT="${_PLV}"
-KEYWORDS="-* amd64"
-
-S="${WORKDIR}"
-QA_PREBUILT="*"
-
-src_install() {
-	mv * "${ED}" || die
-}
-
-pkg_postinst() {
-	# Stub out this function. The downloaded tarball is ready to be installed
-	# into the OS directly.
-	debug-print-function ${FUNCNAME} "${@}"
-}
diff --git a/sys-kernel/bliss-kernel-bin/bliss-kernel-bin-5.4.51.ebuild b/sys-kernel/bliss-kernel-bin/bliss-kernel-bin-5.4.51.ebuild
deleted file mode 100644
index be4362d1fc87..000000000000
--- a/sys-kernel/bliss-kernel-bin/bliss-kernel-bin-5.4.51.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-# Variables
-_LV="FB.01"                     # Local Version
-_PLV="${PV}-${_LV}"             # Package Version + Local Version (Module Dir)
-
-# Main
-DESCRIPTION="Precompiled Vanilla Kernel (Kernel Ready-to-Eat [KRE])"
-HOMEPAGE="https://wiki.gentoo.org/wiki/User:Fearedbliss"
-SRC_URI="https://xyinn.org/gentoo/kernels/${_PLV}/kernel-${_PLV}.tar.xz"
-
-RESTRICT="strip test"
-LICENSE="GPL-2"
-SLOT="${_PLV}"
-KEYWORDS="-* amd64"
-
-S="${WORKDIR}"
-QA_PREBUILT="*"
-
-src_install() {
-	mv * "${ED}" || die
-}
-
-pkg_postinst() {
-	# Stub out this function. The downloaded tarball is ready to be installed
-	# into the OS directly.
-	debug-print-function ${FUNCNAME} "${@}"
-}
diff --git a/sys-kernel/bliss-kernel-bin/metadata.xml b/sys-kernel/bliss-kernel-bin/metadata.xml
deleted file mode 100644
index 6ee797fd125e..000000000000
--- a/sys-kernel/bliss-kernel-bin/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-->
-    <use>
-        <flag name="initramfs">Build initramfs along with the kernel.</flag>
-    </use>
-</pkgmetadata>
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 797dae3062c1..2bb164047ae1 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -5,10 +5,12 @@ DIST patch-5.14-rc3.patch 69715862 BLAKE2B bf826bfaf1968b2da2f074bb16ac82237c41d
 DIST patch-5.14-rc4.patch 69955713 BLAKE2B b4e3051cbba62cf937072205c29116362578be25dec7d5b25d020ffb4e634855be2771c152a36b1d40249692aceed0e70edc25479aad1ac99399dbec878fd97b SHA512 0d62ef70193c4bcb2b13637878e5c6d163d59cdcf00ec1447fe356e86853735e460706aba783a1942de0f32dc5b3fc8d95a012ff6cdcb6ab0d398556a2aa3bf4
 DIST patch-5.14-rc5.patch 70193505 BLAKE2B 3439ab433227c4daca6b4c8dc4f357fce38689f6af669554559294bba3491566ae1bdd4c703bafb96c84f5a2028926b35f253c4f379dff37d9899a0436e0424d SHA512 1752aa29cefbce5baa3e89307c0b87d09a0db29330dab58ad33e9866bc31e2378a9a6cdcb0fd4b05b9794f934c30353a558420527d853907266f8bfb535f30a5
 DIST patch-5.14-rc6.patch 70415935 BLAKE2B d1c1777b24e3a99b8acf7a79d5490e5f5222e77ea9bba525677fdeac22f5143d45f8cc04b78f6f800c924a39965e21871dd9a7b3d8cbc36331bcc914f5b8f9d2 SHA512 4f4544b2dda82e1b556bf1c24de27965eba9ec6875ff4950b87775cafa893cb629c5e25603be78d36426c2f35838d4be60c4ff72fe8664eb0f8dfce8a6cceee1
+DIST patch-5.14-rc7.patch 70593573 BLAKE2B 47396856eb7ed4f8fff1341d8280124a0211a2fb6192e60dd5f735827a0b3e4468beef187e74c45b1701254da3b7d3a24b82a1f371b95fbb523ed62f307c448a SHA512 c9c7d7135fbe704c5cf7c08fcceb4097f910c82f6f1c64b174640e4ebf9a325539186148652c8d9014814364b72f1ce25170816858119413ffc795dbcbd4bb3e
 EBUILD git-sources-5.14_rc1.ebuild 1172 BLAKE2B bff8ddc8315c78f97712397c0489677c2120d59d3d000db164657f066f32345d0812c6151f9d263240e82fb8be080839d2478cfac91da38af65cd8d5efc42f9d SHA512 ac380b11e0bc3f2eb77b670d8ab3f8daea4f7cd63e63f35ed6a4b2e64be285dcf7464db1485dd98ff3c3986054a1a45944f71b81567a3a7ac17876dc4314fde5
 EBUILD git-sources-5.14_rc2.ebuild 1172 BLAKE2B bff8ddc8315c78f97712397c0489677c2120d59d3d000db164657f066f32345d0812c6151f9d263240e82fb8be080839d2478cfac91da38af65cd8d5efc42f9d SHA512 ac380b11e0bc3f2eb77b670d8ab3f8daea4f7cd63e63f35ed6a4b2e64be285dcf7464db1485dd98ff3c3986054a1a45944f71b81567a3a7ac17876dc4314fde5
 EBUILD git-sources-5.14_rc3.ebuild 1172 BLAKE2B bff8ddc8315c78f97712397c0489677c2120d59d3d000db164657f066f32345d0812c6151f9d263240e82fb8be080839d2478cfac91da38af65cd8d5efc42f9d SHA512 ac380b11e0bc3f2eb77b670d8ab3f8daea4f7cd63e63f35ed6a4b2e64be285dcf7464db1485dd98ff3c3986054a1a45944f71b81567a3a7ac17876dc4314fde5
 EBUILD git-sources-5.14_rc4.ebuild 1172 BLAKE2B bff8ddc8315c78f97712397c0489677c2120d59d3d000db164657f066f32345d0812c6151f9d263240e82fb8be080839d2478cfac91da38af65cd8d5efc42f9d SHA512 ac380b11e0bc3f2eb77b670d8ab3f8daea4f7cd63e63f35ed6a4b2e64be285dcf7464db1485dd98ff3c3986054a1a45944f71b81567a3a7ac17876dc4314fde5
 EBUILD git-sources-5.14_rc5.ebuild 1172 BLAKE2B bff8ddc8315c78f97712397c0489677c2120d59d3d000db164657f066f32345d0812c6151f9d263240e82fb8be080839d2478cfac91da38af65cd8d5efc42f9d SHA512 ac380b11e0bc3f2eb77b670d8ab3f8daea4f7cd63e63f35ed6a4b2e64be285dcf7464db1485dd98ff3c3986054a1a45944f71b81567a3a7ac17876dc4314fde5
 EBUILD git-sources-5.14_rc6.ebuild 1172 BLAKE2B bff8ddc8315c78f97712397c0489677c2120d59d3d000db164657f066f32345d0812c6151f9d263240e82fb8be080839d2478cfac91da38af65cd8d5efc42f9d SHA512 ac380b11e0bc3f2eb77b670d8ab3f8daea4f7cd63e63f35ed6a4b2e64be285dcf7464db1485dd98ff3c3986054a1a45944f71b81567a3a7ac17876dc4314fde5
+EBUILD git-sources-5.14_rc7.ebuild 1172 BLAKE2B bff8ddc8315c78f97712397c0489677c2120d59d3d000db164657f066f32345d0812c6151f9d263240e82fb8be080839d2478cfac91da38af65cd8d5efc42f9d SHA512 ac380b11e0bc3f2eb77b670d8ab3f8daea4f7cd63e63f35ed6a4b2e64be285dcf7464db1485dd98ff3c3986054a1a45944f71b81567a3a7ac17876dc4314fde5
 MISC metadata.xml 464 BLAKE2B 37fa8f89a0431479faf733cd072c8d86fe27976913e47a9e09d6028e2eec20bd9b3093da14a2f01f00ff88ee6da012eb1dad96a9b3f5bc04f82157e9715c2645 SHA512 56e60b220ade75cd0b4175c43f01e8e31eb088c563327a25c0875493bbe28b5cef80fefb2b5394eb749c2eee43a1cbb632bdc79d48435e6a2f0fe609b13a2dfe
diff --git a/sys-kernel/git-sources/git-sources-5.14_rc7.ebuild b/sys-kernel/git-sources/git-sources-5.14_rc7.ebuild
new file mode 100644
index 000000000000..d43c5c0ce00d
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.14_rc7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.13"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 961817f8d0c6..f1d465b13712 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -19,12 +19,15 @@ DIST pf-sources-5.13_p2.patch 2756507 BLAKE2B 8602f98e8fc857621418513956ed910340
 DIST pf-sources-5.13_p3.patch 5055786 BLAKE2B c19d0d447bdd6c8204a0c61a84592ee0d6f7fd09a4142af2f8cf9d075311dc7fbad94c78261415b6d8c0f8cc9ef408c2b8e35ee2780320b61e1050e332cdf5d2 SHA512 bff89ba11ab81b5ac3903bdbf271952a59ecf360d071a9c2c375c1eb4a4e2c478e354f7119e3ce97fd6996709d733cf305ab2ecd9eaf8655e414f0b55494da11
 DIST pf-sources-5.13_p4.patch 5640578 BLAKE2B fb3cbecbe1d6498e5fc6bab28ff7b7588733d377228dbff496bb31a3efe5063cce9410cf6077a7672986d747cc05c807078718420a200416bbb6bb0f0609251f SHA512 292920775925306e37c9de2860b3dd12e992d14c70e4c0fd38bb5c35227aac168e976fe251c9c4b51c9509e2cb8737c26da3b18d4959c2888891e189248caf45
 DIST pf-sources-5.13_p5.patch 6877998 BLAKE2B 6f4cfe4c2c98d56309ce57b4cb0eaab1c59ecf6919e3c91cccd5d31421ca440d6333f7966ea53462d1a72e3769ef6ff8e5165376111b84f4484286fa46d69a6b SHA512 dd694c06721f3efffcbd1beca934bbea50012309165ce3c4f325ca5d168995409bf5f3ede670800059cc1941b216d7d50c28eb37250da4edfe6b2e17af834645
+DIST pf-sources-5.13_p6.patch 7070425 BLAKE2B bccbb3ea9777675b28f4ee5ddc1539188c8afe4facc6c4aa06beb11112e30846507414b0994c6b2e048180cb2eaedb612f772aebe16d70dea1f35f25cb30d81c SHA512 02928875462e3ae19df7a6d094f388be30a6b215e5fc2f5967fb570352351525f71c8b4fe60f6cc3179dbc5e7b2771979db90d9cfc89fb9e6c5501bc2c95bd41
 DIST prjc_v5.13-r1.patch 258898 BLAKE2B 013be3c3e9b342268359ecbcc10c7b95c7fe3741d2b9058db87da59d40aa9b34db898d31f1f1a0dab80598cab313499d8083ccea141c5200b5593c9d44647de7 SHA512 ad9276a80e28eec461a307ad44a1ed5acebf810b14ce8c9e6f1dc211be6ed7e72f535175fb65f3115fa217f8b635122c65c2c002ff00ba458c867d8bb6257f36
 DIST prjc_v5.13-r2.patch 257231 BLAKE2B 943d3035035cdd1744ce0e075441224ffce04a1324dc9adfb355003b1fa6bcced1f63989845d1677ada0eac78f39b01d95d3fc7676c79b68858e8748c91b70d7 SHA512 1d9c80813e8f842b8b5da8b52e4348f329ef415b8cbef0a46f17eee64bf22fa8b1e443ae84ec9e7cf7ccff339d4b4bb2df9dfc894eea438e80f07446c82992db
+DIST prjc_v5.13-r3.patch 257137 BLAKE2B 22e05106ee91f104c69f8d11fa4072b28910b8202388a1778ac498f5128f8b93e6465c3e1ef0d9393aa5d01bfc226b3d6463fbba9e463305381a45cb5f015fa0 SHA512 d7dc67a9913d0d7723a616a11db2ab0798e65a6c2dfb99990bc2a4287c0c2e2eab72d17cdc3f93b884f006844f576379a9d8617b7e491dad278f3880d372bb17
 EBUILD pf-sources-5.11_p8.ebuild 2305 BLAKE2B d82fd3ea8f7f664fdaf64c6ff2c019f1b0653cb1be2f021e459b38d995e006b82cba24136ef0edacba783f6a03bd9a3ce761d8c49571ccca1976f370df4c6125 SHA512 fe5258be1c9275c3c0cf5899e8b3cce08b7e33863f26c782bcc88a5c0420a3303660621524679608d741c97290778cf9cbd460acc6122c2fcdd16a17b5b7d4f0
 EBUILD pf-sources-5.12_p6.ebuild 2760 BLAKE2B 9b45a1bec8a722502d3f91fb82f9c44654abd1d7df72b27f34ddd105a2b78ece01f9542efabada927743268aef5dbef6fb3b84fff35fc8c9dfe0c4c5edbabd46 SHA512 479dea03a3062b376134f7a23bfa64e84ee1f6f0e6691117843b05eed9019813a4c8206be8e85cf18044375515e67e72bfe9ac17ff4552236d84ca26930f9fd1
 EBUILD pf-sources-5.13_p2.ebuild 2258 BLAKE2B 057d9e0756294794903bd1f12eb2c6a970351b3556043c20fa49829f6fdacc1ad32e029c739cd1e7f4538cd8299d0fe10aac80d78aef3fa88b37baed7abde357 SHA512 b27deaec1354a5bb1f16d32cdc5626e2533324e303e547da722d8a9686c5b577cfb2e4c02d05724083f5d822d7e44ad1ad5de92bc946c769db38cdd098f3f917
 EBUILD pf-sources-5.13_p3.ebuild 2258 BLAKE2B 057d9e0756294794903bd1f12eb2c6a970351b3556043c20fa49829f6fdacc1ad32e029c739cd1e7f4538cd8299d0fe10aac80d78aef3fa88b37baed7abde357 SHA512 b27deaec1354a5bb1f16d32cdc5626e2533324e303e547da722d8a9686c5b577cfb2e4c02d05724083f5d822d7e44ad1ad5de92bc946c769db38cdd098f3f917
 EBUILD pf-sources-5.13_p4.ebuild 2258 BLAKE2B 268d5f704189c9778ee64c27885059608fb1e662a2dd154b3824a24cebd573255c7764e62c1786f611ecb0a89bf3de4c9d80ded09b9c3759b3ecde8326dc7441 SHA512 866fc6c11370ce91d81c3ee337a9c7c2009f2b9322bb2123f8643d439f473a1c596dc539c832bc558ca1aab71211ad0fd7b3d6da57c217871975f8c0549e46d7
 EBUILD pf-sources-5.13_p5.ebuild 2258 BLAKE2B 268d5f704189c9778ee64c27885059608fb1e662a2dd154b3824a24cebd573255c7764e62c1786f611ecb0a89bf3de4c9d80ded09b9c3759b3ecde8326dc7441 SHA512 866fc6c11370ce91d81c3ee337a9c7c2009f2b9322bb2123f8643d439f473a1c596dc539c832bc558ca1aab71211ad0fd7b3d6da57c217871975f8c0549e46d7
+EBUILD pf-sources-5.13_p6.ebuild 2258 BLAKE2B 70d01125643ae392f74dcd0ecd615c462c4272ae1a0ec5739e8257a47c83c85ade98611163378b8104df3b398f4f5a76c52e035c9b57a56d66e451685640d31c SHA512 7ff0df01358b1cf2f72e70d74dd27350b21513168ea020bdb089152d7054f7457538ca6d275f7719aadd1065c029c3ee3563a3ffeb69def02a2d01b5f183336a
 MISC metadata.xml 345 BLAKE2B 26083da0607ae4e301d8dd622cd9b0016630e1e70dd6197fb8b95912578015a13da38c8434df3cebdf13f22566a132ffa9ac2ee4a32ed482cf780c55327316da SHA512 4bbc43612402fe253b02894ae6bf290ae44082c98a48d31e3d822946a8709752d3c4fb9d338fdb6779d6b421e73073c67f5f951ef423728aaa5cc18ac7958b2e
diff --git a/sys-kernel/pf-sources/pf-sources-5.13_p6.ebuild b/sys-kernel/pf-sources/pf-sources-5.13_p6.ebuild
new file mode 100644
index 000000000000..d78142fa3f15
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.13_p6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# 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://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r3.patch
+	https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch"
+	"${DISTDIR}/prjc_v${SHPV}-r3.patch"
+	"${DISTDIR}/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.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/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index 0341bbe38535..99bec014483c 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -1,17 +1,7 @@
-DIST deblob-4.14 143883 BLAKE2B aaad9858bf626f1495f83187fd2ab91f812504534c7294cfb6818c773229eb780096a2c78a6aa963f3826df3cfdf7a7db5238f71fa8955c21b4acd75660d2b17 SHA512 662a11c03f51d85158175a8bf35fce20f01d94659d36b97a9773304ff9c091b2a9ab72a0445065c20188457fbe174fb43334a79e17b3a9e8553bb6144a971f4c
-DIST deblob-4.19 145341 BLAKE2B fcef31cc3ff32f337ed247ce9b8066b4aac3943a9b9952adbe8be221df3b290317d6a851f1a21e85fe94dae882c3fd6e43a2abbceb31f65471f92bba2e4fc121 SHA512 b0818f888b90cbc7ce08ac6a70d7ad7875418dfe21a1d1b3198b939a07aedbd712e49d5a4c8187784eb4b7531bfc25fd6a88000447b91667e6c601b5d8d3c9cf
-DIST deblob-4.4 137370 BLAKE2B 05f96867d5e50e4bc6ea8073f6f0400c2af27bd920a7732f9a9b30e7d1181fe9de745de239b2c5cf12ef647adf1f169180627fd71eb2316d994488fb3e799ca4 SHA512 ea5f2f2cdbc97bdc90c2131f846761dc1630a53986db10d8e9d07d1ddee12a9d878c57790edd3ecc75ed9792d479b7b726c39d688a3926e850608c81b1b78a3a
-DIST deblob-4.9 146273 BLAKE2B 8bc593ca375e003183dc6260aab0b2f81675b0814ec50fae3afe5d4ce9ce41c1c1401ce80e1c285153f610f8f730f82d6ad03e2578c792fd4af8779f2d1e3079 SHA512 3654b28e72b343bafdb38de10ef0c3621db0539bc0e7434bc99bb8f8ed911d4c9e53ca4785fd193fcfec369328f014fa5c6f3bda51b6f1a8f98b8c37ece119a6
 DIST deblob-5.10 163706 BLAKE2B 75983edaaf8d8ed2689a3b26cf316edb9b9262bd29411168c9a8504775dd324752a4fc8ad24ec3a641a4ba474cca975c472cfa9d58d120ae7f684f19b519f180 SHA512 e3b89e751633f81da0f1e23c24133e84f5a6c89390d6b54e7af6e42c9378ecf2525bd42d7639a42aa3c3a034c838e5ca36f78d4932903298068be03de8ad48f3
 DIST deblob-5.11 165342 BLAKE2B bc29bc741c6e25d1d7dcf431743ea12987a433192101d7cc2543f275897627621b490d74105cf9a8035aa25064063270582fafd425e27deaa29a7396d5dc496c SHA512 0dbc3187e9ced121c80a78a3330cf53e26f34a735a84309d380a2b225ccac052bfdef7c9d6106ab691abcea04377407f84f916a60cb7204a2dd5009f9db0c667
-DIST deblob-5.4 153051 BLAKE2B 270a82ab6a08c629eeaa8d728dd7a37333e502c285cd29db51f2a9d8aba76fc8f1fe7976deb8014a67749cfda94f6e3dcc7275fa25d955ddf0aa665b858416d0 SHA512 bbab9fbc49e470622316074abc193a50f8726e5cdaa4686813dfbfdbeecd26e841f6ffff83df642c8c033a3b892ad0a09b83fc0d104f37d324742c61545f8e66
-DIST deblob-check-4.14 755969 BLAKE2B 5573bdf913554e23dba3d3c56227a2c8c3fcfad7f4a99e1ec9208171008b5d2d50bdc55000672af95e020ef8171325b9d1797a69c988b4df5b0f71bc2a186fad SHA512 09626864cea33804d3dc94ceb691b24b6c14d1b9531eee8e745276dbc403903d762b1f75d685bf831f42b942d6f7ea265efb0d4889fecc976d95b11faf843fd3
-DIST deblob-check-4.19 787042 BLAKE2B 16b96486ebd3c9ee23667212124cf6892d83dcde2e160695d62806d1e8a0815c7e6879cf6b75e5caa72c3d8f2c7d172092ca3bdcb834db834497e758bfad4682 SHA512 a12402061d97ab993f91f90ee03d5673343826b4f099514e2ffbd499cc730c6a8281029e4883d0b89d5181f26eb5085334a882b97fc7e04d7232a37b174807a4
-DIST deblob-check-4.4 694225 BLAKE2B 9369f81751bc80d97c37a07ce92628d212185a4ccd1b1d4ed3b21972f4a135e93910271f0e80a35bb8695d1b9ef6d30c8d303abe51814275115735a8043ddc21 SHA512 6554ae567566da4d30e94a37622f88343b8e96ab39a9204fee34de4ddb5dac8c4906b25843b63c2388d03a4441821c25d395b3c39fc875c498a69e677a4f0cb5
-DIST deblob-check-4.9 717834 BLAKE2B f2471b45f6953ce83c0819b9157ce638a1d93959ec4074a329766ecb0c3adf90fd3022307ea70c2cb3bd3c291f98d6153576cc6597c62ca97abae6524b98112e SHA512 46258698f1c574b44a8c5c78cc2b7fdbaca746976266974ee0f6787904531754b17ad15d542b68e07d4633ee91a8e2d9c32a991ea214292ac072c4f26deed9c9
 DIST deblob-check-5.10 597463 BLAKE2B 015ecc619e38f8a4562240a79734fa9bbc9e6fde60af689e146a0b1c8ba313048cc641762d5bd191c486e2519c636601da4d6c6455ebbe8fac539aa95e9cc45b SHA512 038f3ebc4457a67d510f81d1d6f3b47dd4a0710bc6a006424aed13d779e21850daa2ab82f1810726b725f9fb84e50f53a6cf4c714618d6481997e0ade9cc4654
 DIST deblob-check-5.11 601313 BLAKE2B a582b514b88490faaa398ca6aa11b0c83716407dc5cc4562b4b474602633e56e2d6a508e2c287c84192647c2d5c7802ff6e6a210f8cd236bbbfe038bc0a4a7e5 SHA512 192fe09a5d3df556aad0df300688328377424f812118f5fbd6fb60722b123696e676c793784aecc7371b512902349f6cc3fe1d20519f23197f961ab372e43627
-DIST deblob-check-5.4 553846 BLAKE2B ac834b6c4820c573c9c857c4281eef29c4721073e0d015e08ebca7de6b480b324255c6643c67f743bbdc799c57642b8bbc19d4f5068a835dffed447d86a45bd2 SHA512 2f2ca4bf08eb55cf3a1164917bd7a54b3133b43393da4ba030c397b5a8a65464c0becc2e44ae8683612876956ab9ec0db0b0be0df0dab3a08a1b57d3a3d1617c
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
@@ -19,43 +9,25 @@ DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c
 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
-DIST patch-4.14.226-rt109.patch.xz 239564 BLAKE2B d481d3b128c2e1d1ae346829ad760ae86b7caec723723edb5dea1cb81a4c9392286a20cbcea26882e8df1a2e72717ba5a78564832245e16ff520e0eb4ff020d0 SHA512 155149e7e56b28cbe6a75728095e34404e2e19db4fa0d963b062489b4100909093b7ce1bf5b6e6a4ed2a031df393bceafd645039bc38a10d8c4d988245607825
-DIST patch-4.14.226.xz 4185676 BLAKE2B e22d2eed7809b60bb7a2737b833e677b921df3daab800dd862e74c9afdc4490b3a65eaa024ec71b02c68575d8f8c8fb9cd05fcc49323df94e97a47a3607d3586 SHA512 ed54187a35668b82ab6eda764fcaec3abfa666dd9ee34c1c674fd531b75b82d8dc1b59ef548264380391916804e65207f5fd68885ff8d4b6fbdef367ec9ddd3f
-DIST patch-4.14.239-rt119.patch.xz 240792 BLAKE2B 961f72eb1cf48574754cc2edc3b893a2d37fe397ea6a518086662b8db55912676eaeaf4416c8cea48a36e88699932134a12a7a928450224b44338ae608dbf63e SHA512 6dbf75beaa8ac8ed8c9dc22ab3a01d7e654eb0216eb32e14066f6aeef01ae75b83a7ad579196caee4e390e33b962c75ace78c90258c2b22c06149efa84b806df
-DIST patch-4.14.239.xz 4328180 BLAKE2B 75c1b4410196289ce504da4422d92c27210031ae7026bba08f5c6042cdd437e97044589f89105fb27aade20271bd22e0a22189d2c5a7a3fedfb861926fd20f8b SHA512 69e01fe11b21c98c4022c22ff692d266f100e720fbf30fccf492a04903139e5f2f5aef12aa234be29b7fb094f91339d37202476f6547f76809a8d2a19989cca4
-DIST patch-4.19.188-rt77.patch.xz 167348 BLAKE2B 695cdc8b346d0e70f9ed3f47b8d2829c8ee5fda586a885f51140e0dda29d0970f71be815db43d18e866f7b809424e80c05b10365a074824cab3f5e637640c4cc SHA512 7e5671c08c06f4ca1d52e8f7f67cf7e908e3d7ab58ef297a54caccd749dd6863afe8f7211027cc536635a2a59303e0ba6388ae35dc870b2cf463f039257deb45
-DIST patch-4.19.188.xz 3922492 BLAKE2B 9cbdc79387a6fc0029eb1779751f4fdcf66812e737ec541b993e6ccdc2f34caf432f65a5feb6e43d6386fbb347527d3493dbe9c3f2f4a5c4fcbde9c71a084db3 SHA512 b45d328ffcc1256e002c963c87df72cd396bf4bd69cfb6538aee10a10145f30317d43fafb0aa6fe48970db7a400b4b67833ccbeff9ba6758b299195f583765b5
-DIST patch-4.19.196-rt83.patch.xz 167356 BLAKE2B 1ebd82096b6823e11b6194de7ba714e86c4d1f0a76666db478ac059f891b9c6e812287536c3ca9873c26485bc57e7bde7b77e39e4fe94b0c0aa5e042943e9573 SHA512 d5492da169bee3b55ef50387fe07f79d716fe315e2b420c5fe8e2c7da67cb2d5962cf7253ecaf2f9d543e66eb4e07c21cbe95fafabc9e3e516ab15c67201bd92
-DIST patch-4.19.196.xz 4068400 BLAKE2B f0dc28f984586a38466bd753001d124b13fa7a6a909461427ac5e33fa3dce659d96e07977e3cbe95db1a8728adcfb996b1ba136bd4bde1a9a2134174cfb539b6 SHA512 538028d0899a36ded4fe7d9082b3b30b413bba3ab8e9d987bf380e6f678ea8dbb0328042330908b6978c8057a32c13ba0f5bf5e3ca27676306c0b001dab36bed
-DIST patch-4.4.267-rt221.patch.xz 194908 BLAKE2B 7e230a1e15305a7c95587c5cd5ca208d6be8989d5b4fe01ea1430d1845a30f06409c46961a053ae40273e558b333b6075cd45dcb98724e86f6b33a0877e1fc2b SHA512 5cf38181a96f82f1a9071cb14ef933f526076b59797e8827de14030f166f9788d43064414d1db22369a90014c58117072d44d2938b11105aee9ef30d32df73ab
-DIST patch-4.4.267.xz 3522868 BLAKE2B 76dc5251a90421c7b594686dbf09938d5f7475f6113241831e139eb4684fb6042e690e98c613b585eaf46d5e548927e2a8ea4d8947df01330237e241aa00c6f0 SHA512 85b835314ca8f59cb8ab8f5a5f0d7539a842ebbc8c5ad76f49b49701ec653857b5f59af0bf4c3dabe11e14831ffd4d31c0849398e25905ae86b8f829d90ff25d
-DIST patch-4.4.270-rt222.patch.xz 194964 BLAKE2B 30b77f231a12af581d5fdc0cc12b3172a629efa7e2b9dccd2b18cf6430e5a43ea5417905b81e4cf48d0f71d713cd9fa654dab87280880249356169b3935dd748 SHA512 372ebb040b2eb7a0d0edc1f0848ca50a36fc788b8c600daf289df53f9c99d4deca91186c76128fbdea74586eda875eff6900f02736edd06012ae9a605d2901db
-DIST patch-4.4.270.xz 3555344 BLAKE2B cc3cc56e68c72f8b9c8276657d010f5a5ad281f2744c317d64b47527e3b1ea9c2ecdb6e4c3d09b8ac9581b5783bb82d083af2d0b0f107ad5d9c08414913c927b SHA512 715e8242fe1a133d3b9f25058b5a5e780476feb3f17712fdc5f27a6a5082ede1ff173b59297ea29f3bff7afc3ec582340f61e0090f98bee0542392006d634ad7
-DIST patch-4.9.263-rt177.patch.xz 170188 BLAKE2B 6d8373a2064030872063942f64b4213ec51139428114b3012d93e56627ce965aa92f6d060cc648f52468b26b66b7e090ea7965872ee9cef67aa230ce852f28b7 SHA512 1ab845f4b130fbe6ab834b3638d1275285d6b681fcc67427795e3b22ef7086d154dd38d8a65f8eb548b27dc6f803871e5bda3f2af8a81db43bc0e37d8b6998de
-DIST patch-4.9.263.xz 3915708 BLAKE2B 6a8bdbeac9e41263b8002fa773f5c5c0877d91a6903b2f5d1895eeac6601bdca634a568ff3d258722ccba044b2d8e675cd8d3c26a2e84ee7091a063ada94eb0d SHA512 e01713011651af09672fcba8683c815f339293cef986568c8da1eab3740d2ec1f8fa1526ab98f3fd4866342d62a6ce803a5c231caebb14c1a9b3f1a4cf6480e8
-DIST patch-4.9.275-rt184.patch.xz 168052 BLAKE2B f896a2f6ac35790e51cdd56edce2ca1d115bf3d0c78defeb2f178cf39412c4a280ce41068d340298e776226cdb436be549fdafbbb11fc5fcc1d7b0ff27340b7f SHA512 82c0615e4d6ecbd12d09c014b64913115bd5b27a92788d5c7cc9f27d5de42bde304303ff9679d3486fcc25a9901dcf177dd8b7a5bc668730bde5e8ff4d3ff885
-DIST patch-4.9.275.xz 4008012 BLAKE2B f79df47900dda5fbf517142f9aa0d6b77e73435d3534070df323635666d74feaf362689a78982c6c04155da684abdbde1347ae3236245155d59576d81340bdcd SHA512 deb78bd9699449a952486bfd155bf23f14ed68632a55923abe3e210c4ea2787c875c7975bc9b0084adfe5e34d33f334f687fa67ceec26f99c6bec70f8739deaf
-DIST patch-5.10.30-rt37.patch.xz 172880 BLAKE2B b5cafb2cb4708ea5c093a25ce5900825435305c68dffdae10cfc1de958c9c09472bab6971c49a6236524d5bc8ba0ec1e15692b4da3210b6116eb534fc9ffd212 SHA512 9782f0020806f28438c4816dce8bca7fa0a90a432f583a9750b963dfb586d819d7169e9339925d665509412fcc331280b52c69b42c157d590028d6edddff069f
-DIST patch-5.10.30.xz 1037532 BLAKE2B 0ec1aa0ea4ab96933f413236f45974084dc43ef80598afdf43675ce679ba4611e45b22bd4db93e02f5a7167865aeceb620df373dbf8de2ed4de67378993ddecc SHA512 7a806161b905090759694a33432ae5a1be96ddf7f6b27c0619ff542c67c9e2c6859694751fc1e5d920dcbd96a0f6b05d0aaec71767ea4c0880afda6b71806d76
-DIST patch-5.10.47-rt46.patch.xz 173188 BLAKE2B b08678f6652680ba2acbcf10a4bf071e614d7e669c44314b749433c7f34450b151d8d1817286da9d1aae89d767bc0627a5ae2abcf456fcda0afa88765b4584d2 SHA512 98307090414b3229258cd66aeeff1004da9c4e1e61b4492108e4051792ff0cd9e92bb89a0486554437a346a783f83bf615b3c2a3b0aadf6a823dff56b41d39d7
-DIST patch-5.10.47.xz 1555924 BLAKE2B 2252a04c02d5dd135b6ae7be91c42564ec7ac3b4d13422e362f352b7b19f44175f1ab82b05b6a0c308584de4a5999c1df671e3b38085028c86bc84787be5aaec SHA512 633f527b053cc9d10eacc96466909c16be7c7b2815f190b63f523d666c0226f1504adf5eb5fe63335624d5adab2c233e63ac80e6fa8e48a10be92303a95e0d3e
+DIST patch-4.14.244-rt121.patch.xz 240852 BLAKE2B cc9fb8f9c1da3b79d1650265d6221e02520ba99b63cfbc818a72424368a9ed0c8fa9a96fe5d0fd35390c813f925d9dfcadebc3721a09564eb850995e15b4a6c3 SHA512 9e6e94312dabeecbcf1e920e88d6ed81b5c1ffb357a4fe236c907e7045ee9c13160d58bc72c39dafad7fc605bd687c917d83d4ba298718b1ad533d224a664559
+DIST patch-4.14.244.xz 4402020 BLAKE2B abef5c83a2fb0a3fbb7586aff107cec6b23fbc2ca8f842288165bbf8357877ea8874b28fa7b5306debf0daee406abe75e54e21abc57b0d81013219d7e79fbe10 SHA512 78bf4bb084febdb0ea0a25878ca286e39d1f27dae8d07ee8784bb118b2d0536c06b452ea1a0e04b7da4c7490b1baf6992f5de94fbc62c7f10c4367caec683787
+DIST patch-4.19.199-rt86.patch.xz 167380 BLAKE2B dc158ffba89f85b16995180176c7faa8dde998082b7c9a2a98c846e2214884bacab75c81fb3f3de38ccf0571e797660486dca8d0ce6096bbd431a05d4aafc196 SHA512 59fc0db473bfd82a60fdb073ff58ec952321d5ac6659289c48295640eb4d7f8228c5b8303aaf2c307b5375bf70d5b0e2d4605e885de57b2f6edaa49ad0571f2c
+DIST patch-4.19.199.xz 4162120 BLAKE2B 1c6a9625436f1cb7b985f441a045fdadf99494d2cfe4223df1bb77923a39bea21e1d3325b8f6cb2ac358f036b97f9ccaf522a772566acb24bf0406c2579209db SHA512 d7258eacbbc070f6423af83b9d7a3bc3990ce5f65a33e701bd627df1350e9a0870176d8f654375042064efc0af9ec903d42ce75b321e6096300081035dfb40eb
+DIST patch-4.4.277-rt224.patch.xz 194960 BLAKE2B f3007567996d6959bf8d266dd2c4b522c7a43e834ef4f394125b96dea764621ccdd8224a05353894d192c535787fec2c64a049523ae5f7f664aa39c29ab223d3 SHA512 b8def16e0738ee25e4cad45880776b3434370bd7bdc3c3548541ee3a90c8c1f093670063c7871f59b07ca0037041794078ce85fc1ec6475dddad977ccc6f8cc7
+DIST patch-4.4.277.xz 3615816 BLAKE2B ca88745d191bc1f10967f11ed65ecd98f45ba5696b17177544ab5f959ac97d224a56d321fce7381c37136532d72b9bc9374ecac8725822a9f282c43145b25342 SHA512 dd5688365b947409eb65395ca2a903acddcd86183162c31df0f2f40eaa04746b2d3bed6e81a9594f0b18afd4cdde4bf3dd5ec407356c0199935483ad38339b91
+DIST patch-4.9.280-rt186.patch.xz 168092 BLAKE2B 9d0557d213a9a60de35daa0607d5397f2c0ea086f31705d3cbf04adbb8344c0df45568948869ec7a2b544ca8c274513ab87cc87aff7f75c874ccf0fe3f3bb9ce SHA512 dceee844ae73113806e7999ef285500d8e7f23511ff0074b78497d419064c05bf7f0d433d51d8ed84360c6dc91c94fe5e757f93520e184c9a27a7a1c33f7e197
+DIST patch-4.9.280.xz 4064268 BLAKE2B 3a27eadf819451d08559df0599f63ea05329d0651ed19b4272ba40aff7f779457cbd357864714870ec7950bd460d4afaed5de802d2dcf5110500f0ad86a61f7a SHA512 aeae87d6c75605da806be7cd8b39b00a56bd5f62c170d4cf394787c31de6605ac6fc085b7a7968548279fba397eedb90d817b8f5fba98bb833c6eef2639fdc8e
+DIST patch-5.10.59-rt51.patch.xz 173008 BLAKE2B 7f19158343ae61357acaaf818671a478f9ef52fbe182e0d1c1578ba63eb39fdbb4e5fd96b52c77723ff44452569de60409e924fae404e98ea0c0909ea914bdec SHA512 e49996b9cb38bf7b49de88d52773e47b17cfccbd20c0b7f1163b6ac2dc0ae8c68a8c4fa0e0b1753deb30474ed65d966a0016885965b8130cec31588d9ec654f4
+DIST patch-5.10.59.xz 1908080 BLAKE2B 7eace61991b62dadb88c41f08d0392fd5dfc5ca405dbce803982b6b6a01131bac6f3b922f058a9f8bf602effffdc7a3dc56e271120315d1b5d0805449f51ebfe SHA512 1a2aff2fbafb74ee2f6b623a1e34655bdc56acbeafa83040e77bc67b6374932ffd6ea1b6219b765ae57fbc5ff41e04f76f651489c267eacae7e971153f14a3d2
 DIST patch-5.11.4-rt11.patch.xz 129792 BLAKE2B bbc87d478a9635ebd5f1aae0cb010fdafbb697702e0493288dbad9f78f8f76a44eb7360066a73656e20a8acc9ff143f3600097644b0678ad92ad6aef72816c1c SHA512 e37ebf7e6c0f669f35bbc96bbbb096ae37541aeb65c540caa1201fcc11ebd7b7cca1a6a5f42b92e1da4040c92f882fb7830d054051d5b37a7b178a2de5ca3e24
 DIST patch-5.11.4.xz 277800 BLAKE2B 0f1d9783baeebbd28252eecafc88892b3f76df3f19a1193f5291e84e2bb7e1f11e9a3b093135044a7e39ff1276eedffb9b35f2666995e19369b53bf95387ac92 SHA512 dc4013908431289fed4153af402f33d12c2c20b1606ed08f2c1f0988953261a21385e8d9612c7def952b04727a3b8629fb7fe8c4fa2bef4862ec6f9105359790
-DIST patch-5.4.109-rt56.patch.xz 182720 BLAKE2B cf87f20f32b692e832e1a0a93a2c1b09ad40cae0d3c971f70f2fd82a68a43dc5b6475758a4d725b74c0116d39522a712353e6cb7efb3970bfa794b85e863731c SHA512 c6a8bde71e90342d2cb7cc4a085d11c93818dac2a4c29d66b1c4f5591ee1b793a98a9eb614622882492e5ec79c0fd5f93669e9bf2c3518b4a456fc7b116dc905
-DIST patch-5.4.109.xz 2776096 BLAKE2B 1b705558335df5ef12ee3f01654532b7bcefe23242599c749f31ca9d2c6509a81660e8977eb43c4dd052d586d47537d9d58a82930b9587d69142211baed25bdd SHA512 2033c11b03a6cac1770dbc9188c84881538212f7ed9bc419f594b637aef88934d9602c95d3d4d20af8e0a0a56a135a25905d4a6a358fb2334c9132082b66eb76
-DIST patch-5.4.129-rt61.patch.xz 182772 BLAKE2B d6486f817dba60ddd6526fc98b1a381f5f8c6323fbaa2aff780942fbd26ece2af57c7c39e4b11c87b7bad0c607ec291f6e37ee107d3372bd9cedc1ccc8eeaae7 SHA512 4c70914fa4940d7dee257c02ab95384ccd53329306074a8f54d58481c6979762db49ddfe849c7e10b6bb82eecfdbfd89043b584c7ee281430c4772ac17a588ce
-DIST patch-5.4.129.xz 3068036 BLAKE2B ca95c9fce66dfcc83c5c8252475d79d3d6a66d3d06308520e4643854089c6051266663ae1a1f461443ab9abf24255c219beaaf235b21053981cfb0d850e711e8 SHA512 9b5cc80c89caa74b3b700b6defc5c4e214e09ac3fffb9b7cb364daaec1e81242bd3d03d36ceae7688eee43bf9fb471385ef65ef1fc477ef1a33dab0c2a516e2c
-EBUILD rt-sources-4.14.226_p109.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
-EBUILD rt-sources-4.14.239_p119.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
-EBUILD rt-sources-4.19.188_p77.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
-EBUILD rt-sources-4.19.196_p83.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
-EBUILD rt-sources-4.4.267_p221.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
-EBUILD rt-sources-4.4.270_p222.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
-EBUILD rt-sources-4.9.263_p177.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
-EBUILD rt-sources-4.9.275_p184.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
-EBUILD rt-sources-5.10.30_p37.ebuild 1459 BLAKE2B e681a684eb60ff8d452cd46bcc082f953469bc62146b8b9177ce1da781c660cf3236d7aa2297760a6a149cfd8586239e86d87bfef6179b9c368cfdea322aa507 SHA512 c57527da612fe41ef958fd4e2e4a4a1e683ea1ab20699184bdd305cadc1face8c386aa1671998b33302d45e89c16c582f02701160067759b05b7ba170487614c
-EBUILD rt-sources-5.10.47_p46.ebuild 1459 BLAKE2B e681a684eb60ff8d452cd46bcc082f953469bc62146b8b9177ce1da781c660cf3236d7aa2297760a6a149cfd8586239e86d87bfef6179b9c368cfdea322aa507 SHA512 c57527da612fe41ef958fd4e2e4a4a1e683ea1ab20699184bdd305cadc1face8c386aa1671998b33302d45e89c16c582f02701160067759b05b7ba170487614c
+DIST patch-5.4.138-rt62.patch.xz 182740 BLAKE2B 788f2bf6c0e7a42bdec285bd1901231a6e8645ec58d889ca14d7c554c89ab68f3d633f019e1fa3c59119531fb3931e34838db68230786738e3890a21c063b10f SHA512 416fe5a31200be146256b4a670518253b80e68d400f0d67946fa807c1f3acce7dd37293e3aa4aa6285aa005f19df5077add0643cd28c535ccf1c8826e3a4e75e
+DIST patch-5.4.138.xz 3221104 BLAKE2B 67f23da6fb88ac9787aae01426d0ae03e169e383d1a8b8cafd33fe946b74ae0f1bfcd310a25b20ba1fdccb5de8f52d041700d5ad193efeb045e230845eeb0473 SHA512 fa81c0f8ff8aeb728fad31b973d12ac5640a2b4308c613674aa107a8f48d9f086cf529f36e733db200c2a531ecabd95539aae33d0bcde6310eddca193c52b320
+EBUILD rt-sources-4.14.244_p121.ebuild 1422 BLAKE2B b04f4b4bfab3eac119e6a8a80ba37aed8506308b36230740d2990432ffc059caa5b75064c91233d45c4b3919c0f775db5406f57fe871023c0bfb3f4599db1ca5 SHA512 8c172796a316522943f94b10f7a486fc3c946fa7697bebe23cbbee2934bd5b81d03437c73c199c97b791ec318dea57497f30dbdc167a8442f7df046e527e935b
+EBUILD rt-sources-4.19.199_p86.ebuild 1422 BLAKE2B b04f4b4bfab3eac119e6a8a80ba37aed8506308b36230740d2990432ffc059caa5b75064c91233d45c4b3919c0f775db5406f57fe871023c0bfb3f4599db1ca5 SHA512 8c172796a316522943f94b10f7a486fc3c946fa7697bebe23cbbee2934bd5b81d03437c73c199c97b791ec318dea57497f30dbdc167a8442f7df046e527e935b
+EBUILD rt-sources-4.4.277_p224.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
+EBUILD rt-sources-4.9.280_p186.ebuild 1422 BLAKE2B b04f4b4bfab3eac119e6a8a80ba37aed8506308b36230740d2990432ffc059caa5b75064c91233d45c4b3919c0f775db5406f57fe871023c0bfb3f4599db1ca5 SHA512 8c172796a316522943f94b10f7a486fc3c946fa7697bebe23cbbee2934bd5b81d03437c73c199c97b791ec318dea57497f30dbdc167a8442f7df046e527e935b
+EBUILD rt-sources-5.10.59_p51.ebuild 1440 BLAKE2B 6b12824267a9510afd06a785c7af2d9bd1b76a3c358ac0e89385d91de839a552ed14fb64d866421ff6a1efd4ef2513670478cbcdf94d049f5da09fd7ec23e9c7 SHA512 b05325c1bb3add347dca85dcccedb67f4b8bd26043363e21490cc5f2217128baad0de1302e1e9d17bba05f421e4921c47e5665d4f0f1b7febaced2ed2c91710b
 EBUILD rt-sources-5.11.4_p11.ebuild 1459 BLAKE2B e681a684eb60ff8d452cd46bcc082f953469bc62146b8b9177ce1da781c660cf3236d7aa2297760a6a149cfd8586239e86d87bfef6179b9c368cfdea322aa507 SHA512 c57527da612fe41ef958fd4e2e4a4a1e683ea1ab20699184bdd305cadc1face8c386aa1671998b33302d45e89c16c582f02701160067759b05b7ba170487614c
-EBUILD rt-sources-5.4.109_p56.ebuild 1459 BLAKE2B e681a684eb60ff8d452cd46bcc082f953469bc62146b8b9177ce1da781c660cf3236d7aa2297760a6a149cfd8586239e86d87bfef6179b9c368cfdea322aa507 SHA512 c57527da612fe41ef958fd4e2e4a4a1e683ea1ab20699184bdd305cadc1face8c386aa1671998b33302d45e89c16c582f02701160067759b05b7ba170487614c
-EBUILD rt-sources-5.4.129_p61.ebuild 1459 BLAKE2B e681a684eb60ff8d452cd46bcc082f953469bc62146b8b9177ce1da781c660cf3236d7aa2297760a6a149cfd8586239e86d87bfef6179b9c368cfdea322aa507 SHA512 c57527da612fe41ef958fd4e2e4a4a1e683ea1ab20699184bdd305cadc1face8c386aa1671998b33302d45e89c16c582f02701160067759b05b7ba170487614c
+EBUILD rt-sources-5.4.138_p62.ebuild 1417 BLAKE2B b4babc696775550550c5beae6e97a5ace20af08941a97d640baa5e102a0fbf578d932cd7a7a5591293433f818b1ff6c0589dcb61e1606b2fb442aae9609220a7 SHA512 eef5afe1bddc3cc2ca494de0fe74bb95c2f4e50f651c68292431112774ce0eb6122f053cc2fe008a49d4f9a7483fb15ea4ecfdbad414f6c730ea0b4fe321ebad
 MISC metadata.xml 425 BLAKE2B 4550a69c8caa253029b71eeb5d7c408e986250ffa876b84bb427bf1f14b800ff7f090f03be3b064af231b94bdde92591bb9fcea64ff2f3f92e3d68462bb0ec6a SHA512 697c4045761fb0e516cb64e97a817f6b8b36a86d0cf982eb0df746011837163bf8810b85241580cbe7bf98202a4dd2e69142422904488961512edb2343fe2536
diff --git a/sys-kernel/rt-sources/rt-sources-4.14.239_p119.ebuild b/sys-kernel/rt-sources/rt-sources-4.14.239_p119.ebuild
deleted file mode 100644
index ef7d6b4dfa7c..000000000000
--- a/sys-kernel/rt-sources/rt-sources-4.14.239_p119.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~arm64"
-
-HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
-
-inherit eapi7-ver
-
-CKV="$(ver_cut 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-src_prepare() {
-	default
-
-	# 627796
-	sed \
-		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
-		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.14.244_p121.ebuild b/sys-kernel/rt-sources/rt-sources-4.14.244_p121.ebuild
new file mode 100644
index 000000000000..6b7a4acca86e
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.14.244_p121.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+KEYWORDS="~amd64 ~arm64"
+
+HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
+
+CKV="$(ver_cut 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.19.188_p77.ebuild b/sys-kernel/rt-sources/rt-sources-4.19.188_p77.ebuild
deleted file mode 100644
index ef7d6b4dfa7c..000000000000
--- a/sys-kernel/rt-sources/rt-sources-4.19.188_p77.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~arm64"
-
-HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
-
-inherit eapi7-ver
-
-CKV="$(ver_cut 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-src_prepare() {
-	default
-
-	# 627796
-	sed \
-		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
-		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.19.196_p83.ebuild b/sys-kernel/rt-sources/rt-sources-4.19.196_p83.ebuild
deleted file mode 100644
index ef7d6b4dfa7c..000000000000
--- a/sys-kernel/rt-sources/rt-sources-4.19.196_p83.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~arm64"
-
-HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
-
-inherit eapi7-ver
-
-CKV="$(ver_cut 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-src_prepare() {
-	default
-
-	# 627796
-	sed \
-		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
-		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.19.199_p86.ebuild b/sys-kernel/rt-sources/rt-sources-4.19.199_p86.ebuild
new file mode 100644
index 000000000000..6b7a4acca86e
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.19.199_p86.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+KEYWORDS="~amd64 ~arm64"
+
+HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
+
+CKV="$(ver_cut 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.4.267_p221.ebuild b/sys-kernel/rt-sources/rt-sources-4.4.267_p221.ebuild
deleted file mode 100644
index ef7d6b4dfa7c..000000000000
--- a/sys-kernel/rt-sources/rt-sources-4.4.267_p221.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~arm64"
-
-HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
-
-inherit eapi7-ver
-
-CKV="$(ver_cut 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-src_prepare() {
-	default
-
-	# 627796
-	sed \
-		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
-		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.4.270_p222.ebuild b/sys-kernel/rt-sources/rt-sources-4.4.270_p222.ebuild
deleted file mode 100644
index ef7d6b4dfa7c..000000000000
--- a/sys-kernel/rt-sources/rt-sources-4.4.270_p222.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~arm64"
-
-HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
-
-inherit eapi7-ver
-
-CKV="$(ver_cut 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-src_prepare() {
-	default
-
-	# 627796
-	sed \
-		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
-		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.14.226_p109.ebuild b/sys-kernel/rt-sources/rt-sources-4.4.277_p224.ebuild
index ef7d6b4dfa7c..ef7d6b4dfa7c 100644
--- a/sys-kernel/rt-sources/rt-sources-4.14.226_p109.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.4.277_p224.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-4.9.263_p177.ebuild b/sys-kernel/rt-sources/rt-sources-4.9.263_p177.ebuild
deleted file mode 100644
index ef7d6b4dfa7c..000000000000
--- a/sys-kernel/rt-sources/rt-sources-4.9.263_p177.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~arm64"
-
-HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
-
-inherit eapi7-ver
-
-CKV="$(ver_cut 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-src_prepare() {
-	default
-
-	# 627796
-	sed \
-		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
-		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.9.275_p184.ebuild b/sys-kernel/rt-sources/rt-sources-4.9.275_p184.ebuild
deleted file mode 100644
index ef7d6b4dfa7c..000000000000
--- a/sys-kernel/rt-sources/rt-sources-4.9.275_p184.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~arm64"
-
-HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
-
-inherit eapi7-ver
-
-CKV="$(ver_cut 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-src_prepare() {
-	default
-
-	# 627796
-	sed \
-		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
-		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.9.280_p186.ebuild b/sys-kernel/rt-sources/rt-sources-4.9.280_p186.ebuild
new file mode 100644
index 000000000000..6b7a4acca86e
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.9.280_p186.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+KEYWORDS="~amd64 ~arm64"
+
+HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
+
+CKV="$(ver_cut 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-5.10.30_p37.ebuild b/sys-kernel/rt-sources/rt-sources-5.10.30_p37.ebuild
deleted file mode 100644
index fd00d5070643..000000000000
--- a/sys-kernel/rt-sources/rt-sources-5.10.30_p37.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~arm64"
-
-HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
-
-inherit eapi7-ver
-
-CKV="$(ver_cut 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-src_prepare() {
-	default
-
-	# 627796
-	sed \
-		"s/default PREEMPT_NONE/default PREEMPT_RT/g" \
-		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-5.10.47_p46.ebuild b/sys-kernel/rt-sources/rt-sources-5.10.47_p46.ebuild
deleted file mode 100644
index fd00d5070643..000000000000
--- a/sys-kernel/rt-sources/rt-sources-5.10.47_p46.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~arm64"
-
-HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
-
-inherit eapi7-ver
-
-CKV="$(ver_cut 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-src_prepare() {
-	default
-
-	# 627796
-	sed \
-		"s/default PREEMPT_NONE/default PREEMPT_RT/g" \
-		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-5.10.59_p51.ebuild b/sys-kernel/rt-sources/rt-sources-5.10.59_p51.ebuild
new file mode 100644
index 000000000000..bd07ae46eb15
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-5.10.59_p51.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+KEYWORDS="~amd64 ~arm64"
+
+HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
+
+CKV="$(ver_cut 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT/g" \
+		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-5.4.109_p56.ebuild b/sys-kernel/rt-sources/rt-sources-5.4.109_p56.ebuild
deleted file mode 100644
index fd00d5070643..000000000000
--- a/sys-kernel/rt-sources/rt-sources-5.4.109_p56.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~arm64"
-
-HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
-
-inherit eapi7-ver
-
-CKV="$(ver_cut 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-src_prepare() {
-	default
-
-	# 627796
-	sed \
-		"s/default PREEMPT_NONE/default PREEMPT_RT/g" \
-		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-5.4.129_p61.ebuild b/sys-kernel/rt-sources/rt-sources-5.4.129_p61.ebuild
deleted file mode 100644
index fd00d5070643..000000000000
--- a/sys-kernel/rt-sources/rt-sources-5.4.129_p61.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~arm64"
-
-HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
-
-inherit eapi7-ver
-
-CKV="$(ver_cut 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-src_prepare() {
-	default
-
-	# 627796
-	sed \
-		"s/default PREEMPT_NONE/default PREEMPT_RT/g" \
-		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-5.4.138_p62.ebuild b/sys-kernel/rt-sources/rt-sources-5.4.138_p62.ebuild
new file mode 100644
index 000000000000..337b873dda4d
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-5.4.138_p62.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+KEYWORDS="~amd64 ~arm64"
+
+HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
+
+CKV="$(ver_cut 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT/g" \
+		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 8354f78b8473..d9e5e6992e88 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 6b6b533b6ad7..756b5a4337cd 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -2,5 +2,5 @@ AUX libxcrypt-4.4.19-multibuild.patch 303 BLAKE2B cd342eef2a8ce3e305e544d3737337
 DIST libxcrypt-4.4.20-autotools.tar.xz 628688 BLAKE2B 4c23af2a765495758e52c8e95d53d1c1d911fea011375160c4f10e468939734fcc7198cc327fafa4d5c90afa6d4c56dfe6d1b56c2c17bbc015b44cffcd7bcc8b SHA512 5b7504e9d83df12af7d11864e88d1034ed9ce0a837ef061044c5c7fe603d7f3e5613ddf20b30613a7943735120cd058f2117401d59879afcba34ce0e48ae62ee
 DIST libxcrypt-4.4.25-autotools.tar.xz 614652 BLAKE2B f0f4fbf92585fdd8d328aaa68811ea15bdf75778363ea4bc46a75fb76bb065f044708446d655356ebbf2834f8b14bac40fbe700b510b09ce101f750667a04298 SHA512 30f38a54c8e5cbd31c463223913079f9869d38ed38a2f64c57778ac4cf1b6f557caa527073df54ca8396bb7220807b84afcae2f9790f6604af1561a4b277874e
 EBUILD libxcrypt-4.4.20.ebuild 5781 BLAKE2B 20aa5b04a02fff77c110a2a6f40e9b5b64f6aefae68c72531ce24a757825707283bbd367c663fe882e45d07f11892aa99ab919ae4b2945bebadb1aad0594e36f SHA512 1520d594c33482de9e0a78009d76898daacf3c66e38e6395d6a7eaa899e45e5a18c05ce5336b8356d89f171a5e85960598ec4eebe164c58e5b76a2d94eca0add
-EBUILD libxcrypt-4.4.25.ebuild 5853 BLAKE2B 24f2114d84458f84b3b4dc06b50e14b05de046964c0c58f9743528cb9541eaaf6bbafc1db05b7c8577f7b4b736cfe3f2465c97551a961a14d11be3a7a9afc9bb SHA512 e79e6c6133444a97d5b40e7331b507bf8b44b1b0eef0eb858dd0b418a5e3a3c6294d938477c0c05f20b4057d1d5d88222934baad465aced6608ef3e227c573d0
+EBUILD libxcrypt-4.4.25.ebuild 5859 BLAKE2B 1905c9999cb5cd741d552309bb6463d8c4de666a4a6876c0ea535b3343551d3e0a1de19ee5e11b88c24980c74feb1d375c8eb7654a6d5d23ff80f9e692d4b9a6 SHA512 5a7822e54cefa64131608680e954da56b95c1b749faa791deb500bbef0823c8f6baccb4fe3eefdffa1aa3f994dab5b76afd822d7e222285bf2d0122d735718c4
 MISC metadata.xml 830 BLAKE2B 21022e8e6a34737874590a560010f2a8fd1fb11275b4f675d195b66af70ebf8f28a2d881bab0a6653b0b1fbc09c14b99339f43d6f07fd8ffe282f951c64a4f96 SHA512 03dafb661b2273d25c7e282bb91ba01a371734446e12d140d5c5c469172e62f768de6d2a0f5bcdcdae7275f4ba0ad46de69c546b381c1f0bf338cdb487267773
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
index 6ca63517d947..98714fc323b9 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+compat split-usr +static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index bc2860ad7d64..f3e55c18f0e0 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index 301615be507e..e345d0b5f96c 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -2,5 +2,5 @@ AUX disable-update-check.patch 992 BLAKE2B d06bc123aef2aec89bb4cca40334183aa5b6d
 DIST glances-3.2.1.tar.gz 6851329 BLAKE2B 3f8eb91a0957961d0ed2465d8025d25158303cc8332b7a976c2af0bbd671405aae3b71b1d3a63eeb86ddb0d6e500b955bb0e1e5a93c0ba0b88835f88872eb979 SHA512 e2f8a46a9bc3b2e3aa16d0716b34e06991029df9dec4c29ef70c65b5fb7c96dee3c71cc565b551e35a31aa1c7e1a92538b158c2e660d15b22defad8ae04c4eb3
 DIST glances-3.2.2.tar.gz 6861708 BLAKE2B 99ed3298724a82f036660f05cfd374f8dfa4883ef3c710dfe789ed9f9986bfe873117096564f1dd46d91cd3d0304e0cd1876d17ecd6e3aad98c7dd9df2095265 SHA512 e77b62e5fa6131914b56f0b5249789b3bcac0c625cd429eeb0870a14be55f15c401956c002376e5868fa1332bbb219e9bd3a5bd14c739e3404b068a063af6821
 EBUILD glances-3.2.1.ebuild 2697 BLAKE2B 085491a6c554e3ed9ae6c4f7e9a2351deb76926be98e2acc74222541f94d44655dbb08239e6ae4a01080ea5c86dcf77aa3bb2208ab9e2c40042fa1767ea2ef77 SHA512 f9b16b89a0bec90bdb9286c6a8ba3b320d22d4c311128ad5d90be0ac82b50fdad98181466fddc558c85993ed63970b6f877549ae77e12e0f1a740a9dccb14005
-EBUILD glances-3.2.2.ebuild 2647 BLAKE2B 5bddf2e63e4b9f07380c6f0861745dd4ff5a2a3a62cbb18de105928b19c8e9eaad1877ab011a5401be5f1b62106858e366e8266039ebd4e152df2f567500903c SHA512 e939eaa52cde11eda65c41ce707d69d37984941d6a5a7068c88dd5f98739dc6507aba8b4ad19e8ab7948bc3923fb2cb8d4d49e01e82fe7b6fadac19cbff4bfd2
+EBUILD glances-3.2.2.ebuild 2646 BLAKE2B f785e68002a48d0bdbf14c66df5c98f7a863460803a39c602905ff9ea8fad06871c7a38796910e671de41d06bd67715033603fbb64f9fd56db734856025af5d7 SHA512 ed80caa62c7251ad95d8893c9d116405df45e04488e80b0e60b9efd1351d7015f476f8935bc02ba296d856fe7624bd03efbfcb911d4402489d61158c80bba5df
 MISC metadata.xml 856 BLAKE2B e3d750f1586383ffabb204739bd0636a1b7729b4b704f03f03b356afd540482571780aa4de84620ac2aa4e832e4250867228e59cb5ed3f0f6867e7bc65104246 SHA512 8315a7896acc1068a2f7a6efa2a99078090677f685a90bd2c5220c043fd25e03d137ea0aeea1cd3660544f139970508037e9447cfb08d82fdb4023c856709e73
diff --git a/sys-process/glances/glances-3.2.2.ebuild b/sys-process/glances/glances-3.2.2.ebuild
index 8a89ec65d9e0..e755051c8045 100644
--- a/sys-process/glances/glances-3.2.2.ebuild
+++ b/sys-process/glances/glances-3.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 7217c6e3e66d..b9a0cdb97bdf 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,13 +1,10 @@
-DIST parallel-20210422.tar.bz2 2239130 BLAKE2B 690d09b6447f5c166fd74f44bf231e4c94f98fc8e8b2d1b71dad1df4babb6a58c1b1062859198b5f41c158148d4488bb4edef87bc88a220cfea67318fc281c81 SHA512 175b17b97bd0693e6cd9a69c525a43e030f6425f59237d0c0fb51153edf3043b8afa764be43059359dc1b1769f1368aa187685f9dda23e0136f56b04522de707
-DIST parallel-20210422.tar.bz2.sig 2080 BLAKE2B 327848716c2da14f39975471d9943f37ad5bfcf86dddcde6f47d55f6081b79a9dbb5aa4d96014678479baa8c5f6c88d180150b5f24685bb2164f5f33c36175d4 SHA512 2c47803d494e86bfaa83d2bd6f574b243494435a3240ce0fd390171ec0ae2d06436bfd3b02317c96b640e04736742bc2781a2f1edf34b683a3fa1f73c75cb9ae
-DIST parallel-20210522.tar.bz2 2246330 BLAKE2B cf3dc65526522cedb22b85fabd364dc89837d19675eb08669c055addb7405a476b97031783f46529337f786a2328ef18762f5dbfb3f1c09bac2ba4bc305d7abc SHA512 0f9a633376971c675727ccaf2984aeebcda0e66f43bf7e287e2bf08881168a4042961e49b2eac731b95487b7dd5ca862dadc4b79e497cbd055cc6bf65e957174
-DIST parallel-20210522.tar.bz2.sig 2080 BLAKE2B 8053520c93ee1dae0d158adb6d6867efda6496b2874578e70b640673dba5813898ba4fad2156f3f00a7f87ef551c41ecc8d4d61e0573752abe505d4eea6c2a86 SHA512 536309731b87ac6a523dda91d23b88b60aca7f4516a5dbba9efe08085f9a7590c7e797bd3a39afd52fdccfe1f3a776f1df66751817943f06adc17695bf14f1e2
 DIST parallel-20210622.tar.bz2 2251075 BLAKE2B 4855ee0e581bf1d3ebb7dd16e4126873f0bf4294ebfc8260ec75901b3a80126a2a7c4d11c1a997557cf37e8077be24b9f1a1e97e92629347f1a55e23e8fbd9df SHA512 084537fb2b86f284f8b09dd506a79e07856612a1bb03914deec6baefd08df4c9878ad0247a527b4bc5a6d42e1a9a11d13a4a6e304ea1c3c8083b5faaf7530937
 DIST parallel-20210622.tar.bz2.sig 2080 BLAKE2B f21c6dc3b90757e56547b88ea429e33cb04b7853cc3493a19bd3352a9e2c14f8d293ee1180cacd1449a37047e3084fa4d12dccc5767a28e2daf40d086c9f5404 SHA512 50fa1de3b40f8447c9adf5e52c23e8cf932dca0565ac663bab128f44db5e8159a399208d1a23ed6d5eff78b9cb0d6eb4ada92d642279e41d40b0c429ef4c825e
 DIST parallel-20210722.tar.bz2 2248893 BLAKE2B c72da41de516e00af9d73216a134a184b3436f4d8be89c92bf4607243ba18c6530364cd7b3b4b99cba8f7a55c8a0235819edd1dbe431de1b37716fe104cd9f72 SHA512 2b5bec76ca6db090bc93f57bd09771d264a761677adbd6f4b93256776cf65a62a5a3a4641c450b68044cb7e86c5e7202d9455d2f9b0ad0cb8ad64d6da6955f89
 DIST parallel-20210722.tar.bz2.sig 2080 BLAKE2B 48186854bb752e50c719f2fc6c964b3dd0b3407bf5d0683dafb475a7e6a537de1ae0e6f054f9105a4860b2fcfab50bc59ca159639bf72fcc42373f457af1cb93 SHA512 bc999d37c6eed6b170b845a01d3b0fb88661ed271fe4c18609144d3d224173ac2c66bd6fe40a5b8ddc4894503a38e558835a45ffad3ee8c0201d04dc1aed9a3c
-EBUILD parallel-20210422-r1.ebuild 896 BLAKE2B 34eeaa5e5e2d7a816ed5f094c4fc074627348f64af768c86009539d1f6c6c980fad8d2d1521398b42aeb58486da775979cb24b1ac1fa061665acdd759c15185c SHA512 8a686b059c8749ac330e93faddec0863c8cb895ddb74492f294aced088c99e3258dc20ea313e1a0ea6f5a668fe17649c2a1ae354452f685dc70cfdc0b32125fc
-EBUILD parallel-20210522.ebuild 896 BLAKE2B 34eeaa5e5e2d7a816ed5f094c4fc074627348f64af768c86009539d1f6c6c980fad8d2d1521398b42aeb58486da775979cb24b1ac1fa061665acdd759c15185c SHA512 8a686b059c8749ac330e93faddec0863c8cb895ddb74492f294aced088c99e3258dc20ea313e1a0ea6f5a668fe17649c2a1ae354452f685dc70cfdc0b32125fc
+DIST parallel-20210822.tar.bz2 2267474 BLAKE2B b9d75cb5ca19ca602d73fe3594d7912dc1e1dfb14264a7ce24863d77a927eb3a5bb6afbc32f963fd59f75886409ef860d3fe17b854b98ac75498d80188a59fc3 SHA512 ced70d70910aca387afa8f7dd2fe8a370d7822bb0cff5b7b18043c8bbc550f165bf59763911e108dd23651d57a54cfc72bda06b63d96eb122f88e696de8b58b8
+DIST parallel-20210822.tar.bz2.sig 2080 BLAKE2B 467e77ebce03f8014797484a450296968178fdda3306ea677c5b67a4f06747bf66f3af9310fb6166eb1cc6536678b5797d7ec71ed6e720c5e00158a868b239a0 SHA512 311b9c31f4ff900a968f96aad53f7c4a7f72099f6233434e1a9c96970af55a39e1935d529b13d04dcb15ddad07d084881da1a8afa5bf32b7a8874614b2131384
 EBUILD parallel-20210622.ebuild 896 BLAKE2B 34eeaa5e5e2d7a816ed5f094c4fc074627348f64af768c86009539d1f6c6c980fad8d2d1521398b42aeb58486da775979cb24b1ac1fa061665acdd759c15185c SHA512 8a686b059c8749ac330e93faddec0863c8cb895ddb74492f294aced088c99e3258dc20ea313e1a0ea6f5a668fe17649c2a1ae354452f685dc70cfdc0b32125fc
-EBUILD parallel-20210722.ebuild 900 BLAKE2B 24fc7f4850789ce9d10a96500af216cbbd64d985f8560581b27dbc0ee672fa48393ecefcc815e38a534e3eac2e84cf54bd2c1393d767bea203532c7296e245da SHA512 ae23b5af9ce95be7936712ff4b0da8f26db8d74f74c97ae58a6869234093cefb6ba77c423cedba198e2cd973fcc7acfa504636492f46856c8c64358b0d4359d1
+EBUILD parallel-20210722.ebuild 896 BLAKE2B 34eeaa5e5e2d7a816ed5f094c4fc074627348f64af768c86009539d1f6c6c980fad8d2d1521398b42aeb58486da775979cb24b1ac1fa061665acdd759c15185c SHA512 8a686b059c8749ac330e93faddec0863c8cb895ddb74492f294aced088c99e3258dc20ea313e1a0ea6f5a668fe17649c2a1ae354452f685dc70cfdc0b32125fc
+EBUILD parallel-20210822.ebuild 900 BLAKE2B 24fc7f4850789ce9d10a96500af216cbbd64d985f8560581b27dbc0ee672fa48393ecefcc815e38a534e3eac2e84cf54bd2c1393d767bea203532c7296e245da SHA512 ae23b5af9ce95be7936712ff4b0da8f26db8d74f74c97ae58a6869234093cefb6ba77c423cedba198e2cd973fcc7acfa504636492f46856c8c64358b0d4359d1
 MISC metadata.xml 1077 BLAKE2B a636be1d6e6e4861e156561d8670e0c07ae27657e2ddf8cac3a6d9dfcb3c637931fe95daf998dc93fac1ab2a31d9ae43e73469a2882124fa8e229f1c7bf55d06 SHA512 5cfcbca8d00c6fd19ef2ad24fe6f23d3e02164b31a330d0ab34a739a8a4152f8d8df31a42c563d0b482a94519bdc4b0d92182b04d6937dd98f06bcee3726493b
diff --git a/sys-process/parallel/parallel-20210422-r1.ebuild b/sys-process/parallel/parallel-20210422-r1.ebuild
deleted file mode 100644
index 33f0a0338b71..000000000000
--- a/sys-process/parallel/parallel-20210422-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/oletange.asc
-inherit verify-sig
-
-DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
-HOMEPAGE="https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="dev-lang/perl:=
-	dev-perl/Devel-Size
-	dev-perl/Text-CSV
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-IO"
-DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( >=app-crypt/openpgp-keys-oletange-20210423 )"
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
diff --git a/sys-process/parallel/parallel-20210522.ebuild b/sys-process/parallel/parallel-20210522.ebuild
deleted file mode 100644
index 33f0a0338b71..000000000000
--- a/sys-process/parallel/parallel-20210522.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/oletange.asc
-inherit verify-sig
-
-DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
-HOMEPAGE="https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="dev-lang/perl:=
-	dev-perl/Devel-Size
-	dev-perl/Text-CSV
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-IO"
-DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( >=app-crypt/openpgp-keys-oletange-20210423 )"
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
diff --git a/sys-process/parallel/parallel-20210722.ebuild b/sys-process/parallel/parallel-20210722.ebuild
index 184819eb8c40..33f0a0338b71 100644
--- a/sys-process/parallel/parallel-20210722.ebuild
+++ b/sys-process/parallel/parallel-20210722.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="dev-lang/perl:=
 	dev-perl/Devel-Size
diff --git a/sys-process/parallel/parallel-20210822.ebuild b/sys-process/parallel/parallel-20210822.ebuild
new file mode 100644
index 000000000000..184819eb8c40
--- /dev/null
+++ b/sys-process/parallel/parallel-20210822.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/oletange.asc
+inherit verify-sig
+
+DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
+HOMEPAGE="https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="dev-lang/perl:=
+	dev-perl/Devel-Size
+	dev-perl/Text-CSV
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Temp
+	virtual/perl-IO"
+DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( >=app-crypt/openpgp-keys-oletange-20210423 )"
+
+src_configure() {
+	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index aa0d8b50ab0f..28d0e13c0665 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/httpd-basic/Manifest b/virtual/httpd-basic/Manifest
index 173e40fa302e..2487ce700de8 100644
--- a/virtual/httpd-basic/Manifest
+++ b/virtual/httpd-basic/Manifest
@@ -1,2 +1,2 @@
-EBUILD httpd-basic-0-r2.ebuild 614 BLAKE2B f1a76577ab8236c0a5f0a4a201ef7a8494b1a6a6e1b5ee1b4c7e0ea09715ac904ebbb6afd95af28896efef5b797b89fb3bce88437e2fc11bdc459af4bee605e5 SHA512 79033293616794a0c96845035256e80f160e3cf2097b98306dc188a8aedec571e403f9dc6c72624a1f6ce633f51039b8bd858a4802fc6553c1a1be34d00d7958
+EBUILD httpd-basic-0-r3.ebuild 594 BLAKE2B 98a843422a40baeb6a8d070de27a115ad2c09b48e49bc7a65b15385027ecc31c139130c3c48b9d0ea251735d8f21afddf3ab6694ae107b1c8390713842b33689 SHA512 1dd299b70b317b0d37b9fcf76c50fe4e9d035a3e461f969445aed112a35c16b2828b683f33b2459e431738eadc6b9725f7ac521fe96fea4198cf9d45ed323f8e
 MISC metadata.xml 274 BLAKE2B e90c1b6ccc1e6ec3bac07299e589bcdeb67ef1500c37d5048bc799b2871406ae6da47b15bfa7587ac17871b5b7d8e82aaa414b86eff2290b37af7fdfdc7eed4e SHA512 357b8a73346c67488139d0a38e1557d754ba326c80fd545dad4e4ef3c05ea1e8b20801656bf7865e3693a0e60fa994b9d39e699ffeec7d7731a782e0e9e3867e
diff --git a/virtual/httpd-basic/httpd-basic-0-r2.ebuild b/virtual/httpd-basic/httpd-basic-0-r2.ebuild
deleted file mode 100644
index a704cf5b4772..000000000000
--- a/virtual/httpd-basic/httpd-basic-0-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for static HTML-enabled webservers"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| (
-		www-servers/apache
-		www-servers/lighttpd
-		www-servers/boa
-		www-servers/bozohttpd
-		www-servers/cherokee
-		www-servers/fnord
-		www-servers/hiawatha
-		www-servers/monkeyd
-		www-servers/nginx
-		www-servers/resin
-		www-servers/thttpd
-		www-servers/tomcat
-	)
-"
diff --git a/virtual/httpd-basic/httpd-basic-0-r3.ebuild b/virtual/httpd-basic/httpd-basic-0-r3.ebuild
new file mode 100644
index 000000000000..feff34c823f9
--- /dev/null
+++ b/virtual/httpd-basic/httpd-basic-0-r3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for static HTML-enabled webservers"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	|| (
+		www-servers/apache
+		www-servers/lighttpd
+		www-servers/boa
+		www-servers/bozohttpd
+		www-servers/cherokee
+		www-servers/fnord
+		www-servers/hiawatha
+		www-servers/monkeyd
+		www-servers/nginx
+		www-servers/thttpd
+		www-servers/tomcat
+	)
+"
diff --git a/virtual/httpd-cgi/Manifest b/virtual/httpd-cgi/Manifest
index 4c837649b168..d17a4b96648d 100644
--- a/virtual/httpd-cgi/Manifest
+++ b/virtual/httpd-cgi/Manifest
@@ -1,2 +1,2 @@
-EBUILD httpd-cgi-0-r2.ebuild 617 BLAKE2B ebe34ab8387a6e4adcdea910ccb7d004546e3dcb969afef69964b0a5a669a5cc37861a32509e852819f01bc68f612aee752977689932655a5b326522f9e5777d SHA512 96ff924f2223f85081bebad401f1f86518b2279b8355632cb49b2103d0a3e70ed515812671fa83986f43acb6dd16c6d3a177c48931a7b3086e39ab0bb0ddb31b
+EBUILD httpd-cgi-0-r3.ebuild 597 BLAKE2B 05ea3de88c8101a5da8f48a6aa15fc2830b09ea6e9207309e6c82e6eb7fb1d0e104eb55e379c0baad4f5ec742065d7c4436ae8275ee7b6a24772e9fb4e643cf5 SHA512 4e8f09d1f24d9a09a4bc5f519108cac7bc830794bf64562cee1a76f5453b1a8a18ba530351ad3bf472ae4ebc6b92ad6c17df9e1bfc26b52896f044e720876149
 MISC metadata.xml 274 BLAKE2B e90c1b6ccc1e6ec3bac07299e589bcdeb67ef1500c37d5048bc799b2871406ae6da47b15bfa7587ac17871b5b7d8e82aaa414b86eff2290b37af7fdfdc7eed4e SHA512 357b8a73346c67488139d0a38e1557d754ba326c80fd545dad4e4ef3c05ea1e8b20801656bf7865e3693a0e60fa994b9d39e699ffeec7d7731a782e0e9e3867e
diff --git a/virtual/httpd-cgi/httpd-cgi-0-r2.ebuild b/virtual/httpd-cgi/httpd-cgi-0-r2.ebuild
deleted file mode 100644
index 31a1f406c393..000000000000
--- a/virtual/httpd-cgi/httpd-cgi-0-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for CGI-enabled webservers"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| (
-		www-servers/apache
-		www-servers/lighttpd
-		www-servers/boa
-		www-servers/bozohttpd
-		www-servers/cherokee
-		www-servers/fnord
-		www-servers/hiawatha
-		www-servers/monkeyd
-		www-servers/nginx
-		www-servers/resin
-		www-servers/thttpd
-		www-servers/tomcat
-	)
-"
diff --git a/virtual/httpd-cgi/httpd-cgi-0-r3.ebuild b/virtual/httpd-cgi/httpd-cgi-0-r3.ebuild
new file mode 100644
index 000000000000..e47faa5d7976
--- /dev/null
+++ b/virtual/httpd-cgi/httpd-cgi-0-r3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for CGI-enabled webservers"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	|| (
+		www-servers/apache
+		www-servers/lighttpd
+		www-servers/boa
+		www-servers/bozohttpd
+		www-servers/cherokee
+		www-servers/fnord
+		www-servers/hiawatha
+		www-servers/monkeyd
+		www-servers/nginx
+		www-servers/thttpd
+		www-servers/tomcat
+	)
+"
diff --git a/virtual/httpd-fastcgi/Manifest b/virtual/httpd-fastcgi/Manifest
index 57c1ea26aba3..c5caa31de482 100644
--- a/virtual/httpd-fastcgi/Manifest
+++ b/virtual/httpd-fastcgi/Manifest
@@ -1,2 +1,2 @@
-EBUILD httpd-fastcgi-0-r1.ebuild 434 BLAKE2B 7013c8622a70955f2bc0e629693794627189a89cb6485cf28e35c793ee13a61bd46e6b2936ba9ac06aa9530d4ceb5c066cb405457e5e6557d152801ea6a73f79 SHA512 0f4f7ef7235b7bcc2e0b479ee32e2e313d25a4a19f27bc416a8ff522a63b01d98e82b2ebf3906b8e7031fa78f868e22cc4f5e59040f14eeea8151f95049a0f73
+EBUILD httpd-fastcgi-0-r2.ebuild 414 BLAKE2B b5b8ca02ef5abb3411531c05dde0ed47f9dcbfdf8861ac5b830b41d80efb903a2cd7acb1b5d664d06364289071009116184280347b9d3c4763e6d30fb7c6905a SHA512 1ea78650d10c32690fb2733108856eb8e73df8415f8c084f75e600b76630cc03103ad13da81bb6da8a057656b38e31790f57f3e8a467586faa96a803503db0f5
 MISC metadata.xml 274 BLAKE2B e90c1b6ccc1e6ec3bac07299e589bcdeb67ef1500c37d5048bc799b2871406ae6da47b15bfa7587ac17871b5b7d8e82aaa414b86eff2290b37af7fdfdc7eed4e SHA512 357b8a73346c67488139d0a38e1557d754ba326c80fd545dad4e4ef3c05ea1e8b20801656bf7865e3693a0e60fa994b9d39e699ffeec7d7731a782e0e9e3867e
diff --git a/virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild b/virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild
deleted file mode 100644
index d165d61f7388..000000000000
--- a/virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for FastCGI-enabled webservers"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	|| (
-		www-apache/mod_fcgid
-		www-servers/lighttpd
-		www-servers/bozohttpd
-		www-servers/nginx
-		www-servers/resin
-		www-servers/cherokee
-	)
-"
diff --git a/virtual/httpd-fastcgi/httpd-fastcgi-0-r2.ebuild b/virtual/httpd-fastcgi/httpd-fastcgi-0-r2.ebuild
new file mode 100644
index 000000000000..02b49d5e1390
--- /dev/null
+++ b/virtual/httpd-fastcgi/httpd-fastcgi-0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for FastCGI-enabled webservers"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	|| (
+		www-apache/mod_fcgid
+		www-servers/lighttpd
+		www-servers/bozohttpd
+		www-servers/nginx
+		www-servers/cherokee
+	)
+"
diff --git a/virtual/linux-sources/Manifest b/virtual/linux-sources/Manifest
index 1c8483992f4f..cc966eb4521a 100644
--- a/virtual/linux-sources/Manifest
+++ b/virtual/linux-sources/Manifest
@@ -1,2 +1,2 @@
-EBUILD linux-sources-3-r5.ebuild 655 BLAKE2B 4b8c961588c67ea4312957f4fcd4a5db69d7a725a2d0bc6f176c548a6a7ca72842b61afd63071de5a2fc46e0d8c0ef3659f6ca8b13cb8d490c8a6a11683ae942 SHA512 766b1746582fcfc7e4ec4ec165c00966b7364c4f383d4b852ae382344c6411251ffdbddab3ea27a8c061075203b92f4a91ec150f644143a90f1b06b679c3d7fa
+EBUILD linux-sources-3-r6.ebuild 632 BLAKE2B 7ca42434a155017a0b386c80f536c7819479a59477f451f5d3b4192acf262a24fdba201b1cbc0f176f0799a747f9bf55a16683b8b6da13b0d068f33436ecfcd4 SHA512 62ce6c20d874104825f28a39cfccb6c6d2d733fc14b54fee33b7efa71d8f0d7f6c132c20ddc75a514718eb322fc113fb22527727544c3fb3914e44d836fc49dc
 MISC metadata.xml 468 BLAKE2B a2e2b53cf911117059960b6581db9a737d745e3be9f6f80feda248be65e700682c1f72986394b68378a8bcf2d68cb732846757c79875c7443c4b9548be06ebef SHA512 f71f24039b55d071de348a08ef1986d9e85f969e347d94ee1f0c465fe2bf6f60f3275f6864cde5817606eef671932138ae30f6bb7bc2e93c5eff9d5e11dd8fb2
diff --git a/virtual/linux-sources/linux-sources-3-r5.ebuild b/virtual/linux-sources/linux-sources-3-r5.ebuild
deleted file mode 100644
index e68f305afaa5..000000000000
--- a/virtual/linux-sources/linux-sources-3-r5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Linux kernel sources"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="firmware"
-
-RDEPEND="
-	firmware? ( sys-kernel/linux-firmware )
-	|| (
-		sys-kernel/gentoo-sources
-		sys-kernel/vanilla-sources
-		sys-kernel/git-sources
-		sys-kernel/mips-sources
-		sys-kernel/pf-sources
-		sys-kernel/rt-sources
-		sys-kernel/zen-sources
-		sys-kernel/raspberrypi-sources
-		sys-kernel/gentoo-kernel
-		sys-kernel/gentoo-kernel-bin
-		sys-kernel/vanilla-kernel
-		sys-kernel/bliss-kernel-bin
-	)"
diff --git a/virtual/linux-sources/linux-sources-3-r6.ebuild b/virtual/linux-sources/linux-sources-3-r6.ebuild
new file mode 100644
index 000000000000..ab3ca0381172
--- /dev/null
+++ b/virtual/linux-sources/linux-sources-3-r6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for Linux kernel sources"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="firmware"
+
+RDEPEND="
+	firmware? ( sys-kernel/linux-firmware )
+	|| (
+		sys-kernel/gentoo-sources
+		sys-kernel/vanilla-sources
+		sys-kernel/git-sources
+		sys-kernel/mips-sources
+		sys-kernel/pf-sources
+		sys-kernel/rt-sources
+		sys-kernel/zen-sources
+		sys-kernel/raspberrypi-sources
+		sys-kernel/gentoo-kernel
+		sys-kernel/gentoo-kernel-bin
+		sys-kernel/vanilla-kernel
+	)"
diff --git a/virtual/tmpfiles/Manifest b/virtual/tmpfiles/Manifest
index 3e31f51fc2e7..fdc990582f85 100644
--- a/virtual/tmpfiles/Manifest
+++ b/virtual/tmpfiles/Manifest
@@ -1,2 +1,2 @@
-EBUILD tmpfiles-0-r1.ebuild 490 BLAKE2B 63f05237985323bdc4d293b62af416bd863b7acb13b6356d9f7b727f715a3b1d226e8e3dfce04cab2691257467cd5fbf1e0366075ab1b6340e9ec224789999da SHA512 a13cedbb5fd834a9ff71d4edfbc4eea3aa1288d38592b161fc3d301a54a56f2a5c574ce5071eb46ac4fb3da7776b11cde1534ad40bc57122e2ae9b73349f9a6b
+EBUILD tmpfiles-0-r1.ebuild 516 BLAKE2B ffa20ba4b90a3b829d3003f3cf211927bdc779dde0d3d5876361bcc7b26fcfddfc97939871bca227802c9b94ad337b0a979d058c1ed3d1014c071eba5fbf7010 SHA512 c8076d46d454795dd008bcd5364d6d50ebb033b4792b0515871482e9746558c0e334ec55a6551dbc01ae9c0764dcc98864977dc0bdbc22fc7d3316cc5d53750b
 MISC metadata.xml 384 BLAKE2B 19518050a59e37d153d1cdeab3a6382be06f92310cdb206caee2bb99be68da0fe11f9eb73566d39de39da81faf1f6698399bcc31aa124f05ce94159e44585e5a SHA512 d77fe711ec2dbaed1da39947d529ee0ac42173651c58f6be46c98f59811185646cb41ff6c4e308d424f0697dd37e4645d79e6d288f9e2d2fcb18720dece7ade6
diff --git a/virtual/tmpfiles/tmpfiles-0-r1.ebuild b/virtual/tmpfiles/tmpfiles-0-r1.ebuild
index 03ef36018950..ab126e516e90 100644
--- a/virtual/tmpfiles/tmpfiles-0-r1.ebuild
+++ b/virtual/tmpfiles/tmpfiles-0-r1.ebuild
@@ -8,8 +8,10 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
-	|| (
-		sys-apps/systemd-tmpfiles
-		sys-apps/opentmpfiles
-		sys-apps/systemd
+	!prefix-guest? (
+		|| (
+			sys-apps/systemd-tmpfiles
+			sys-apps/opentmpfiles
+			sys-apps/systemd
+		)
 	)"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 70bfbd411edc..921b5e7a79f4 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index 5d196ddc3559..3d9385de69c3 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1,5 +1,3 @@
-DIST phpsysinfo-3.3.2.tar.gz 891158 BLAKE2B 40428647a502f9861f89a490a10e95bef0fdf306d2ee27507b4f396ee7371ca3d75b7259db53b8501b127fb525dce283cb8c73e50172b5b2a78fc490fc7f658a SHA512 33f76436d6ba1aa76a4c7e7dba84f5d4bf458b505df47d65ff9f1ffecc4db48a853c9cdb8583019e70c4d0b54c184ae6d48968f3ed820a711804095a5fc31b07
 DIST phpsysinfo-3.3.4.tar.gz 946436 BLAKE2B bdfb731ac8e60e436f915b0ac72f3c327b08dfccee0d1cedc4ddc89700c4dc76bdd73d9e37ab82fad25e096a62a9a4d31442939558ab593ba5b97520d428a6c1 SHA512 6bcbf78edfa3af441ee6768cce559635f7aed6ce0e357379a7ad1158dab21b860c82845d746f66074c84cdc92e4a21fb4710f61b69ee8cfa1e457d098d642bf2
-EBUILD phpsysinfo-3.3.2.ebuild 1680 BLAKE2B 0b6d1d90d01ceb50736042ee13cf800f577a958ff1326f4918ace512cf8179d158c29e5fe3332f8a3aaf76002f2b27d3ada183648004c48803af6c8ac82e3814 SHA512 e93f3f6affef0bcb7f6eabebd15156b4e5558eec86abbdaff6319a6eda2d03d4be60c9bff5ed495d9d31cee65f8e34972a7519bd2451ee5649231ecb14ea6b0a
-EBUILD phpsysinfo-3.3.4.ebuild 1684 BLAKE2B 0f0feb31ef87d879ad4777013d1c6f1837227119be362ac5d324c11e8ce49cdab8531db4662fe56fb17c97aa3aba35070f2b0e29fbd027eceaa92b976aa78ea9 SHA512 159b7cfd4d61a0bece701f7a527bb1834cd804201bffff3b0713f409fb7e79d72035615f0994fa68b83fd6ddc48d68475b3e7a6abc28237f0d5832a51b9263d0
-MISC metadata.xml 511 BLAKE2B 3139dd25eebac631793e015cb1db6e41d64c5a3e9a75f61f340d0f1ba73b99d304716dfca4b0f0f51baf0f46a740312bb198c52aa625f5b838e6ae10f341a8e1 SHA512 59fd8766c9545193c86374e1dd05d0a08e1f5c548f4297ad4fe22acbd4ba36aa4ae46ccf6f497bfae1a7e015cf95a5f51fb417266c21cf5b5201eac31b543d41
+EBUILD phpsysinfo-3.3.4.ebuild 1680 BLAKE2B d725aa3383e714b8618009a2c576969751cbd616f5fe34cdff08a57dd7aafa37e866960cd12f4b1a7105596cfd56cf589f905834fd39b1b9109c43f801dbee00 SHA512 26f66192eef2838c64e71ab153e277aac9fe09eee73491bcd42393794f40292084640c8a63d117a799090e8fe24e879fb56e0219e041d169484fab8309d51c4d
+MISC metadata.xml 535 BLAKE2B a76d00c8d70854246ae4609edf2d366cecf2ac6c7f433842376b9b3ffd7868cfb002885af5ba000f46f808d9f052ddbae0dbc32dc9095af5e64eaad5711cbec1 SHA512 ac7fd7245c927a7417584498a9a8edda6200fa8c2ad8e6a0370e3e95f9c464db720d164f8c95b6aac2f5c124684eba82fcf72cd0cab5eecbf17e712596b900a4
diff --git a/www-apps/phpsysinfo/metadata.xml b/www-apps/phpsysinfo/metadata.xml
index b8a3d9353d86..87e544d46e20 100644
--- a/www-apps/phpsysinfo/metadata.xml
+++ b/www-apps/phpsysinfo/metadata.xml
@@ -9,6 +9,7 @@
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/phpsysinfo/phpsysinfo/issues</bugs-to>
 		<remote-id type="github">rk4an/phpsysinfo</remote-id>
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild
deleted file mode 100644
index 375b614eaee1..000000000000
--- a/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature webapp
-
-DESCRIPTION="A customizable PHP script that displays information about your system nicely"
-HOMEPAGE="https://rk4an.github.com/phpsysinfo/"
-SRC_URI="https://github.com/rk4an/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-RDEPEND="
-	dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode]
-	virtual/httpd-php
-"
-
-need_httpd_cgi
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGELOG.md README*
-	rm CHANGELOG.md COPYING README* .gitignore .travis.yml || die
-
-	mv phpsysinfo.ini{.new,} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/phpsysinfo.ini
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	optfeature "showing disk temperatures." app-admin/hddtemp
-	optfeature "showing system uptime." app-misc/uptimed
-	optfeature "showing snmp statistics." net-analyzer/net-snmp
-	optfeature "showing iptables rules." net-firewall/iptables
-	optfeature "showing ipmi sensors." sys-apps/ipmitool
-	optfeature "showing ipmi sensors." sys-apps/ipmiutil
-	optfeature "showing system sensors." sys-apps/lm-sensors
-	optfeature "showing s.m.a.r.t. health." sys-apps/smartmontools
-	optfeature "showing lsi raid controller health." sys-block/megactl
-	optfeature "showing fake raid statistics." sys-fs/dmraid
-	optfeature "showing software raid statistics." sys-fs/mdadm
-	optfeature "showing quota information." sys-fs/quota
-	optfeature "showing ipmi sensors." sys-libs/freeipmi
-	optfeature "showing apc ups statistics." sys-power/apcupsd
-	optfeature "showing ups statistics." sys-power/nut
-}
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.3.4.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.3.4.ebuild
index 98bf2ace46fa..107fe9bb00af 100644
--- a/www-apps/phpsysinfo/phpsysinfo-3.3.4.ebuild
+++ b/www-apps/phpsysinfo/phpsysinfo-3.3.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://rk4an.github.com/phpsysinfo/"
 SRC_URI="https://github.com/rk4an/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 RDEPEND="
 	dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode]
 	virtual/httpd-php
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 15732c5707f7..7e1527b1d057 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 319b4169c811..fe82a2082085 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -14,12 +14,12 @@ DIST chromium-92-patchset-7.tar.xz 4004 BLAKE2B 8587663a072eb08abacbc2e54924855f
 DIST chromium-92-ppc64le-1.tar.xz 30416 BLAKE2B e953e3ba1ac0ff4bae437328eb1c52fb3863007ff92db91c6858c8c5f7b4c5c39fb8bf6898c3385c7faa82666f1a18aae7fcb5379b9199e58c5c0526fbd9dbee SHA512 b5a20076a34705c53c56d7763189ebfd860a456ca544a7f0c9ce30c877be92270ea724f1bebb9b597b301def27dde0a672b0c30e16e6abbf958cecfd60b07ec5
 DIST chromium-92.0.4515.159.tar.xz 958060524 BLAKE2B df4f06bc18c4c92061db55d098bde0a811f94f72fdf70cf973754e41db507a70274f48ebdcdacd13a787a35559553fa36d861787d4bc94c2cf2320dd06862970 SHA512 d6d563631278e721f38b045c39c9e205fbedefb0666af2f027a2a14c0d04814a96909da17e5b299bf40a94fe54bdfda0a91186983c8f929e7fbc7cdaffab922a
 DIST chromium-93-patchset-6.tar.xz 6796 BLAKE2B 2688c68becac1187668b459f9827ffca79de6c7ee64299dff20f91cb774af676ec3d95d809b4fc5f7bd663c3b8c904a46ac9cd3ec70a5ce248456dcd48834932 SHA512 eaf0d2bc29c53c7021ccded9c14463bbde2887926c069154c0126ee1bf513bf41a38eeb3dc21023a2e9637ce3e1e541a3b2a79a990bb8becae0da0a04e57c76a
-DIST chromium-93.0.4577.51.tar.xz 1038758556 BLAKE2B 9e26c519e6176820459b0c01716c4ec5145b051a0f83c84084209cd15904f6fc8621a6e662beea67dc31faf178181bf3b8236842111135bba1228ff0163c8ac4 SHA512 09d82a450d71656cea9b85fa8ada23b5c20047da878aa249fd6335f2338b6210c41f4c6b9a9ed3f8c344dad95f95eac4cbbfc60ecc030c4df50e047fc9ca8f41
+DIST chromium-93.0.4577.58.tar.xz 1038747000 BLAKE2B b7a2ed6d5a06e6e5b0a2071c72dae020a36d0640a27329aac6eee9544337db131e9f3b8130b9deaf6629550b230003f5f2b1e8881f7fe6336e1c44ff77a4dc3e SHA512 eb27cc408c511f095e33d2c5369c95e4750fd8ca7bbda6a44080beb02b25fcacf200307c52e7354f0f85dcba2b1b64617e961a0e1fb97b1c5828da472dd5371c
 DIST chromium-94-patchset-3.tar.xz 5052 BLAKE2B 3946b555d22792023696e85dbdb02a5fc43e39819c3a1a25c782d12771a608b068a7d11f757fa6390e7d295fe9c2b3b8085c31bd79d35edcd882a3f9f66df8dd SHA512 42f7beb412a7e691f35603625cbb316223706891f2a289301e4786ab92cfd4414d2f4a365f7637ba49a28508e18523670e59ae88512bc56afdd79d22f62f407e
 DIST chromium-94.0.4606.12.tar.xz 1042728660 BLAKE2B 250509ba893b58ded24f65ca77eba42c929cfaa94076469ca7ef20576c0b9204b5fc1e7c780286f795c5c0031b6e383f960d20bab4ea1acf9facd87386b71750 SHA512 82bf09c7bfbb1d9652439a65911ec18b8ea48e7f74a41227b328be95baf0b11ea0a96a7ef612d419f00b38b3ef6b2bef7936b8e53bbfdaaa2570b9e8f6a41252
 DIST highway-0.12.1.tar.gz 1480579 BLAKE2B 2889f96e33ae4411b14dae2229d86b0581f2044f50d6bb829a83417f0d67f0c9a8c03d552d09a985231ea11e88497fa405efcb85d158b5734b477bec5764a1eb SHA512 d14aeffc80739a5993177fb190ac03998d495004e9c54126c0e0b174c28be52a3f3fe581d8a08db67c34bd00045223d1850e7b384a2e7fe37a8150d7908004cb
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 EBUILD chromium-92.0.4515.159.ebuild 30756 BLAKE2B f84cf368e172f17bec435db492144d8667139d742d3c35318770477c6f84d2979b1162cf0a6a63a844e75980f0d2cf04b5d4e8311f4eb001bb28cdd2537c946e SHA512 59397dfd00ae0e4cc8d14e058cb150948c9a4f9cff823cb461a9e48bf524cba6118f2aa644324a62e6b80994e20384534e7622a2b767c3b46b84bbf01e522b67
-EBUILD chromium-93.0.4577.51.ebuild 29917 BLAKE2B d0764d23c580aa8c6c1930e8b2b3fae318f28ed78fd592dc329c981b212208a5e681a17b20ec2a84465d31f6a0704cc8bae050ab0d77b3125cbb55e5264a17b9 SHA512 6a6745d21acd0da64a935e044978ce3c6e490c046c35c6b410d0c31da09159f25010e4b983cfbfd936822e27d353c1a8c623fb2155df6d630191682b4d9109d5
+EBUILD chromium-93.0.4577.58.ebuild 29917 BLAKE2B d0764d23c580aa8c6c1930e8b2b3fae318f28ed78fd592dc329c981b212208a5e681a17b20ec2a84465d31f6a0704cc8bae050ab0d77b3125cbb55e5264a17b9 SHA512 6a6745d21acd0da64a935e044978ce3c6e490c046c35c6b410d0c31da09159f25010e4b983cfbfd936822e27d353c1a8c623fb2155df6d630191682b4d9109d5
 EBUILD chromium-94.0.4606.12.ebuild 29518 BLAKE2B 505e47722767006a15110dbe15a3822f86a9f136853b7fa6bcb9057675de627b7792d8f4a52e686d24464e6c25fb1533f5cd94b22eeeb294582bc59547ca38ad SHA512 a7772d78f54e496838dda94133adf54b6b32e90b35debce19353eb73cc5a2fb1d5e47e2ccb3b47647af56135fc56dadffadef080a7bd7ed8bf7868072065fd82
 MISC metadata.xml 1519 BLAKE2B e4364e8141099703f087f1733b2d28aa688930f5e9cf4659fc3561af30d4490c611b76728b2bf2d745eb07b1482f59923166ca340740d48a0321fffc908ef4ed SHA512 b6a1e1f04b7e1b92ea2172c4aa89ce67186a6c8abe6dc6502db7b0588a9b3be2d0fa8d43c797f83b95f7d1c7a20381c26ee534082c4b81b17d4105b63aad06e4
diff --git a/www-client/chromium/chromium-93.0.4577.51.ebuild b/www-client/chromium/chromium-93.0.4577.58.ebuild
index 770da01d6141..770da01d6141 100644
--- a/www-client/chromium/chromium-93.0.4577.51.ebuild
+++ b/www-client/chromium/chromium-93.0.4577.58.ebuild
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index da90ef0f2237..5ac3b7b1b5ca 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -102,196 +102,6 @@ DIST firefox-78.13.0esr-vi.xpi 562865 BLAKE2B 695282cb29634e91f5401809e1010572aa
 DIST firefox-78.13.0esr-xh.xpi 427848 BLAKE2B c31909945f72dadee041eb3bcb4042ea97e5da17084a10b9af54174970d5e76b7c0606d58746a5ab4e85743dd556e6cbe4c2e718e9553cc39e134989c7261b83 SHA512 d10ca999401c99dd32bcb9c92dd6bb4652d59877153c91553aa2e9a12bcc86869ee36b05f78f7f4600dfdf511d8a04a30b7a539e6cfd0a9d45454af5bebe2ba7
 DIST firefox-78.13.0esr-zh-CN.xpi 564769 BLAKE2B 2771f27244e43c48075f9f6babbbd362ef02ae6aa4ff344affc84fc96cd69427ba2f9650ede1aa27ad8c4e240030855df06f5d5ba133cf1f42bdc22ef7e049fb SHA512 9ea0f86c5529e9d069e1066974be9c50b93325be653711159215e06dcd4b0ad76c7e4a8ba954ec3e104b424918226c2b4999c7328638d352ff389b0e24b44b65
 DIST firefox-78.13.0esr-zh-TW.xpi 564747 BLAKE2B 0aeef4fb1a7f1290f84f7f18d4f1ad63dd267a2b7f472dd7c2aac55851776c9308457ea9d6abb297c661d18b8aaff274d50ee1f8b39ec36de9a804b62bb419bc SHA512 73e873090097c1021c34e4e063b9bbc729023279b94a451307332ae70fb5f60b9cec6b515d3366550d126368f913c574200664322ca20b95279f7171595120d5
-DIST firefox-90.0.2-ach.xpi 467582 BLAKE2B eb20fc04a512be8d1eba219f7541af93dda781080337d76bce276a5583bab5db1938bff037a238377250b6810232b77534bbcf835362ee385b4b1bb6aad60067 SHA512 2f726bfe18bc7e6aa3cde436e9c142382513a1175269b710449cbf7481dc3d91171d21ca1bc30563901bb35eb31befa3c2aba115ac596951d3d6aeb5b94bd1ed
-DIST firefox-90.0.2-af.xpi 430709 BLAKE2B 05cc8dde801efd97dfe56d1d102fa48e1b6e62b3e905648007dc488149628ad3eb297445319f0f1b620f2549d7830c16b81c53e06fdff1d43fcc70e815875256 SHA512 3865c9e96b66def2e640d747cf73ec97127b58e15e0fa01d5374d2ebe35a91d16a8176b68f4025122af56648415b47d03fe6a4a1e007a64da8a9ff4e1eae8ef8
-DIST firefox-90.0.2-an.xpi 515453 BLAKE2B fe5487cceed1fe4f941adf78760cbfa313f58408a5034eb72809e82b3a404e6515222058ae0fe8e7b18807eff8baa72a7ffcfe80798ce4ef9213be7bd52fc2f5 SHA512 1958e46092c05ba266896dffa83af98adad83572a31e769219b88a044ae132f2d2625154a20abbe997147188033f4924ef50e678d435aba9fdf0d8a291c89ed8
-DIST firefox-90.0.2-ar.xpi 580224 BLAKE2B 0ce2771752d9c3e6a2bb4d39b4eb4da5ba9ce4d530b04fe11b7775cc08107a78d3cdee033cd2a564523481cf69954fd07fc6adbcdc56ac0abea192be98fad91e SHA512 eaf2335811cf451dfff085efdd0256a3c72d08c59b1d31dbb08a968d40d5c20d45e590479e10738726bdc597a523c036a2b26bdbf41ee469a6bc3dd3254f0ea2
-DIST firefox-90.0.2-ast.xpi 508002 BLAKE2B 74158545d969e4181c4a80e3a1a2d9d2dd0e4d358c7846b9c426b25a00fac9d11bf10f8dc39e594ad9fc8395fa0e427d06824e3981a7dd7e59db1bbe4b0930c3 SHA512 7a5b98e537ea3a930016884fe13c1bc91ebb6f13267f759aa1c689a80f9e3243eafcbd8de16060bdacd6c59295b6a6fa5ad419cea3328acb20be5fd53f909b5e
-DIST firefox-90.0.2-az.xpi 503461 BLAKE2B 15c7e6b13ab47639c611df6c51ebdddc2a365b6f0ff0e93285e17f9de8b85f91d028467c3f80ffab4a1ba0e28d8f16543db994b5b6970c5a22a8d4e36713a6a3 SHA512 18f759e63ad51e9719b3e5f4695f8e592360e612835e9f9ea5cfc616bbe07fd46bf110f881b42663d0e2384f12d34ad3a9207aa62247e582b1cfc62065205210
-DIST firefox-90.0.2-be.xpi 637220 BLAKE2B 1e10160eeef6b14da9431ffbdb6b94b244477d23f9b38ecec6dc8a40a188461624cf5fe9395f93c41cb2701eb2e18367db1ee991debdf3927fb44db33631cb31 SHA512 c9eeece43756e020e39908ce1d99f238c3d581cfa66b9accf8ad23fc0691d461b976ffe7027e29cc21914a07c9b009c19d5a7d17013b70739d5cb13dfe20ae8a
-DIST firefox-90.0.2-bg.xpi 590496 BLAKE2B df82040f0991b69549e5983a6d3988bd71bee2aa367bfa2552d571cd1702e555ba0c488aed195f16541eff54a4b714e3d54ef6c99da573d451a69af44967ac85 SHA512 0429124d8eff17ba6cdb5b1f3b8107f1e37e8fba9445ad88532b5780db1e139d527bdf4bde37a1287657828a68357ee47e9d308b540f1130eaea65332ecfb3a2
-DIST firefox-90.0.2-bn.xpi 579586 BLAKE2B d989d0ffb3b396eff5f4cb3b42e503e52395715c371af60f7437e7c05d5153c1641c67ebd68870f019458ea9f9f32c888c7ffa8522d18403823571bbffd7835b SHA512 49d2b6d9bddb60140dabc91d7566318a7a33cc96664459fe75b29d07238a22056db615e6964b9cec9b0390cbd482bdedf4362acf144f752a8d82e7aeee76c360
-DIST firefox-90.0.2-br.xpi 539710 BLAKE2B 0691c6011c853e856577e7d2faf320b3d5cc276c360365f63f97fa03860ae1eafc02a31cda92506bfb3182a1eb2f345fc9f8661cd3446dc4dd11bafc09d587ac SHA512 630169e5a074099a3d965da66253c3707a3fc898a9b5aa3f5f5830c948c589e2f260ab6a50795417d19e63528658daadbeec2ef3117dc3c30d026cf9adb684ca
-DIST firefox-90.0.2-bs.xpi 475430 BLAKE2B a6fb2a37cd6517c5816e036eeb794ff0de0c71f75b620b795a463ab33a6e47c8982c060ad128f012972a8c6759a6ec5cc178f31f2d242b86949597fae59e372f SHA512 44208f322553d88e59fea067a1216f8795a0359d330ff26762b420031bf8f31ae87d3fa1579153e5e6dcb53058c048b1df49eda74deace4bec8262ea6fd0d20e
-DIST firefox-90.0.2-ca-valencia.xpi 548479 BLAKE2B ccda2b43e7ca3ccc3cb2bcdcc78e668d51b940d571c2c7a7dd117ace3cbba8696304aacf9dedaff9d3655e3dea96d0c694a4fe1788e8c0eb6c7e9d7595786c65 SHA512 64b6e4854cc9e1866a6ee7218d499dfa66a62680d36b2ba5973bcb99cdf09ce9664f078f0f93946575e4daeb872fbdeef28d7bd302113f83668be2376a1d4602
-DIST firefox-90.0.2-ca.xpi 546603 BLAKE2B 4a73a815709f2c9fd30be7bd282cd889d3babf08af0513e022999fc4ee789fa7ebc57a1b5798a465d46bc530830edceb1ff9b1e09889a139c25364436b32e09a SHA512 7b3d1f509dda3e9adaa8e15d12d1bb2a33c16356e7eebf99a0cf73fe2611bce6d84a9b7c328704dcc6caedb60fb9faffd9773e6e099f7379f5020b9c9263aaf2
-DIST firefox-90.0.2-cak.xpi 574164 BLAKE2B 442b69ff8957b047591f21ea22ce9d04a5d2ed88d870b321eecdb527c95dea94806ad76b8d88127548e35fd87f647b15c21e9a5c2f9ad7a7ff4582c94e500d48 SHA512 05a50ad71449ff9828fcbd4cb089d23c27fe885c43bb7f02bde303c0223f0e64036589e52049140fcdc1b92180d4f8fde430f2d984fdfbc3e0a0dec7bcf33bcc
-DIST firefox-90.0.2-cs.xpi 577720 BLAKE2B ddc2062e0bd2642236266c47bf763121d2581ab0cb99da04860fb33d688b26c4c887760feb7356c5808ce889497fd62b12e01f00b55131ca45031a9e977bf153 SHA512 7e277710908892964749f446b48a8624c199d5d45f780608ce0ac6a7a5f7cbf57cfd4ae986f79f76a46ef2a0b41828104daf97028b54a2d83f6f134597ec28a6
-DIST firefox-90.0.2-cy.xpi 554650 BLAKE2B a8b3f9879534e4f59763adc1ae6ac310d14223faaa23056cf7248130489f993228083fca854d15ee3392761c33fd37d506402fb657b51dd1a607432e9a1d19cb SHA512 c18522048efc7edbcba01c1bee79e43d5db7b9816ac32d91f4441d3a0cd65155581966372101f14264fed70eaec881d5a099995a5b4beb9c6a3af54c88045212
-DIST firefox-90.0.2-da.xpi 546288 BLAKE2B 580541804a971226172c4a5405c2d97e57b0a8f6eada7d0658cffd79bfd5e4b915cf29c8ca58887f328a2601103b52b328ce5fca67d5e7a261a09dbeea347d76 SHA512 41beb225ae75c34dab6133f98464f10e9b7faa6405a15199272d05039a4c0417f7bcb67c0b4d058b716c010b9afba7508779aab664fa9acfcdeaf8a12b336a6e
-DIST firefox-90.0.2-de.xpi 566471 BLAKE2B de4bed3a835be63460e938cfeb73ea00d3db1170a83fcddc7d67c7031028547205f1d9c016d46927bca1040ce9dde1a6dfe091647ea89d13425e559980baab67 SHA512 5dff86f82a0ae5dd86180d1bbb50af329a8d753905464728eb608e67db7cab66030d76617d119807642cbe16362498fef67658f07eda7ad7edc76a59093db3cb
-DIST firefox-90.0.2-dsb.xpi 579297 BLAKE2B 24b04ee03cbba2269150674c994c073c5f114cc56e8703a1f993b2572a64ad9c78c49c65bd4b064b785faf2f95c3676a978cd01b54bfb0b5a36fe9b8273c4a09 SHA512 1d2e7a9b4f701d05ce9af4420c3458872cce5e8be2ecf1644bedfac5dae294f13056ca649a112bd2d7d0fdfa5a50574a107cfc51eae3cbc3bccceadca94f78d4
-DIST firefox-90.0.2-el.xpi 652899 BLAKE2B 00d52fd1ac72f2ef57958b02cccc7270dc7f565ba3844dd0be495930eb7a26cd72c0f1c289961aa940fbf5dfe4b070159fe6f511df78ee26e0fc793e245a5227 SHA512 dd9e5a59bf81ba93ffb131fc4dff873e557cd252941c2986d37730752258a2034db44e53672e7e2174c6f5467fd784ea22538e8e2334b441aeae8e99a326ca96
-DIST firefox-90.0.2-en-CA.xpi 521250 BLAKE2B 0db675cf883e92fc41c640f9c599b7fca295ae4f28f686440ea2e2b9a4436445b9eee2c2fe6eb625b1cf96db87642c341084696b35911e52239486fe11d3ce6e SHA512 c1f4a0e29e4e7313b0ae8efea43cd436f199fc249dcd6fd15d6ad7b2be106a90e83f49083f7d1a018be580f783fae5bb07ed5c01012b5adc59526dabba72fd30
-DIST firefox-90.0.2-en-GB.xpi 521806 BLAKE2B 1a04f7c7953f1f32e11484ef2b21559428f37ae00911d5560a504e42fd2bffdbef8f18ca55f924ff19f62679e74f6886b4901bb3027a25f85ddb525c38416315 SHA512 42690b90fcedd3f42ef373c8bd987b0bf2fb19d30071e451c33ffe3f6baa9c089ff870dce41274841a06a6d126ad09364b399f2d44f96b69441dc9dfae2cbf35
-DIST firefox-90.0.2-eo.xpi 548059 BLAKE2B cd513f81964c574fbb8436d28e6af185c74009466ce843f18d7414a730b709b26c8c8588e5e9eaa3ed3c057ffe16ddf56b179f048fa180760155e04151946c90 SHA512 8a02dae10df6d178fc32cc71df44b85bc7f9645dcce699a67a0910f4a91e058e99d05464b62a00fda32d7e1d43c629d2b6401e89288d1532fc08cd4868b5916e
-DIST firefox-90.0.2-es-AR.xpi 559628 BLAKE2B 3d253e9bd11b29a3dd5783bad9e8b3e5f64b10baa3f497369c8175d295827159ff61b5a46abd4a0a6792838d18fdfb363316f64600bd4d786035e11fe4066129 SHA512 bbc319566de8dcb9911f76d5edaed504bb24bf5d65af518a5645f4941e8fddeab4e1fcc750d6a2ecb223b41c9746a5192822c99c7a30fd4e913d9177ac34f26f
-DIST firefox-90.0.2-es-CL.xpi 558527 BLAKE2B bd89d7e8cfdf892115438b7fc92a18c48b633e9f856c9a4821ea2a7dfb90120e1b6dd233854ea96c2f1cb7dbdadd71aa369a7c879092ab6b0b109ae21864ec25 SHA512 b70799b720dc11a06c641f8bc21726d16e1979a2bbc9bfa8ed3fce019c24298ef0539ea47bf497663971d6de5a8d7e42edd73eecf259e4af966f41dcfd1827ba
-DIST firefox-90.0.2-es-ES.xpi 548794 BLAKE2B f0320caafcc35a4e71abab33ae4a35f341d7f869661f7f7e2c8eec9fd68ac1d5be0502c9fae795005365f6d4e8d6024c86bb932ec3baf9b538b9595ee8ca06ec SHA512 5d2840475edb3659e7bf5428ddd92cf4929bb94a76884686a3c3271a6a4053e1bfe623d803488ab058b0b9860d9f4d659d36701eb6b90aaf5ea1723b3d83a0c0
-DIST firefox-90.0.2-es-MX.xpi 562244 BLAKE2B be7fbfe6d4780a871dea7127a786820ced8b139cd5ffd61989cf003ceb5d333910a9b7421a40008bf0290140a927a5ccdb0e389f9078f9b2a031cde00b5789af SHA512 b7fe64cf33d7be4ac13b66891a7b6ae350b5a8177537e321bfe1b8da2a1234980d0bfbc819102dba975d169baa9b26a356c80f41b41751d36e1ddf1defe5911d
-DIST firefox-90.0.2-et.xpi 496662 BLAKE2B 31829a9cc3c809b6a0d91a68671f44e197db7f5b9b10426dbf4722f74b577de1db4be84f11f48eaae0d1152ac82af5f9d86922dcce2cf75738d3322485c0de52 SHA512 906f6f819baf2a96dfe0189ed322cb25e046d38dec7037cf5526da71cfbf3d1c0de600baf31c511d08eb18067beb4bfdd35ce5f7de91364847d0a0a7b21c7a3f
-DIST firefox-90.0.2-eu.xpi 544791 BLAKE2B e8df641b3d57ec9d044f80c274de17e23e216257e0d78cd0e86450ba5fc39b18839896b3d3976e3be0ebf394b0d966d6ee4af0dafa2e3ca1a9751b3370d775a9 SHA512 920522a5fd26a53d27f15533f40c5972bd330037656b1c1f94828c4d7b87e33a446f49c4f311cc15dba16a931c73255887de25b91036a1057422a25727e6f481
-DIST firefox-90.0.2-fa.xpi 565155 BLAKE2B 1dc2ffd9990b923247d487670dd734c67db0ca5703834fa052f21684597de0bfc9902062d5c7f6fdfb4d68c85684fd93db5e060091af220c3c2ab74f4f9138aa SHA512 a929bfc80b3c217da3eae1773898a646d9c2c06d7e13578d1b3147a7497155953ca2a297156b1012ee7f8630b7764d2953ec25d610f958ee7a19965859666455
-DIST firefox-90.0.2-ff.xpi 488049 BLAKE2B 751ff1cc8b0cdb51af4f0cd42db3d1c96662d9994fbe5fd2e4a1d2a1ab57a9b4b5ae8bd8c3e5d3454de83365c6a1391be3e07ecfd58efcfa4ae7b412c402a826 SHA512 0b6e0b583f97722a57f9d28caa14aff4fe7d342e4f1b188a1b0186e865eaad3b1b5ab0d911a9187c082760e85b9f970c71be6e44d84827a575b102f28a7011f5
-DIST firefox-90.0.2-fi.xpi 545936 BLAKE2B 1d992fda4a9cbe8ff43c786277c55ca005888eac771095d037d595974ad6430994ce7c0f741acf96f175a816e800bc77496e318290914912ceba8a82e3c6ae68 SHA512 2143f3b989153534f61a394c94e9edc74f0070e8d6d389b455999d4cb4cb0597322871c100a1114adaf1073ef29d7cc5ff6c13e8f59de5f4064683dfe1f12fd5
-DIST firefox-90.0.2-fr.xpi 570078 BLAKE2B 75cf2bd14e3e8b67053aea83d492033ef46ddd88ab69a902f17a4e21c36e1fffd72d855d48be825da3928717eb726447435bf345f26b9edb5cbf949f08b19209 SHA512 a03b42c77585f70136aaaa3e102ab53550ec441933814e817f10a5ab846a47f5b1203738c22fdc07fbd7968421aa3be07fd3966f54a3d7a1f564e5733a4f01e9
-DIST firefox-90.0.2-fy-NL.xpi 555597 BLAKE2B 3508589c747154ebd7a9b712b58d38776990b8d9d2fbc6f83209a3e395b844a0bbc7ff0c62afbfefba58d509514fe0614bef7f711b1b44bad0605beffdd7c07d SHA512 5dac5d2c758eedfe7d351ba5185bf2f680d1816ab74256c9821b7846140130908976a979563438f910ddb51294ac8045e86620f9b35fc58e30ef4d9e3bc8cfae
-DIST firefox-90.0.2-ga-IE.xpi 473120 BLAKE2B d72e1ccb36942bdf00b337efd0231ae5b338a28e17eb6a5bc51e613df4658c27da61486319ac08d4f9a0373dd2f42e7358afdb29da680bafcb97b9a96f61a7f8 SHA512 9826db654e10053ebad1b78caa2bca440ec8ef2eec30e1d3f70b04679c5a89ae8eb9098531b13aed6957a2c4fc7a885e0ac7afa36d0f98d40fe0d95574c7ee55
-DIST firefox-90.0.2-gd.xpi 550980 BLAKE2B 19032850535ac7c4d5129ae61a901cefbfd14b7c0ecc6acc22ad29422290775c61f0343442f823dff4039f99a40428ce138987e178471190515c91b509eab110 SHA512 86d69a91cfc1c836cf2b5d8b25ad509e32fd5d1d3732379009e50b8d2a9222371e287a3e00c0d9541165d79bed59732b8e144f3b638e43db9838bc29d62d4b20
-DIST firefox-90.0.2-gl.xpi 554486 BLAKE2B 1bc91d2cfe2639d84dd080198d5129414c581ac3c02dce8b14aec1e6c4a169e9aa07d6ebfd8fa98dca4546fe85fd1a35054e561912c4744e07f0768f71c7aab6 SHA512 4f36662c5eab07f649aa21aa85dc57ec82c8ab7b961fcad80fe4f487c40a041b98c2102b4f7b96cb4259e931333db4ef357e4a69779412f4fabe7cc7f66f0b21
-DIST firefox-90.0.2-gn.xpi 571719 BLAKE2B 37d4265185ec26a8ea8e86b57aa0aae529295e1ad54e5229e0e108872fea8b039acb4dfd85153e8a9218db46ea59288558d9c60cedf04554bde32faac85275e9 SHA512 937a9bf0c77e2d5a5f7d48c0aecf6b27bd6377ef05a82e2f674c38bcaa392a3f2d92f7b6eed97551eb26f39758f215bbc102b01314c3326e54c0d70abf91aa7e
-DIST firefox-90.0.2-gu-IN.xpi 547542 BLAKE2B c207abe6581170975581f1ec5f074fff4113be5eb19a3f6113c2c6d660d66474c21a46b73ec87e4afdb03c04b9d052c77732b676108b89decbf04f2ed7cf3f71 SHA512 ec9de8cffd0ffc3828d69fadcf8c2a42215aa1d84474b08b3eab42d1466324cf2f5d5a035fd9f17b90230b3778eec7d229ea2d0fbf4aca6d652930249255a2c8
-DIST firefox-90.0.2-he.xpi 569407 BLAKE2B 7e69b976f53760242da74042d85573159082d3edd5e1d3ef1fd185b09c6863f8c275214d9a2fd420ca559f83099b393c979b701305e3c2c02bfb63aa8e0194fc SHA512 1094fd8b6d6435ba094d0ec2ed70a5b1d911059c1bb4850033209604521d21d8ff579e829224c494ed4046da16ab804381138a1d3893ad5b0e14787442136b3d
-DIST firefox-90.0.2-hi-IN.xpi 579616 BLAKE2B fbd00e727022b20e0bdfe3adea70558b5e992fcf40805d0ae3407ffc49b41db5579cbff3780bfb05825bcb7d2b5cd7265dc5fd18f6be934806ea461d3c2a2629 SHA512 209bbac0799e13114ce20f3ae853dfed6c4e4c56efe71a78d765b6c1f725a52b0e88b87d6cef6efeccc1391413f9d322f60f0fcf79b197a1ca2256ab7861dd88
-DIST firefox-90.0.2-hr.xpi 549998 BLAKE2B a051f4591139d4e51114b39df0089cf970f6cecd368785c36592b5f3d4d129850510044f6e3b48ad7298ede1b2765ab502de75530616195d7d636599b8c275fa SHA512 8d77ca7fd7dbca5926ed4f8becd356a8bd31b8ecea36fe26b8641ce9d02daac2268e71e19968ff9f3338b379e943f041a4518207491a170bb629ea4045e2a0f5
-DIST firefox-90.0.2-hsb.xpi 575410 BLAKE2B b952d82e59ac118efb537453ebe7a87c15792c52b005da779d7d06f7fd665e8dea05984ab07b9dde17371828fe6f44212aef4dd492a32e7f9d6ad87c68369be9 SHA512 b59caab36be18ffd000a9976e3703e9e8d520c523494f080ef020f49ca239af17ca97dfbfb7dc70d36a32bdb51388c8ba2e8d4c4195d6b15c0f6ac57895df6cd
-DIST firefox-90.0.2-hu.xpi 579113 BLAKE2B 206d00a85161b6aa2f2422d825a54fdb8a77c856f5da5a92c707729d078ed7a020d6f0b6e288bc117cdcddeded316811eabea264198633f11a27ec35e7a592d5 SHA512 8cc740c1454279b9bd20d78abf4ce352db596e85e879eeb335b79b00c0160de6b2a704f3c6c44d4231c80d2d40b58d676def68cd77bc2ed916eb617cbb0ad964
-DIST firefox-90.0.2-hy-AM.xpi 604422 BLAKE2B f49a46b07e6bd9aff619d6ecd142d53da4366899bfaa0cc13051b4132cfa8c81c16d0a1cb999b190373e64fda1434df9ce965c91969956dc1d4fd64c35fc5bb0 SHA512 737b37f8a96eeecd920297911cfaed9664c0327f7498cce5d0c0dd942335498cf7b15c203226dd3128b60a08a176556cfc8abdb434a77fbd5a846948faf4044d
-DIST firefox-90.0.2-ia.xpi 544431 BLAKE2B ef3eb4e133074467183d3a54f2cc6af6ded4e8edb618868115fa6366d61c2d379a3903c0eadad8ad2a0d0e2d9eb57539d317a04b784a41b45a2cab8d73e64a56 SHA512 e3a72c94be0f03c93f85ea9b7ea1b37542f759d5de9a0522003abff9c12f30ff377221794d351d82c2b23afc07631b7fbdc0c0e629655877714e0ea3f9e49c47
-DIST firefox-90.0.2-id.xpi 540133 BLAKE2B 52d47167ec02bb0917c0b84df77e34694594ed3f7493d1790fe036268f304b1efa1097ebcaf2eaa9347e73d07faf4fd46e97da1d8961c9b1eeb68e13b222a1f5 SHA512 c510bc024f902e795fc851b0709570f5d493cd9bfac12ecb6f552144dd8c96c1ba607e6fd05f765e0f0425792859e86e661579b89b700320c044d18b28171cfc
-DIST firefox-90.0.2-is.xpi 483713 BLAKE2B cae0f001ab5767163706140ca2ecf6e15c6db37a147882586d40073d2598fad2e5fcce962d4d51d0af5a925e634ef59117f5f93f70347237470f047d727083f8 SHA512 22da40eb5089e2a267a66c17c9ee8ee400753f0a9cd7337d8eebbb0d1e66f1ac31316ab875a6645107b7cabe884308f2a1d1d0a64ea96449c984ec74963d85b1
-DIST firefox-90.0.2-it.xpi 470917 BLAKE2B 2b8ad1812676dbca90ea2164e4b534a3f246bb883bb3db7dfdf90c324733563903ddbe4345803e77085fd37c5a099d9b787f94e01a413349c744ca67b25f519d SHA512 018de01e7aab5f3f8319ec1f1c74ffc5a77d9b6fb2e410f700785448d3c5cb267b095edb9c9cd69ed08ad529295a859086a7f5d4ba53c39e464716e206098606
-DIST firefox-90.0.2-ja.xpi 605314 BLAKE2B 34739e38a812f92c8579a226b36f2c7622eb758f2942069193715143f0d63e9f0b85e08ef4ecee75d1006a97304a6905b15e0e76c65b55d7e1d3cb29c45cbea8 SHA512 7687014e78fe50b692e97bbb22bb08c8c1e25b54aeb104b766587428aeda8fea935ccb089320e72dc1efaae7656c0de5485fc3905b98127b45f59e38ee58276a
-DIST firefox-90.0.2-ka.xpi 606361 BLAKE2B 618a913593b9ef7832fd810ffd769cadb47bb93ef9d9362b86539a3d6da86957aebe412364f32ad4c77974cb97fb801edb3938a29c2326a66796bdc0d3e1fb54 SHA512 2bd7a719dbcd9cf2d7881260d5c0ae0892882983d7d07c7e7348c6c82b2e2f861236afaf5f9ee4f60940f3a2a6d9d3865949c5e2e92b6f26c09c4081f752c412
-DIST firefox-90.0.2-kab.xpi 562888 BLAKE2B 96890638bab2d4acc87390ee56c4c26c93d5514c32ebbc1c833aebab51e793a2e3d336e2076912edbe68843f83c8f02559a3f36feeab56329eea8ee9dd0fa320 SHA512 c8397002c9027ac7786957076c202a6db069ec1eee58fe0623291b5a72821131007ce2eeecde1d522d06af571e4dfa87694977d25fddb0e3c76d84768cbab447
-DIST firefox-90.0.2-kk.xpi 621558 BLAKE2B f57a4466136e3ed9adb06d0b693e7a653d4a06cd25153f42cb35ec6387530b6029d6d6d08b5b9dd0d7a5bf6a17f6e46992b443491ef23fcbe0d05347788351cc SHA512 6ad921f93a0e788aa0f2d59a422643eb48b85f54eab32066e6eac1338d0e73e0a6882f73f562c3011e4f53db8f00f92817a3539086d8c97f4f3a7940290257ea
-DIST firefox-90.0.2-km.xpi 546445 BLAKE2B 0b5eeb9fb63549f3f9ff6c875418764e8191317bd8a167c2102face45b88dcb569c2df47fba209c5935e2fa7c8952b9f200de43cdd49caa0418b413b22ab8f93 SHA512 760431880427fe5abb65fb0a351fe80bc1ce84368c90b454594d6b13185254a19e88eaa2b095c38b9338c88230254df0fc0d1929fa24875458a1d7a8076ccd6d
-DIST firefox-90.0.2-kn.xpi 510724 BLAKE2B c24388d4c872b798ed62e83c6d15d8f9bb33be6d258e16af43f34d94d05df348df09295a2d9c2b7ea54ec876cd4a84570648f3d0c964ee3c628b246ca145a15d SHA512 4483428d7a968f259b13787e94b845e0a9ffe55be1fe83b5fdbda01a7bbb970c959d7b24acaef729b9814a0e54b32be7967191936671d0224e92bff35570699e
-DIST firefox-90.0.2-ko.xpi 590731 BLAKE2B d5178a54243b80c34dd3221fb0f9447cc9933ca03b7231ed13a006682f38a2f9b60734284a015326dda508c1801d50bcaa5fb6d299d13548012ab8c3bc89867f SHA512 7678485b6588e369067467250b5dc4a8009009850d3d63d8e2340d989b7ef383e81ea6af2f305a8b70115bdedcac5fabaf8a201eeb2b254de938bce818462e83
-DIST firefox-90.0.2-lij.xpi 484766 BLAKE2B 382c5ff77eb58e58e5c8e32ed0d7fe135d61974adaac1c990d514a1683c75d45fc68048a22f2d66ba0edc12e3ae119d9f75a217eb37cfee1180654c1288bd7f0 SHA512 3eca5e9266846d6b3c7ac108986da092dee5178e321aa8bf6892d4ffe009c2ab205ff86bd3d16076f8b9214b55578f81d0907bed9043c2c41e64e4316478de29
-DIST firefox-90.0.2-lt.xpi 572555 BLAKE2B 63f4b6095ed7e5cee86a4a25eefabea77a1c3ddc0562d7bfda0bdf08de5ffe90c9020e106d729572177386cff9461bf0427ecbc13368ea3dd8d6bb21388e18b2 SHA512 579ee64b4b3683a433b265b6c4c71d6c1006aa7c81e850b3b7f4d1ec7f3376c2bcfb89db76a5ced145343f11010fba24192f3fde365421b3e855b66755630e9b
-DIST firefox-90.0.2-lv.xpi 475696 BLAKE2B 2675056a88af23b89dbec450aa2ed11621f6de09bdc21f0d06bcdf662c1421d517660f30d7648debbd588ce23651f525bf2f5255af6305c27defb40bdb770d4c SHA512 d48159a8e812bd321db05e8a865a8f680feafb0e4767e0d35d74795eda5a889fea5e2d8745bb0d2b438594aa72bd73981c2c2474e0ec089a29e0eafab13f550a
-DIST firefox-90.0.2-mk.xpi 472368 BLAKE2B 91a36844e99016d7e2e4aa7d0d99680fa8d83e6a1e9282f6c3eda916e4cbaf826e8d66349eee4d905ab9c15eb6af7ccb7599bc0710e5a11d3dcfc39a0ca0a259 SHA512 408884c11556fca1371cb211a61f63ebda6df8df56ce02df0eedcb82d9e6ce72d77436bd9e2202d1e07e244ef08a62d2c7eb41ace62b813a8d80f6c134143102
-DIST firefox-90.0.2-mr.xpi 547715 BLAKE2B a1164b4b71eb42057bf0361e06cf2338f201c6926d7c6547ab256285a6fe7686d64a5674c909c95a31e920940b50c858b179f1607118cb19323e1c01cc075a28 SHA512 74abb04ef83fae4c570e82697ca2353a9e76772650a87e4e5f7c99f7591a8a84c1e5761a21cc2952a5846bfe873ab50339b958c9411141d2e636d1573e776b28
-DIST firefox-90.0.2-ms.xpi 459315 BLAKE2B 9231c3e855cf744e053e84978c97e071dbea39046434d7e6d1639e985ee5422ce71fa07f3189594873c3ef062fa9b1edc42bb3df1f6d8cf77ae456490f1938e1 SHA512 4dbeda882792988e58d6b6df7f2f7bc8b9ebd9ece288bc83f92561c62366ed8c59043528fbbff14fc4856188b22878a0bdc146ac95aa1a3e840a4f543ffa087d
-DIST firefox-90.0.2-my.xpi 531263 BLAKE2B abcc403d73d5fb9ba0f6e8baa8b01a0547dd4e94a809b66bb6a2dd30f2fbd0bd55bd16b6ea6d353140802d415b894e607f4a79a0be4468121c2cf7c9363c9cdd SHA512 11679d0de73764b3efa6578b858394b941d7e45587b8e46adde984b60db349981086855cdb67721b477853e19806efff54c2c2f1cab1ce11f395e6833fbb62e9
-DIST firefox-90.0.2-nb-NO.xpi 540211 BLAKE2B e73bfe5862495669d645543576b64b3d66534e3d9bf3b41dfd871dbfa4146bac3ed46a6f58ae369e237d76f9024e7b462c60c2afe0fe91c0d2555bbe92abbf66 SHA512 8b13a9a28c36fe4438c52d85c3948b5cedc6a68fff0e7968a952fc5183b69104df5b9d74b71ca43cf3018cbab184f019b556b30075bcf67cabd04549cfd22fe7
-DIST firefox-90.0.2-ne-NP.xpi 488264 BLAKE2B 25f40a5eb34b4aa07d3852f0967cdc37c4cb0dc58524bd5c3cc773d4db4c73bb9ba8969f4e8d70d43282586b479cf09e62af1aa823a77c656968ae824f31e847 SHA512 80ff7b32a58e631b88a46588039774c258d02312d0e2fd98589725b882e481e3ea9b48923a0b9b37dad3c777dccc8395608f20aea6d757d7be1b0f9170033659
-DIST firefox-90.0.2-nl.xpi 549132 BLAKE2B 61413733011e4fc81224f223f570027f2ae60b8fdd89acc9ea1bee2940a26c28a4ef18425e12182cec9ca40f7dcc829eb885193a9ea7cb10cf9b10e4c27d62ef SHA512 544abdd3cb7b19076ab96365c63dc521b3658420472d7afd83ea4d199bf9399652bae7a1945dcdc89262902b3060df75984f573cafe69ef2dfdb2d9cd2e32173
-DIST firefox-90.0.2-nn-NO.xpi 543785 BLAKE2B 851daaa399a7e15fb795365c3e81ba09e6ffffae19968c18b686e74f92cb7d8fcc84fce0383e791a59ac001790123c00791a5a763ab3e601bfdb7467f5928c47 SHA512 59ca8671c752e5a0d399166f8a4ce52cf20d158358d65810e85498bb00982a90a5fff86382f155d63f2060447d9e9119773bed41f389a88341d3034f10e4cf7a
-DIST firefox-90.0.2-oc.xpi 565026 BLAKE2B 63786a9a4c8a11828ca2e00d5eb718d9ed5171f1f5ec8554002d966884d5d2c7cd14ad89286537bf93b1e79255df5f191b9e9a7ba4fe238d6d083092706a4bfa SHA512 2bccaece0b3a0c0e8e3d9bc978c909fadae0d032a8a2e4df9778580cac0c60efb6228534ed8f1629281330e0532b0ded70118e9456995e6d43d9970cf41d4c68
-DIST firefox-90.0.2-pa-IN.xpi 612507 BLAKE2B 03d21a09f80ff1b4a7e6f5fcdad46036fb8c91f1eb46d04b7e7ea8bd84888a94e05a3b49004d1cd8b4d2b711287beea6f0c4a3dc2f8cebd772d6f5ccaa896e0f SHA512 da912c4ee934f2d44714ea31c139c1c794949466281a377c7fcfc314c6eac78fd85d5e795b11d8c24a131442c125b80fffc4c173b8e7fb08064db75bd3480cdd
-DIST firefox-90.0.2-pl.xpi 568488 BLAKE2B c9056f7a8569d435781e3a17983fbd7889ee2e87acbae27bc79d78cb129c08da9b3d623d746cedb12282f8668fad1f5929050bbb5a1cc066358147d5b74ec4fe SHA512 bcbfe1b6975ec1ae940b08be4f45d7f04f4f30a80536e1cf912fddd6cb899d4aceb470e8dea8424bc0cc36435d75a8e865ba91f04ae87b293f6119e9cbd6f7e8
-DIST firefox-90.0.2-pt-BR.xpi 554982 BLAKE2B fcc2d465fd7f5a15ea861e5c1150888a308851b5fe0cb62847a5c6ef83d059ed5c80c1cd5720665525f17d3fad512b7fdbbd82f28a206df2a5224e9e3ff3cc9a SHA512 6d1e85376bfeb12558617f710671c31473707d738d839e78e107e93711b80c975191210dc293f7837795ce8d2e0acfeb9af09796ecf491a701adf932a78b9ab6
-DIST firefox-90.0.2-pt-PT.xpi 558862 BLAKE2B acec5024cc929b4e29e624b00db49d108535e2d270967c1b60298badbfb5f424a133da648c995fb00afc828fb03389af9e2a65d3fd57fd7aad038283109996bd SHA512 2fafd35e5c0106f9a3bfe54f032e826a37e6b7cd98941a8ee0255bf56116b1d65bb31fce8f711f8f7d1431d0b97bbb94f53c5ec3910864fbcf6e8e774f70e0cf
-DIST firefox-90.0.2-rm.xpi 549899 BLAKE2B 9df12c0b8c193e33ba5822f909e9a1c91594f15baace3bb146b3e69ea93a526a37ff2ae72f65e4acf094ed08ea81b5f7541853f60dd4c819944b081dbcf89c83 SHA512 04858971ce69fd2d219a3d0ba97a5d72a5af88b6725f66aab79a8806a192cd6c6f4f17d0e5804abb937aac921e40a9494cdf41badc5ce6a96ec1d64ddf3d6470
-DIST firefox-90.0.2-ro.xpi 548131 BLAKE2B e6a19832c5252abdfb07a74374cf8604d0357e025d9093f9005c7ad252d162a99eb9cea38bb10f3a1554095747b8e7a3f950174f60fa219a9561ba9b861672a2 SHA512 9d65785acac5a8767960744a569aaf4bd9aace691376771415e6de9b6a3f392c70c406cd9837d7c6504931306132c0aa884dca83d785ea6fc66afe8cd7b4df49
-DIST firefox-90.0.2-ru.xpi 641994 BLAKE2B 9124781768996090200198864e0b24ca72d10c36e371b9631fc03a3a336a2a2cbd8a227ed12f8d3282c14b06b7a31efaad98f185b65cf29f602d8b958c695395 SHA512 8455deef343028d99810c01b3dcddff85bbcd31307dfd0aa461b0b66b194eea2d915be1abac7902b10bfa18e09bd16880c3b22f3e78a7bc62a7bc580c9e6b89f
-DIST firefox-90.0.2-si.xpi 497038 BLAKE2B 1b5bd85f054bdac7d3bad8e64f3a9d8fe2ca2912cf0231ec92213c9ab80f68bcf48109567115a8e6b5ec02ee5bff759a1a3a44496e19045da6871045ee392027 SHA512 6c1712c1f282ce5ff842aa39203f4fee5aa38df79c49f203dab0c3269b2b43c7d1a350da76d435de7b995fed1559784192137bb8b703ab08eea652481142917a
-DIST firefox-90.0.2-sk.xpi 578642 BLAKE2B 30fb46e4287edd81e32625926e3b8e510d6f4faa84247e4ce4646078c9e7c407e275a3e35473d530c2c425c351096e867ae1e88422231afb2729287cf52737c5 SHA512 742afc3b57cec29e12f546acbffc50dc34259655b934b7edeb0a431fad9f69a76891f4a3d504bd68325bc11af8eb090931f9c681041f26b4dafd330388b73dc9
-DIST firefox-90.0.2-sl.xpi 548456 BLAKE2B 7c47551255551b2fcab86fc8a0a75d7b3a86f1ddd17ca0dce53945b18290191f221b3230bfd8063573e55f42be9f6204583db1d2c960e0c3cc4db5aa569594d4 SHA512 85391db88fb1b87836a9509abd8b635562280b79ec6a501b7fe0a5da685028e5331d77168307a3cf395dd314cfeb61bc68405ae46ae70e6a6d724d6f46a1c73a
-DIST firefox-90.0.2-son.xpi 428012 BLAKE2B 0c1d466b53f148b315e4b4e1a621e4b0dac3f8ed789514a335940f8d1a48d5be9df072e7baa3b6c0ee79446834f2606ae4420cf8121c5423cb6b5a9467eb12ca SHA512 cbd2db587f7b2e94bb888d0649754c2a8f9b423f7ad88577cb629e5b4ea2a7ad203ce755003a3ccb2a6551910617bd4f62c8bef84775873cec7410f39c3bd1e2
-DIST firefox-90.0.2-sq.xpi 568627 BLAKE2B cd6dab95c8ae6f597ac62ca649e8037624a1c91768587d574eb5762bde10ef58e6c23d8ce5da9d5731a009c65d9fc901f602db435b8986c2b9f9bd8ce53d0d0b SHA512 66e7251f67f43340a8f9df2a45748032e8b859057993eb834cafc663146b594e25d54af81dcbdcf402b05a84512198f3f50205c73a45da9f4aab738aa03e08f8
-DIST firefox-90.0.2-sr.xpi 603101 BLAKE2B ef378fac2d8a5ba7df6753620a4bb0b28c9cd53861f4f15001707fd1517942c1e40e8911d10e830808490abcd131f9d7c36f8636d4f647a9af1750be0b192e58 SHA512 e7c5767d77ef0f705aa1d1c567bed89fc2b4da24d669faba9d60beb0bd12d9f8b45ebe0b0027d84e8194fa1000e63bd10a419b649e8e3c47eb045b4d1d220f40
-DIST firefox-90.0.2-sv-SE.xpi 552226 BLAKE2B 5114b1443f8ed57b05ad9bab185ae3fd4831f6c0bc434401721cc11bb5fc11e5e42a09b8da76d8f2a280dadfd5af6bfdd18081b43c3c17915dee34d1e506e102 SHA512 6986de8362530f0db5903d277f70188ff7e7e53e41c44c1f01ceac640b53262dd8bf92c9c967d8e33ce7c31cb39d9089c7d493ea6c28a9907c1ba67795d2607a
-DIST firefox-90.0.2-ta.xpi 526631 BLAKE2B d4b8bbf41992fbbaba840bfb19d62801a8b6d3921fc5c92379ce5baad6d5a45f7b730250cad9e90ee41220b7fc7ab3f360c0aa5b609cad2660965e69065ab6b3 SHA512 d88eb96df7bff317df242a8eec99140eae0eb121e1ed6ffa9242a9b540064666c0db9af36a4fa729e23bfd8fab9abbd32a2c5c3ff85b6ad2723be8da6ccfa956
-DIST firefox-90.0.2-te.xpi 568744 BLAKE2B 401da427b76f0c455aa880ef64721a8bc8d3ad25093cd67b48d4d37a65bef7aa6c02db37c94bbd7190ad036a49255351756f12f7c7bfb3894bdd8566cd4b63a5 SHA512 4388b917725a32522c0c50e72a4ff2e96eb61a4514bc6311adf8b99f386691720c78168007661790698d1aa14bdda9e28e0a24d35995460ad0f3ba642e8a20e8
-DIST firefox-90.0.2-th.xpi 621169 BLAKE2B 20bc114e791056e866ca87fa717270afec022ece33cf3568f445f460c690e5d98aaeb409744298d94b17b2655f6ea39165c0b4d2de7b1b87d94691e832f43b5e SHA512 b775f9b6235dd154a7f26ff194ea6de858c5c8d98698afe9eb2173e3ff388726572583c9f4b3fc4c762e244751c623151baaf0effd8a12056ecde7236e3ce0c7
-DIST firefox-90.0.2-tl.xpi 533288 BLAKE2B 9d2b4fe2251c08621b0fccc7492d8dd9879a80cccf64e7096e97e3125f5dbc06ea82e57fa52ef975c2da28d4226bd8a3cf77860140b3f5eb0055b476326701f7 SHA512 eb47c4a62a2b51131d0da056ac6ade774f59e8610fced36fad3cb64fa661c1eafa8e6fa8e6b53508ebc6a190cb45c68e17485310c215b96af2938a588452e57e
-DIST firefox-90.0.2-tr.xpi 564703 BLAKE2B f70afbf4ffb27efa5ed52cd102449a9a853afbe16271b431739e456f81a5603ba29b8faf8de16978c0f9dc41d554c2b4f5cbf7c74e454e8bed1d46639babed7e SHA512 8242f1173f9e3f3c596591bb6d14801d72870123619148087fca33e5ac7d74b52850c5ba772727a2c831009d36d975c0f3826bcc01846042f21531b0f7ddc8e4
-DIST firefox-90.0.2-trs.xpi 506694 BLAKE2B 00fb05e468dfa0e3c1ba6e572189be68118a45e17d9a5b929821b0bf063bbf114935f9ffb2fa12ff13ab3e0050de62f6c893b324d29df8922096bbe1f609042c SHA512 f174dcadfbf38d413040543bff026ff940448fb39337379cbd15c4254b12115329c682618d6d62850c62ae0b9607a83bf5182b0b16ddeeb6109605ea10fd277d
-DIST firefox-90.0.2-uk.xpi 635684 BLAKE2B 79f8a22184a62e25d52219fb662d8bab2e6844579b593d56ccf9036156e52111ee28219b1d6d25c8b959bba80104b560ad4679083a9a048284b780cd7e262859 SHA512 9289e74724069d8e3a881d5694a394da908b1c781df37a9bb163249a9730e157f34df91c290a6c2019980934b386da5e7037a3471117b41b08f3bd7c0e53914c
-DIST firefox-90.0.2-ur.xpi 577991 BLAKE2B 4f0cabc51071c71a1b0c88de4b699f16940136240a5d8a9f273434c4d56d69eddb4b04fbf1420bbebc85c0f00df031c15e4b21b66f19342b02e9348e0ecf3ec5 SHA512 80cab1941a57798914be843899e7c1164c28df0f293ec70efa00536221c3cb49a72ce327595085747367220bf399f681f1066018c7530b14bb42cc6fd0ce340c
-DIST firefox-90.0.2-uz.xpi 483022 BLAKE2B a125d2b044afff77a72e426ac1554465907a306139c1b602502d2ca77c03eb9768bbc3f90c3c2cc445d93d57fda97d164209a235e92bb7b606e4c6c9e5746ca0 SHA512 b799b862fb047ef0c48b351c8a7b42bf372dc6785beceb977ff4aac6933e3958f972706af77a74464a105d10a6ffba8be3cac5d9e1813575e04852af2800845c
-DIST firefox-90.0.2-vi.xpi 586903 BLAKE2B f1b143163e443d76a213e7c4aa57a5375adf809f9a8d2c246d036be9d67ab7678e1eaddf27a0c386935327bc44e4e21df1716c0f3dc2ea24a50b1077e31dcbc7 SHA512 3bb4186633e2b353266ac17fbd5277c4befe544e966d3d2d7312743966ee1f5407404f94542f25a3242521616a744108703d115a761a849832c9b0697b0bc406
-DIST firefox-90.0.2-xh.xpi 430182 BLAKE2B d849e34655c8b50abb2ce4d2197cdf8761b27129fe8fedfdaef04221ecd0300ac8a8ae998b07a39d21bf3a3187693e818846c92da0b5e7e3eeda522e536f86e9 SHA512 5bd4f80060e5b75f56b3a02489717f58bc39a33785c08bf3e308131f690437ab072860e3cc9cacc00eaa0f58da9cdf02491d75b31909f1d8f8423c1378d60ac6
-DIST firefox-90.0.2-zh-CN.xpi 588311 BLAKE2B 6656456291738d7b7651e14558a288eec053c1815fec33826e6db4c36058007d9131fb2c2847fda57f8ac75d8b5da9e7c0334db6c9cda0043c8bcb2a84db92c1 SHA512 6ee44936371e07a21903565bdacffb593a4a4fd64413bdc1f6998cb406afa11d934eea20e5ad5117468750d3eca53e80aa6afd9ece1c63ad4eae59a459a3b0c5
-DIST firefox-90.0.2-zh-TW.xpi 588723 BLAKE2B 295e5ebb3f810f1ab8b66f301ee5fcd67d147cc640daabbb12e481baf835a439992fc5e1d1195bcd8b28e91336281b2e94d207d77261ec1297c784fdc3fba5eb SHA512 a6b5747fc3986357f13db401dd93763f370e547e3fae61330108debd981fbc630f6af8003d6146e73cdcc948e4b79fc00614e6a257358155b3cfe0176d2e55de
-DIST firefox-91.0-ach.xpi 465289 BLAKE2B 5caa3a3103616976d61880b893e48c5d5e425b409702b8cbd327a1111e1e359fa0341894500351fe24cc73deb8e7228b009e36332642c12d3afa92f9bc79c76c SHA512 42ca4fa331f7a53171717831bc3309782f7cd91ff2a91a7d8169b04efa8896b200cb2937e4365f0413f74cac71c7c5a41085d4716beb9bf39b70f3f1993457c1
-DIST firefox-91.0-af.xpi 433157 BLAKE2B 054cf19dbe8bead4d2a88ad5e8a2c6ad21569af45a10be1dddf7d44b179017fcb5575fe26063740bdc59b6b411e5decf2658bdc266f6bcb642207abf543bd9e5 SHA512 a7d07c25cee103086992e106f1448d6a5f7b614755045e6cc8d7e165a289bc7675034dc85be171a3677739fb9d88c38b5f5cdec58f120a129a022369185f8492
-DIST firefox-91.0-an.xpi 511816 BLAKE2B 4ded8e0e43194412cd7641af85f238165a6b5a3d0d215ba913665efec8d172f940207320c75b4d38243d9a6a23d9ed9fbf01dd7ca78daf81dd7ebb480d34b396 SHA512 4edaa0cb4f24b0bf20be96f95fba5d9cacf29d47cd9f93b95c8a4314bae50901bdd4031277ac596a2a2b5077b52faccd21a73c4db1481c3501671f5c65c13922
-DIST firefox-91.0-ar.xpi 573966 BLAKE2B 0dca5dced622775462cd0a1995c2c533c0393b93755e3719780a90517d1936e044abef2bc9ae80896fad5db4333aca9649f6e0f7cdb2ee3fd8452e1e57629a4e SHA512 a8fe66283f9817e628443cacec970d817e169ec903e6cab8c360d65adaaefa86f5e511ca4336e02655c27d09f11af9bf02da0fd75c30b8f62ceefce807881aca
-DIST firefox-91.0-ast.xpi 502946 BLAKE2B 951da964221af2f004595b2ae73cea80dbd9e7941f9e3f1705c32e30eafcfd7a71d75531defe1ac04d2ae6e06f1b725dccdd85cb7b3f434fc1b8e6c02b6f1d49 SHA512 170a7f17a70671e7408454536549bb6075076edf322a1b269c2f63b89e52d8734c193aa3a5d853cbec7af45b4c944a298f55c37fa653fcb859411b89f4dfbf07
-DIST firefox-91.0-az.xpi 500890 BLAKE2B 635160c21c321ff882528882af81518a1c3201aa255b4099f7f388bd690160bec68706c9a533bd1e68b77b6ebc6c5898d09c2d1fb5d79aaa0ffeca43f8627714 SHA512 9fc084bb22205cce52c7e900729a781f516daa504a089f454e026c2f1e4bab57aaf66e467a2398a37bcd5b45c4eb17cb17073599ca2031a6fbd02b5139715f7f
-DIST firefox-91.0-be.xpi 630156 BLAKE2B 8134ec1b2f0a953c370f80f50d61141c8fda8f53cfadc717c6de7a15328952ff9c0d94b6a0b39497ead48892c24c34d615a085a3ac6c4488b6a278fd8af5db52 SHA512 78edc9ad3dba1938058ead00d24ea5c0a7fe566e42e42fdcb2c44dcc4dd05175b6660b375515e2261b9cd73f271b630db479b7dafa0566eaab083bfe4145da5b
-DIST firefox-91.0-bg.xpi 585083 BLAKE2B 4f9c2945e2d06d12d7ea87af65a3a17012f74bc1c2dcab36abff75cff295a7d1497a624d93fd17b5c8c94a776d6e0d47d9b0d66e7b6430ccfd285cd01ec96de8 SHA512 bef93bc67062febfbbcfe8e311de1f2f469a035b9a954d2cdd7af1c3c974fa49862636738b787c6ae75af0b300fc3318e31977fa080ffa44ae8f76e24c2b0108
-DIST firefox-91.0-bn.xpi 576492 BLAKE2B 5b5494475cc9b83c5648fcb947129e4d034783f5408449b4c24ea3800019fbe9351b67540783ed6e6a775059cebac645ae43de1e60a42917af2a7d3be631c3c1 SHA512 8a072652885a163ec0d52859222dc517d9c9781326e5c66749ed41cc53989a53924b55ef7c868f9181d603c5f99b342c8f88acd7fb8fcbdd50698fff85d78aef
-DIST firefox-91.0-br.xpi 534798 BLAKE2B ff332548e1d18b8542bbbc9b934b3c4bda2e98332781c2f2d7b340f2680bddf83267e91235b63b3f59d07865dc6c15fe07f17412ebd313ec1c9b4bf6750e2968 SHA512 cabfd979e9753c111af45cab45c588f760a948432c7ee0dd4b51f39084f86da9925494441ac8e28bb5983472ff594f1f00349a5ac3aa917a7cf125c3df0d04c4
-DIST firefox-91.0-bs.xpi 473109 BLAKE2B 3511606332aec32aba83e127fc720445cf93ccfe484131df1effed727daadddde779a987398d18f477745f07998c6cb81532c10c0853febba6b6af6ab55c5b6e SHA512 cef96b038b392241938d3c1b55ef28a589e900d4ce3f08b62ec16e0aa5944d7a5e91d10424707d48a65ccaf767d46da9945462d65432376b10582ae5b54c85ea
-DIST firefox-91.0-ca-valencia.xpi 543231 BLAKE2B d02783b71d9a22074cf2483c916220c73dc2a7c0d0488230dc034789a0564128cd91647922e1ce0486c57b27ac46f5d519b4718c8a78f3ef31b05558fa9d9377 SHA512 c0ba6960dcfb2242a1f37b5de636a2d4e503649db6660908b80ad9efce8e903acb46c59a7723e72a7f8656a0c443a8225166aff2a1ecc5fee56fcdfd92b31a59
-DIST firefox-91.0-ca.xpi 541002 BLAKE2B b6ff41c7f0a665bdc0ec5a31aa4bacb228967fd05ea3fe25afc3cca8b65be30bc3b9162102a881d897a9c72638ba73730a10bc119b0e4eb4eab04d4ddc033db4 SHA512 0e457a1e7740ecad698cdc3941aeef593e5418def7f75e56fb5ebd8a6159bcebbe573a32aa2058b367b1f2435dd7886f3440a041b2434b5da100acfb1a29b1f8
-DIST firefox-91.0-cak.xpi 568027 BLAKE2B 798700b46c0e9249d1a958b0d5cf112b9b59dbfa1d6d2e50c195ed158f7f1a8fa674b13407f43bfdaffc28955fdd621072802362ded7519a3c80a84a3f0bae20 SHA512 0d31367c46905f39e1ffe53833f4b23d6c4f31b6f0b6024a585573de234234a67f0b8ebdac47ea53e83bec5f36f82cf3330ee773903d00fead6b51b0990a55ff
-DIST firefox-91.0-cs.xpi 571502 BLAKE2B 9899c0b7694c4ecc90f791f7c1a4ebc5f5a39fd9ceaf2df537d00142cbd631225b7727a1b162939455f03c9fa7b2b815105cd57eb7afa9a95fbbfebc8e10726e SHA512 c0c118d39c2c52b674f1aff66c412cc9b4dfe44c93c46a0920e8dbb46458111c2bec977114438e505e157f38b8d5776af544542ef8eae589cfd0ed666e9fc3e8
-DIST firefox-91.0-cy.xpi 548299 BLAKE2B b7f2669ae8ddafbde2a47b41043e0ff003700475b2e52f58a6a7ff6287f76f8b369d420e814e383d16acec522883d90b35c1f283b7fa615337030eda2326f53c SHA512 b5cac20a52cce8c92d17982c2836ad6d13e7df1148d6d73ea9c89a8e59a734c24ee8748570badd23bbfdbaf1087a1f407305d7673cad19ab39f6e912a880d0a4
-DIST firefox-91.0-da.xpi 540526 BLAKE2B f636bfab26c458d19cf40dd923543bd6180ff41b0c2ec27d124cdb91c686c6def368f12622f226c6f452636a39ef1e61d767146ee4dab7e5c5239954b0da9d3c SHA512 23506c3ebaec29486543050bcbb4946b03f2a27b9d951c2702c785e5ad6bde34f16a4b676043a51d8addfb384d4c1c8fbccd7d49148627687fa27cb24551b197
-DIST firefox-91.0-de.xpi 560086 BLAKE2B ad0674c865a939b20272b919e941586806e6015dbfed780c75e39fdeff42e191b46cd245d433d3f4a76fb7472a2a10562747d15245b6c2d6c98cd0e3ab8b5b29 SHA512 13369fe4af14708d408f577980a98be9edba511e1fd18e5a5cb6b33a9ecb4837915853d76297b16276031ae24292510e83010bbc4c74706018c782d564e69991
-DIST firefox-91.0-dsb.xpi 572864 BLAKE2B 894cbca3eac24e94b3f0853ef274f4b7178d80825fb64db87b9be507a2ec195799e979a29be39a7a237ad953b779c0fb49981fbb3afc4359fe75e5ec5a0f1922 SHA512 d7d52841790252f97fb0f55e444d4e2d5dcb939497daebb7584444d4d69e606ab36074e022578579b125402a8a40146f0cbcf608e4ddb23860c70ecb1bdd8745
-DIST firefox-91.0-el.xpi 646570 BLAKE2B c293b47413c863655717c7534ca4d35f8ce8a10cedb9f7c62758303510710fbac2572baf700091f3b840ffe3f15592dae5b99ebbebc7afe84c3e85a50943fd35 SHA512 924e852a974cd095368413b6e70ff6fd77b9db4e8588cd6e3eb79224b16f2ac9d7bc67f8c81fc39b7b3fa000d29a5916f1e0623f57a01bb5dae8473b62e182d3
-DIST firefox-91.0-en-CA.xpi 515718 BLAKE2B cd987596e082ec2e7fb919b0891fde74e6e911e159e7aaecbd0c28da453e53fa0a5e224b1f43cc08e66c0babfd85778b69d76b914a6d3e97adb6ad5e74750658 SHA512 c7da5c36e8ff434db4065d2d8173c4cb6d367f72b28592d20919d30d361a4ec5eab8cb11da4ed214dba1daf820debeae99825f4ed958a4b674e94de019084307
-DIST firefox-91.0-en-GB.xpi 515983 BLAKE2B 74b6ba2a8e506bdad24c39c5a4eda6d146dae134f6acf76851d852a75537a667ca0312490ce2b5b113f66bb83921451518bdc8d85c682100454784c4203474ac SHA512 4bdbeec68aecf02a16963bffe80f2b7f63ff59fe3e9a12fd1ed18a9437447507ee5d8c54f53313f41dcc056cd66fe1d3a1a4091d631e45b960c1a2d141c2edfe
-DIST firefox-91.0-eo.xpi 542040 BLAKE2B 6706e2a3ac2524b4ca1f9616e28569e05ef6efcd0e88e7029da5206b1842593f206e9fb6202caab3ec4aba145ebf8152dcf0b33120d037fd4e1c95e7ae8199cb SHA512 ba5bd1c10bfc1846feced56e587bcfda9c2002f481b8b79bec1a5a501833d8f5fb2369701227da8e1b4f6518713bc7865c2b11bc62c97494c8a57e721cb3bf27
-DIST firefox-91.0-es-AR.xpi 553515 BLAKE2B f0da3acb9e615d76a6fdbdce625ba5bee2b346e2cfe827aef0d0e2a961be13019759adca530bc81ca8a9afe22083f3aa0a43c309f37869c7fee05a72f75edbc1 SHA512 930323c03bb7b610d1cfba677b6d23428ba675e6a1fa5365ea6bfac6a975e0f84537b07b5240628eb976a074738bb45abb46ed4ce9595159acc32fdf789fcd58
-DIST firefox-91.0-es-CL.xpi 552538 BLAKE2B cc9b6f067ab109423552477f93ffc219f0fc9bc45ed39ab6b4a03c997c47dec79dcf4e8f0fbc04dd961ec6c1159e099bd520a5d0f07f256ae806e6e5a4e53672 SHA512 99b42b5ec117f17b5a06b20ae4880f902dbd42fe05b5da6fd6ef734ee6720a10a9cd0993c4742e7bb6a03fb89d5695e4c0b35ec3375f5a87a952befc998a70c3
-DIST firefox-91.0-es-ES.xpi 542520 BLAKE2B 6037ac0d852618fb67ce12435bb789c31eb9565114f2c3f07395ab44f530aac2f5aab9c46b6fd499c10320012cd62c0299bd529181bf9432fcba6c3c1ed79e0d SHA512 8fd364d3ca28b0f7feddab8fac78c32c36868d3bfc05a8f986bf5c0c46dfc3e32435a1e129740014cd6af19717f14fdef32ba3688ccf79abd3b5fb3bda5f5d50
-DIST firefox-91.0-es-MX.xpi 556671 BLAKE2B 23950c4d58151a3c382dc7d2b5413cf584a25a27cce19d3cd827e8394742ef1f074a791dee5431ae2ec214cf0893ce62fe003e1aaf756989c6bdcf44ae0dc4ca SHA512 12584dcc7c7ef60ea27f0cc30b2b80fe86c29c54af36d05706cbacda15fa73e4b79ea5d3d39eab3b89a98eaf9d2d123505f73c5210c6014851d0e3706558c69f
-DIST firefox-91.0-et.xpi 494137 BLAKE2B b28f36710c19f400d2a42f3ab7fbcfad794a31a7dc2aa2ff60eab16f2664f31501145a65427900e0b3f2bef4a40f5ec62da8bd49f79325e7586e9788fa318caa SHA512 75e41f9accf57c8ee361df2391b49d3ff43159ccbfec48c9e67b9dae24012c7be78c525246b71ea78e7751f458746933f9212db7761e804556f9488c8c2e7531
-DIST firefox-91.0-eu.xpi 539054 BLAKE2B d2e88f54c308159ebc6d3da8256562b34d5b5bec6db0fc65c04a296f59bf388d5e6d82e798ac002c395114f17a0ad67142866e7cf1211e3eaef7a310de7e7ec3 SHA512 f35028251321707f2b4033f27fb4981bdf6f8ffed7ba3c616aae994c8767cb5681362b65df359133528223ef2e444f303cc3d0bf794a1d450a70a5ceb12db786
-DIST firefox-91.0-fa.xpi 561641 BLAKE2B acd8b361e2d2a4b3e18dfe7b997be1cfcdc30384012b370118e6684cbc13c0d7a4f30d7f13d370c1d3f235bfe701e830e8ce7bcffcad4fcb2ab4c513dbf3a27c SHA512 fd397bd20adc1bd89cf6ffa48186176e911a63258db7de1515de2af0f1b6a69d252a3e152c421a3ea7686a33f65e1a1e64bc5d33ba823453cd64037cee390e4c
-DIST firefox-91.0-ff.xpi 485698 BLAKE2B e4e30306a77a2c9d6540deab07f375b38c143d6c71678f032aed2c20967474eb9d822dbd63d128d4689329e6d3257d196f3165c239da111372321a1b5bc1b0f8 SHA512 9c4641708c37641311f11a93412d49dfb53809fbe349fb2fed6e4d05fe29734af1d6004f18344b40cdc3d3f72ea8106d6cb33029df38a75c9cc8d11d03d8069b
-DIST firefox-91.0-fi.xpi 539818 BLAKE2B 3a6ccea3fef665e9ccf1e58e23e7cc737499a0edf736d22f07b639f9b9c52478c18390fe7a8d4babbdc8fc06c613ea3c9d2ed10a84c63fdd1f4d333272816bf0 SHA512 043dc0af8f994de82f2ee6dd6ea944412ae0b30b2e2a1c22a5d78d065a406b35cf4d25a165996ee102b3017c9d2b310dd5c535ed5779237b70cc4d1a1885fc15
-DIST firefox-91.0-fr.xpi 564065 BLAKE2B 81f89f497651c117857e41992c37991128448a399df17add0ca93e225f1a2d1703e751cbad855da5110d2332b968403e3375e28e58452b3dbf2655214b6cc1c4 SHA512 e9b619f3a1f657d4bb05eae658d597243a5d0579db1c524637a16346f8c574d279484a79b23c691a2c04ba0b864cad64a055e13790b21fe9095a2e7e85d8bed6
-DIST firefox-91.0-fy-NL.xpi 549216 BLAKE2B 44dbcb8405a419a1a7826fb834dd7cdd2ebb75c2c979fccd978e4a8822714ea8b092834effd7a2801d8320934d5a64f3defa06560a03f658db89ca0f1dcb179f SHA512 543b769c0fcce6fb08892197e8e071bd34a6090a6909d02d1cd65d1d7245e8d307b534696985a3751efaf30b85b217aa2a6b23b3edcfb3d062afe232e7e75122
-DIST firefox-91.0-ga-IE.xpi 470708 BLAKE2B 33e16c7215da016ba38f650612758b53a4e90d441faf424d224501bcdbb27f57f69cc56dfba27da4015b364870fc7439718ea4da7b3ade860d18db8a06850651 SHA512 12ee445cf04d63206c00c472de89e0fcd289619e0e1267d43a552e831c17c6201f734f96dd179fc1ef196f3bc2029233bcab5f649f4f403bb27ac34dce8d30f2
-DIST firefox-91.0-gd.xpi 545681 BLAKE2B 70a801a71dbc71ba53a41a8d3f47ce053b67f076ccff55abcddcb00ea8fff6f5002c43542a1e5d1daa719605a542bce288bcaf3ae92bd9244c8de6efdf9b422c SHA512 b8ebbb02f6d253c763e86237c65acfdcd855678a195c6ab5160d89e696f69f3668048e082ca0002a509bb690eb9d4695195965dc734ff4377d793b615fa1710f
-DIST firefox-91.0-gl.xpi 548395 BLAKE2B 93b842d01c577fdfd551c9fa4ff0d4b4c2985fbe8bc07ff014b37e34845ebfdd32d1163149e1617e91432d5d5fc1d8a5096584cba16f2baaab7d0d77b02f248f SHA512 ff0f89c571da15a253ca312bf37073b47689c60b96c4f78742a7c7b2f5e580c33fb666dd93839e5990f1d9cc49a8ef58ac94d3b996b71374f5795548270b7632
-DIST firefox-91.0-gn.xpi 565280 BLAKE2B a39b3d17003e6f1217b2b251b21e49b91808d1c68b8632c035bc2ce6616b81219a90f539a95e148d59181a2ce40ac1564853b7eb24e6a24154e4eefe7dc9208f SHA512 63c0f6a80f0134c6541b684e24574684cad8d365a8fe4d30b46996ed2781fca9e24796def22f4a8bdf72360e080c2640c34a2bb1f02b55f802a6817a9c41ba7f
-DIST firefox-91.0-gu-IN.xpi 544528 BLAKE2B 73ce4f8b615affaf33ecf45b798d67f00aa034a467dd2d5edba1e5d97ff6dfe40de5bc13cfe6d6d1972704566459d71e3e789ce6237825c637477ca531505374 SHA512 c378380aba51d2c39b2fb074d6e5e810f7d20a5c4eccde237d880f9953dfa051e71808c9243b52adb4df1a8f80a3d35bfe96666d9822786c51d6113a25791f61
-DIST firefox-91.0-he.xpi 563141 BLAKE2B fcf2159b718fab7126a2b8cfe09cb0ba361f2138d872e3a55e81b10e30bf3349eb2988d3716569e4243bc7c0cfcbbfcef89ce60cbada0eec855a9a4e80cdf77f SHA512 9cf94c33e7fe9662237c750117601a868f6d4a65c9d7af8b67e5e03fa308c515e9b8be9fabaccbb9177c2cd55a08c1f1b94a60ef8556cac1287cab8486f3019a
-DIST firefox-91.0-hi-IN.xpi 575683 BLAKE2B 3dbca885603431e569d3e2e6db32a43da8642f832b0fcffe32928abacdc2af583d4c67095242fa7c67d912a8d53e76254c70496e51537acae7cf95be24f0205b SHA512 7e237c94a3ddb8be408a02e23251e9ed913686a6b649fbfa78fdeef3f7383e684e8636a71a61a7d5cdabd6cdfd4fdce2594ac57a552870ec51a42062bfe5bd44
-DIST firefox-91.0-hr.xpi 544093 BLAKE2B f5eda58802fed3f6b86f49d3a150df4cd8103cafd14b686435fcad064fea87cf98b70400bac75262beecafd4efe556bd1c3de72e5199212fe6e51b0ac72a1722 SHA512 42689ceb500dd877c861c0232664a4891c72eb000ecabfc7c1fcddad200913d5c70ddce30f2a1d17b0117e9ad75e4b12eb67d886c1ec21c81429eff6e52e53a6
-DIST firefox-91.0-hsb.xpi 568939 BLAKE2B c0efffd5ede68d6f77d92fe77f9efae9e95f8dfeaf7c178b71676d390ffd0f8c6f0f8d84a39abf5fe469b6452b578b81208ffff778b01ba56a90fedcebcc604b SHA512 8cbfecabdfc073f181a646cb63942b3933c555a553d6ff439bd7e7a32fca76495c999976e894074acbd3d1453a0e1360583813fccc65ed1c10332f77422720e3
-DIST firefox-91.0-hu.xpi 572762 BLAKE2B 527214a323d73161090256b10075ee4fcb70e23b8139c9199ef61fab56a38138b7ce905c1f02170aeeafc104d8de4a509a7bca78c3ea7be8e9cc20b4bcf8d565 SHA512 e12fc1a9def1b2fd2eef35f691b1e0b577d3116b08c45f2178b6b3be9ac6de5e60381f825e915cd4f88a686c39ff5b8b71710ecf433eed2a525aee0679b39132
-DIST firefox-91.0-hy-AM.xpi 599015 BLAKE2B 9483aaebb1da4e0f266948d03c6e37a3f046f8c4f983e412353bf5ee5eeeabce1e6600a1656f88375290b1bff218b3aca697f5b1b79c8fa45ea86f50f6cabac3 SHA512 a11ebb2f338352aca351b789a835db0222cbfeee6a053d21c66fc0203aa17a8280c9a7ab4b9519101259526e32f276305ce1364c3c40a49b1bdde10c96f22166
-DIST firefox-91.0-ia.xpi 538518 BLAKE2B abbdbc9dc6e443ddc5b13dd391a789641949a1ae366021ef26e8fd461bc11e8b49ea22ac5bf1658fb80792589f0ee6084e64cacc231678cef2cb36b5e83c4d2c SHA512 b06a9dbf2a7e3b23df9255d5a2760164e27494cf2c70d2b37747c25e7e9ae9ba9ecc961d290209c1cb9be0695b0785ca1f41a07568b24857d996ab430af1360c
-DIST firefox-91.0-id.xpi 533876 BLAKE2B b176f16b6dbbc9ae26ae172f5f6bbeaf8347964aa21da33916022e108b04daa0cc8701b7f3488c5074f59d47d4d87d397192a4fc75559c37462f7df580a24ba5 SHA512 a50be6a95d968befa539c568ed8c62fa6e96b8795faf8593afe24b54a4ccaf75ef71e283479793d2ca83892959f7145fb0fdff4043890b95c92ce74c2fa1885b
-DIST firefox-91.0-is.xpi 481332 BLAKE2B 4f20dcbf6673fbd03d91f384f36f6b6de5bf3f374d6121451917845cd4fb69394e88cda98ef83f9915954582f460bae6e0c0a9ff5549d22c6dbad02b02c4083d SHA512 6dc16097867d9d9744f1ce90e8df62c70f8d314299811caf1149758468ae274539754a1ac14f1a8ebaf08c801901f42589e61307959cd2d480a18e50069eed26
-DIST firefox-91.0-it.xpi 467045 BLAKE2B 475b1884e036d4606d9e4ea41dea6e8163f6e343469b83060b182026235b8ed2aa7295388621828653752c810787789d4c16fc15518507f4b54a0790526e2e59 SHA512 480500cab9415ec3f851e325d04c8e9fd90d9e19b84c04f0f66f2e12361151c70ea2fdf2ac7bbf0f219d6a2a9c25776b07f201cde624c9cf44811aa1fe65613f
-DIST firefox-91.0-ja.xpi 599317 BLAKE2B ef486f48c54e6d0f4cef51c8202dfc73072c7b860cdfbba785b25443c6737c71a73335fbb1baa516937c05a3b33098414c4adcdedd529226149466d9e9494b64 SHA512 6e3d9cb272764b53a62b7dff03cc944623be38d0fdc9b4aca91992d314e7befeddea42ab59d4aaf8a6a536531a027ade5e185c7e0557bbc955841cc257cc7fcf
-DIST firefox-91.0-ka.xpi 600143 BLAKE2B 7d0477d2aa144231546d917f31777a657a4c973acf3bccd9cc743394c0ca86634df8f4fa2bfb6a5fdc22cf9f67c95e44999df801cb2284d3f266872149bd7a43 SHA512 9a952a328f0cfe6b994ba293974fd3542cef2286dd4adf441e09c49ca236b4549785bea97890608d2cbcce32c217d6d6a81197d931d0e676b4c1023a5996fb75
-DIST firefox-91.0-kab.xpi 557817 BLAKE2B 1dd2a6d9d471a0fed234b7912e3266b4890d1954a4d9c0c39e7db28d949e0d0d3aaadde70aa4f74603f686735b738e1f31c0c05d2b764aa58693e1f4091cf756 SHA512 361d2082f6b815b02a61257161efd3ffdec63e259ac10f60f18ea5621112fbd7285434f1d8cfcce4859db6ce9c9ab78b3d2b28dc25ab144c49d5c4962781a027
-DIST firefox-91.0-kk.xpi 614347 BLAKE2B fa493a734850f1d15de1cca43b3f3ac219f03df23a349c52637646b37205e4d3549323b72094fb14fa3153f4a997eeb2d65e667271bedbe0ba58d7150a010948 SHA512 960284bd5cd82b0335eeb4c59acec2ed1cf3e2239d60329c746a99350f2a0748def8cfb6677cf6cd84fa3d96afafeddd7cd7c9e3eea1eb3017a0260af68472fd
-DIST firefox-91.0-km.xpi 544984 BLAKE2B 16b1f51f6815ed86ba2be8306e3c4701ac34170d9c9a4b44006517f9c143b47d051578f01788976ab9e0e98555b66cbbf94964c32542d0d26fe022ce5c59f25f SHA512 daf94d05f4557fa0a4c0592c047660d44a2570737d346e0b837913b2c23394098b940b8d41a6c50a49c20855cd848c391f99b8f99370885ccd5ba367dc3ba2d0
-DIST firefox-91.0-kn.xpi 508509 BLAKE2B f157df3345e91c4a0db8561b5036ac45523e449e60ce2f97cc46f637257053d5b999140d9ce9ae8d2e529b50394b7f6a875b8d913053f93872636cea6d437330 SHA512 148d10e63e3b8a04a4d524d4b079cfaee4e5bcdaeab30e1f0ecf0250b0dd22f94ee6ce0f312ba5268d6a47f4d298e70ccff8b0275d0a47431a8e0696b358e928
-DIST firefox-91.0-ko.xpi 584341 BLAKE2B cc307a9e2a59b6c5702a27334a4ba03ac3d1db17c217d781880bc071ff6e8608bd463cd6772f05ccf39e5d1c16bc0622da2f37349653e904535d37ea0638d6f8 SHA512 7c43611c2bb301fde4058be2013da705f4fce857bd5997686e8f8e5c8b23237b65ea3d7966b9713f9ee969976fe2a39f18b270b9301776aba1aa45554e7bca90
-DIST firefox-91.0-lij.xpi 481935 BLAKE2B b53684a60ca34ff8bad862cf24edf9f0d1da536693c3314fb50653a0dc6a337bb3da80d92033b60294f365a5235ac3247787dbc813265f6218299ad3760c7c6d SHA512 625bf884951645c2a4b271948cf19d9e03fd0d11682f7fdfa95efbca6a0a2a0434561df3136324577629d71ce68d48ee3cf8a249fb3f401268c196e317e8b88e
-DIST firefox-91.0-lt.xpi 567601 BLAKE2B ca2618e06647ff5a3541248d95b9b93c85f239669b75c5876bf539c0c07cb30a7923b0d3135a1417782bb3bb41b2e21688663db02abfdd9ef3c8cdfe6ed23cd5 SHA512 a7190f62eedd11625c9c1791865b463877c98bf73ac6ef3abd10a89daf85d4f966307ae04b525b761ca5c7b18c188075cbb858d4b8c8b2aa8ca871c249aef3f0
-DIST firefox-91.0-lv.xpi 473335 BLAKE2B 86097eb1233969278f691db92ecdf0d259208fc2709434f90e57a39157b75d7319b0e3fc0cd5cce534b31634e84a3fc96157d14390d829f63fc84b35d629237b SHA512 fcc238b564ce02773640222b3b8b9de44586440729f59a702437751b37c259a0d3613d3b6296cce1656f3d36ca097ea3534f26e43c040ae2e0decc2caf8cd5d6
-DIST firefox-91.0-mk.xpi 473482 BLAKE2B 5404c3c38aa07977d5b09d29ec6a0c396c08b4c706bb549a103f8c98603d8ca87c844faf82a0d40cde680c91528add2fed66081501f963d0069d2e477763b2c8 SHA512 92aa41a4acec82a0b466ae7ac57f339d0d68be8e1787107647fcc343b152f85319c2d7f15dbef3850e414a01492eeb869b733b4909ff47048e0a2c557824c7d0
-DIST firefox-91.0-mr.xpi 544857 BLAKE2B a071cb0b89fe4bb5fd9e17934ea6c81bcccf212e22d46886e71608417ddab17d6a50cf686226ca18d00d595d9a0fc01b26bd6d71f6b64c0a8de2787543691d76 SHA512 d62ffd4a68cfe3a79ea9d51bd257046e1d35318561c43bcafecbe5ced002113d9b747499d7875288c0c18f39c097dfbd563e58877985396aff023b5f66f3c75a
-DIST firefox-91.0-ms.xpi 457208 BLAKE2B 3262d30d2f35eb49ee6d0465669f6fa6aad3a39750af0b02f138a125cf0e4616aaa9387dcc3dd2bd1013a9d5d8845457f45737482cb4c414bf13aa60a9aaff1d SHA512 4a388951a188451f0eb8f6d2bb18cb7e082c0842d441781fb0fe22b22b5f3322ba3eff7e55834e7a62464d8b06c6d760fb0d2ad81d46cd38360579ba4f4173d5
-DIST firefox-91.0-my.xpi 530139 BLAKE2B b62a2cb6f9c1398d0b6b8e15ed6cb3ab332b2a12b016402eb27bccc83507a4b425ab72f448c3c6ab75b23e290116cb8b47071e6aa739786982011846a32c29bf SHA512 78f965a40ea515a6e6f1ca2af88cf8609c04210d7471524c64a2d359634668b091a06d2280c3376babb59b767cfe2b6bd63d429dba45781aa6640d890f8d3e8b
-DIST firefox-91.0-nb-NO.xpi 534995 BLAKE2B 9e7118327229f119913e8ed956bc97d9f55665e46d5233a48404428ecb2c4ecd8c289dc6883ec6e12c0a1298a25803d14515394bb1349a1b47277bf0def19a22 SHA512 b05e123b56d9f01e35c47dc74366d7580fc2535b80856407b91ef222f75eff944348588667446b59f962f2c35cceb03c72398d6c55a89deda857fc4d7fb607b8
-DIST firefox-91.0-ne-NP.xpi 486180 BLAKE2B 056bc4ddb87578f7e8608848fe2bffcfe949d1ce31cb7a037fe8e3abe6213e3593aabdd067cd196920f4dcdddf1985cf78acc5f1c737f9e1b2fdef5b28f76d4f SHA512 60c0468a0cfe5bbcaad0a6d7b91f9df7879ef8603a469f83504b464ac1356be28fe0b16e2ad81939f79455a608c7f54ffa3136e6d8bd7e73d4c96572857c7c67
-DIST firefox-91.0-nl.xpi 543377 BLAKE2B 2814dd33998f8b200e1b6104a223dde198ec710313c29253c3f00f8e1308b940dd9d82a7c1ce8a9df46f4539993f5eb2f61909de34af66b06bb105efb4aa6d22 SHA512 5c06170f33e0f73d3d87c9bee1803fcb69e89b7e258b5f003b7a45365db8511fbf2088b515224d2197c0cf16e2eeac9198b9cc3b2fc80bb9ec3bcad785d11d57
-DIST firefox-91.0-nn-NO.xpi 537549 BLAKE2B 1024e59210b1f6ecb7bd4f9087b1100ada72527bec9243ec1f4ff7e9b79a647e52e86e926c1d87a96d40854a983ec91eb8ba1ec3b8ab152bc4a4174e23cad8b2 SHA512 9f8f0729977b4c0ce78f4c4ab0561b665743d003c66c4d7af1da81cff2d1e1ec1164f97a8342e6000ec552f162bd1a75634a5298a90b9d5231f08405245a07ae
-DIST firefox-91.0-oc.xpi 559030 BLAKE2B 9bfe51ea062bed0af912c899983ad903634e0072afda8746d6b50f15c96c0544a0f6087ad1e90474e4b46759795893f016c8e25636cd75fe45f9b695db244274 SHA512 1cbe98fa36343932f06b36464b4fb4d59cf1cd85f42ec1eeba8ba0ac5c55f870a1929c65e001efcd609a7d274615ba5508512326743ab29c28322a1c13dc9b22
-DIST firefox-91.0-pa-IN.xpi 605084 BLAKE2B 4df145130801eae8f102bc97d13cf7a5401fa742d437092b29ceba218055539d7f7d7a42d6dd303c4ef8f138ff2c093b4a8767dc3a3ddd36b44b2d5e71341821 SHA512 302e58a8e055c46a02e9126033c0f2971e59f6909d33b6e0fdc44b95937ad51db8147b181e4a13d62aef075f0776f9a8059fcbd3ab70625a14a6420b261eae35
-DIST firefox-91.0-pl.xpi 562847 BLAKE2B b493355e4b22e81eda20001abf25b2faf72933a39849188dd7ddf033bb42dd95a45bb59834ccccf841e417e8b6454eacd5ddd27aabeec5df446674356b1ae601 SHA512 183b78b428e5fdab7136bf0650c41564efc813f12fea9b0b2de43a81a0f18e79c7b667be9aac8907a0ccffcdec13a4043ca61691ff658c99c47e23c46b1b0146
-DIST firefox-91.0-pt-BR.xpi 549008 BLAKE2B dc488c58d6a9aeb7cd01d0ffb6b8091749bb043e87a3a85f6606658c5e7aeb0c1d31fb98d01ddff6dabf5eb170e779538ef953b4a90a580023bea38e9d8bdaa4 SHA512 fa560ec92e6efc682f7ba53112a5459199d2f49f6a5532c8f4b98473ed1fc7345da57acfb44c81aa2d887be0aa9c3feab920957eef643d5bbe4a3e2e1b9bc379
-DIST firefox-91.0-pt-PT.xpi 552660 BLAKE2B 585bf88ac927ca885aabcff8a4f1ebe7dd5081cbcbcde45615f2aa3bc0046090ecae14edf4d20198d3741bd25a317c265072455036cfa026515313db07a13a7b SHA512 44aba25a7169225c9b6f49bbe75a49033db25a801214ce113c01cb23bef48b0676e7e16abbbbb85509c8895b55d18fee4fe9923723b97819bbacfdc25e328bd5
-DIST firefox-91.0-rm.xpi 543750 BLAKE2B dd52ee4014a32fd0139ef9c9ce6a52da5e73a005ddd9daf33ab08f2e5c4ee2de4bd3839d6ed18f35211eaf8d7be48fce9ca12d8428e69297f6aaceabc9cd1123 SHA512 340936ac955f88dba046810cb98faf97f2fd1e82fe29320bb423cff9cdaa14a56cc8b301161e73a3d6fdc799910ba0629ec440c60f2fb49b4fc162711f3923a1
-DIST firefox-91.0-ro.xpi 544861 BLAKE2B df223fa4cf02cdf9b10a318059a20af93587051b405b5564425392d9021a28eef55bac3960f9c8030fe791801918840d8a53f4f01fe410399c6d7c181750d8fb SHA512 b00c3c77238d6b6d20811fedbafc3261e69569c305894b9ef79887741bc4b922f7b4847752658e989a0c04393b73d99a52b0dbbf4c0a50ff33af0710dbf1422d
-DIST firefox-91.0-ru.xpi 635030 BLAKE2B a2e492f36079e46997228a3be1dc7c26a2128d97fde32b6119bacbc389885a197c28a7fabfd28e554dff753da3d6986d716782e8728129dbd8de31638947a6c0 SHA512 affdd9b7c04cfd358fe59978a18796d84f6488df4f16e6ccaab6b30a478a34f34fc50c9a0b84fdd44b7bf356e0b7b4a644944e7b7c6356c72d2a7901cbea34a6
-DIST firefox-91.0-si.xpi 496839 BLAKE2B aa1615830c25f27756d4742ca97da6cd752918894ad19570c03b9d18c1372f301cc4e0b5b0cbc0ba85d8f94d63dc9b0e8d4473a7efd982c021e238d929d5a5ec SHA512 60f2b66781bf1584bd5d28fe92689bf9a7c3d8b5fcecc4867ad794e109d440d099654d47baac38e030f6d24bb8be68c43b0db28e1ea35f6bf5eb48809d226990
-DIST firefox-91.0-sk.xpi 572081 BLAKE2B 5e872b8e610d44e05474c9b60e00dbf38262cfc17dc56c57b3608af616efff65f0b15c86e3ed3dcca0e9ff3de9e1575408651fe0867c65058765f68f441f6b58 SHA512 79789c47680a6f34113845add7cf8470124ab5dcdd171dea6dfdff2a8a114ea133d660be68f3551709a723feac1566635179cab48f11ba8fcfee6811a4316db3
-DIST firefox-91.0-sl.xpi 542775 BLAKE2B a0c8f588a1ecf684b5da0d592ea174dccdd471c70f7712e3d06d3190a36063bab2c42ca543fc42d24bdc7b2cc30e76a1c2fbbc2bf158ffe510f5ff2b16c3132b SHA512 37df4cf7c8cb1c7e09e0c95bd514f51979c595d2c65a36615d9a645cc31df5fbe18de2f16bac04cd0b7a479165610905968ae3ce8513f889272becea52ae90e9
-DIST firefox-91.0-son.xpi 432944 BLAKE2B e2a6a2b2e1046659f40b0e8dc85b99d2d19e19ae0670c87ebb5f60c0d799eca264912ef9be0c1125fa33f172e340f9243eddc64121858babb54cb87e3a6e5fb0 SHA512 03156f7974e940be06e2ebeb9715131009bb3d6fd2d39393e5b08c43b7a77ffa2f26bc93cd76639f3e33168adb2d6f7ed34cd57a9d8079f355a162dcad926a81
-DIST firefox-91.0-sq.xpi 562217 BLAKE2B 118e5f4f8fe7642183bbf71c1e5cfa874b923b85e9db4d429f0d5338434e9712bd6b4072f19f77c56213f81b992f3bd5b53dc63cd9c4ff5131c3c85ddf4cbfe7 SHA512 2257a1f266c8045d0323154a5d9e4cb3bd5ff2de5895871df422124fff0422aa23b4c69271301daf2f62c6dca4143c68c906188e65965a15c446e49a7db0f256
-DIST firefox-91.0-sr.xpi 596023 BLAKE2B 1cd0a25c8c549ffa2364aee8fec38adab4fd954c6c2fef55a1be2637af9a3d7385d26d346b2ef86d6e2cd72121ad44d9cec9c0675f52632231ad30ce154344fd SHA512 1736e357869d10fa43a2224242827525831bfbd663690727b2cc1df93d15429afd1f81efd73a0ef2d0ac9b278467cce6c0b60671538cf87b464ff1022302a039
-DIST firefox-91.0-sv-SE.xpi 546381 BLAKE2B 4cf1e08885cefd27ef193be88953202e9657ac88a79972d6ce7cca6ec375e738673074b5de364965e51c589a674b2f16674cb0e44879b37192652a75c97db2d4 SHA512 b42fe4ce6f43282235e5966578d227c75d36ca34358fa968a38b4b77cfef862f732a5e2740553808d3abdf666413740fe2bd5ed1490cac71273ff8f849cba235
-DIST firefox-91.0-ta.xpi 523938 BLAKE2B 84d2fe504c115eae4d9eebcaa7f5aa30a5dd0da73a178fcfbd0a6806d48454db7edb3f73e5a7740450043548fa8ac951b90307ec95565e14f91a3e3eadfdcd1c SHA512 dfbb51e925b77663d69e07c122a96eb15b7dcc9a0d9f8210cb7568dfe491cda8b7a42f8bfca20d3edad30228ef23b697b115cafd7d7df92b4b5cd149fd1a4d75
-DIST firefox-91.0-te.xpi 564760 BLAKE2B c1bdcdb64f2519074b3204c7a37815ce3022af8aaf042e49eef3a60f51c9acdb65ac0ee769127284a26b9faf85d02ab8693cf508b4bb94eade46b1b02162e44f SHA512 655bbc6e1fd8a87a596d230a0a680da43db7e86270af93e7947dd7cc32fa6cfc1d0c6d4f4a24fbb1c0f27bd6ee8cf9230262fe59a1908badc54fca071aa6e1e2
-DIST firefox-91.0-th.xpi 614160 BLAKE2B c8b4524f2d81908f32f0815775e6f6145738384ee8ed9a51557a9d5baed533572484b77a07129c70f863d5ccf2d6b9df0f7944b95ce63c8bf4f8b71b228b33a3 SHA512 76c7613d8779a0197159c6bdba0c311fad3ea624b4de944e2d0fd25e03e9385145c2097b80ffe37452a0509b780c35b27e1ccd73e87ef26398e03db56d62d18e
-DIST firefox-91.0-tl.xpi 531314 BLAKE2B 0b4f982c9b7ecf422da6c3dd14d8a92b01000b61ad0c643f7268ed39635459f9ad4aaa489484d986908d32fad5d15758c3054d6ef8b5901f087f93b2f76938bc SHA512 3df710d6fdf2ebcf20e4012055e109564e5c7b44257f8183fdbb39f0a49f2a165904f16a3e199aa5fc68c516a14e18d34806537e9c9c024b563e01e3bf8f3798
-DIST firefox-91.0-tr.xpi 558465 BLAKE2B eecb412388348299dad551aa0b154427a8033a3a72bbf0a5213125f215062e0e3f2a1e166da6eab33b024668d7fff20f15cdedce7230acb1a88cc34f5e5bbd32 SHA512 aff6632794bed53331b459a4e860547dc24433abdb2e3ffa1c20356fe2c811b0d617814c49f3e50f204c38a74503f38e6a9db02344693c7818f5b36d38dcf4fb
-DIST firefox-91.0-trs.xpi 503654 BLAKE2B bcc134641064241e938dc54de465438e28ee02b9fd14a704d6ef34b4c57842667ccb8b98a957383e797c7f9bd37750b4b0ef0993ae371c1ea050f263a29f8b2c SHA512 a2fdd43966650398273f02e0296078ceb478b90ed48f3531525e63918a607627e5651c81dcf338c29c8b0fc825f8fdef70994f2377513e0f04ff66a42174367e
-DIST firefox-91.0-uk.xpi 628573 BLAKE2B 5c5fa5b70ecc57bcb3d2871525ccffb85d6f50d526305674292e687b4cd3fbb8fbbd75f31604e43b36e011231f508d6c4cbabd281f4d0743bc253f392f755aaa SHA512 e9ab80fc640986d309fa0e938279ddba8498493bd4a779516f60e5acef62e5776fa98a802b6b68a065b57f10ae3525821191bdc73c9a674ef670d22a0de04731
-DIST firefox-91.0-ur.xpi 572682 BLAKE2B 59813662712c2a4d237ce0c8b623240fe8d19576d77eef0489655bfce728296fd6cb13a92525358a18339f54d0a97cdd4a3ddbc21a7180e8213a3ebe96b6fb58 SHA512 10a062fca9ef824159a8ad40ac111ff4d9d87cd7a5de7f2a9342159b5a2ca6adfe076940a94f58a6fb0e6d099a12c45a8c3fd2ae4d88f8f503ccee78a588a220
-DIST firefox-91.0-uz.xpi 480952 BLAKE2B 9c81c2b7e32ebfce449c44e19b823d5536c1ec08b34b6db304c639f90cb180e3a697dc1883fe173952f5ef08253c533f4fb7a00e780d033320275310f65195e5 SHA512 4533906fe6854abc703639a9260f262a1a4a53a13e90ebb8916a8a52998935102b8be2b7d04d2176d47b3efef6960f31dc860c0aa6dd727ac26d70fb2f3e31e8
-DIST firefox-91.0-vi.xpi 580502 BLAKE2B 7c6886328396a24e164fdd9fe8d61a012c09dc1cdeb26c858b16e73acce75e8bd542017c620d25f8f111b6decf36db02588b62b653a112eb7d9f4c00887a9103 SHA512 83d85d88605f20180f3d9c70e215345d5e74e4100faf589a2934d4eaf6d46b15ab5139a8bacbfa7373fa45d9bac77cd111793420c725c1a67cd5da2babfaf0cc
-DIST firefox-91.0-xh.xpi 435046 BLAKE2B 39d8bbf73f7360899ff2e3e17ea76aa23096b090d1941c69df45b58e4ccd32ea44fb8ac6f7bc73e7ca61871aca9f94f2b815a5484c3e46adaae36afe02ae82fb SHA512 68ea88ed0116d662f08f7ce581cd3f14d3685e7a41b1fc0cf104204f09750e5b1b6e3f7884385498888b419091b991907f2fe159465e00313dcc4e69511b9a4d
-DIST firefox-91.0-zh-CN.xpi 581935 BLAKE2B 346ca8b1d7d99c31544e58e679988f0b53277c0d59dcc6be642a5fac863c1691c1e1ec66b815f7644383b907d04eb3481c850d0c5919dbabd159475cce1de831 SHA512 0456290e208fa190ea6e0a9f07a86c0ddbfbbfbcda7fe5c2d292bc6718de38838b30ad9412b8d26e57f56d7d42be76122a6d6b409d0c2ee298f738bbe3b98d4c
-DIST firefox-91.0-zh-TW.xpi 582117 BLAKE2B 0f39cab747215ec9ab3e3da043e8650ab654f5dcaf8c26e7f96b373f6fa101a7c8960f3873fb5cadaae879170dcf27d67d06791b7e25732964c3f5f830e7e137 SHA512 5e504c968fae303241b8ba475f030fd228d19deeb54df80520e32dfd005b626dc6fcc4dfc4c906d614b8e747094d474734d0a9c47baabd5121271f8063df4985
 DIST firefox-91.0.1-ach.xpi 465287 BLAKE2B 2d45551393247fda1a64aa05e8491c52e476c033a457cdd8872b3cab88028692f360b2310174116b93437e6523d86c19150045187f1392fa2973cab0f9141a8f SHA512 560cf7a68510d55909a15524af17b3e49c3c6acd84d61c509545ca0661733779b563699952f07d8efd6becd569b204f7114aa7434ff8889184f5c2f0a71d4d07
 DIST firefox-91.0.1-af.xpi 433153 BLAKE2B d7b7210a9dbe92e2e73493539e3245f265247a6a754461c96e3a29fcfdfc5714ddfb83025b08d862d76bd19fab03fbb9892665fc8987033a406cd6e0ed0be6d5 SHA512 65ac9bc81d3676b1dd7871596fb8ee3361bc1e6204571319adc2691c8969234c7c0a66c00a52244e1ff8bbf213f38ae4ea9c85a181d3c92039cfc47902305e8f
 DIST firefox-91.0.1-an.xpi 511815 BLAKE2B 286a6e19f1a882942f187204a2923ec7e8ec38eded208acb0fe01b0c0f83f3b9cb30dc9bfe622d5a66ef327732ad8aebd415177716133abb074e8e85c1d400a2 SHA512 df6c249c5f0f572c4d128ff62e4c49d13dc6c2e4e3d450f290f4f9e55c18da2d1ffc4d04f75359e827b7a2b0d8d242c3f3f40f9e08d64e64e2d0c27a8e1390e5
@@ -387,16 +197,108 @@ DIST firefox-91.0.1-vi.xpi 580493 BLAKE2B 655227fb4bc61ecf7214ed185c6ff62cee36da
 DIST firefox-91.0.1-xh.xpi 435057 BLAKE2B 02b8cd6ccd064c43111158efc842f305b497af8338ae633844dcb0c926dde913532b1df213b0c9f420a5ad9477e6ac26cef39075c26e509a76fd1c355e6d989d SHA512 01e6af744a5f099a79b6bd2c124a4c203fc494c8f3f63fa5b685581a258d504475b29767af5368cd4b1eaa5958fdbf17ef65d618613f720dd2b3289a2b304c55
 DIST firefox-91.0.1-zh-CN.xpi 581947 BLAKE2B e536cd392e3eb452f7de9bb708974412e9e34f862fb9213917df4317f331005f29300e7a486302584a8c2e59c03088b8f4a1e3d780549e9006a62f22a495fdf3 SHA512 d2f1767782b9f9a3dd545bc3fd98c08da3fc9d4809c5eaed088518e0fb766813acfb498442486768aa90f0ecc9ed9e787b805a268c6a03a8ec381493ed694e4a
 DIST firefox-91.0.1-zh-TW.xpi 582122 BLAKE2B 1cc357c92eb9a3ea42fc1c30e9aec966b6368a6c0ca60fa41415ff561d86cfb7e5bfaecbc69bc99b2e0ea8d93f0026c0c48b41b0fe06df5b784eb76bdf25583e SHA512 9927feb39e7bf343414065d0ed8e308e9c754c393d59d0ad7fdc8a743d20d7eeb315b1fd0a8f5e004968d99ce2fb1cac3344ac973ecb31257ad8052612cd0f73
+DIST firefox-91.0.2-ach.xpi 465284 BLAKE2B 1827b3beb7ee055d363f3d993a02a732363e0a8f37cf9ca15fd97f0702779a7a1a2ff4a7594b3c85034db42f3b50124b4cdf1e2b38e0fb01f1a7ee16f83f00e5 SHA512 6f9016adcce981dfe122282e5806ea690e615af4c2542f996813eeeea81bea81ec87eac38f12baf9e0daad19af546a65753fdedc1cb715ee93ab30250dd8ba78
+DIST firefox-91.0.2-af.xpi 433156 BLAKE2B ea445ac7e7b0080ee0b454a6839ef378359945b9aa6fe9c8e99accb8343982127cb42d64a7ffc1f24edd5f0358d3eedfbc58828bd1f3a37058ab41dd160db5fb SHA512 89866a7e818ecc53674b1bcebc7ef36af7b3ec8416cb8ad6b57f0ab4ad9a1445e99dd203aaa52631c5cbb9265adb9c13197abf593f0c5a4849660f40afa3e122
+DIST firefox-91.0.2-an.xpi 511823 BLAKE2B a0aee9d410bccda629ceae7cfb913519c31317bf2dae6290b36b764219154d4a7bc17dcabab0d7494b525edd374f5003f00acfada79d3efada0676a73c593963 SHA512 75a4a2ac929a629fa1392868abbdab4d3f86f94f93c15fa8f8029c84ad5c70054153a85b7fbdee47495a25efd7f829cad3992b3e87fcb950607a70fe58f1e48c
+DIST firefox-91.0.2-ar.xpi 573962 BLAKE2B 7e7cd41eacdeca1773d3bf97a15270249b4514ca3ce30bf44d2ec3ac19394f0e1eb1f0fafe991ae850bd35fbcccfadcb9a469f6af9ffae7c4fae9a8d9c3ef22b SHA512 2dca2e3828a381c08e48f5cf05449a62ce41d2ee5e86e5d74c6f128458e2ef7f748d8e93486dc40b942330e2481dc836bec38caaa957d18b512a3b48421f914b
+DIST firefox-91.0.2-ast.xpi 502953 BLAKE2B 129f446a8d4d7d704423426a22c2fc0fab4c11bab737f1395a8bb3f9b0b9071942e4d076e98fefd487f673da7f5fc7a7debd701764559132be8dcefc33328b5d SHA512 8af2bf2347ee42566c9e36872890212a08ec66c4b1d6eac97d43212d0b05617e5fdf8504eee6087344b4b4cff05b1b1e23b1433fa5fcfb9df6df7c0b8c57259e
+DIST firefox-91.0.2-az.xpi 500888 BLAKE2B cfaf3f2be8c9c2a99c68c91ecb05e2526e0caf6e80bf955708d6c6f35e0eb789ed8865e2c0343830865a201defb42ae1a09df8895bd38a1bc92c25e573212e51 SHA512 2e25186f03ced1a2c817dc05bef502b5eb62a46e58a42ef31f5fc8b1a6747e57bd2c132987e08aa4aea30745130b818c2acee0a685fb506d51964f6ff9348823
+DIST firefox-91.0.2-be.xpi 630158 BLAKE2B b01908e7234c26ce6bd1093639e6ffb9f184fe6bc9b3389bc70a405109dca768f98135e22989e7e071d6e49a61d9e5102d14785073cec6f458eabcfe54c1ac33 SHA512 589dd1b63468f2f6e08b769680f8217f21d73a2b16257eedbd5f100e9d17591476a7572a04e89c3a14e9d63662fd62ef9c56e9d756c2172461af015ea7bef0ab
+DIST firefox-91.0.2-bg.xpi 585089 BLAKE2B 6759da23207731cfc0ea46a14f64863c97aa8e1d4f030664819407a91c37b458b64a3fd6902f005c070aba5bb9c42f7dfd4f5752bde00277147670b728b647f8 SHA512 945b973fe302fbb7344e6152ae5680927ae4df45f9b836b79e9de89f0739a162a41565517db8591abe09762564ed07709c3b7175d89803df27b54c9308e5da2b
+DIST firefox-91.0.2-bn.xpi 576482 BLAKE2B b3c12715a82cad54cd607c3ba4d97f8863850ba52bfd48395376f48d11b7fb2854de003a4c497cc5af06fee31e52d9e5ebf150f7c28085b0e5033a65ab69d7d7 SHA512 899f6c151b0133d18516247549651fc0a008d2f8a5a329976201f5d60192d3715907c56848933c3f03883bbac86b1e933414379bcf207ec4d3c9ed1639e3d745
+DIST firefox-91.0.2-br.xpi 534790 BLAKE2B 66f419ae8b34b69c76e192f603d7b68aea2e9883fc74e1f24cfc010a5465cd3750310b29d06d674d861d634117efcb09f18e9fb186c12131a80db00a5bd95540 SHA512 6f97876cfa656d181c819beae2ec0d08bb13901538df0e5cfa27abafcfe43660b49f1db9e4dea3ac2da38f3a7f5925341449ca50c71cfffdf24aed9e93a94120
+DIST firefox-91.0.2-bs.xpi 473101 BLAKE2B 6228b43cfb0397be9d0303b84c17338a338e4c84ee05e578714b9212812066d7209ca11bc80ab16308a53372b202fe60fccb7792e520e14a0c3e4d2edf9ce342 SHA512 d3cd6bb28e5adc4a8effa3907c4843813d583a2d4a04c5ba1371c9b9cd086c38158b7aa8baf2b91c1f917b60b79fc2214bc1b956cc12996ba1d0c58356d6b261
+DIST firefox-91.0.2-ca-valencia.xpi 543235 BLAKE2B 80fc2be3f773136a409cc231321b21db4a7fcf1c927d460c4c10cd47fb14bffb9915a3d792d49646ea1798f164a7a00c994aacd376cc11c2d7634fefcfbd88d8 SHA512 e0a6e8d39d11caff521aad0fed3416a16097190b102db40970c63070eac4723831a428425abf9d6a1c4fb47ee18ef63cc3a7ef829938b528646f3ac14a46edf1
+DIST firefox-91.0.2-ca.xpi 541005 BLAKE2B 411c713142c91d73902d09667a2ee058a8f13c2ce7dd2655655a63e349176f15d998625a63b1b37e497bc5ef053ee5165f8a4552738ea1b4d92f541e955d68c7 SHA512 782878ed186ddc0e64aaed91c66f02d4387b2493f81357d73e6a7c2f2f5612929f6d2fc955b927dd7d12ef5e18f9890589691ea834ce6232aa60474b11e66d75
+DIST firefox-91.0.2-cak.xpi 568042 BLAKE2B 24f066877199909cbc65ae213e53f53f9393347d8ed16c09c54e9dd2e344715ee004d273e8a8720b60f71f993a93b986d0db80434e66ad9aeb7d998553ef5491 SHA512 14be651ab88b951617ae1f60b35ab61f4241268d261d9cbe2604e11bf2c4d0a8ccbc16a4ef980d88865d84112c4ff1577e7002b57a4af3cc1d90ccbf0693eb21
+DIST firefox-91.0.2-cs.xpi 571515 BLAKE2B ec03024b6e69364913f952b4ba56b7c4695f5067c7bb1115d7c27b1cf8f04abc7bc5ed023c3c5a6c673ee99356bff23af160a5ae642e741cb2b98b637fc9ed99 SHA512 b47773ce2f19f5e44de7ba59d27b01a533641d54b0354a2d0c1b4e6455f9ad9b8485f72dd03d2081d7780c2221c154b117b0f14e6669b2774fb11b19e1fd798b
+DIST firefox-91.0.2-cy.xpi 548289 BLAKE2B b0513e5f5eff768ad4061125a6de882a5046235115b115ec6da6e9d308b844a51482a189225c50906f675b7e47fa51cccd1028385ed69be809cc5ec22ef19ec7 SHA512 8eab5988490e1a0f396290f399ac47347bc269ea6ba6676a9e1ed6c52f9beb494687e1ee60eb1eb1b1a280be551c7c784a47925ce2652b4cac1cccd3712e14e2
+DIST firefox-91.0.2-da.xpi 540522 BLAKE2B 5c33f02e1940e8dbef839967276c9fe8fcc8011f814790825433c6960bb35e9d624af4c35d615516e43f5d65a2320266612d10516ff0d209ec49396f6154cd28 SHA512 50b8d81b568e1c29cabd304427ade67fae622d1a1af589773c148c9c2e45651baaba6b9707bbd54b1f103cbefcdd476ec5623773a9fb44fcb8c0a4377661e001
+DIST firefox-91.0.2-de.xpi 560089 BLAKE2B 47647865fa91e22e601b52ae2bcc8f2ac91619307551ef3dd260e258f7657d8ee164664eda40354a30e8c50be94402dca56b5ef9c53a2bc463c390130c8fd46b SHA512 8267c893cebec1cb3198045bbc5ec2cea821abbe8ade3488eec27b1d599d74de87df4396b686b509866f850dc3b996a0e665f8ff1e3b510f08fd8d7a9035b39d
+DIST firefox-91.0.2-dsb.xpi 572860 BLAKE2B 49debcc4b22fc28e7bd2b951b59898f4d60070dffb50f851759161731dabed3b8750424cb5d5517c9f71ef7c203b1f26ff370dcc0fdeae11fdb2a9606be4571b SHA512 bc045c295d4a33507a4037003e3dc32cd632d88c31c89b10543e5ee57b733659bee5ebcb45629fadf79ace5c6a47fc3fd9cc06aa2e75ac43edc3d32bcd67fe0f
+DIST firefox-91.0.2-el.xpi 646568 BLAKE2B 50a0fe00c2b14556f39d501232593289585213e66b65897f630e6688e1a3ab4b447ccd1634672148370c325712510e7dad884872360e8d8744db8901b51af849 SHA512 0e62e049b3a51ad1f2a2a95fa5ac62996a3e56a69a41355bc74e6af9ce487ec98e89a15237b351878c9a90f34f0ca5ce14d6d27659f432eafd11f960b4fa21a3
+DIST firefox-91.0.2-en-CA.xpi 515736 BLAKE2B f0de88e7c171910287fe40048c3c4e70c65856e6c7d6af06ff92edf4b0ff6600678f0f51164bb59b2315187200783068c0b28436d50004e64b944dc46c086684 SHA512 6b9b6a4fe029df7a283d78237b23f69bb57e84ff60055843dc422795dbec4fe92a396344c0be2467be7764d30f19d993c4af01e6935da688ad503090714ca610
+DIST firefox-91.0.2-en-GB.xpi 515982 BLAKE2B 034e89bbc4419c77913370b19f587b437588aa7f9ec27a84aeba27887ce2e31e967d695d67ecb725b31ac0d84e3fb56eb34491927cb4604bec658883a55f6a47 SHA512 fee033b59fb4305a373a902519537ef3293c74ad5ecc5016ce499bf845400d34e7ae5915ff5f95a3384f5eda20ddee97578f9c1d8c7f055936c4800e5341bfbc
+DIST firefox-91.0.2-eo.xpi 542048 BLAKE2B 374f51c5979d382e73c0bc4cbe7e4ea66112b4cea907f71cb140515632852a686ff0f3a1febd0f74e4c2c536977e7aec0c0eff43f33fe61ebaf3aa96238dc0c1 SHA512 cc0049d2b4b90833a66affb778a3481c1de0816bda7eb150616562c43fca9095d2d5704cc4c9edf346f29e30471c83848d15500a319caea5b04f7df8c0461708
+DIST firefox-91.0.2-es-AR.xpi 553517 BLAKE2B 311b2b0e5f4c0704b2bb993bd9da749b84c4780fe0b4dbfd960c11f6c0e33ac5b74bd7d88bf0e8a993019f52e093e5b5915d6a05660a655fd189363415939730 SHA512 792532867883d33fc234a204291c9966b06870db3d15d8710beba6be7892ad5d7ab0141191390372b44042f9ab6a3ef81c113ab7a6a675306fbdaffd2b3378e6
+DIST firefox-91.0.2-es-CL.xpi 552534 BLAKE2B 48891168c9de04fc35ee63cba20c0f0c03ae967e389a5cfdd6f6984663ccedd28d686f84d8ec4880b41938a5e64833c635c51b9b63c247f340aacc010beb2aea SHA512 e774fdbdab10bdaa97d81a8e05963b60921143aac2149cc03aacd0ad8b89689882617ad3052b78286300a2d8c44fb549577cc84d78048e725a7ecc1a831470e4
+DIST firefox-91.0.2-es-ES.xpi 542522 BLAKE2B 62d28273362e360317562939cfead517c5da7fe2d38b0e13123992e67dafe5ed4c06a5c426a28192719bbe6aee6cc59fc6d8e36bea10f8e544ec35e12c62b0ee SHA512 c50e56de633f981f0e8e5fb0c82f5ea0e347d71434bd467aa56c131a01d605b44f955e6cfffddd0e9a7a12fef98d811830d032aef2ede7a3b8576ae164e8ccdf
+DIST firefox-91.0.2-es-MX.xpi 556676 BLAKE2B ed87e4b73f9827a31c4b257c797f5b117d37f436ad7876f6aea71052ed858b700f535597372a49db9297bf51c8cb2c3a053661642fdbc228beb85f63d6542c65 SHA512 e07113691b8fc1a6b798dd8327f95d725f635fac7e198fde00f833528a073c69eab6b88c7e1d4c50340475c7fe2c1416498ca243cc6843bd93da8ef1342db95f
+DIST firefox-91.0.2-et.xpi 494142 BLAKE2B 4e8ace24cde2baf4826334e0fb7ae7209893bace1981f994fe3dd1c9b1cb4e7384eaa68db7974a8dfe0db2cba6ee468268f0852f47db81b975b02cd09c77185e SHA512 1f53ae61a22fe59935b7b7be506f466909e27ea3a541bcf36174ceea89bce56fd35b15372c7adecb92173e87ca0706c1bd39011fea40c136768410d9c2d49d8f
+DIST firefox-91.0.2-eu.xpi 539046 BLAKE2B 93cfe5c88109054e09fb0605d998bc4ebe9cde572332ed6fd8cef517e5afc50596175a08cbd041dceaa056c5a419cd494e6a75a2d19c54603b9d48be5b357424 SHA512 61bfe155b5abbcf15739576928e2f4f84f4898911fb862d2d51d45d4648d0f5ebfc7fab0770f64b295dbf604d6772883884d3f908dfeffbf6438f44ea1078f63
+DIST firefox-91.0.2-fa.xpi 561638 BLAKE2B f277a445a109761dea17a8601b62c1d03a53855d46ba17c5129aa5732695663499ae86ca279a1581db2bde6ee1b8dbec09506abb60ea8c39dd4550bdf735af8f SHA512 c0821849b254977c6002b92f0a48020476531f6485260155ef103e4564f6628f3b097c24877cb86adfa6ab0afaa15786924e65e3f60a2284753f7ba52514eda9
+DIST firefox-91.0.2-ff.xpi 485699 BLAKE2B 1d372646848dadb64a1ea0f084e762b8174f6f815fedd265dbe0b70af07a7fc472cc32ae755b18e4b9af8257dce5bfc18f67526a997e17734b4277573684b310 SHA512 bc34242897070e8593f8024f795d18e049fedd448d0084aff7b7d4765bd4d9b9458bb692cc54eae15872ebe7d2f22a00e732f1093a7628e216d4ccca0ba4615e
+DIST firefox-91.0.2-fi.xpi 539811 BLAKE2B d09217d946f8fdcdc9dd41b4d5c5bd9d9d30a37a1e1d4cc85b37c90d5e3a7874aa58c8297c7fb10ee437f738cdf64fef338c4aa0d92733c5f2c4a9aef877e0ab SHA512 4d87dc2bcaec4b3a1d653797fb3a56a609931ce3a24ca277fe0a050d0fd7336e5ddef881e03f7c161184c857aa0d361a7b9c80258ab42bc4e9fa73d335a8d8b1
+DIST firefox-91.0.2-fr.xpi 564055 BLAKE2B 7e6538a7246179fea01b20361334a7ce429e73f6cb7537c096ee512acc77192dc0e39546956c1cdffa9b497e4d14ba41ad38c5f5b583fe42f57032356086df28 SHA512 aa25c36a732d512c4d686698f69ed1467d82c02eb4476d8117959683f7aabd1ca580019e0450c39ecc95916b9e2765c4eeb5a94774ef3ca87e047830a8756925
+DIST firefox-91.0.2-fy-NL.xpi 549221 BLAKE2B b8b836dd7fa5f4f9bc0fb5ee9620db0ad2d1606ea26f49344433fbabb85321cfe760412d02fd61c010be25bc92f8793101e341527b8770375a20adfcc3c25666 SHA512 b452811f1fabc0240141996c393d2e0bc04a6d1163aa32e9cbcd381f2d505a0cc6b4d82192dfbfeb671346e111db16bbd6bf73712ce7015a3c4fbdcf438a0b2d
+DIST firefox-91.0.2-ga-IE.xpi 470699 BLAKE2B 1da8c8d70e28dddf138b6750b6bb5b03ce95349e1108f14e395993aae0c9c2631b40742b10ff4b5763e2d5c145fc316ca2394bf14715467e4ba75b542d51f23f SHA512 2d7cafdf455cf805ddb522152238dde6261964399f60bfaacf2c6cd70e54c047ae70fd0952254d34b7b1b4f9c85162687684f5e66c7d60ee0915571b96c78c84
+DIST firefox-91.0.2-gd.xpi 545686 BLAKE2B e6c5552211ca1b07426ae79e80fe9be7fb516ad831c4bb303f0aa1bb7e3f648062d0b29c9a617ed2bed3310dc51a28889232b4c413e93c6623126ff4fdb7a075 SHA512 5ebde92fbb0697745e8b8cb4d0eb40581a2a54f18fb967a90cbe7d90bf22ab9b1a40d04f7a52f1ef96c349167a4a50ef02476a68a5bf5d9fa911893a3a90f37b
+DIST firefox-91.0.2-gl.xpi 548390 BLAKE2B cacc1630f147ede28dab1c47d1eb4442077d0126fd5e02ab06572f33004e50f43a0a7365ef863ff0b3f983041b2b915cd34ce674c56602616912516dab39adfc SHA512 644cec199ab6f9919b82b3d903cda3fa12557c9e7ac0df4e4d41e854d04f54fb98775e80d052aee6a840c1de008c83390c4402cd3a0703de1edd94ec7ec37a37
+DIST firefox-91.0.2-gn.xpi 565276 BLAKE2B 7053cd1585af3a9f755a1f09132035e5b3e39f9b293364a411028fda8382dfe9ad91970a748c52dcad35fa526ddace25e0e032032dfcf8cd2008422b54be5117 SHA512 ca0476636fded14809fbc8549305b7f5d42382f973704f04fa6bd1cdfd378ce4340046a8ffc7959caf5345a5955cab235834d7830f77717a759e9404c8b74ba2
+DIST firefox-91.0.2-gu-IN.xpi 544513 BLAKE2B 414c5705c7b9116754c7a64b9b270d5fdf08589e50993643165c61e2a0874eeec5ca11156c9dd8bb7ec2edca05ba0c476f4df10927907b3a10aeb4f4a6a4f509 SHA512 2fc8ba1bb037a70e20c3914f304aa8798fe4f7bef9814d73f21df7e4deb2abd708ec90fe8c257640d66249fb21efea3226564416d326705f10258defbd84ccfb
+DIST firefox-91.0.2-he.xpi 563140 BLAKE2B f4a9fb78602318778be27806f67afc4d638248472386dd5f1140cda9922a3d62439d06e1ebe0b19ed8adf86f256bac14ff7cd5a53e6fa82ab05b5f596813e2a1 SHA512 0100acf0f6cce50fb382ba9e70c5b95e3862779308a6f6038726914226f1948b556335aac498f2737217f0a77037af2545788515bd1ea643af37c855ad0833ca
+DIST firefox-91.0.2-hi-IN.xpi 575682 BLAKE2B b93b1cfef22c48dc1fd7c1b6cf2f6198428aabcd19a002bd60c2b17e14cfa68e93253391783c179f20a4b619cb75ce2b4b09a58228525f73c8c9376075476bfe SHA512 8f9b0d18fb1ccac2df13faba3b84151e222b717b0110f3bed4b3800848bfd165c42388e3e81a76e7bd13356cbc1a85f4b6b8676f2c0179da3847beea5c7610cb
+DIST firefox-91.0.2-hr.xpi 544093 BLAKE2B 522e7738189dfdfa741bbf6e071a2a0af759830b9ef055d6397f22a95da390e6a22d6d08e4c5cf61588d8d6decf0e986c80be0720640c56d5081f9eae373bab6 SHA512 3284e8570ed98d6d453d87fc3d0805015b5219c4dab9d5413622a5bc95ff6026811b30a6e64546b138884f9e1bcdb04144efe6efaca6666ad37eb0a89ec1ffa9
+DIST firefox-91.0.2-hsb.xpi 568931 BLAKE2B 02948484c3d21a10bb1811921fbcc9a2e1d549358ba0436d4958edf85a5f3b5580d011ffa98c154c79c2349e3dbdd04f70993e70a62aaaf3a52d0a36d94b9540 SHA512 2767920e501cba28b842bb358dadea7a9b992b7324186dd1b4e6a8f3da404aa682a5f1e23d05c3c3ba79d5bd0550ed6631c07ceb3d35ec223974e6608c778dc4
+DIST firefox-91.0.2-hu.xpi 572766 BLAKE2B 85196c0e3107768d3b50c32d12a44156bae2ad7bfecd5f3588c9fbba4d122da4d8fb09bb2e9582a7c35f19e74f8622bac6e791da022f151e37727a5841c1b6aa SHA512 15be8f755bcdbd1c3f2ddb5f5e6861bb5b5eaac2fe6590c117b48d2a3dc841356d96c1385569a54eefb4232f3e0b9552f0082e9921f5dbd62a85e71519b4552f
+DIST firefox-91.0.2-hy-AM.xpi 599014 BLAKE2B 6a08d2427f3ed840cd88575d84e862bfc46998e6c1f5c51ed975b4e7f7e2f8bff373d11b59c71fdc4da34ff16cb4ac81ee2f803effd7e8cb4095086f6c43ead0 SHA512 6d6edbb1cc88a9d4af446f7979b559ec9fa848e6c89d45f00e0cd74278f2c0863bd1f7c78710c0238fcac7dd9fa1f62e79d9ef04931bf2df94d1899eada3c913
+DIST firefox-91.0.2-ia.xpi 538523 BLAKE2B 078f874a0252b40d0817ae333d157c0f18d9b3f84da9778702ef2ff96d55bab94395cfee04ae8b292fea36f7c8f7f3e62aea63a4aa4534073525532a60107760 SHA512 526712c639ced83b42602d160d020d66a1b5381db15e3be500d121820a697c48ba961ed5b874003e1df5b819da28107f620805b630b4fccd85613229841ebe47
+DIST firefox-91.0.2-id.xpi 533874 BLAKE2B 165ddea29605321b3296ade87e8cf276fecc45848b3df036527eaacb566ec3b44ccc5a90611a4f815279e0aabb06eaaba6c8b432460bc6bed8d92bf63247b174 SHA512 333874f55731dca69937a4f43fe335c0c066af4506955af8eb3da82764c5c05394f359429ee38992c51a714c7d7e0f4427235d54c52f176865a03b291dbd0bf9
+DIST firefox-91.0.2-is.xpi 481340 BLAKE2B bb8c5840492f47ef79c763e2677fbafcfd90b3d16c54f9492958fae73c12f575265873fe310dc9010fd55a62d42c74572351a828b78edbcd479aadaacba5ff93 SHA512 d74497fab93316d556002558768bb28ca26d39198d745e9d252b6c97a46179e9a33a207d0aafca098ee83de79522d5e73d75e1fbac3c0f83ebbbacd3d2d0a7a0
+DIST firefox-91.0.2-it.xpi 467043 BLAKE2B aca3186e0e425f0532f9be8c647c44f2edb934fdebfb0197d122e921e181093ff38485bc9f9e18e32bd2d3ae68a23219def152d00d0d435b7b643832d635b595 SHA512 070fadc60b7f06591a1e9714a12f3f60be04f6fc42ed4ff8713d8755fe39c1a99345f8e9fc0bdb94a825e5cc582e7d671275946a125597f08c57152927bbddf6
+DIST firefox-91.0.2-ja.xpi 599312 BLAKE2B 4535634b3469ee7e76f465ce87cb82baaff44bc69bf9b95c7691df876df4fe91bab899c48b3bbb2b665eef8259aa83251aa3c184b0296cd431a8e6c6ff82db0e SHA512 a1e813820de9b5e44d7adb18f1451c55e62924ed769e394b9a7b38ff24c6a96e49f674402e76b53eeb43d19e597f7df9083f0158987462157f48940808d6f057
+DIST firefox-91.0.2-ka.xpi 600142 BLAKE2B e1a2ebaa905ae3432c06f448f4a2e4414caebf92148abdd52d8077784f5d6d5c63770c7c797d5bbacf206ec7f5ed6410dfc3315229f7e13f67df1b225175a434 SHA512 d99056aec02d3c62a3b6fac4d44bd7bf35edd73de32500f9dcf2ac5320d6fdaf93bf495303873dd725d80651d393786a3fce5d7eb68ca5ecfaec5be199c9f3e6
+DIST firefox-91.0.2-kab.xpi 557813 BLAKE2B bd0baf375f7318ce8f88883f52368b0d35132674ccda5905e2154b03e493db6452267069b482c290d3db005bca450c038257262207b2547872d66136a0d864a5 SHA512 3afa8920925b1c54d7b37b26056bd170e246615544bd4e3efdac9404602e4c17d6b7f019c56819f4dbd53505bee220e7edec91d85ed442fbebccdfee7130b6bd
+DIST firefox-91.0.2-kk.xpi 614348 BLAKE2B 8cca4eaea30764e7156c55c13118d5ca1d9dda845be7894fe2bcfc734ace1d967e984cafd8e1a522298032a7f1f345847d806429cce0ea157ab12566c8f70d06 SHA512 12753ddc8419b830a0e6af938399902da277ee375cb29a144e32c1a71c5c5cb314c308ed1283bffea4127b70e5dada7449f141455fd148c0fbe0d85e56a817d2
+DIST firefox-91.0.2-km.xpi 544983 BLAKE2B 648abe7d2f3c4dfab206330886bf64e9e5e6a121612ef8589bd6f9bb2ce0f74a2db5336098e9f7b15fd959bc562be7aaa6e5c957f7b601ceab0f06be9eb5e7eb SHA512 5dedbefa7d088c87c009263ad6bf11b3c739478fb993a1b94fa10fa5d0e8771fe92db7548e52618543340f7d42774faf15a9ae834011577ad6a4f45d113163d9
+DIST firefox-91.0.2-kn.xpi 508521 BLAKE2B 70d6936f6b213428e3a09c94d6cdf9ede084c9c96dc0dcf43134bf31f1bbc356cc69354c3a6e9780b5f208e6ce254f7e307d31f39d2d38660260ad374c438b5c SHA512 e9bc6fa8cb3ebc9cd5d6f289b2d7f31a8f9063cf84819cd5e56e43db7a2d864ce2fcb09cf6602b53dd6cff595f62f50caa60343efd2ebed84c0c87bcf92c838b
+DIST firefox-91.0.2-ko.xpi 584343 BLAKE2B 58a4c560788b2b8f9c7e7f577cab11c7ca34cb243685bcecab8b8a5453f8634289b61b30c8717d2487d3ba10f59bf76a09af4e156fa7cfa4c2b7b81453355638 SHA512 7fbd65d20d1f72f6ce83b8efc2d2d37515360060b2a58d0395e03eb297aa136a13f919187b29027512f7558ab489cf73d7edec344e37a91578a2c03a346d2f7c
+DIST firefox-91.0.2-lij.xpi 481930 BLAKE2B 52dbe2aa33ce053073c0c157471d5c6be9c94743ec90523687f8ce70da96c17f64a59a1cf96c78f810e86a64b3ff573b366742184f617d7e4d713b3a8c85c564 SHA512 463bfffdae4e4969fdf9e1629dc44185e4774dd786d0a072b4ad3214230f0f6c8299b129b1dee1859a626cd2233e5c0af60128651b7722fb50b7892bcc873225
+DIST firefox-91.0.2-lt.xpi 567603 BLAKE2B f073ef003588d3fe0cfee368ddcfffbae6ef0b1a233f4e0ac9637b76b4724db5cc2452373098552103523d28426e71c6ab88149f0599cf40040c057dfc61b45c SHA512 664557a9e4d05ceac2fac9d51b89a672824b83eacfe14744cbb639866ae0efdf743c6d245f5c870dc97209b015ddc9ccc2feec9b71af717355f5073fc0fdbb08
+DIST firefox-91.0.2-lv.xpi 473333 BLAKE2B f53f90bb380bf60d960c998affdcf2d250fb84da847a6904d67a54f437e0e0c522346276a3db6967d5153998ddccb1916a98ff70ea44182117d300f0ce950582 SHA512 d59618421f4c3b8dd85e8a2eabe08c3a858eb3c8a06dec84da7451c4f12bd0a1161db3b300bae138558b552ebf5bcdba18494272b08871b4d7d1d05d280c7c34
+DIST firefox-91.0.2-mk.xpi 473479 BLAKE2B 6ff5f26980802fa7049fd550e56215807dda08fbf248f77c2d4d06255bf5d7c2897b5337582276b14ce7b11692c04c442d746559ac04b5d901dd6e53307e7cc6 SHA512 f8902b73f7dc119c960bf536817c47589f7d9bf4fad73ecbbb173bded865e96beeb1eee891ce69d4cd7be0732f7f07bf5a43290d79e32acb3b1d77ece720f1cf
+DIST firefox-91.0.2-mr.xpi 544869 BLAKE2B 8063812be027d53982c5b2c52c576622c4b5ee8add2deede210c70eb3a9fa77b4b82d8f78c2277cbcfec64955a76ef7f91d290b354aa01275c6d98cd15211b6d SHA512 75a95bd65b7caefd471a171fa56ceac1dcc73e65fb62d89af71da608fc44a802d3e239546f78340e9d61335765183dad85f1593cebbcfc7418d0e467a041e3f3
+DIST firefox-91.0.2-ms.xpi 457203 BLAKE2B 459bc8db9573053491d7708cf7136fd8b25f0ee406f1058d49b46868242ab2fbfcaa00fd5dd97bba830dd4fc3d98eed944adacf7fcdc3219b35b438bc76625bb SHA512 733971750312670a2345c3724585991e33e65d17126bd699be7c115da6f814700db01411776ea25adc2ee47ade78d6f8f18f4aa0b5e301dc749de5c1c2fdff26
+DIST firefox-91.0.2-my.xpi 530145 BLAKE2B 42909546ba46ed0e12a93703cdf356407e2b1bd0296d74748fbee32415bd1c8cd647602c7c7312eff94b31ef27fcfe9fe947dbbb999c10978c06027d6f90efeb SHA512 c24deca71aeaf03d083767b37758da97c20b735973bc7373d791b7d4f2d70175bd243b4ae8b65d3fd277cdf43d65133d7c536dec6e23aa395e68547176364ef9
+DIST firefox-91.0.2-nb-NO.xpi 534986 BLAKE2B 6393d435d9bc7f6afd76def4ebb3a03efde327a3bb8a3fd84eabcb485d4fd340bd0dbd84918102ff10fb9b5e9f3a5783d2404010c448a3eab34e0fcc5084b35b SHA512 bba89b13817da879d2fbc029dd42753122ef3ead9f24163c57f6e56daba4d83c69ec117dc729a87a8d217b073e0f623007e05bb5f15c5cc579a7a0c254ed9ad4
+DIST firefox-91.0.2-ne-NP.xpi 486178 BLAKE2B 22793df48a5a2f62169a441934aa8975470f7765b32d6097b19320c3cb4e3890cf95f9b5a91e7590781e342bdf0fcf26ce4949208fb8ce89001b4d3bf3adc5db SHA512 d4b67b1fde7c386cf0df744194e72df12e0341b85678378762d15ab86d0d9d1e03d9d251705986b5cf8bc67aaed54694d719b73426a2911b0ef3d1d00b76c14d
+DIST firefox-91.0.2-nl.xpi 543375 BLAKE2B 7089b4c42afb164560e45727f655255c8f6d0c0530dcd18535524520a9b011aa145f097c0d260b5a16df007ecca58dc63c8516ec55aee2559a5217b120c03db2 SHA512 5668f48b70798f5da84951c1f95ab60ad2d7e354abdb75546684d0df2749381c68ce0d3f8e481c29aa9d7e942cf092aa03e3967cd914dd8abd5c7f8fa7ba7366
+DIST firefox-91.0.2-nn-NO.xpi 537542 BLAKE2B 9bbb693c26e3776485d816cd032ecf380f3dde7785b9994f56c06d194127993bb22624b3d5a2d9e7c300b7676f9d1e8cb9627e9929cd80bce39c030e656e6949 SHA512 dab9c2c2bdb72fcf8463d82a351746c9cafa4b3400493098d8ebbb5c611a6b0563d070e36d7cc659351c45212551e7e77af023c91e13691d88a70afaea169484
+DIST firefox-91.0.2-oc.xpi 559028 BLAKE2B 341ad88da64ac06e86cff2ff2f2b3a31e420a1529e64f0b626c0374272d123a808cf47aa30104bc3821488d1051f3020fdb5a91c5ad590069857029b39d64038 SHA512 7fee4a09dfcfdc84372faa8ade371441985d235c73e1cd0349c7ac8d280ccd5f9ac1efb86530cb5dade4face156d6299f8d14a0b3d7972a49898da56b816a5d2
+DIST firefox-91.0.2-pa-IN.xpi 605086 BLAKE2B d31232b6ab3154ca7c1b4f69308c24fd9fa7ae5e367e02d089cb8f759ee95397b504f6a94c059b6c822597fecff69703af59cec5f299fac62b97c396ad132a06 SHA512 86a98ac48c729fb308ece202dec5116732dad5b13c75a8fcb6dd4a3e7f1888f432a5aaffa0b4fcef7de409d3f5d2e6e32c4b762f0e0c2e932d5510361835d0d4
+DIST firefox-91.0.2-pl.xpi 562852 BLAKE2B 45177be1a73deba99c21c00e92607567384fd93e632803b4babd3f6d0b2d4ee7106bb3cfaa713b44efa0f667bb524c0d4b0ed14f2cf3aef2ca46869e5dcec60f SHA512 913c5fd1618e09fdcf404af08754022249ac4dc3580efc823a3ffa14876eab949b28c41ea99d291d59d0012cee5306509108ebbcfbb97cd1d3396f9510831d09
+DIST firefox-91.0.2-pt-BR.xpi 549002 BLAKE2B a12c8b2d7dd6f5228a547a79f5f6527cbce47b599076d372d87501f8b965299c538072dd1845efa52f94c579506a82129dd5623d3d66ec8f7a325aabbfa63d9b SHA512 4de795d87061b9e4e6d484efd765d2cd68b68b98dcdcd58382095d8e4d7d3051650da3a28f01b632b5eb37c4c3e5f50f0a2dda3c97c02f5dd2097d472c957de4
+DIST firefox-91.0.2-pt-PT.xpi 552653 BLAKE2B a6b625df698b8dbb2686b140b8ad89a6e547197b91d397b72ce03b27357f037529eb4b9dc431b5a6c785f365dcbb0994060b87a11e77daad069687c7f39fba3a SHA512 499152aadb03b3721dda8ca4f1943b56122e4cb9ddccfc90d1eddd6f7c116ba2f3746e686ac1b4057a2c3a821beda3d1d6aada651b545fe144b5c86f3780bbce
+DIST firefox-91.0.2-rm.xpi 543758 BLAKE2B b5c6b7c255cf47d565379c2d09978d54fa84da46b29601c3ef23dccb244417080f22e6c18e96fdf5ba4c657da8e7f3adba1f1b44436e40fd615b4f2ec6ad70de SHA512 f3ffd1514fa4d664cbb5e0d1a3caa1c286dfce482665a111504d72c5e0c1f1db2148552c24e7daf801317c11732049df997134c481de790ae2962fa3c81a3183
+DIST firefox-91.0.2-ro.xpi 544870 BLAKE2B 638192c620112619abd447597f9d7db7bc09cc5b1fc7bafc1986863ff0904f78695fcebb4271d3ddb86167436d98052aa2b7fc5fdc919d1751beed00204c0f85 SHA512 b4700a3b946df0210683d463fc244cbe345f4ab34b4240ed746f15096a4a00448bbe5a3bbfd7bed1909c7df39cb9e234cf33db3650096a8d1b34767fb6694f81
+DIST firefox-91.0.2-ru.xpi 635037 BLAKE2B 1173448e8346105bf86e91be2467c5d5baa4f0afb8f79d83197acd3ede3fa88505a7f123f132a7dbab13c4bdc0aaf095815cc943056a1152569407b7d51afe63 SHA512 5e18f24daea284a47ec2a563d790e3dc8ae44ffdedffa684f737daee04fe480eedcf4ff60481d8c76becd0d1c16cb80954c612aa00162cf40390f9f2ac3727aa
+DIST firefox-91.0.2-si.xpi 496840 BLAKE2B 3609ada9163696aba196d9748e97f8e6ea16510b0f55145d23c16d8868def2236a178c4b429f0bf9f479c75ed83623e306443e102dc82c87be35de12fd4a8fde SHA512 7dfcfc0ebc6c2d9651c3274abfc25d100b451b55375a9e9380cc2586531ab08c0a5e1ce4d914f8b846f3d4f8c10ae33fe66c9d04817d01d5e7f3ef98239ea6d6
+DIST firefox-91.0.2-sk.xpi 572088 BLAKE2B 86020743034e7e00783038256231e1bcb3f2054d3c679db716d71ecc42e5b3be18e3151180250f82bbd03c99d72b71a886f5d8cb7b08da4fe596fcd1de62e5bb SHA512 5487d0ebf35a13368c3f2c4c6e933953ad43938f98a56660d7ee83156bfedfd5f766b8779ae0980aebebe6a4112cc3e90ad941159fed6767c4319c4bcbfed873
+DIST firefox-91.0.2-sl.xpi 542792 BLAKE2B 05b78a248eecd982251e83aea8d4e180388e5ba2424d8642c8b8c37e9024622bce4c7e268067bd2c959602326f7ded61f3268c25c6048abaff277f6eb53dd143 SHA512 684d20192df92823fdd853d8a79582748e2c1f3d95d40b2896952b931b34feaf4eedf222aea640ff576f0fe68efb661a48acfa616263a3d41d9777a23ddcd992
+DIST firefox-91.0.2-son.xpi 432937 BLAKE2B 592a2605a2fe3567e0dc5020382c3cad9ac152cfdd3793c679a1f776983cd9aa4cb83d59c39ff3dfca8c0e70c98fa8fa13ba5a11eed74ce906e2cd0c9f955aec SHA512 cac2639b2358550d50ba53cea726dbe65717d40296d63dc0eff85bbebb3cf0186c70ef6e8d83857e61b06bd5c425c1a72aec34723541e2aaded96ae6838e616d
+DIST firefox-91.0.2-sq.xpi 562223 BLAKE2B 49443861d6ecd85d6fe4383518a0b65b57055260d326778497042e771f62cbb830dc479e883fa154dd2f2a2dbf4061fde46f137f14e63b8bce76d4c90299f13a SHA512 c6a65bd7fc49ad9fd5af2c7b8b86c42a90b81074ea16411adeb6794195fda74cd13fc61762f0962ba6252da8011c8279deaf2352ec9be3439254fdc38c398d45
+DIST firefox-91.0.2-sr.xpi 596028 BLAKE2B 6ea53132a28738d54446b82fba65317a3f9f493f185f76595067d29a84551a69995d6676150946dc52df9df5f6836476d578b9609bb04f7ceda77f9bd8723e73 SHA512 c4e6b08d0e983bae2f76fc8b5d3c301dcb8103051d7d7d1766db7981972cfa8027cb178ddb854be6a95c4fb9c2b4a82336eee4fd5d4de7b6af4e98ad8d0526cd
+DIST firefox-91.0.2-sv-SE.xpi 546389 BLAKE2B 20dde060f8e0bb1a0117bd8d3135dd5593720eac58a946df6f6572fcc1a3c558052dd8db4d696b3c56326685af149d02ad023388539f45c71c959b0e5c24671a SHA512 42f66c348933a446aead3dbb115873e52a7f8ce428b75065ccac8e6bd6a3332f1f4a5e9fc30fd001f7e6fbce4c20f50c70f0aea52fe4f3bac605a1b94ba96e45
+DIST firefox-91.0.2-ta.xpi 523941 BLAKE2B 2c87a6ead3ba80ae2d31353dedaeb6f58da25751684e5341517720690f8ab52201259aad7ce33ed78816d817a5d3a3a2147ab3bba6513ea044971a8f7f273cdf SHA512 9c24dd0b1e17623af3166ca4078bee47a6958cd9287c8719a525f1c5ae8a88bc21044e8e83675c9e786be93fe6c1a4c30a91f1f68a880eae2351b4ad3bb050b7
+DIST firefox-91.0.2-te.xpi 564760 BLAKE2B 314220ed7b4ebe6bb27d740360b608c4702051a6f2762429868c9a116c568f87ae34eb062d86782e0e753febc70daf02ae844c3fdd3f1ccd67d13f2a4c404ce1 SHA512 4170d39649828e1c8395fdcd1b0e5555ca2ca32e4003c68ead981b108ac98c5cf955bcfc74486c3e940d8e5ce21c9853a7fda88b98b50698a979f7258d4bdeb4
+DIST firefox-91.0.2-th.xpi 614152 BLAKE2B 85b298f4dd95f35e7681fec5a736c3dcf27bea72d0c319292a342a8d5f72dd8764d02c98aac5e0d49326ac506cd8045715bbe8088e67062c97ec116e1f32779c SHA512 0ea959243a6edb9433bf86dffa7cabb09b4b69dbda218a4e040625c75d543d5e5cb065dcf6ebaa346b347abe6cf0d76237458cae8fab04f1ebef3e8a9320de63
+DIST firefox-91.0.2-tl.xpi 531316 BLAKE2B 0946e102605fc7c05c7e883b693cfeca11204f4d1d0793864e9c0f7a5c573b04f1714a72094e8e78b4106889068921a1c13b44ab77478352310c05507de9a087 SHA512 8f13de4fd691937296bb4c3e3d67b2d826b0e89ac0a972cf4ebe2bdabd4b5539bed9455a56f6211067900b9b003d388c90d96b2b25f4896ee9c78814a7bde6d2
+DIST firefox-91.0.2-tr.xpi 558469 BLAKE2B 1f6b73ada217f445cc9eb04358f7d6e84ffb20283d4bad63afc735536851af4a7198cc2a4e32a8c2b2659d212b89783844e006dbedc1a613353f76a523a0ab38 SHA512 c947f20755b5691bdb115e15108f6a6783a74b372dccc6912749e25ded9d01e463b4346bcd1b8d2d8ee017c95573b27431056ed3878c547b36be81a8f108fc9a
+DIST firefox-91.0.2-trs.xpi 503653 BLAKE2B ce6c5aceeffc3ce0f3980d64c6111c917ab984020d03b18302422a1db3dc8f9d56544e27b45dbdc12d4f394f41d133624932e390c358572b1a8f5df780d62717 SHA512 f1b16b1a9e97344d6f0326e29939ccd9a2e71dec21748310b4c76ea4ccd130f6e3c0ddaef7596eff073315d8d57602c12361aba45e85785720e73ccdcbf0768b
+DIST firefox-91.0.2-uk.xpi 628579 BLAKE2B 1276d8d95c61ab17748b3d5809b4fa1c0606b7eab417888e3e4f822295ffca7e1d5d38c6c3c5ee83b2dafd3fbef2462b942c245ab13e90775e252dadada43740 SHA512 314262e929bfeac9908709e01b78f0a42a9317e0c427cf47f87233353dcbee5ad12ca2b77a322c8a1bd481d43b42d133784170e5335429cf11ca16da838762a3
+DIST firefox-91.0.2-ur.xpi 572692 BLAKE2B 3726bed6a61448343fbe39dd952045d74ea16e9910c1b4712e0e4145fc852242b675265929f06f4f32daf31e648438cd95bcf2e3077005f12e21b28392283402 SHA512 f0d2ef0ee280096c905b29b8cf81e8a561d789e51b8cc45ffba4f56a79854fc0a9d28270fa85d1db85642690bfb1e3d8b2c77cd04fb81a0ffe5dbf3e9198c00a
+DIST firefox-91.0.2-uz.xpi 480939 BLAKE2B c992594e78b95eb6678ac7beba5a5c332b3af5d9ea09ffa77e052e0b4745a84c4e27abc9423d9ae0db44eee15ee3e05880da378a83f86754e3b55179b862ed20 SHA512 9b65130a52b0eb05cafda63960ac0bca6f499d1bf9422685b8e21647665daa837331d7f59fc82a6bf55cb7824e851cc86529e140e5316ebe319e06669bd8bf1e
+DIST firefox-91.0.2-vi.xpi 580492 BLAKE2B 9df06719539a0d9f9d55f6480bc438598eb632916b4254599df1aad25abb3ab3d379fb1d55d8dca39416dd9bd0e7f225c6579643a8a7883bf68aaf1d9783b56a SHA512 684ca1c7c994d3a67a27b3e3c1318bb6dd0b668a49da13c4c5cfb4fe695915a38f6f9cfbb7bc7ee3e322b6139f0ab561ef741b11a12ccd418e747b03a70e18b7
+DIST firefox-91.0.2-xh.xpi 435041 BLAKE2B e51f7abe34cd7e65be01e3a5c0288cced33e85c0e63e4bb33e62f0972724c689d40113f40cbdbeccb84ca536b540fa3a1653d8853c461c28b7f353fca11db1a9 SHA512 eb6ba0cc1446d67663270505e7f9b215733dd6d668218197c1b5a7c95b22c237ea5f66cea6b8a9ba7e74699d50643927e77c95b29f2922cf30aff5ac1bc9dc7c
+DIST firefox-91.0.2-zh-CN.xpi 581941 BLAKE2B 92ffe8fa9317e8240a522bf312333cf35359fc036e9caf6bdb8c56a4701163efbbe6f69145a0282963c255998c554a6f2f0876c31aa6c7396dc7bfd73f15ec85 SHA512 f09100f3d7555c00cdb33bc0b0a07488494baffe6bb8e7408c32196e91808625fcd9af24d4088bcbaa06637ccfc3f6e8772d29dc0c66b1335d09ca7a6e0ced55
+DIST firefox-91.0.2-zh-TW.xpi 582124 BLAKE2B 962fe6182f240fa5f1bce94f7e1038c958aefa0736a1b3b36a3565d26acd6361d19dc31cd4747dd723e9069490b073b2b2fdd328af440efaeeeed6531bb00a72 SHA512 3315585c1cc781c2f8707f7f092e70374e93166884149ee9123ddd1cc5e6c4950ce6ea5050637181a79096544d3567f0c4c46dbd88ddb6eb1d3e06c2c5b7346a
 DIST firefox-bin_i686-78.13.0.tar.bz2 73180486 BLAKE2B 1eae7f39c1fd4aec7518726e6ab95d936ea144bdf569d28181058dde16acbe6f563bb97bc01b340f4f5e21a7e186720b05725bb8acd2bac080e67ec4ebc375a6 SHA512 0994355b7eb806803f411885b9450eb62884507fbab8c5fca807290863d55591bd037c26063ae3ced77bbff9c9e859c20fce83e648311a372bce8f7f03e341b8
-DIST firefox-bin_i686-90.0.2.tar.bz2 78032029 BLAKE2B 75427a146836abc83bb64eb4a2d281932b0f5cbafaf31d4b92dec785dfcedb74f90665c2ed2a8e41b57c19801fff6e669fe7e77454c3668941f5eb9d24961087 SHA512 6ea1e90afa4c67b2d0e5b5aaa78bc20ea26653271fdaa3135a22c8d64bfe090e43b1de05803181355fc652cc6134953ea1562cd6f37589d0b25731c4d06c3feb
 DIST firefox-bin_i686-91.0.1.tar.bz2 78684437 BLAKE2B f59d8a5b6c9910f20ce2399da834174a5f4a07ed243bf2d211aa76fef575616db3b0b83f30f79f9b0d1ca48646874f90d9e9267a15859c62601439c99f4a91e8 SHA512 53c1a485726be90df52fabcbd87953e27a111eccb52235aeb892c390c2aef675ff8b225ddd5518feed611daff0875697cf5408864150deedcb2d59b464a3d561
-DIST firefox-bin_i686-91.0.tar.bz2 78724977 BLAKE2B 305f42a0af09c0eb68a1cb09350df5de9856d24b882890b941a61a827469623763ceb3250010ce4f2dc77b2633672d82fbe624a29e4de6fb14aba23fc82d04b4 SHA512 69c1dcebc127fff6f4781b48ed83a69e4e721fb3cf56c9bd9cac32d6f8d80b1ab0b1dd528fce0988841bdb0c9c9a4ce38b8f280bc6e368de641cf7ee67076b72
+DIST firefox-bin_i686-91.0.2.tar.bz2 78856174 BLAKE2B fbfcdc21fc5e0feaf601033da30cc680bdeb598f6cafd53c5a7485fa42bcd3ed9ef8a56c7c62ca1780b97f020cb21c4860ac50023a021638c49ab79040dd6b0a SHA512 4a24b3ee5fb3409f295b5a841ef3ab11ace48b159ea6b3a94b40b04a9bd80467806d8c82c956004061cd3c79c711064bdbf4b4bd24a2d2ebbde8f32a2fbdf163
 DIST firefox-bin_x86_64-78.13.0.tar.bz2 71244828 BLAKE2B 373316cc48a1985a8bca8dd3390081ab47c2103270d5555c842667e1b5e2e7702da5e6e19c327f113cd092cc2136eced7a81c487c5207b41ed3d174f0a961fd6 SHA512 46de79aecfdb40dc5f9da8e0518d94cba4ca9dade02dceb6b9cbe817145fa1782bfca08c25b0ecb4468795316b937ef92c370c1930ea06a742f46d664da671c6
-DIST firefox-bin_x86_64-90.0.2.tar.bz2 75026836 BLAKE2B 98b378bba9aed805990e14d45cfcc42f873fd7104e98c5f98a32c680d41a21ed309397de0d5780cdd7c9a44080627be80466e60adbb5eec237009cc5bf1b2420 SHA512 eae9329460a0ad3819b0ada1f95994c8e3ffaf70e040606d70aea70cc88311afcdc0d98d8c9e49b1f5fffad70488c1670b5d3886667ae1dd27538d777e8b1e40
 DIST firefox-bin_x86_64-91.0.1.tar.bz2 76050533 BLAKE2B fddf6298fd723a651071e1b13093edf4339b3d510dc6ff5a7694f14df92e76d668a6a5cb8e1644ee27a8b529fe17b0cdefcbaf43bb76faa3f172a65b6621e23e SHA512 b69b0aa7624f58e28e47d8f54da8a0420c7f0ba4d99cbf3c0b91edbaedfbf26c9023da2a5e5e0a2dec286baeb5ce0dda5499c764262f960aa8e93b1e3f5022f7
-DIST firefox-bin_x86_64-91.0.tar.bz2 76145110 BLAKE2B 921a99bbda73472d328486b8c43b0db54fc5c2ef16b8355485f46d4f37ef7ae2df7c76ec9886fa30aaca9f10ff995f76fcb77abf3a0dc6736fe8069cdb7bd65e SHA512 bb5d4993e0f5add075680d71af8cd4c6f6c197261db7ed9dd1aa10c9e0dcabb478c570279ab91a0c8db7e200882f9eb7c6b1036467b0439baf68d60f883db85d
+DIST firefox-bin_x86_64-91.0.2.tar.bz2 76205295 BLAKE2B 2d1997e4ddebe537d53deb65632e7f60b12168e89b3ebbe13252b702fcbdac7a2b43aee46a020208e2479f02a9a0998cc9da7d02ad0b6cb9deaf0dc01b5f18be SHA512 3f55759a6a3f976c91153d7629a801b41fd9d1c6003bbca3b4f40474c07daf941c5b226e51915d5c1df3d023f2eac91ab4c42d7606b64dcfdeca6144c180a1ff
 EBUILD firefox-bin-78.13.0.ebuild 11540 BLAKE2B 1c49df21f84cdb50ac72e1f246e9d8ace457609f39e9e8b958bd6f488df8a2f27af21449588bece5a6e3552f2e1b4e7adc7813e88a23407eb9c42c99c6662382 SHA512 c42081fe1315e4d8795bd4272c383d0e3c2037fa9adc5316153a124076f3b9e5eb1077751287fa0ff5cfc74d869953fa6226bba3b71c038513381e7bc44a4e55
-EBUILD firefox-bin-90.0.2.ebuild 11510 BLAKE2B 5efff8a24494246164446815ce83035bd9361d5e664d4eb2d19b0ac6e4efbb23ae9064efedaf501963736621595910d7586517adc6dc76e8bcf703bfaf1ff952 SHA512 2f1da478e0ec5b497d97346e69a4158a685cae285b78c31fa7413c685893f7fe4bfc27db3311e412876e693bdbfe754ba29fd7870ad7c7f30214131c0d9ce0f2
 EBUILD firefox-bin-91.0.1.ebuild 10866 BLAKE2B 55fec6c50118984d57160c2d160d767dbd1cb202b13ed0848fd2e25b215a417b208e000763491fc9ed0ae2b60c11f3245a5d50d2d69f48e8c71a7cefb40bcc66 SHA512 e68d5ac6b6278a90307d83cd461b72c2d75953c6ac85e391fbd78d64517634bd11edb9280ad22b33bfec4960d32c906a72b280cab56c3da17d7ab7c266398fb1
-EBUILD firefox-bin-91.0.ebuild 10866 BLAKE2B 55fec6c50118984d57160c2d160d767dbd1cb202b13ed0848fd2e25b215a417b208e000763491fc9ed0ae2b60c11f3245a5d50d2d69f48e8c71a7cefb40bcc66 SHA512 e68d5ac6b6278a90307d83cd461b72c2d75953c6ac85e391fbd78d64517634bd11edb9280ad22b33bfec4960d32c906a72b280cab56c3da17d7ab7c266398fb1
+EBUILD firefox-bin-91.0.2.ebuild 10866 BLAKE2B 55fec6c50118984d57160c2d160d767dbd1cb202b13ed0848fd2e25b215a417b208e000763491fc9ed0ae2b60c11f3245a5d50d2d69f48e8c71a7cefb40bcc66 SHA512 e68d5ac6b6278a90307d83cd461b72c2d75953c6ac85e391fbd78d64517634bd11edb9280ad22b33bfec4960d32c906a72b280cab56c3da17d7ab7c266398fb1
 MISC metadata.xml 425 BLAKE2B b26681e09f7a128942a50f9edf7ea7db4060a91bf5384200793ee3020b48907d034617dba59b6f71a54414270b1f94909eb2d2e659cf845ce2ac7ee095405fed SHA512 abc41a669eb3f658829ad46631cdb560b4bb26297f6398981a66e19b54bc2403b3b2913c904421b1afaa92884d55a910a1fbe3f029911b2073557d1311236ff0
diff --git a/www-client/firefox-bin/firefox-bin-90.0.2.ebuild b/www-client/firefox-bin/firefox-bin-90.0.2.ebuild
deleted file mode 100644
index ecadc88f7e5b..000000000000
--- a/www-client/firefox-bin/firefox-bin-90.0.2.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit desktop linux-info pax-utils xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0/$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland"
-
-RESTRICT="strip"
-
-BDEPEND="app-arch/unzip
-	alsa? (
-		!pulseaudio? (
-			dev-util/patchelf
-		)
-	)"
-
-CDEPEND="alsa? (
-		!pulseaudio? (
-			media-sound/apulse
-		)
-	)"
-
-DEPEND="${CDEPEND}"
-
-RDEPEND="${CDEPEND}
-	dev-libs/atk
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.26:2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	sys-apps/dbus
-	virtual/freedesktop-icon-theme
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-3.11:3[wayland?]
-	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
-	ffmpeg? ( media-video/ffmpeg )
-	pulseaudio? ( media-sound/pulseaudio )
-	selinux? ( sec-policy/selinux-mozilla )
-"
-
-QA_PREBUILT="opt/${MOZ_PN}/*"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-MOZ_LANGS=(
-	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
-	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
-	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
-	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
-	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
-	xh zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	mkdir "${S}" || die
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			MY_SRC_FILE=${_src_file}
-		fi
-	done
-}
-
-src_install() {
-	# Set MOZILLA_FIVE_HOME
-	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	dodir /opt
-	pushd "${ED}"/opt &>/dev/null || die
-	unpack "${MY_SRC_FILE}"
-	popd &>/dev/null || die
-
-	pax-mark m \
-		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
-		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
-		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
-
-	# Patch alsa support
-	local apulselib=
-	if use alsa && ! use pulseaudio ; then
-		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
-		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install icons
-	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
-	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menus
-	local wrapper_wayland="${PN}-wayland.sh"
-	local wrapper_x11="${PN}-x11.sh"
-	local desktop_file="${FILESDIR}/${PN}-r2.desktop"
-	local display_protocols="auto X11"
-	local icon="${PN}"
-	local name="Mozilla ${MOZ_PN^} (bin)"
-	local use_wayland="false"
-
-	if use wayland ; then
-		display_protocols+=" Wayland"
-		use_wayland="true"
-	fi
-
-	local app_name desktop_filename display_protocol exec_command
-	for display_protocol in ${display_protocols} ; do
-		app_name="${name} on ${display_protocol}"
-		desktop_filename="${PN}-${display_protocol,,}.desktop"
-
-		case ${display_protocol} in
-			Wayland)
-				exec_command="${PN}-wayland --name ${PN}-wayland"
-				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
-				;;
-			X11)
-				if ! use wayland ; then
-					# Exit loop here because there's no choice so
-					# we don't need wrapper/.desktop file for X11.
-					continue
-				fi
-
-				exec_command="${PN}-x11 --name ${PN}-x11"
-				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
-				;;
-			*)
-				app_name="${name}"
-				desktop_filename="${PN}.desktop"
-				exec_command="${PN}"
-				;;
-		esac
-
-		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-		sed -i \
-			-e "s:@NAME@:${app_name}:" \
-			-e "s:@EXEC@:${exec_command}:" \
-			-e "s:@ICON@:${icon}:" \
-			"${WORKDIR}/${PN}.desktop-template" \
-			|| die
-
-		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-		rm "${WORKDIR}/${PN}.desktop-template" || die
-	done
-
-	# Install generic wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}.sh" ${PN}
-
-	# Update wrapper
-	local wrapper
-	for wrapper in \
-		"${ED}/usr/bin/${PN}" \
-		"${ED}/usr/bin/${PN}-x11" \
-		"${ED}/usr/bin/${PN}-wayland" \
-	; do
-		[[ ! -f "${wrapper}" ]] && continue
-
-		sed -i \
-			-e "s:@PREFIX@:${EPREFIX}/usr:" \
-			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-			-e "s:@APULSELIB_DIR@:${apulselib}:" \
-			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-			"${wrapper}" \
-			|| die
-	done
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	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 "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
-		|| ! has_version 'net-misc/curl'; then
-		einfo
-		einfo "For using the crashreporter, you need gnome-base/gconf,"
-		einfo "gnome-base/orbit and net-misc/curl emerged."
-		einfo
-	fi
-
-	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-
-	local HAS_AUDIO=0
-	if use alsa || use pulseaudio; then
-		HAS_AUDIO=1
-	fi
-
-	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
-		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
-	fi
-
-	local show_doh_information show_normandy_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 70 ; then
-				# Tell user only once about our DoH default
-				show_doh_information=yes
-			fi
-
-			if ver_test "${replacing_version}" -lt 74.0-r2 ; then
-				# Tell user only once about our Normandy default
-				show_normandy_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-}
diff --git a/www-client/firefox-bin/firefox-bin-91.0.ebuild b/www-client/firefox-bin/firefox-bin-91.0.2.ebuild
index cd387ec20494..cd387ec20494 100644
--- a/www-client/firefox-bin/firefox-bin-91.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-91.0.2.ebuild
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 1b0717e3a74e..0f5c2a1eaf11 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -8,102 +8,6 @@ AUX gentoo-default-prefs.js 620 BLAKE2B b78720a71b86f69a8d23b34aa47ca1c6e7c616f8
 AUX gentoo-hwaccel-prefs.js 162 BLAKE2B c5f2dfb727081e2d538c262f12c0cfdda31cbda58c77f4024d820e1d1915203d1fb8ad2671f88ff0eb2b019bbf44079a8b1114e240b74f815680e5c28eccc295 SHA512 f1847f11e7059a83f09c3c7494aadcb04512cdf2ccf6616ebe3ec02fc46de66fd35cf83d81e08013c0e594b73e4dffcb67a32288b6949ce137669715583fd0a4
 AUX icon/firefox-r2.desktop 8137 BLAKE2B 5d0ce737c0e0969cb1a61de7989f5ca1ca0dff413d6d98bb0c93e0fed510b4e075a88fc117d3713e5e11ee7471ceaeffa9bc9dfd4282f3ddb1ea837d823e4887 SHA512 749a50b11d89c1329a52d13745ff8d5f801e565038cb5341319b4b515f36baf1c0c740003d6d01188c27e31d7ddeff58310e7b2420681292d0f2522bc5bd34b6
 AUX icon/firefox-symbolic.svg 7432 BLAKE2B 33a552ffb9850f6b9cd3cb8d9f7f80268ac08f00a0bd5eb15d892c6fbb950f8cacf6058b9c838f5be1ae1b53541f143a1ec0c1302ae85b49100b166fcbccdce6 SHA512 ba7db9a7c95a051bcd84e4c09c802fc55ee3c0d1d06ec1b169b04e414259b75bbe92fe584aee41a1e3f71e71c160df8bedf5393449e5024110ed27dbc0579ea8
-DIST firefox-78.12.0esr-ach.xpi 460283 BLAKE2B a00bee0c7f0ec9c27454f618c0402721db074b6319c1b0964a5ccde3710175a20f9a6727eef881d8d3db7205b2f7bf5bcbf5c050c39cbd20f95cf23c6ee480f8 SHA512 6542b5683dd352ecafecb42a9bbdc438cdd927deb9e1c8f55f52a1c12690d1ac1281c379ed7dcedd6a62b4ff37b816b5a7870b0aa9a725444640a87b1e6749dc
-DIST firefox-78.12.0esr-af.xpi 428351 BLAKE2B b4f671687a03ed5e12e5c805b501ad3a975090168a60d4549326cfae17d0e31cbb7458e8118a8f85d566a75de97cd2b7a0f92f77f21e9b4a5cfd57163a54b163 SHA512 fa91d12158cf7d41000c3cb4beb0290c4fe760e5dcd27cd23d77b228f509558830ff4d2c29248bfc08f69c0a8592302cc6aa59fccb5b16f292e290bf9801f7f4
-DIST firefox-78.12.0esr-an.xpi 508377 BLAKE2B 63f4678044c1ff6088279a5fe25bc7a0eb0fb8eb8c2ca326c14ffad242be91892e8277bda016e852d61834bd095408d9c822e329918748248e4f8f0864c64718 SHA512 b1cbcf41150858ec827d485ca819490907d5604ceac758d478a5f39a20b1f204dfc674fa5563c25e8fd93d85f83faab3673e4d08becd6c628d1d8c118c22bbee
-DIST firefox-78.12.0esr-ar.xpi 560954 BLAKE2B 625905b86f9a7b9b8063873f7ba91d59196abc95a27b15764fbdd3bfea24d7aa69c7a9c4934fa9b0d8f210ff90b9782d981221bc8d892b5fa83b1c355166d554 SHA512 c0b09fe41708f1cab137a270ac848627ec98fc43e47c6a405d32db7e01a13338516cefb2f3cdf1a8590af00e75c3d4bec782646d6d143d2b103c7e5eb861dfdb
-DIST firefox-78.12.0esr-ast.xpi 456387 BLAKE2B d8a5fd537ccbbfcd654ac58ba963123380363bc5acc3261fcc5f4051d93e254a9f9cf2929de1dbb9c2092e2494c9744c973e1b8a2a12650655f8d25fba7fc749 SHA512 ec5e717088863808fe34f088336f13add49035ea8d7f323fc3c094316cf8044772d5ced904904cd170f471186028c0ecca21ea52cacffcff185548172f0abd69
-DIST firefox-78.12.0esr-az.xpi 497433 BLAKE2B bec0f0209a6f5d9043f4789df51c34519c5f33c08a2f6620041f591599929514658bfc7a5ea2cd457ded405f58e000861b6c9186972ee4390555d7fe0c5fb489 SHA512 49e2fc648e30e419407714677b59194196404c50c92e4d1affa01d66cb7719302979f3d4b74c7fca83fdbfc7ec5c406cf876b1fd342384870c39e08f72346d48
-DIST firefox-78.12.0esr-be.xpi 608650 BLAKE2B 0ab6829a8f7d49678d905f99e53375946a733e12ed46cd693fdae3da19aade621b572028f938d33c91da3e69280b53c6ab6a19690648a414127bf55a3279ea7f SHA512 de62c7f2e5c8ef8323eac321ff3c735cc165fcc53ecb044dbeec35a2196c52fe9cc083c95ce755b97c320f123500565e471fd8b0edcadee2b998d005402e6b84
-DIST firefox-78.12.0esr-bg.xpi 553973 BLAKE2B af6c0b0aaa207b9714269c2844eaaf4b7bbdff58350022bc816001711517f50e30b3eee62ed8dee53b906eb990373cd462d45b62cd112d44ac04e047638b5afc SHA512 3f50b3a300270a12b220ed903ba79738e807d71d731bb8755a543984b84272a7f67e1e4a05fc5ed7c87f391de69e9ede628f50a4f8faede4acf224adf0de4f7e
-DIST firefox-78.12.0esr-bn.xpi 572610 BLAKE2B d54b5abf4704b472537badef7559170f3663cabf6c7a48563fbac1b1f12f16bc048cc28e382f66aaa064fe5ab25b57e9ed58e94e9b285184d5a8ee1c2adc526c SHA512 3b116f3385d67f6901a801a758a02c834a9019696c498d085b7c0dec28d723b66f6485063db1ce7024e8b53793a3f146cac7337c130afd060c810d1e39ccd652
-DIST firefox-78.12.0esr-br.xpi 507129 BLAKE2B 19172ffbdc74639390d9beee945183e4f3ae068200af8caf697839774b942d251f36970f95b1ee17ea5726a4050a3ae77f22182810cb10668a17574aec522b4b SHA512 fc0c7f25f3b8a08052d5880e6c18df752b650c349411e464938d64850c7f8c5a471f5a7048fc13a6c7e8a0ef1b3bf7a7bec9da3b70bc4ca101f24288a09979d4
-DIST firefox-78.12.0esr-bs.xpi 463802 BLAKE2B b151773b4bb7e1c51566205e645c8a65a996bfcbd3a60f0648977f8a0784a6dae69ac799efbef5ba9daac906e48cc218e55d7c9a89181d8bd598930be5aac4a6 SHA512 85a7cf7f28c984f1330ef0e2b964d446bacb4f3369d1800031cccb61c43e10e990726af3d8aa8478af6eb416773c9e66f50793c87528435bbbd7b0c50e4d3b91
-DIST firefox-78.12.0esr-ca-valencia.xpi 517178 BLAKE2B d1574689812e3c1b01323d9eec83475d89e333e7ab8bdbb2b4cc11eed3cf7c56088adc3d1da7731c5ae65f3b9c0a76ab0743f50f3529dcd38d62be55c2862a9c SHA512 20b4b91a5e69975479a92f563042128d66d319843a71f7555f7fc53a1b9296d8eb8c60a3c647176a70408b616b5c5e44b901ed67bba46670dbf6cc31edc84e53
-DIST firefox-78.12.0esr-ca.xpi 514183 BLAKE2B 297626859bcd85f1e77f0eb37fb9c98175f8a7e6b45bf072405746b9428c2b789318db2f65fdb5dd906f8e21f7678d39efa62f031c4e884a689de5c7c2d7f3ea SHA512 24bcab6bb8d1e16d6098ace8502703e33e2c88c9d31a695c0783b103dc0212dbc48178a488a35b54fdc0a70675f0e37244cc4ae7bfa39d13614ff89fb2b2f7d9
-DIST firefox-78.12.0esr-cak.xpi 551556 BLAKE2B dfb1d7f88d2ceefd923f4af7239079ce2b1d0336cef47f26e35d5aead93351b05b26317875adf870acc817b71e02cfbf39e322377b3f89f93707182da13ed8d0 SHA512 1a1be2a52f85d06ddded2077ae330767c4629c363f7c11a1e4ac104d36ee4ae8640ae10d3dca1c94018c3cee6d94bbb241de6aacc49440479d5725074742fc75
-DIST firefox-78.12.0esr-cs.xpi 540329 BLAKE2B feaa6692d66d57084cedeacec0f3a49a5f175d59699af6980a12880ed3cb615fa5552f53a660adf9125a90703be743be15d6cdc651a68456ea22c4ac81a388ab SHA512 fa25f5f1cbe7dcff4e78fa02fc6996d1503c35b5b0a581172c6c111c86e1c65ef00dbac01372a33d929f03b15371545bb99801138afb26e39181248e663087f5
-DIST firefox-78.12.0esr-cy.xpi 530698 BLAKE2B 1e6cf6f9ac920a03315fd6901d79942cfc87387b00930b3a1feea7680d62a0683737463ba034530f65e9f85d1d99a3e2afc927cb6e221fcf1b1b9afe61d98919 SHA512 9456922b7291077fe26db1e4515742be7f860d294610022d384fbed1d5adf2ac973870e48e9695781fa82eeb92b431fd03dd15ff31a2f31082e340653c7a93f7
-DIST firefox-78.12.0esr-da.xpi 520269 BLAKE2B 3dc9ce7d730472394c3b237d5f9eef4b92dea1490cba2e73286aa48de477986ca6afe8a8a9f697ade06569f7ccb507a35ced025276b69d86b8ee7f0043ec1362 SHA512 6535bbd10493833c9f490806ebfcc7a02a122bd17c82468637e1e6c67f1f09aa207d5ee7a00f79796a70defe5ee53486db4e6f5ed9a712f06072ffe103948f9c
-DIST firefox-78.12.0esr-de.xpi 542853 BLAKE2B c52079da5fd96cc7a9f6636200764544c8d0c082cf9bb7dc3878740391b1b4eeca39721ae7a313e8614b71a80e856f413e79546b2cf62555f03800812759ce44 SHA512 1c66836985c31b6d46d4898ff6a73f2920d09d487f7deb4e5e0556cd84c7878da4c4ccd3131bee5ad8740bfe3b248c62e220d9a6c157dd5800111b288c339e9f
-DIST firefox-78.12.0esr-dsb.xpi 554280 BLAKE2B 3d14eaf320d18d7daabc8a0af83a34f52a616ed66f454ff2f8441cc776af604ddc90830f5bb6e1f777070607c73f25b522ca0c11faa34907ad52120e41ac56fa SHA512 4a05f52721ce363f4d977f92475029fa5a86445742acb1d3e4f023ba7875e9cc4b4ed290f75f3263c276066344e8d5af49fff4feba38485980b664c4f2bc93db
-DIST firefox-78.12.0esr-el.xpi 626568 BLAKE2B f89bfc615907dcfe53d870d6bab773f086c84e03d7632e826983da5271504528d3b453295d3edd1e5a9ce887af338f5fdc226c4fa7155f3fa9fc08c0ae09d378 SHA512 5997b04af48084cf9087110a42740e4e71d48ac4e0d52984e2e4dd62045001f14fb41105a693fb81a423bd985c464402a27d0217d0aef9efbb2e5fe975d74b33
-DIST firefox-78.12.0esr-en-CA.xpi 497732 BLAKE2B d7a74ba343baa1910eba123f801b82e18d9fdd1054e0df87ae234dc97ba5daa6a81d5b7dcd6fa403e0c52e884459c807b335094b4a8dbb09793a37d3731a4809 SHA512 78c05aa972db64a70980ea967f87edfd1edd08935313f70a43c0918c693e372dbff6f3ff1d233ca96268747e3f950e4666f23971d5d380f05a144d1be75d30b0
-DIST firefox-78.12.0esr-en-GB.xpi 497581 BLAKE2B 166282a2040172f9e8d209b9a8b098d4f56d1a4888ebc9b7ecd937991305827bf5f8bdafc75bf85effe97d4f809ca7a233b6f5ffd345e893fa3a5bc15fbf6445 SHA512 af372200fad2cfa9f653ac349289f0c20937f5ec798832e0d202f2f330fcba5fd04168b5960a5b8a534a1904bd5206f6745102e73ed6775dcd5120a120ba421c
-DIST firefox-78.12.0esr-eo.xpi 525738 BLAKE2B fa6cfd49fcda4fdfb54c93295978512a016f115cc0da9e54cc82f0da9c4fac90b2e2ea52d3ea41ee6b0654c90656b17d33ce316dee349da0dbe719eefdd6c6cf SHA512 8b11970ac93265c61c6518fa06eea0749f15f3cb94058e4f4c0db166fdde7261bb5bd9eca1e5f54db271570bf63d7f84d1ff5e141b20ec23ba09aeb9f30ab1e1
-DIST firefox-78.12.0esr-es-AR.xpi 535801 BLAKE2B 60688df3b040e8b17738c5c8f60e29bd9bca88f8d272e09ea9db60af859981ada067ab5ab7418153805a730e9fab1afcc0df2d55601c4d1dbc334d8ad56e42a4 SHA512 6567391847b866c5c4d53bc628259e69ca1038c468f0030536525d1bc5df19fab8654015f6404684156521a664422d41fdd341d8d4324e0ad8ecad1a96e759ca
-DIST firefox-78.12.0esr-es-CL.xpi 535347 BLAKE2B d31a9937488d728c9142f774a230f82fe955f4e735b9c4c71ba063e4c0fe80fc13a1227876dd14fec6bfe069cbe07e10e8ed93577bd214f5cd27581eeddd4b02 SHA512 49c96e3e2e79cd8b57d47e62a9f023ce52cf3b2ca82cd3d7f03d26f3c7433f080e915d4b0d0460af6d7f287ebdb8307e20a395ffcbcf926add14b31814f488c9
-DIST firefox-78.12.0esr-es-ES.xpi 522691 BLAKE2B ffdc2051ae8566d8320aa5cb100fab84df2e5ee1686353f21bffaeb15b7058e8920c46ac1a86f014ae2535435542e410b9464501d2306bc8215678eed917439d SHA512 754223da264548ed628611da8deec195ae5ac978c9f6244d2f132a7449c6693a09e0c808023dc3e18413e6372ea9957a8ed3d584fa06795b8355aac2823288c4
-DIST firefox-78.12.0esr-es-MX.xpi 532295 BLAKE2B dcc9269f6c4a5f55c871f11f81d29146d83c4e97b33ab509419b598d6716ce097760bbd677f7a5f0367323f31273837552db505c88920994a5e42f85616d84b6 SHA512 b3fd9d7fa72e730a215f3ef8b9cf45be999b5c393dd9a7f9a460bf83c52f10ca1057c52763f336dd3c5db3ad70bf9d0a6583a227b4403a4eb0137d33d0dfa24c
-DIST firefox-78.12.0esr-et.xpi 485252 BLAKE2B 181287684643149c2256a4c33c9486b947c8fcd973aa8bf76870082ab61ae735e997293abc852ff98611ecb1ccb9ee2f6f091604d3e7a67bfa570d741143ab93 SHA512 7661ba4923fbfda802225135ff2df04f5e6ea731bc8e3268dfef95749023b810997932efab11453f8b470d27372887e41d0231fd9a82936d376ad5a66705b4bf
-DIST firefox-78.12.0esr-eu.xpi 505876 BLAKE2B df642126d782f09639ea28f7cab53173f2039b0455f35589ecf9a1f07ec12331e555661c550bcb79391cb8203702312a36ec7385341ddfb487efa2cb218bd00f SHA512 905a1f112d2d5dc5e1ac465a4234ff64d08f44394c609c7dc11a895aa203b69bf9dfbf381b204b025d09a6a0db2eb95ceecb61d3b8f01014a9b003863480dacb
-DIST firefox-78.12.0esr-fa.xpi 538927 BLAKE2B bdab40593d23214daac28c7f6a2e4fda159b9af828158132354077596402dee1a09806ec8a699390f75dae82e548639b81a43ab4fbcbb331d9c2dce5309f4331 SHA512 34d8d6ed8aca43b5b70f595fc866390e389cdc79d7b48b8e66eb179c76f6cc09919b66fdee485b7646f386b79a1aaa6998f7b7c672ed7c286e646058484cc79b
-DIST firefox-78.12.0esr-ff.xpi 481609 BLAKE2B d076044f29ac3dcad8fe8dbcbcf2a8e8c6c52611d3cab47bc1a9341a42030c3cd48dfa595b8277933a4d038d81979a4cfc002d9a84c6203b2257126bed5e624f SHA512 620194c07b9a6eaaadc99617111c602d05ee573c8c3b95ed494e8322508b39d1e548d77f9014dd8ba3a2c2340239e1fab86a2788e1ade99b4dc6e16a205f7ee5
-DIST firefox-78.12.0esr-fi.xpi 517919 BLAKE2B 598654771e21d1c9964288f3c4fd53d2de6eb61cbe56fb6c0794904e8b12fcc0736191767658e9d5395ee99cdee0de56c2a7b07de16295573a4b7062d3703924 SHA512 a01cd7389cbb0a6adf05683a80b43b32119970181b0c32bec0383374e2fb4a5f767c3eeffff669a563fd6ae908ba431f67449d79433adc0c89133e59e6e67a22
-DIST firefox-78.12.0esr-fr.xpi 545884 BLAKE2B 1741066c45d77d6dfd4c33efa22cd04c343050a02e3f977cec5914729af87fd8cef2a2aea73afff9c9ab6b953d528bea7360b987ade059514ca03e72b937941b SHA512 4657093bf73e284491811cb3b98fde6b3b6fb47793a962700945f86091e677dcbb4431efa6a84b6f58320ab57ee88c0d8735a74c740ae6f21b76105740b26c1f
-DIST firefox-78.12.0esr-fy-NL.xpi 532485 BLAKE2B 8f3a639b2259781068c75163ed1a09ec9d11cfc0e07151caeaab881f75c551b1abebcc36a9c2373c5488ceac53762b911f348ff3781de598ee93e914f3c0bd5f SHA512 e816b480705a9e2ac5b46ec5e781ee15a5096f0ab78376599bbd447fc87007623b4324d675509e0115d20257d1efb03d66ee60d72530aa5c28db8d9a9afae4e9
-DIST firefox-78.12.0esr-ga-IE.xpi 466890 BLAKE2B 1642e6587825a9220424de58c5f7933402713cc8b43173247ad8bf47bcc1fe56feb5070616e29d6fcc4af66a2ff4023850d2873958082c6257656624daf73769 SHA512 fc1a6f74877ad6beb275b836f6ba1ed2b66e26170c15ecbd50a40d7cfa35b8e77b7eaea851e308213c73f57538a1fb32deadb44dad5a9d9bdec9de261c9cab08
-DIST firefox-78.12.0esr-gd.xpi 491887 BLAKE2B 86bb50326f52ec809777b1aa6dcfe3c5df6436eb0855ffc0ee7946a2266d4e70b8c596e4743be66c0d96d2e78eba74cfaacc044a4dff75dfa143899b964f3bb1 SHA512 41fe61ff05a39220faffb5c3cf131a92e00eda26f41bff0c61f8802abea179e0fb757ff74a2855921f2523cd1dd2bea4cb03589fc70210f7c6f25bdab321b726
-DIST firefox-78.12.0esr-gl.xpi 528408 BLAKE2B 7700bde64cc4ef05bbe29de4c7f066ca064c4f557787119e8bec5097ec947846d57f0a4494bc4bacb05d9044d8433db899840c7181f60b0d258290177530433d SHA512 9120e09f38178c72aa190ec1a78e1f750c748b1b5d62cea5abea3d7767cf7cd14000ae83dffba272311daecd3b811e00728f125d301de5a3fa7a78c1520e87ff
-DIST firefox-78.12.0esr-gn.xpi 546465 BLAKE2B d55ec543e9a8b4192e3d2b28f75305f9ee04d5dbab51a23edd216e20c70fd752e94567cd573eacd1727654a1e48ddd6c4640f43abd784f31aa4406769a25b7f1 SHA512 43c83e5bb7bb3d95856c05fd3a962eaf4cd01bde39576f43da4bc35e49b571c81f7baf4c84a8836d2bbfe5b50ce1c21bdf97c702511d74562e138bfe9c0e3b9a
-DIST firefox-78.12.0esr-gu-IN.xpi 541422 BLAKE2B ba3a82771dede3eb4a6971dd6c28a248139428dca3977df7a4279bd5a2028a2d01f3d078b748dc0c86923fa8677b2ebdbcfc1b99598b93d89d9688957404b3ca SHA512 62cd42cee8dc8531e1ddedfcb27e17d06f46ada4ae7be3c402badaa57fd84a3fcc70f6dd6afb1a2eb8b6ceefb979899aae1a67e08d73db073fd8f0d29a9a19c8
-DIST firefox-78.12.0esr-he.xpi 545595 BLAKE2B 8b2c65e9ecb12a9bca63694c4fa3ef6cd1cd04093e9f4da42bbf0b2bedbf90feca27a99d66652fd735f84c3f5f85e57b55734fddeaf748a8bac8212975343ed5 SHA512 209f3f6b1b2dd176fa340c65d3d880cbf7f02a850969ee333f0d98b7bf69bb2ea5a1c0dd434c0bbe06fa1ff74170f4bbb57112af072c5a045486ad9a3331e436
-DIST firefox-78.12.0esr-hi-IN.xpi 567860 BLAKE2B c6a65ab10c21bed41dc7eededef8092ddbdb0b09c6c4de87d4f0558c69c6d063595aa9c97ef3b7fc7f6fc88393609421cf5048b3e1d8130fd5c4e8361f70040c SHA512 cc2e2b370c0eabf2892993c1b97f0481f515b981c7f1fb4cbed8068fd13ffcc7ec0a3707dad53f691b5cf77816e24a8a04eadd88995daf572e34ed16ff95cb12
-DIST firefox-78.12.0esr-hr.xpi 522698 BLAKE2B 13c644feb97ebd9a5f0a0469bfb766a541fffd127fee2942cb9514404b9583c9d1ffb5eae668e2dd73190a82147fb304235f91c84fbe57c0cb359ccaed032bc1 SHA512 d5efdd70d10dd0a401d3d80976be737d5012ef33d95332b73d773793ffe567a7a447c8a65b9a2d931a4e6273c7623771b2c50a0c9424ada6dfc25b0722fe9911
-DIST firefox-78.12.0esr-hsb.xpi 550669 BLAKE2B 3a4224cf17d1faa79eb19c33922a1189604d8bbe206dd837931df509b0eab67d46ac90cc8a3464114c694037ef8896bff197d8fb0a74372093de70f765414810 SHA512 17e8bd7d8ea4e9b36ce32313792f2125f78db679218d530c4c226e8c86711a3bc79dc1ba40b66c04741a2601b4fd6bdad5d5eb732e365219fe2f2518256338a1
-DIST firefox-78.12.0esr-hu.xpi 554886 BLAKE2B 3ffed6828c76c5c51d6774653ad61777ee89943625c8ce59643f1af0df6e2a4d5dc918778c7c1bda9b3f72cce6fa534221d9b895ead11818348f9c7a0fa1bdfe SHA512 df432acbf507eca5bea458ce545de7521719ef1392a91e9717d538dc29d83135c9c5aa8bace1ca08788672eab7974d35883a4064d443aa6404cb408db784d77e
-DIST firefox-78.12.0esr-hy-AM.xpi 588981 BLAKE2B 7ff31af1fa503573f59ba57d072a24cd7ba8185a28256dd66c3e176ba21619b4175d4b40e3787c76ffd7944a8da059da588167cd773e3d8d5643e95e1fb33930 SHA512 3169381fbb21cbedd115613fc9ec96b1fa4fc9e6bc819a3e94134a05a8ac14ad5f2241426cf928d3ebdb3a48db8e49fd1596ead5a8cc40b9ad12385e6cdfe604
-DIST firefox-78.12.0esr-ia.xpi 518808 BLAKE2B 769860bd1a8940bfa4cff65682501db93e653facbe4c1ab1ebc4068864885266c0e203bbefe58f477e1fb3e397cb5ed7b0a1fdbd840bca9b89f7e2bda5bff705 SHA512 4d02668a8e6c30fbffe327692a0dda509daffd1f5eec08026f9b3944825333b0a38d3f71810220369b0bbee5f4c0082eb6d2fbbeea2aec873de720c4538e49d4
-DIST firefox-78.12.0esr-id.xpi 509561 BLAKE2B fcb2f7a558f6592260bec964de149001be7078e338f4d09446b01f1fa0d196252d2ce2fc1d2ffa4ea0de45d492323b4e9bd94ab268baa7f2f3f9c91aec7514e1 SHA512 098bbe019415541975e375f02de131af3a50b6ebaa3c39399b14b907e67740a28dbcfe4b15f0755011c5273504ecf74828c65c5d219b7a3dd7d9b9bd9de19179
-DIST firefox-78.12.0esr-is.xpi 477012 BLAKE2B 5bf1cbea09a85303ef4d3e25798c94a3a3e23d770536ad08c645490c042fad85f1254946aebe85c5388d54115d5c9bbc30c9c1ddf2e34ef40bc2b4b4c8642760 SHA512 fb385a03d574a8d280a54c977be14996d33d46d5b5495368e4226ecefb12e479bb57b21e28f3c23c14f4d1f0353c725cea3ea5e3e3498e4ade2a91ad59e0f847
-DIST firefox-78.12.0esr-it.xpi 449807 BLAKE2B 0b2b52d50fd220c7d250701bfa12ebeaa5863c78e8759948e481e22ea76cb10a406b2b32135a73f23155dd4c594002db777ca9ff4c4a64c0b87e642bdaf68c81 SHA512 b586eda2043774edc5008bfceef5f779d2e468f7304eea9bcf2d956078d95f04dc6dc49ce996496a131bbd366bb6b588d20b914ee393f175c94bfc52713af199
-DIST firefox-78.12.0esr-ja.xpi 578200 BLAKE2B 5178f4003c7ae8806b52223d1e1b599a693519f9daeacd5532c8dd6fcebc7cc82cb5539873eb4395dbb2a22ef6da5d09a9d9f9b0d395c7365fa1e6fe45e1b0b3 SHA512 268afcab72d2a5406b77d992ce005e336520f957bb81dac3491ea74b2d9e2906aa34dfb7f7ebb70b290737382237481bcfea0ce9f4c3316bd3c76f9698661e07
-DIST firefox-78.12.0esr-ka.xpi 579082 BLAKE2B ef8c55d39a2aa255eff85a7eb66f2a2d5c267948887fb9e975ba86d323518d863122bd5d48b2de158f35b084f54d6621189f4cb7df44dc271e85ab494fe113d4 SHA512 8db2582ed315e846e6eba468fb804cd7940984edf29a7b992a96eaebdca35110465457d55eeb5ba2557b4e868a0b0b600ccbb2023603104d7c934f80e022d951
-DIST firefox-78.12.0esr-kab.xpi 539732 BLAKE2B 8f5a140b2d2abf4958c6e437f26d49e6ce06511ac798505a2a7573010bde510ef523fa92d809e6dbe7dafe1e370932fd5db039099b2c619908d095d94b470ea5 SHA512 e4455e2031b86ae7b0b76da7b90f68cdec247ef9cadda2cbb7b86b85b80f296418cb3a034c6c630c9d62c056a35f0010b0f58ad53e634f7db68e4a4cdf09fa6a
-DIST firefox-78.12.0esr-kk.xpi 593260 BLAKE2B 68eea4cb0f257d4e1d0771d3e06324d4a556ba0c063a3d17f641330b289cd85c677f01c644713a882fdf3a94650d4824957dbebea37d0d87628c872c8f77a7c6 SHA512 e216c3727e7c1ef3c04862c207a9b22ee18202ace5dae589d19735e82496fa10560ca7c5e97750829ba7b9df57f0695778dc60794c837710be2509f139783fa5
-DIST firefox-78.12.0esr-km.xpi 527366 BLAKE2B d166e62391f2a93ee7ed06801bb1ea0d702ae4977c610aa013dbe7e21d2f7d243ed969370a8815a4173b5ed691b375804632222367e8b9c537ac7a03c3768e39 SHA512 ae50dcd81d874cd8802270903f4db23d7fac0ae9e913a674a2b487062cc901102723b3155e83a423ca07eb814f75fe5ab39b83ef36e203842c96af7d0bc587c6
-DIST firefox-78.12.0esr-kn.xpi 506748 BLAKE2B d753d31da106fb6857dddb21b95f755d8d8cd24f02e58a8d3b189530c568bbc94942d62afcaf49f3c82b209baeb455252a97892482538564c0986408c1fff3f9 SHA512 5134e70ab4ebd1b121a063e918924139a601c86af006d9e8f3a5025c68a6af550319511b4f032eda1c2a45fd7e857577d3ad4b7a6f86753b3f84c065e200ebf7
-DIST firefox-78.12.0esr-ko.xpi 567527 BLAKE2B 14b9d67c582ce2cacf1196ccfaa9f612e98547f30f321000650978422a2a0cd33f9c6f9f135b289baee75f28f3c30675ab486d37d4b028c39da9b26466a36837 SHA512 36bfd233884dff29ef3a41370df17cdd1f306b1b35bd81e8d2881c09a5f73536f834c6bce7f0b81b3b89862b19fdd507ce321e2b467de20586e829189a74f90b
-DIST firefox-78.12.0esr-lij.xpi 475236 BLAKE2B 89d82e8b109a625ad2b7440a908fce782b43e7bbc1b58b3c60a652334f25b2896640e1b97bf541c59cade8c6840425d6ef0cd9c8d8fef3224f77184f5515b5e8 SHA512 78b62ae948e65b53573c1c393b52242129e12e1a30dfff36ef2d435be0466c14cf09f28dca92b7d6ce67430a6c5f057178bb601d3378036db0cbd1ca13b5cc5e
-DIST firefox-78.12.0esr-lt.xpi 540687 BLAKE2B 36f07f0bd85470537f06e6f2a40ad5ff5143c256a44f6ee332caa4ff77f2dd87990c18368bd85ece775558f9312f3201bc30ec3b354ce3d25e822e6c98f6c938 SHA512 1df7b888852aa29de0de945e1d901a18b35537e4ab9ff9807e9efd3ff2c385292873862836bd40ad8eef1cfd5f6aa6b2fe7288334e2ee295ae12cdf29e6a3eb2
-DIST firefox-78.12.0esr-lv.xpi 467454 BLAKE2B 2eb95094f103059c77dcdad427394b70c26033b8fe9c2867750829b90deea9d1ffec738770fc0fa23ce2f84b8c92775307fc3ece15d2749419270ac1787e2d27 SHA512 4517bf89ecf9fdab3b68b58ae53709b327b38f6c546aec85ca339427e1e2f4e846b91f680d7dd59bdb935ad9c81dc2a85bb5e2803fa70a077a10fe082388def4
-DIST firefox-78.12.0esr-mk.xpi 460012 BLAKE2B 01b91f2059dea0e6aecebd98daf280a1d299a80d7777cd0e363b60cebc1f6bab04ae8cf6c666bedef33b9246cf623e8074ac9eca26d7a325451b5e1c673e9eee SHA512 641986710a8da7c4dd334039e403a8f42f0f143752555af72079246e001e8a4d7b8d013e900fb2b755ea60a2df2a748cd802398f694d6fb9e2c1cc61ee118f28
-DIST firefox-78.12.0esr-mr.xpi 541569 BLAKE2B ac084f640e23cdd07f93dc3b68d61eda67815c70f13d616d8440553f06d4f831d7815e390c88466d5fdff4767efc61196971bed750080b7940ca53ca76e5b26c SHA512 98282c85887e71dcdc08be45c46baf8893e9818880ad7096c57d946c2e08808fad74222c907c593a6f1d67f50f1cf6fa65e158f2379b3ff2e45c641c8975ab34
-DIST firefox-78.12.0esr-ms.xpi 453061 BLAKE2B 0fe96bd6db5f8f0fb9423a659a052a51a1bade98d9ec613efa29db87b6483e792ddbb6d6b6368cb7d9a1f52be42099d3fb927a4a438cb4aac32968089fac2376 SHA512 122da1a5bd6c521fbd93657afb26a734082f23b9e6e3d32c28345692c86665fe1310c74bebefdf65715451632e4f03bb3a0697e010712da7b90251e3e7a4c9ca
-DIST firefox-78.12.0esr-my.xpi 526323 BLAKE2B acd832cfa37ea57d3f475fc7d83747dedf76a81d3d783b83fc1dce42949e0cbbe905390945df314b14d67a4ae8a685abf8c20258bcb85bd04104faaebf18bfa3 SHA512 92b0fe9a657e3ca85d9b1c81d3435d94028e041098b7e1b52a26d4e9f378319cf70e9649585fdba5dac919c8189289394347466dd8be0492f05239ecfc4e5ca8
-DIST firefox-78.12.0esr-nb-NO.xpi 518519 BLAKE2B 3acb4ebe5add5433b603729a4afd3d07b5c611b14996f4723c865a4e4f77e77c7ab7b0a00c697190ad52733323a8d9807be5cf273bf4767b0b823fb0efc1be43 SHA512 9f1a0bfcd1c668ddcb7ce1ea52ce25ea3c490fb16ee8e4e475668b1e3a7e2e10db7dc36fa118b911f7b3b7e71054b664589763cb760232028552ea2220415a48
-DIST firefox-78.12.0esr-ne-NP.xpi 483409 BLAKE2B 24bc0e9eaca3055f2e6ed764b5ab230b161404694a7cff3c0d61de5d742fca558d894f72b00d8b9c2d7be5b96ea88eaf1656e90843f62afc325044fdc80bbd4d SHA512 ee4af731da6b770ea503aad20900da86aad7ebfb9e4509035a0efafb658eb62ef6633ebd6facdf38404dc2bf6e656eceeab6c4e358e472b7a220d7419ec28bb3
-DIST firefox-78.12.0esr-nl.xpi 526209 BLAKE2B cc7926d00063e84f4a9bfba8719d276c4c847152da283f0b36dce24cc1ab1f0ac0bffe29ce574362286c664564380e88f1575b19af5121f54caeca02f79a132a SHA512 5be0868df240c3f2bc5f62d62e33557bb5899d4afb8f775270a2a7e8d3cedd62b06f1bbad6ee4b42efe47faa974d2af684a629b910ffe3aa11877f0f0e772515
-DIST firefox-78.12.0esr-nn-NO.xpi 520165 BLAKE2B 5c730388fd83f76227e016a0cec35db136d4549105c7c55182125bbad7ed7b6797dab79d5a56cc1edb06d04cc6cff6734b9fc45db7c20b2efeee201f654d8247 SHA512 571606c967cc2d8343a9cd144b4c2b4f8739d43a899a60674d38822a8d8c488a6f4f38a3d7fe79b32a0e2c70b8d358ee0b6229bff4eeb16ad75e452629d78df6
-DIST firefox-78.12.0esr-oc.xpi 542161 BLAKE2B 56862a01dc976698fc1fa822cd4a540040cce2a98dbd8c68822d4d02daca9c30c785f2df4a4efa525f971aabbe90aa2f8d499b4b60ecf7fe064e4902a710742d SHA512 ebe47b83828bb15fd17829d5a741adaefba99702ea6642d0df89767ac0567905e0ba4d7c5014b453bb0ad235c317d1d9908fa9f3c956221d2330adab6ff09d06
-DIST firefox-78.12.0esr-pa-IN.xpi 580361 BLAKE2B 5708b864aa5bae9961c5aaeb75bc2d82e118e9ed4e5ce60b2202aeecb2ae9a55f3c2e5ea497352c7c5a5310be08c42ea7099199ccaa6ba5de5bd3ffce26f7406 SHA512 3a539f44c67f97f2e4a1c9cc29934e5135e241fe0adfd579571305baacfa545e602f78a2ac183086add7df444256eabee7e3ab32a626bc8d3ccb46d668831094
-DIST firefox-78.12.0esr-pl.xpi 545587 BLAKE2B ede715662416623631f16a1f3ded4a9beb8483a6155d541ab0d316902748295025fcc5a58a376d437ce496a0e23bb67772acf83b6477f70b0d0006c2ef58f5f4 SHA512 426b6385cee5ec7e1fdc97f8ebab31d9d3e7c7228cd791f2653a6e153c9c210e25ccb9040fdea89779664e8469958a3fce2036e31c00a51d48ef97eb1709cf85
-DIST firefox-78.12.0esr-pt-BR.xpi 527570 BLAKE2B 51dc9cf77c2f98cf5ed9045d355f8045dfa9bb3008dcaceb820b6df22d15e3fdf2d7fbcad986d17a93541051e863360786a3063d87233a9986f3a51cbcb821ea SHA512 9475a182f30f5124e9480def4c4d481ef744e9a57dd44418d9219ac464a9c52c35b50d713420b5957d3c18ac0b278ff0e9fd7ebbc8e7d723e3e54b697bf44786
-DIST firefox-78.12.0esr-pt-PT.xpi 532051 BLAKE2B 0296ef68afc434d5f382fae28f7d196fe535370fcf3aad8381fd485d52337e1655e7e175a73f69bea8f4ec9ea51c81f616fe6e01d893d43f37ff15a32e72c5bb SHA512 63cdc360ce7a950285c9ad2a8fefb15e1653db6cf03b5dc7ef94113be7a9abb79277e7a483a9969e317df5a80c0a780b480e36ec4b54b81e061eb6f8d78228f7
-DIST firefox-78.12.0esr-rm.xpi 526719 BLAKE2B 06fa9e1e88a49dff5b9e2d3a8257aa04f07f53761f9786b41f837315605c7df7d65c99a1d7faefa9d70a205801ef3a6de5e6037c3ebe740bbc848d2cec29526a SHA512 0562f349ff89dc6d58449ea84be5b7a3729b6a0a9da10eabe3e33ae0fdd67a356022e416a9164a76ee2b6ee53dafc683a5005709674a78c9b533c66cc45d0275
-DIST firefox-78.12.0esr-ro.xpi 535573 BLAKE2B 6873bee12b50838cf27b91c1d6bdd63a9e1cbe3c63e89c79ad2b8828f33c29dd95915cceec5fe42a3be12f8c1f59dd0225a9ace3bbef0d4e8cfcadf9724fe6f1 SHA512 73abbb7242568011eb39662e15ec2d63fc43fe269b21f82227d4b9a7eb89e9b3a7cc6ed9617600365360636a8df968cec87c966fd501ef1b4b12d276dd11c5f6
-DIST firefox-78.12.0esr-ru.xpi 614597 BLAKE2B 736786d92085cbb194dd371aee0a517ca6a17d9f6fc0db45e653af2052c5f5f39fe267b7ea826d102c68f699e991473474b0398175db17e3dcd58963a680d5b3 SHA512 432e4594e3c6446d9cfd24089a70960da19876b1e79e30f736471ac32f5772bce10c6c58be70237963174e828bb0f9ddbfbed2a314376d248fda9fe7d1d33f50
-DIST firefox-78.12.0esr-si.xpi 492527 BLAKE2B 1972bbf48b423af6d7642ab712affd8be3d2d9f22ee6fcd4d0ab5d79b34338d73bbd0f53f3809cf9a9c4adcb7a65a30ad5c751a8281efde29396e5eccdf49b20 SHA512 d223b49e703f2e4a0f26dee7353bbff6e865659abcb1e13dec3d2904e3c6a6d3d8c83216c038e425a65752e82b0ebe96368292f7d1229abe77994558394e439a
-DIST firefox-78.12.0esr-sk.xpi 534223 BLAKE2B 2b5e1c5e6013b69a7fd7bd47036c87fc12c4c53b8c3a8c2620dabe82594f4316dd71a038a47c3135a0b87a87cdf702ae0540f58906c0f6e0b181e0b9f68c2c4d SHA512 a3db60cc1d983eb7d1a3e3db671d82b80c657f294628a7d22652de82ed95ae3f149b7ff1e196d25fd6e25689c75c62b3027431fb33682ee9e7cfa5ab5ba529a7
-DIST firefox-78.12.0esr-sl.xpi 520944 BLAKE2B 9b4024810e61b3af52c866ab4abbcd660cd5da7a36245cfc134afa00e5e503edb22987c72a3d4180fee4aaee30549614063b297dd1a9db510705a665e4c59096 SHA512 69c1f56fcc966b29746f85a180e331c0646dd430f53cdcfcae3c958077d0bdc0d6332dc3c15910fa2e9dda6809fbe1c3982c9aa1f7bd7db6fcecd9d2fa4d99ac
-DIST firefox-78.12.0esr-son.xpi 424572 BLAKE2B d36a4002006b7c7f2a259e6b40bb4f385a2740b4e8ba9d3bd7b278baa24b0a1e62243982f34819f17a6824cc66f5ca4e7f32a355291ea33d8865172eda58cb69 SHA512 3a412d3ff10a11b9aab2751f7b15617cdfc4297d77301ed054119d4bf8746ebc132067e3dbb4100884de735d83f16ad326b4a7b4cabe150da609d8cafdade4a5
-DIST firefox-78.12.0esr-sq.xpi 544911 BLAKE2B a06a917f6dc1c3d0ccd712b3bd2ec1ce54c801c212c15da968282a7e169399690e7530b5b553dd11d3548df95e676c4882d54d394e593385a42c631d128be9ab SHA512 749552c95096d15e7c7eebd680dcd31d2565383222e4ccc8cc3fdf30b4536749726a5a6813c4ac665b57711265b1686073464743ba788d30f3b832c5107388e7
-DIST firefox-78.12.0esr-sr.xpi 561391 BLAKE2B c34eb03fcc556e2db09496931bd2d08ba9dc8a4ecff89ca03e19e8679deb0f4d03ffcea9f7d67eedb292a0dd4c65a66345eef45d5a284c72663c33b1bfb1d50c SHA512 8b5110e43de2c7afa4e6fe152c768ce1eeb3e21938abe34e27d9dce69f890ce3b3d90144639642afcb5c3a348ded6c412c7e48594c95657ee33275b056754868
-DIST firefox-78.12.0esr-sv-SE.xpi 529708 BLAKE2B fbd72399195f0824350510000c07ab0b8595d3315ba7ad983d4147aa86955a0843b5086046cf6d80bd8769ee7a21240d368b2ffa88194c2c07cfef55aa6adb98 SHA512 efdfa3f39ac1ec45d736590fbd5a36b81c5b6996e30129d2a7bec93f8d90fd6db31f997fe28f6dd430e10d9333edf5f5f2bbd72116ae73368b52522716f62b19
-DIST firefox-78.12.0esr-ta.xpi 521544 BLAKE2B e776dc5d8b1e01021a99ef84c94721342322a44399b689101d230881f9d212211e10a842a68675f2e11ae016eac93f061abd553998531b3c0d8a4f9e9f163680 SHA512 86c6631376f95e6c08d4e1d3bc0a2d5adb89cac885909d1f6a3b6ba8753d8d432784442aff27c71a673b9e0392b687e952284cd8ab3e36d06ac52e8a2ca55779
-DIST firefox-78.12.0esr-te.xpi 558391 BLAKE2B 2e0b60ebb90905fc49a2a2a5813aecc763ff598fa96f5af9f3f89ecde2914fff793d9029df1970cacc18a9b078b473ce62b0885df7f4832abeedda8cc03e520b SHA512 9058cdb3773e10366bac36dc77a122f4e6e83b84374c9d00861d40d28eb241425426644270eb31eea8098f8fac8b17da8db67b7f266bc7f6e86eb4e94863ea8d
-DIST firefox-78.12.0esr-th.xpi 592243 BLAKE2B ab688f807db0004f9e0de221079b1d107f5202686316c4a3c9bb7e899b057ca8682f29873039aaf9ae2f6cde0bd9141efc51eff00be1292df6ae43263dd80ff7 SHA512 310a04fbfa68f4f93becaf6baf10c98741f802556228076fe332672131b04903d35ea5354719a6b05a672e3b0b5ddee984abca97c62bbf198ac42b8ab2ed6995
-DIST firefox-78.12.0esr-tl.xpi 521109 BLAKE2B 4410a08723fbe30017adce09bb067712dc81580b6718ea6a9ae59222243d279f7418803fd624572cd5b543dac8922e5cb4d1613c70fc68f7ca9e09268c98ce97 SHA512 f7ab25435fb1a5c0550f7d15bca7ca93a8866c549756240ff6f7aabb843b7d780caf3b6fae8ab20685c03c65e419f88b3b4f6551d6524dc9ddd1d7cb857b92c9
-DIST firefox-78.12.0esr-tr.xpi 539884 BLAKE2B b2e56de6ae0ad00cc7c52d102d291d8d978bf0c24c88cfd5a6a9b856b9b31b40bfb6a26f709d51c848422c9925924bcb94f513a97d413cc33b0046d4cca42d64 SHA512 2eedae3645dc963a6016120007a634a0cfc4f1b38d27dc530340b6e8b8312c4d3a53de1529924688dd9d17b735cfeb27c6df10942dd72c2d138d35c27508bc25
-DIST firefox-78.12.0esr-trs.xpi 501218 BLAKE2B d9a566f1c0f5a5dcdc99e9c6b8e5fcd2b778b7589a3e2b5139b082189185d97f8dc7d35edf4a6980c964624d600495e902b2788dbd6b4359ec6aa45cbdecc744 SHA512 5faf29b0ee329c6dd2822491debe57c4f6ea8e6ec4275f25229a074d4274a6a843fd71c51d2714f44c07067dd92ac641548666fa017da644c300ff51ecd67588
-DIST firefox-78.12.0esr-uk.xpi 608585 BLAKE2B 96dcd88731f6ea3c9bf8cb1c0a6c10e37bd3dc5a8610a9e52b8bdc493bd898cd28c098e0850563d775f4f9c9e596f4b368baacea8eb9848d6aa3e428fed52676 SHA512 8d1176dfed8fbe3023fc850b2171e386ab6f2e1c38d3480fc7664291d8d59bfb8da90fc25562652e724de08454d3e2a57f537e3217c6540b75acb85db2de141d
-DIST firefox-78.12.0esr-ur.xpi 557951 BLAKE2B 201bec421aee0cdb63d211de89da044e5b6250c318831d1284dfbac2096404b9ba77b0ffd2b99c08653f9cfad3770b4045e90404eaa0e5587720c2adb8455fcb SHA512 d1bda9bb3207dbe654027175883c11cb9a82c11c23adee9a978ad5a6e9d5317cfaf0e87b4896c3f8ede86dcbb525b43be03218c2768b646023dad9a0c5ba6049
-DIST firefox-78.12.0esr-uz.xpi 477555 BLAKE2B 986bb748a2faa8b9a0aaa5ec874eea0a410502643ce71ebaafaeb184b97d4c4badb818a280339cedf6f401b34f79166c14dca08dbb8e714367f674b17bdee34a SHA512 1770757a2c1c3d9197ed08d6dc6514e8565292e1153c2c6d810ef299c5e070df1b67fb5996195541e880c71a63bb254905cd217f2532cbc7e75369241530494c
-DIST firefox-78.12.0esr-vi.xpi 562863 BLAKE2B b0c80866ab862e0d9d43306e897c8b3a06df6a03d62de0cb186b08ffc9307a68d17b361614046eb15388258af87938c93df9517e59b8736af2114e46a7a8cd2f SHA512 ea8aebe03949c8a364d0b47196bff4dbeff1eff1594f8b36dace7c6d401c3c353ed80bc89bdaf505f2b40abcb7c9c5ff13d38748f194629663f6e1cccb7c783f
-DIST firefox-78.12.0esr-xh.xpi 427839 BLAKE2B b6cf89388e45ca74b4d3042f9bf30535cd26a42aeda03b03340f2779ec0fe177653f43ffc3a6fad9a3ed98049950ad18b05a76b043d91ddad40f311e065fede2 SHA512 c146d9d5140ee3023a749d21bf4645e07f0ceae8f8b9d6ba91dd776c57e69b1c56e402fa3ec2b1d8da4918ee60e82b423c9994737e288d8a799c8c5ab1119116
-DIST firefox-78.12.0esr-zh-CN.xpi 564771 BLAKE2B b745ddf8c8ad7686e5ca7142338ef4b2f2e362874d9b087c4f4980f4d9e96f076bb318e0782c8c2404c00e71f585aaa76b26da0e369fb02b9121402b5471fa06 SHA512 cb707c11c8c0554e6255e725ab5c68f3b15c2d34d85f84fc6ab4ee7eae83fa91b35be282d592b845f09539ec43d1dde8167bad1eb24b86adbbe236c72854764a
-DIST firefox-78.12.0esr-zh-TW.xpi 564742 BLAKE2B 3d4b211b35c9aabe2c610b621c175bcfa4fb0f1ba4af607407b9002a475407f53cb8f2e7250a96fa93abd5ee74bd3ee5b0aff01a91e45ca7211fadb2b03e5e1c SHA512 a241c3af98170e0885b63ec0c140fb1ad7749a5bc762b7154b77282d33bbcf7926550182d261e3ac4b0084d4b8d98b30111dc459f3cbf2d9ccdf9f6b811222b5
-DIST firefox-78.12.0esr.source.tar.xz 333737488 BLAKE2B 775a55511a48f4210807d2648833bca6f95d9f4cd48b5d0de8cf0bf2609590c1615fca7ff855ae3643a25466d131e15dc293e6a57aa05e1d91d2cf819b0b89ca SHA512 646eb803e0d0e541773e3111708c7eaa85e784e4bae6e4a77dcecdc617ee29e2e349c9ef16ae7e663311734dd7491aebd904359124dda62672dbc18bfb608f0a
 DIST firefox-78.13.0esr-ach.xpi 460301 BLAKE2B ca4cd3d8d2384de6fd855bb6bf2b6f4a5bae9addb51e7a092eebd8e6f4de1b5cb7f452c58636679e68f58c89ae816eca6108813df8bea4272553602b65a40630 SHA512 b93d460f80a2403946c0daa8a083670b3f95cd91d5b9d9620b1ccd71f4a2eeaa6d9ee9acf73517e6efb56b39d8a4058f66e328b058df5c143006d18fae2d647b
 DIST firefox-78.13.0esr-af.xpi 428367 BLAKE2B deb1463defa2b2567b7f1ac2e6a12cdbd7b723ce1d1242d55fe34d3422ae52651bce6e785347647b59ab75bd9c8e42ab75fa6bbaf74ca5449844873077a826e6 SHA512 777c8f15e6a004e2fe1a48011187fe6d7d7ff2c8372885043e57e646a9c4913ded02695d970cdf0660adbd90840ea791008c342f33eca77b92e8809f1b659c38
 DIST firefox-78.13.0esr-an.xpi 508374 BLAKE2B c1c02f6732ea63a2692b2f82540c61a50a661c681f433299acaeca1008be387f489e58fc3e776762e0fda1799b956b503b3b941974bf2f03835c59cc2b724d89 SHA512 138363db07e7e2972cfb59ae76134f6604494659b0459596a1af56c37b33d0713c1632e34d239486c7b8adf46bb86aa84e9db3bc9ba428862ab075de76056451
@@ -200,204 +104,9 @@ DIST firefox-78.13.0esr-xh.xpi 427848 BLAKE2B c31909945f72dadee041eb3bcb4042ea97
 DIST firefox-78.13.0esr-zh-CN.xpi 564769 BLAKE2B 2771f27244e43c48075f9f6babbbd362ef02ae6aa4ff344affc84fc96cd69427ba2f9650ede1aa27ad8c4e240030855df06f5d5ba133cf1f42bdc22ef7e049fb SHA512 9ea0f86c5529e9d069e1066974be9c50b93325be653711159215e06dcd4b0ad76c7e4a8ba954ec3e104b424918226c2b4999c7328638d352ff389b0e24b44b65
 DIST firefox-78.13.0esr-zh-TW.xpi 564747 BLAKE2B 0aeef4fb1a7f1290f84f7f18d4f1ad63dd267a2b7f472dd7c2aac55851776c9308457ea9d6abb297c661d18b8aaff274d50ee1f8b39ec36de9a804b62bb419bc SHA512 73e873090097c1021c34e4e063b9bbc729023279b94a451307332ae70fb5f60b9cec6b515d3366550d126368f913c574200664322ca20b95279f7171595120d5
 DIST firefox-78.13.0esr.source.tar.xz 333506484 BLAKE2B 1922e2f6b2ada46e581e4eaaa388873d31c6a922e5165ba225eeaccde5c1c6d7369a57ecf8e89371a34f692dca5754a461abb7d1c9bfda9cbc4f021d39549439 SHA512 78a5dc8713ab879ebfc3b8fd7a8219844d06f0d897342fdf9a11471633d98e148ff85cf10e561899df4910b94a33b57709b64788df4621a8c0b83eb9a7102cef
-DIST firefox-78esr-patches-15.tar.xz 65604 BLAKE2B 86e421e555ffd5f7f201d0f1a1c446c649739c67cdf8dca536efa115e09d9c357ce1551b7270c77e8bfe7dd53e0f3e6386496283879cf5e0c59b3c864951ebb3 SHA512 b229e895f083a0404cda1da0d8ae937429d5975ac52ab20e8b15611d9c737381a1076ebfa8c8a127dacac0e12a2a905ffd579facde2d80c6facc911e5739e34b
 DIST firefox-78esr-patches-16.tar.xz 55964 BLAKE2B 79d3a465c69656bb55ee7c1e9060606464b6404435b92f534db275521ac2343e045feae1fff6166fde9e2599a82cd982b0b2395271b1033f0f784e745e2c6965 SHA512 3aa971c726646cbf37a14a0dba6c4ac966b88db655cd8b730c5572543bfbf682991ee7c139889541e4f6936c13f27233dc1837fbdb9ee340b33ebb2cec59b01f
-DIST firefox-90-patches-01.tar.xz 33084 BLAKE2B 943f5f9f87c6ce110dbc52e78a58ca64ab11cbf3af01bed8c0d6f537baebc0ef89455f01b966f9f052f62ec7124fd0b4019e27e410ffaa0530874e5dda73b01f SHA512 90689ad703de17c02581a6b8aa1c013b9ab96da22a17dbb8e06fc9a5fb04d00358df9e44285b5350708b366b32a7e6c6130ef8dcdb74b0f2b5c0dd44293ba825
-DIST firefox-90.0.2-ach.xpi 467582 BLAKE2B eb20fc04a512be8d1eba219f7541af93dda781080337d76bce276a5583bab5db1938bff037a238377250b6810232b77534bbcf835362ee385b4b1bb6aad60067 SHA512 2f726bfe18bc7e6aa3cde436e9c142382513a1175269b710449cbf7481dc3d91171d21ca1bc30563901bb35eb31befa3c2aba115ac596951d3d6aeb5b94bd1ed
-DIST firefox-90.0.2-af.xpi 430709 BLAKE2B 05cc8dde801efd97dfe56d1d102fa48e1b6e62b3e905648007dc488149628ad3eb297445319f0f1b620f2549d7830c16b81c53e06fdff1d43fcc70e815875256 SHA512 3865c9e96b66def2e640d747cf73ec97127b58e15e0fa01d5374d2ebe35a91d16a8176b68f4025122af56648415b47d03fe6a4a1e007a64da8a9ff4e1eae8ef8
-DIST firefox-90.0.2-an.xpi 515453 BLAKE2B fe5487cceed1fe4f941adf78760cbfa313f58408a5034eb72809e82b3a404e6515222058ae0fe8e7b18807eff8baa72a7ffcfe80798ce4ef9213be7bd52fc2f5 SHA512 1958e46092c05ba266896dffa83af98adad83572a31e769219b88a044ae132f2d2625154a20abbe997147188033f4924ef50e678d435aba9fdf0d8a291c89ed8
-DIST firefox-90.0.2-ar.xpi 580224 BLAKE2B 0ce2771752d9c3e6a2bb4d39b4eb4da5ba9ce4d530b04fe11b7775cc08107a78d3cdee033cd2a564523481cf69954fd07fc6adbcdc56ac0abea192be98fad91e SHA512 eaf2335811cf451dfff085efdd0256a3c72d08c59b1d31dbb08a968d40d5c20d45e590479e10738726bdc597a523c036a2b26bdbf41ee469a6bc3dd3254f0ea2
-DIST firefox-90.0.2-ast.xpi 508002 BLAKE2B 74158545d969e4181c4a80e3a1a2d9d2dd0e4d358c7846b9c426b25a00fac9d11bf10f8dc39e594ad9fc8395fa0e427d06824e3981a7dd7e59db1bbe4b0930c3 SHA512 7a5b98e537ea3a930016884fe13c1bc91ebb6f13267f759aa1c689a80f9e3243eafcbd8de16060bdacd6c59295b6a6fa5ad419cea3328acb20be5fd53f909b5e
-DIST firefox-90.0.2-az.xpi 503461 BLAKE2B 15c7e6b13ab47639c611df6c51ebdddc2a365b6f0ff0e93285e17f9de8b85f91d028467c3f80ffab4a1ba0e28d8f16543db994b5b6970c5a22a8d4e36713a6a3 SHA512 18f759e63ad51e9719b3e5f4695f8e592360e612835e9f9ea5cfc616bbe07fd46bf110f881b42663d0e2384f12d34ad3a9207aa62247e582b1cfc62065205210
-DIST firefox-90.0.2-be.xpi 637220 BLAKE2B 1e10160eeef6b14da9431ffbdb6b94b244477d23f9b38ecec6dc8a40a188461624cf5fe9395f93c41cb2701eb2e18367db1ee991debdf3927fb44db33631cb31 SHA512 c9eeece43756e020e39908ce1d99f238c3d581cfa66b9accf8ad23fc0691d461b976ffe7027e29cc21914a07c9b009c19d5a7d17013b70739d5cb13dfe20ae8a
-DIST firefox-90.0.2-bg.xpi 590496 BLAKE2B df82040f0991b69549e5983a6d3988bd71bee2aa367bfa2552d571cd1702e555ba0c488aed195f16541eff54a4b714e3d54ef6c99da573d451a69af44967ac85 SHA512 0429124d8eff17ba6cdb5b1f3b8107f1e37e8fba9445ad88532b5780db1e139d527bdf4bde37a1287657828a68357ee47e9d308b540f1130eaea65332ecfb3a2
-DIST firefox-90.0.2-bn.xpi 579586 BLAKE2B d989d0ffb3b396eff5f4cb3b42e503e52395715c371af60f7437e7c05d5153c1641c67ebd68870f019458ea9f9f32c888c7ffa8522d18403823571bbffd7835b SHA512 49d2b6d9bddb60140dabc91d7566318a7a33cc96664459fe75b29d07238a22056db615e6964b9cec9b0390cbd482bdedf4362acf144f752a8d82e7aeee76c360
-DIST firefox-90.0.2-br.xpi 539710 BLAKE2B 0691c6011c853e856577e7d2faf320b3d5cc276c360365f63f97fa03860ae1eafc02a31cda92506bfb3182a1eb2f345fc9f8661cd3446dc4dd11bafc09d587ac SHA512 630169e5a074099a3d965da66253c3707a3fc898a9b5aa3f5f5830c948c589e2f260ab6a50795417d19e63528658daadbeec2ef3117dc3c30d026cf9adb684ca
-DIST firefox-90.0.2-bs.xpi 475430 BLAKE2B a6fb2a37cd6517c5816e036eeb794ff0de0c71f75b620b795a463ab33a6e47c8982c060ad128f012972a8c6759a6ec5cc178f31f2d242b86949597fae59e372f SHA512 44208f322553d88e59fea067a1216f8795a0359d330ff26762b420031bf8f31ae87d3fa1579153e5e6dcb53058c048b1df49eda74deace4bec8262ea6fd0d20e
-DIST firefox-90.0.2-ca-valencia.xpi 548479 BLAKE2B ccda2b43e7ca3ccc3cb2bcdcc78e668d51b940d571c2c7a7dd117ace3cbba8696304aacf9dedaff9d3655e3dea96d0c694a4fe1788e8c0eb6c7e9d7595786c65 SHA512 64b6e4854cc9e1866a6ee7218d499dfa66a62680d36b2ba5973bcb99cdf09ce9664f078f0f93946575e4daeb872fbdeef28d7bd302113f83668be2376a1d4602
-DIST firefox-90.0.2-ca.xpi 546603 BLAKE2B 4a73a815709f2c9fd30be7bd282cd889d3babf08af0513e022999fc4ee789fa7ebc57a1b5798a465d46bc530830edceb1ff9b1e09889a139c25364436b32e09a SHA512 7b3d1f509dda3e9adaa8e15d12d1bb2a33c16356e7eebf99a0cf73fe2611bce6d84a9b7c328704dcc6caedb60fb9faffd9773e6e099f7379f5020b9c9263aaf2
-DIST firefox-90.0.2-cak.xpi 574164 BLAKE2B 442b69ff8957b047591f21ea22ce9d04a5d2ed88d870b321eecdb527c95dea94806ad76b8d88127548e35fd87f647b15c21e9a5c2f9ad7a7ff4582c94e500d48 SHA512 05a50ad71449ff9828fcbd4cb089d23c27fe885c43bb7f02bde303c0223f0e64036589e52049140fcdc1b92180d4f8fde430f2d984fdfbc3e0a0dec7bcf33bcc
-DIST firefox-90.0.2-cs.xpi 577720 BLAKE2B ddc2062e0bd2642236266c47bf763121d2581ab0cb99da04860fb33d688b26c4c887760feb7356c5808ce889497fd62b12e01f00b55131ca45031a9e977bf153 SHA512 7e277710908892964749f446b48a8624c199d5d45f780608ce0ac6a7a5f7cbf57cfd4ae986f79f76a46ef2a0b41828104daf97028b54a2d83f6f134597ec28a6
-DIST firefox-90.0.2-cy.xpi 554650 BLAKE2B a8b3f9879534e4f59763adc1ae6ac310d14223faaa23056cf7248130489f993228083fca854d15ee3392761c33fd37d506402fb657b51dd1a607432e9a1d19cb SHA512 c18522048efc7edbcba01c1bee79e43d5db7b9816ac32d91f4441d3a0cd65155581966372101f14264fed70eaec881d5a099995a5b4beb9c6a3af54c88045212
-DIST firefox-90.0.2-da.xpi 546288 BLAKE2B 580541804a971226172c4a5405c2d97e57b0a8f6eada7d0658cffd79bfd5e4b915cf29c8ca58887f328a2601103b52b328ce5fca67d5e7a261a09dbeea347d76 SHA512 41beb225ae75c34dab6133f98464f10e9b7faa6405a15199272d05039a4c0417f7bcb67c0b4d058b716c010b9afba7508779aab664fa9acfcdeaf8a12b336a6e
-DIST firefox-90.0.2-de.xpi 566471 BLAKE2B de4bed3a835be63460e938cfeb73ea00d3db1170a83fcddc7d67c7031028547205f1d9c016d46927bca1040ce9dde1a6dfe091647ea89d13425e559980baab67 SHA512 5dff86f82a0ae5dd86180d1bbb50af329a8d753905464728eb608e67db7cab66030d76617d119807642cbe16362498fef67658f07eda7ad7edc76a59093db3cb
-DIST firefox-90.0.2-dsb.xpi 579297 BLAKE2B 24b04ee03cbba2269150674c994c073c5f114cc56e8703a1f993b2572a64ad9c78c49c65bd4b064b785faf2f95c3676a978cd01b54bfb0b5a36fe9b8273c4a09 SHA512 1d2e7a9b4f701d05ce9af4420c3458872cce5e8be2ecf1644bedfac5dae294f13056ca649a112bd2d7d0fdfa5a50574a107cfc51eae3cbc3bccceadca94f78d4
-DIST firefox-90.0.2-el.xpi 652899 BLAKE2B 00d52fd1ac72f2ef57958b02cccc7270dc7f565ba3844dd0be495930eb7a26cd72c0f1c289961aa940fbf5dfe4b070159fe6f511df78ee26e0fc793e245a5227 SHA512 dd9e5a59bf81ba93ffb131fc4dff873e557cd252941c2986d37730752258a2034db44e53672e7e2174c6f5467fd784ea22538e8e2334b441aeae8e99a326ca96
-DIST firefox-90.0.2-en-CA.xpi 521250 BLAKE2B 0db675cf883e92fc41c640f9c599b7fca295ae4f28f686440ea2e2b9a4436445b9eee2c2fe6eb625b1cf96db87642c341084696b35911e52239486fe11d3ce6e SHA512 c1f4a0e29e4e7313b0ae8efea43cd436f199fc249dcd6fd15d6ad7b2be106a90e83f49083f7d1a018be580f783fae5bb07ed5c01012b5adc59526dabba72fd30
-DIST firefox-90.0.2-en-GB.xpi 521806 BLAKE2B 1a04f7c7953f1f32e11484ef2b21559428f37ae00911d5560a504e42fd2bffdbef8f18ca55f924ff19f62679e74f6886b4901bb3027a25f85ddb525c38416315 SHA512 42690b90fcedd3f42ef373c8bd987b0bf2fb19d30071e451c33ffe3f6baa9c089ff870dce41274841a06a6d126ad09364b399f2d44f96b69441dc9dfae2cbf35
-DIST firefox-90.0.2-eo.xpi 548059 BLAKE2B cd513f81964c574fbb8436d28e6af185c74009466ce843f18d7414a730b709b26c8c8588e5e9eaa3ed3c057ffe16ddf56b179f048fa180760155e04151946c90 SHA512 8a02dae10df6d178fc32cc71df44b85bc7f9645dcce699a67a0910f4a91e058e99d05464b62a00fda32d7e1d43c629d2b6401e89288d1532fc08cd4868b5916e
-DIST firefox-90.0.2-es-AR.xpi 559628 BLAKE2B 3d253e9bd11b29a3dd5783bad9e8b3e5f64b10baa3f497369c8175d295827159ff61b5a46abd4a0a6792838d18fdfb363316f64600bd4d786035e11fe4066129 SHA512 bbc319566de8dcb9911f76d5edaed504bb24bf5d65af518a5645f4941e8fddeab4e1fcc750d6a2ecb223b41c9746a5192822c99c7a30fd4e913d9177ac34f26f
-DIST firefox-90.0.2-es-CL.xpi 558527 BLAKE2B bd89d7e8cfdf892115438b7fc92a18c48b633e9f856c9a4821ea2a7dfb90120e1b6dd233854ea96c2f1cb7dbdadd71aa369a7c879092ab6b0b109ae21864ec25 SHA512 b70799b720dc11a06c641f8bc21726d16e1979a2bbc9bfa8ed3fce019c24298ef0539ea47bf497663971d6de5a8d7e42edd73eecf259e4af966f41dcfd1827ba
-DIST firefox-90.0.2-es-ES.xpi 548794 BLAKE2B f0320caafcc35a4e71abab33ae4a35f341d7f869661f7f7e2c8eec9fd68ac1d5be0502c9fae795005365f6d4e8d6024c86bb932ec3baf9b538b9595ee8ca06ec SHA512 5d2840475edb3659e7bf5428ddd92cf4929bb94a76884686a3c3271a6a4053e1bfe623d803488ab058b0b9860d9f4d659d36701eb6b90aaf5ea1723b3d83a0c0
-DIST firefox-90.0.2-es-MX.xpi 562244 BLAKE2B be7fbfe6d4780a871dea7127a786820ced8b139cd5ffd61989cf003ceb5d333910a9b7421a40008bf0290140a927a5ccdb0e389f9078f9b2a031cde00b5789af SHA512 b7fe64cf33d7be4ac13b66891a7b6ae350b5a8177537e321bfe1b8da2a1234980d0bfbc819102dba975d169baa9b26a356c80f41b41751d36e1ddf1defe5911d
-DIST firefox-90.0.2-et.xpi 496662 BLAKE2B 31829a9cc3c809b6a0d91a68671f44e197db7f5b9b10426dbf4722f74b577de1db4be84f11f48eaae0d1152ac82af5f9d86922dcce2cf75738d3322485c0de52 SHA512 906f6f819baf2a96dfe0189ed322cb25e046d38dec7037cf5526da71cfbf3d1c0de600baf31c511d08eb18067beb4bfdd35ce5f7de91364847d0a0a7b21c7a3f
-DIST firefox-90.0.2-eu.xpi 544791 BLAKE2B e8df641b3d57ec9d044f80c274de17e23e216257e0d78cd0e86450ba5fc39b18839896b3d3976e3be0ebf394b0d966d6ee4af0dafa2e3ca1a9751b3370d775a9 SHA512 920522a5fd26a53d27f15533f40c5972bd330037656b1c1f94828c4d7b87e33a446f49c4f311cc15dba16a931c73255887de25b91036a1057422a25727e6f481
-DIST firefox-90.0.2-fa.xpi 565155 BLAKE2B 1dc2ffd9990b923247d487670dd734c67db0ca5703834fa052f21684597de0bfc9902062d5c7f6fdfb4d68c85684fd93db5e060091af220c3c2ab74f4f9138aa SHA512 a929bfc80b3c217da3eae1773898a646d9c2c06d7e13578d1b3147a7497155953ca2a297156b1012ee7f8630b7764d2953ec25d610f958ee7a19965859666455
-DIST firefox-90.0.2-ff.xpi 488049 BLAKE2B 751ff1cc8b0cdb51af4f0cd42db3d1c96662d9994fbe5fd2e4a1d2a1ab57a9b4b5ae8bd8c3e5d3454de83365c6a1391be3e07ecfd58efcfa4ae7b412c402a826 SHA512 0b6e0b583f97722a57f9d28caa14aff4fe7d342e4f1b188a1b0186e865eaad3b1b5ab0d911a9187c082760e85b9f970c71be6e44d84827a575b102f28a7011f5
-DIST firefox-90.0.2-fi.xpi 545936 BLAKE2B 1d992fda4a9cbe8ff43c786277c55ca005888eac771095d037d595974ad6430994ce7c0f741acf96f175a816e800bc77496e318290914912ceba8a82e3c6ae68 SHA512 2143f3b989153534f61a394c94e9edc74f0070e8d6d389b455999d4cb4cb0597322871c100a1114adaf1073ef29d7cc5ff6c13e8f59de5f4064683dfe1f12fd5
-DIST firefox-90.0.2-fr.xpi 570078 BLAKE2B 75cf2bd14e3e8b67053aea83d492033ef46ddd88ab69a902f17a4e21c36e1fffd72d855d48be825da3928717eb726447435bf345f26b9edb5cbf949f08b19209 SHA512 a03b42c77585f70136aaaa3e102ab53550ec441933814e817f10a5ab846a47f5b1203738c22fdc07fbd7968421aa3be07fd3966f54a3d7a1f564e5733a4f01e9
-DIST firefox-90.0.2-fy-NL.xpi 555597 BLAKE2B 3508589c747154ebd7a9b712b58d38776990b8d9d2fbc6f83209a3e395b844a0bbc7ff0c62afbfefba58d509514fe0614bef7f711b1b44bad0605beffdd7c07d SHA512 5dac5d2c758eedfe7d351ba5185bf2f680d1816ab74256c9821b7846140130908976a979563438f910ddb51294ac8045e86620f9b35fc58e30ef4d9e3bc8cfae
-DIST firefox-90.0.2-ga-IE.xpi 473120 BLAKE2B d72e1ccb36942bdf00b337efd0231ae5b338a28e17eb6a5bc51e613df4658c27da61486319ac08d4f9a0373dd2f42e7358afdb29da680bafcb97b9a96f61a7f8 SHA512 9826db654e10053ebad1b78caa2bca440ec8ef2eec30e1d3f70b04679c5a89ae8eb9098531b13aed6957a2c4fc7a885e0ac7afa36d0f98d40fe0d95574c7ee55
-DIST firefox-90.0.2-gd.xpi 550980 BLAKE2B 19032850535ac7c4d5129ae61a901cefbfd14b7c0ecc6acc22ad29422290775c61f0343442f823dff4039f99a40428ce138987e178471190515c91b509eab110 SHA512 86d69a91cfc1c836cf2b5d8b25ad509e32fd5d1d3732379009e50b8d2a9222371e287a3e00c0d9541165d79bed59732b8e144f3b638e43db9838bc29d62d4b20
-DIST firefox-90.0.2-gl.xpi 554486 BLAKE2B 1bc91d2cfe2639d84dd080198d5129414c581ac3c02dce8b14aec1e6c4a169e9aa07d6ebfd8fa98dca4546fe85fd1a35054e561912c4744e07f0768f71c7aab6 SHA512 4f36662c5eab07f649aa21aa85dc57ec82c8ab7b961fcad80fe4f487c40a041b98c2102b4f7b96cb4259e931333db4ef357e4a69779412f4fabe7cc7f66f0b21
-DIST firefox-90.0.2-gn.xpi 571719 BLAKE2B 37d4265185ec26a8ea8e86b57aa0aae529295e1ad54e5229e0e108872fea8b039acb4dfd85153e8a9218db46ea59288558d9c60cedf04554bde32faac85275e9 SHA512 937a9bf0c77e2d5a5f7d48c0aecf6b27bd6377ef05a82e2f674c38bcaa392a3f2d92f7b6eed97551eb26f39758f215bbc102b01314c3326e54c0d70abf91aa7e
-DIST firefox-90.0.2-gu-IN.xpi 547542 BLAKE2B c207abe6581170975581f1ec5f074fff4113be5eb19a3f6113c2c6d660d66474c21a46b73ec87e4afdb03c04b9d052c77732b676108b89decbf04f2ed7cf3f71 SHA512 ec9de8cffd0ffc3828d69fadcf8c2a42215aa1d84474b08b3eab42d1466324cf2f5d5a035fd9f17b90230b3778eec7d229ea2d0fbf4aca6d652930249255a2c8
-DIST firefox-90.0.2-he.xpi 569407 BLAKE2B 7e69b976f53760242da74042d85573159082d3edd5e1d3ef1fd185b09c6863f8c275214d9a2fd420ca559f83099b393c979b701305e3c2c02bfb63aa8e0194fc SHA512 1094fd8b6d6435ba094d0ec2ed70a5b1d911059c1bb4850033209604521d21d8ff579e829224c494ed4046da16ab804381138a1d3893ad5b0e14787442136b3d
-DIST firefox-90.0.2-hi-IN.xpi 579616 BLAKE2B fbd00e727022b20e0bdfe3adea70558b5e992fcf40805d0ae3407ffc49b41db5579cbff3780bfb05825bcb7d2b5cd7265dc5fd18f6be934806ea461d3c2a2629 SHA512 209bbac0799e13114ce20f3ae853dfed6c4e4c56efe71a78d765b6c1f725a52b0e88b87d6cef6efeccc1391413f9d322f60f0fcf79b197a1ca2256ab7861dd88
-DIST firefox-90.0.2-hr.xpi 549998 BLAKE2B a051f4591139d4e51114b39df0089cf970f6cecd368785c36592b5f3d4d129850510044f6e3b48ad7298ede1b2765ab502de75530616195d7d636599b8c275fa SHA512 8d77ca7fd7dbca5926ed4f8becd356a8bd31b8ecea36fe26b8641ce9d02daac2268e71e19968ff9f3338b379e943f041a4518207491a170bb629ea4045e2a0f5
-DIST firefox-90.0.2-hsb.xpi 575410 BLAKE2B b952d82e59ac118efb537453ebe7a87c15792c52b005da779d7d06f7fd665e8dea05984ab07b9dde17371828fe6f44212aef4dd492a32e7f9d6ad87c68369be9 SHA512 b59caab36be18ffd000a9976e3703e9e8d520c523494f080ef020f49ca239af17ca97dfbfb7dc70d36a32bdb51388c8ba2e8d4c4195d6b15c0f6ac57895df6cd
-DIST firefox-90.0.2-hu.xpi 579113 BLAKE2B 206d00a85161b6aa2f2422d825a54fdb8a77c856f5da5a92c707729d078ed7a020d6f0b6e288bc117cdcddeded316811eabea264198633f11a27ec35e7a592d5 SHA512 8cc740c1454279b9bd20d78abf4ce352db596e85e879eeb335b79b00c0160de6b2a704f3c6c44d4231c80d2d40b58d676def68cd77bc2ed916eb617cbb0ad964
-DIST firefox-90.0.2-hy-AM.xpi 604422 BLAKE2B f49a46b07e6bd9aff619d6ecd142d53da4366899bfaa0cc13051b4132cfa8c81c16d0a1cb999b190373e64fda1434df9ce965c91969956dc1d4fd64c35fc5bb0 SHA512 737b37f8a96eeecd920297911cfaed9664c0327f7498cce5d0c0dd942335498cf7b15c203226dd3128b60a08a176556cfc8abdb434a77fbd5a846948faf4044d
-DIST firefox-90.0.2-ia.xpi 544431 BLAKE2B ef3eb4e133074467183d3a54f2cc6af6ded4e8edb618868115fa6366d61c2d379a3903c0eadad8ad2a0d0e2d9eb57539d317a04b784a41b45a2cab8d73e64a56 SHA512 e3a72c94be0f03c93f85ea9b7ea1b37542f759d5de9a0522003abff9c12f30ff377221794d351d82c2b23afc07631b7fbdc0c0e629655877714e0ea3f9e49c47
-DIST firefox-90.0.2-id.xpi 540133 BLAKE2B 52d47167ec02bb0917c0b84df77e34694594ed3f7493d1790fe036268f304b1efa1097ebcaf2eaa9347e73d07faf4fd46e97da1d8961c9b1eeb68e13b222a1f5 SHA512 c510bc024f902e795fc851b0709570f5d493cd9bfac12ecb6f552144dd8c96c1ba607e6fd05f765e0f0425792859e86e661579b89b700320c044d18b28171cfc
-DIST firefox-90.0.2-is.xpi 483713 BLAKE2B cae0f001ab5767163706140ca2ecf6e15c6db37a147882586d40073d2598fad2e5fcce962d4d51d0af5a925e634ef59117f5f93f70347237470f047d727083f8 SHA512 22da40eb5089e2a267a66c17c9ee8ee400753f0a9cd7337d8eebbb0d1e66f1ac31316ab875a6645107b7cabe884308f2a1d1d0a64ea96449c984ec74963d85b1
-DIST firefox-90.0.2-it.xpi 470917 BLAKE2B 2b8ad1812676dbca90ea2164e4b534a3f246bb883bb3db7dfdf90c324733563903ddbe4345803e77085fd37c5a099d9b787f94e01a413349c744ca67b25f519d SHA512 018de01e7aab5f3f8319ec1f1c74ffc5a77d9b6fb2e410f700785448d3c5cb267b095edb9c9cd69ed08ad529295a859086a7f5d4ba53c39e464716e206098606
-DIST firefox-90.0.2-ja.xpi 605314 BLAKE2B 34739e38a812f92c8579a226b36f2c7622eb758f2942069193715143f0d63e9f0b85e08ef4ecee75d1006a97304a6905b15e0e76c65b55d7e1d3cb29c45cbea8 SHA512 7687014e78fe50b692e97bbb22bb08c8c1e25b54aeb104b766587428aeda8fea935ccb089320e72dc1efaae7656c0de5485fc3905b98127b45f59e38ee58276a
-DIST firefox-90.0.2-ka.xpi 606361 BLAKE2B 618a913593b9ef7832fd810ffd769cadb47bb93ef9d9362b86539a3d6da86957aebe412364f32ad4c77974cb97fb801edb3938a29c2326a66796bdc0d3e1fb54 SHA512 2bd7a719dbcd9cf2d7881260d5c0ae0892882983d7d07c7e7348c6c82b2e2f861236afaf5f9ee4f60940f3a2a6d9d3865949c5e2e92b6f26c09c4081f752c412
-DIST firefox-90.0.2-kab.xpi 562888 BLAKE2B 96890638bab2d4acc87390ee56c4c26c93d5514c32ebbc1c833aebab51e793a2e3d336e2076912edbe68843f83c8f02559a3f36feeab56329eea8ee9dd0fa320 SHA512 c8397002c9027ac7786957076c202a6db069ec1eee58fe0623291b5a72821131007ce2eeecde1d522d06af571e4dfa87694977d25fddb0e3c76d84768cbab447
-DIST firefox-90.0.2-kk.xpi 621558 BLAKE2B f57a4466136e3ed9adb06d0b693e7a653d4a06cd25153f42cb35ec6387530b6029d6d6d08b5b9dd0d7a5bf6a17f6e46992b443491ef23fcbe0d05347788351cc SHA512 6ad921f93a0e788aa0f2d59a422643eb48b85f54eab32066e6eac1338d0e73e0a6882f73f562c3011e4f53db8f00f92817a3539086d8c97f4f3a7940290257ea
-DIST firefox-90.0.2-km.xpi 546445 BLAKE2B 0b5eeb9fb63549f3f9ff6c875418764e8191317bd8a167c2102face45b88dcb569c2df47fba209c5935e2fa7c8952b9f200de43cdd49caa0418b413b22ab8f93 SHA512 760431880427fe5abb65fb0a351fe80bc1ce84368c90b454594d6b13185254a19e88eaa2b095c38b9338c88230254df0fc0d1929fa24875458a1d7a8076ccd6d
-DIST firefox-90.0.2-kn.xpi 510724 BLAKE2B c24388d4c872b798ed62e83c6d15d8f9bb33be6d258e16af43f34d94d05df348df09295a2d9c2b7ea54ec876cd4a84570648f3d0c964ee3c628b246ca145a15d SHA512 4483428d7a968f259b13787e94b845e0a9ffe55be1fe83b5fdbda01a7bbb970c959d7b24acaef729b9814a0e54b32be7967191936671d0224e92bff35570699e
-DIST firefox-90.0.2-ko.xpi 590731 BLAKE2B d5178a54243b80c34dd3221fb0f9447cc9933ca03b7231ed13a006682f38a2f9b60734284a015326dda508c1801d50bcaa5fb6d299d13548012ab8c3bc89867f SHA512 7678485b6588e369067467250b5dc4a8009009850d3d63d8e2340d989b7ef383e81ea6af2f305a8b70115bdedcac5fabaf8a201eeb2b254de938bce818462e83
-DIST firefox-90.0.2-lij.xpi 484766 BLAKE2B 382c5ff77eb58e58e5c8e32ed0d7fe135d61974adaac1c990d514a1683c75d45fc68048a22f2d66ba0edc12e3ae119d9f75a217eb37cfee1180654c1288bd7f0 SHA512 3eca5e9266846d6b3c7ac108986da092dee5178e321aa8bf6892d4ffe009c2ab205ff86bd3d16076f8b9214b55578f81d0907bed9043c2c41e64e4316478de29
-DIST firefox-90.0.2-lt.xpi 572555 BLAKE2B 63f4b6095ed7e5cee86a4a25eefabea77a1c3ddc0562d7bfda0bdf08de5ffe90c9020e106d729572177386cff9461bf0427ecbc13368ea3dd8d6bb21388e18b2 SHA512 579ee64b4b3683a433b265b6c4c71d6c1006aa7c81e850b3b7f4d1ec7f3376c2bcfb89db76a5ced145343f11010fba24192f3fde365421b3e855b66755630e9b
-DIST firefox-90.0.2-lv.xpi 475696 BLAKE2B 2675056a88af23b89dbec450aa2ed11621f6de09bdc21f0d06bcdf662c1421d517660f30d7648debbd588ce23651f525bf2f5255af6305c27defb40bdb770d4c SHA512 d48159a8e812bd321db05e8a865a8f680feafb0e4767e0d35d74795eda5a889fea5e2d8745bb0d2b438594aa72bd73981c2c2474e0ec089a29e0eafab13f550a
-DIST firefox-90.0.2-mk.xpi 472368 BLAKE2B 91a36844e99016d7e2e4aa7d0d99680fa8d83e6a1e9282f6c3eda916e4cbaf826e8d66349eee4d905ab9c15eb6af7ccb7599bc0710e5a11d3dcfc39a0ca0a259 SHA512 408884c11556fca1371cb211a61f63ebda6df8df56ce02df0eedcb82d9e6ce72d77436bd9e2202d1e07e244ef08a62d2c7eb41ace62b813a8d80f6c134143102
-DIST firefox-90.0.2-mr.xpi 547715 BLAKE2B a1164b4b71eb42057bf0361e06cf2338f201c6926d7c6547ab256285a6fe7686d64a5674c909c95a31e920940b50c858b179f1607118cb19323e1c01cc075a28 SHA512 74abb04ef83fae4c570e82697ca2353a9e76772650a87e4e5f7c99f7591a8a84c1e5761a21cc2952a5846bfe873ab50339b958c9411141d2e636d1573e776b28
-DIST firefox-90.0.2-ms.xpi 459315 BLAKE2B 9231c3e855cf744e053e84978c97e071dbea39046434d7e6d1639e985ee5422ce71fa07f3189594873c3ef062fa9b1edc42bb3df1f6d8cf77ae456490f1938e1 SHA512 4dbeda882792988e58d6b6df7f2f7bc8b9ebd9ece288bc83f92561c62366ed8c59043528fbbff14fc4856188b22878a0bdc146ac95aa1a3e840a4f543ffa087d
-DIST firefox-90.0.2-my.xpi 531263 BLAKE2B abcc403d73d5fb9ba0f6e8baa8b01a0547dd4e94a809b66bb6a2dd30f2fbd0bd55bd16b6ea6d353140802d415b894e607f4a79a0be4468121c2cf7c9363c9cdd SHA512 11679d0de73764b3efa6578b858394b941d7e45587b8e46adde984b60db349981086855cdb67721b477853e19806efff54c2c2f1cab1ce11f395e6833fbb62e9
-DIST firefox-90.0.2-nb-NO.xpi 540211 BLAKE2B e73bfe5862495669d645543576b64b3d66534e3d9bf3b41dfd871dbfa4146bac3ed46a6f58ae369e237d76f9024e7b462c60c2afe0fe91c0d2555bbe92abbf66 SHA512 8b13a9a28c36fe4438c52d85c3948b5cedc6a68fff0e7968a952fc5183b69104df5b9d74b71ca43cf3018cbab184f019b556b30075bcf67cabd04549cfd22fe7
-DIST firefox-90.0.2-ne-NP.xpi 488264 BLAKE2B 25f40a5eb34b4aa07d3852f0967cdc37c4cb0dc58524bd5c3cc773d4db4c73bb9ba8969f4e8d70d43282586b479cf09e62af1aa823a77c656968ae824f31e847 SHA512 80ff7b32a58e631b88a46588039774c258d02312d0e2fd98589725b882e481e3ea9b48923a0b9b37dad3c777dccc8395608f20aea6d757d7be1b0f9170033659
-DIST firefox-90.0.2-nl.xpi 549132 BLAKE2B 61413733011e4fc81224f223f570027f2ae60b8fdd89acc9ea1bee2940a26c28a4ef18425e12182cec9ca40f7dcc829eb885193a9ea7cb10cf9b10e4c27d62ef SHA512 544abdd3cb7b19076ab96365c63dc521b3658420472d7afd83ea4d199bf9399652bae7a1945dcdc89262902b3060df75984f573cafe69ef2dfdb2d9cd2e32173
-DIST firefox-90.0.2-nn-NO.xpi 543785 BLAKE2B 851daaa399a7e15fb795365c3e81ba09e6ffffae19968c18b686e74f92cb7d8fcc84fce0383e791a59ac001790123c00791a5a763ab3e601bfdb7467f5928c47 SHA512 59ca8671c752e5a0d399166f8a4ce52cf20d158358d65810e85498bb00982a90a5fff86382f155d63f2060447d9e9119773bed41f389a88341d3034f10e4cf7a
-DIST firefox-90.0.2-oc.xpi 565026 BLAKE2B 63786a9a4c8a11828ca2e00d5eb718d9ed5171f1f5ec8554002d966884d5d2c7cd14ad89286537bf93b1e79255df5f191b9e9a7ba4fe238d6d083092706a4bfa SHA512 2bccaece0b3a0c0e8e3d9bc978c909fadae0d032a8a2e4df9778580cac0c60efb6228534ed8f1629281330e0532b0ded70118e9456995e6d43d9970cf41d4c68
-DIST firefox-90.0.2-pa-IN.xpi 612507 BLAKE2B 03d21a09f80ff1b4a7e6f5fcdad46036fb8c91f1eb46d04b7e7ea8bd84888a94e05a3b49004d1cd8b4d2b711287beea6f0c4a3dc2f8cebd772d6f5ccaa896e0f SHA512 da912c4ee934f2d44714ea31c139c1c794949466281a377c7fcfc314c6eac78fd85d5e795b11d8c24a131442c125b80fffc4c173b8e7fb08064db75bd3480cdd
-DIST firefox-90.0.2-pl.xpi 568488 BLAKE2B c9056f7a8569d435781e3a17983fbd7889ee2e87acbae27bc79d78cb129c08da9b3d623d746cedb12282f8668fad1f5929050bbb5a1cc066358147d5b74ec4fe SHA512 bcbfe1b6975ec1ae940b08be4f45d7f04f4f30a80536e1cf912fddd6cb899d4aceb470e8dea8424bc0cc36435d75a8e865ba91f04ae87b293f6119e9cbd6f7e8
-DIST firefox-90.0.2-pt-BR.xpi 554982 BLAKE2B fcc2d465fd7f5a15ea861e5c1150888a308851b5fe0cb62847a5c6ef83d059ed5c80c1cd5720665525f17d3fad512b7fdbbd82f28a206df2a5224e9e3ff3cc9a SHA512 6d1e85376bfeb12558617f710671c31473707d738d839e78e107e93711b80c975191210dc293f7837795ce8d2e0acfeb9af09796ecf491a701adf932a78b9ab6
-DIST firefox-90.0.2-pt-PT.xpi 558862 BLAKE2B acec5024cc929b4e29e624b00db49d108535e2d270967c1b60298badbfb5f424a133da648c995fb00afc828fb03389af9e2a65d3fd57fd7aad038283109996bd SHA512 2fafd35e5c0106f9a3bfe54f032e826a37e6b7cd98941a8ee0255bf56116b1d65bb31fce8f711f8f7d1431d0b97bbb94f53c5ec3910864fbcf6e8e774f70e0cf
-DIST firefox-90.0.2-rm.xpi 549899 BLAKE2B 9df12c0b8c193e33ba5822f909e9a1c91594f15baace3bb146b3e69ea93a526a37ff2ae72f65e4acf094ed08ea81b5f7541853f60dd4c819944b081dbcf89c83 SHA512 04858971ce69fd2d219a3d0ba97a5d72a5af88b6725f66aab79a8806a192cd6c6f4f17d0e5804abb937aac921e40a9494cdf41badc5ce6a96ec1d64ddf3d6470
-DIST firefox-90.0.2-ro.xpi 548131 BLAKE2B e6a19832c5252abdfb07a74374cf8604d0357e025d9093f9005c7ad252d162a99eb9cea38bb10f3a1554095747b8e7a3f950174f60fa219a9561ba9b861672a2 SHA512 9d65785acac5a8767960744a569aaf4bd9aace691376771415e6de9b6a3f392c70c406cd9837d7c6504931306132c0aa884dca83d785ea6fc66afe8cd7b4df49
-DIST firefox-90.0.2-ru.xpi 641994 BLAKE2B 9124781768996090200198864e0b24ca72d10c36e371b9631fc03a3a336a2a2cbd8a227ed12f8d3282c14b06b7a31efaad98f185b65cf29f602d8b958c695395 SHA512 8455deef343028d99810c01b3dcddff85bbcd31307dfd0aa461b0b66b194eea2d915be1abac7902b10bfa18e09bd16880c3b22f3e78a7bc62a7bc580c9e6b89f
-DIST firefox-90.0.2-si.xpi 497038 BLAKE2B 1b5bd85f054bdac7d3bad8e64f3a9d8fe2ca2912cf0231ec92213c9ab80f68bcf48109567115a8e6b5ec02ee5bff759a1a3a44496e19045da6871045ee392027 SHA512 6c1712c1f282ce5ff842aa39203f4fee5aa38df79c49f203dab0c3269b2b43c7d1a350da76d435de7b995fed1559784192137bb8b703ab08eea652481142917a
-DIST firefox-90.0.2-sk.xpi 578642 BLAKE2B 30fb46e4287edd81e32625926e3b8e510d6f4faa84247e4ce4646078c9e7c407e275a3e35473d530c2c425c351096e867ae1e88422231afb2729287cf52737c5 SHA512 742afc3b57cec29e12f546acbffc50dc34259655b934b7edeb0a431fad9f69a76891f4a3d504bd68325bc11af8eb090931f9c681041f26b4dafd330388b73dc9
-DIST firefox-90.0.2-sl.xpi 548456 BLAKE2B 7c47551255551b2fcab86fc8a0a75d7b3a86f1ddd17ca0dce53945b18290191f221b3230bfd8063573e55f42be9f6204583db1d2c960e0c3cc4db5aa569594d4 SHA512 85391db88fb1b87836a9509abd8b635562280b79ec6a501b7fe0a5da685028e5331d77168307a3cf395dd314cfeb61bc68405ae46ae70e6a6d724d6f46a1c73a
-DIST firefox-90.0.2-son.xpi 428012 BLAKE2B 0c1d466b53f148b315e4b4e1a621e4b0dac3f8ed789514a335940f8d1a48d5be9df072e7baa3b6c0ee79446834f2606ae4420cf8121c5423cb6b5a9467eb12ca SHA512 cbd2db587f7b2e94bb888d0649754c2a8f9b423f7ad88577cb629e5b4ea2a7ad203ce755003a3ccb2a6551910617bd4f62c8bef84775873cec7410f39c3bd1e2
-DIST firefox-90.0.2-sq.xpi 568627 BLAKE2B cd6dab95c8ae6f597ac62ca649e8037624a1c91768587d574eb5762bde10ef58e6c23d8ce5da9d5731a009c65d9fc901f602db435b8986c2b9f9bd8ce53d0d0b SHA512 66e7251f67f43340a8f9df2a45748032e8b859057993eb834cafc663146b594e25d54af81dcbdcf402b05a84512198f3f50205c73a45da9f4aab738aa03e08f8
-DIST firefox-90.0.2-sr.xpi 603101 BLAKE2B ef378fac2d8a5ba7df6753620a4bb0b28c9cd53861f4f15001707fd1517942c1e40e8911d10e830808490abcd131f9d7c36f8636d4f647a9af1750be0b192e58 SHA512 e7c5767d77ef0f705aa1d1c567bed89fc2b4da24d669faba9d60beb0bd12d9f8b45ebe0b0027d84e8194fa1000e63bd10a419b649e8e3c47eb045b4d1d220f40
-DIST firefox-90.0.2-sv-SE.xpi 552226 BLAKE2B 5114b1443f8ed57b05ad9bab185ae3fd4831f6c0bc434401721cc11bb5fc11e5e42a09b8da76d8f2a280dadfd5af6bfdd18081b43c3c17915dee34d1e506e102 SHA512 6986de8362530f0db5903d277f70188ff7e7e53e41c44c1f01ceac640b53262dd8bf92c9c967d8e33ce7c31cb39d9089c7d493ea6c28a9907c1ba67795d2607a
-DIST firefox-90.0.2-szl.xpi 525937 BLAKE2B a5c7eb4385823339d56ada2771a8cf130c8c29ccf7d60a65f0e88a7e1ede5413b663c6429efb92770ffbeb55f271f6df6b09b13c158332bddbfcd48b01ac2808 SHA512 6e0b0b0d20c19db95699156397d71bf5719c9f92b44864942bcbd5f1b6226f57998d92dcf8817f8030c09227dfed1780ad5671b4edff40e7270c7d3ce2c4e769
-DIST firefox-90.0.2-ta.xpi 526631 BLAKE2B d4b8bbf41992fbbaba840bfb19d62801a8b6d3921fc5c92379ce5baad6d5a45f7b730250cad9e90ee41220b7fc7ab3f360c0aa5b609cad2660965e69065ab6b3 SHA512 d88eb96df7bff317df242a8eec99140eae0eb121e1ed6ffa9242a9b540064666c0db9af36a4fa729e23bfd8fab9abbd32a2c5c3ff85b6ad2723be8da6ccfa956
-DIST firefox-90.0.2-te.xpi 568744 BLAKE2B 401da427b76f0c455aa880ef64721a8bc8d3ad25093cd67b48d4d37a65bef7aa6c02db37c94bbd7190ad036a49255351756f12f7c7bfb3894bdd8566cd4b63a5 SHA512 4388b917725a32522c0c50e72a4ff2e96eb61a4514bc6311adf8b99f386691720c78168007661790698d1aa14bdda9e28e0a24d35995460ad0f3ba642e8a20e8
-DIST firefox-90.0.2-th.xpi 621169 BLAKE2B 20bc114e791056e866ca87fa717270afec022ece33cf3568f445f460c690e5d98aaeb409744298d94b17b2655f6ea39165c0b4d2de7b1b87d94691e832f43b5e SHA512 b775f9b6235dd154a7f26ff194ea6de858c5c8d98698afe9eb2173e3ff388726572583c9f4b3fc4c762e244751c623151baaf0effd8a12056ecde7236e3ce0c7
-DIST firefox-90.0.2-tl.xpi 533288 BLAKE2B 9d2b4fe2251c08621b0fccc7492d8dd9879a80cccf64e7096e97e3125f5dbc06ea82e57fa52ef975c2da28d4226bd8a3cf77860140b3f5eb0055b476326701f7 SHA512 eb47c4a62a2b51131d0da056ac6ade774f59e8610fced36fad3cb64fa661c1eafa8e6fa8e6b53508ebc6a190cb45c68e17485310c215b96af2938a588452e57e
-DIST firefox-90.0.2-tr.xpi 564703 BLAKE2B f70afbf4ffb27efa5ed52cd102449a9a853afbe16271b431739e456f81a5603ba29b8faf8de16978c0f9dc41d554c2b4f5cbf7c74e454e8bed1d46639babed7e SHA512 8242f1173f9e3f3c596591bb6d14801d72870123619148087fca33e5ac7d74b52850c5ba772727a2c831009d36d975c0f3826bcc01846042f21531b0f7ddc8e4
-DIST firefox-90.0.2-trs.xpi 506694 BLAKE2B 00fb05e468dfa0e3c1ba6e572189be68118a45e17d9a5b929821b0bf063bbf114935f9ffb2fa12ff13ab3e0050de62f6c893b324d29df8922096bbe1f609042c SHA512 f174dcadfbf38d413040543bff026ff940448fb39337379cbd15c4254b12115329c682618d6d62850c62ae0b9607a83bf5182b0b16ddeeb6109605ea10fd277d
-DIST firefox-90.0.2-uk.xpi 635684 BLAKE2B 79f8a22184a62e25d52219fb662d8bab2e6844579b593d56ccf9036156e52111ee28219b1d6d25c8b959bba80104b560ad4679083a9a048284b780cd7e262859 SHA512 9289e74724069d8e3a881d5694a394da908b1c781df37a9bb163249a9730e157f34df91c290a6c2019980934b386da5e7037a3471117b41b08f3bd7c0e53914c
-DIST firefox-90.0.2-ur.xpi 577991 BLAKE2B 4f0cabc51071c71a1b0c88de4b699f16940136240a5d8a9f273434c4d56d69eddb4b04fbf1420bbebc85c0f00df031c15e4b21b66f19342b02e9348e0ecf3ec5 SHA512 80cab1941a57798914be843899e7c1164c28df0f293ec70efa00536221c3cb49a72ce327595085747367220bf399f681f1066018c7530b14bb42cc6fd0ce340c
-DIST firefox-90.0.2-uz.xpi 483022 BLAKE2B a125d2b044afff77a72e426ac1554465907a306139c1b602502d2ca77c03eb9768bbc3f90c3c2cc445d93d57fda97d164209a235e92bb7b606e4c6c9e5746ca0 SHA512 b799b862fb047ef0c48b351c8a7b42bf372dc6785beceb977ff4aac6933e3958f972706af77a74464a105d10a6ffba8be3cac5d9e1813575e04852af2800845c
-DIST firefox-90.0.2-vi.xpi 586903 BLAKE2B f1b143163e443d76a213e7c4aa57a5375adf809f9a8d2c246d036be9d67ab7678e1eaddf27a0c386935327bc44e4e21df1716c0f3dc2ea24a50b1077e31dcbc7 SHA512 3bb4186633e2b353266ac17fbd5277c4befe544e966d3d2d7312743966ee1f5407404f94542f25a3242521616a744108703d115a761a849832c9b0697b0bc406
-DIST firefox-90.0.2-xh.xpi 430182 BLAKE2B d849e34655c8b50abb2ce4d2197cdf8761b27129fe8fedfdaef04221ecd0300ac8a8ae998b07a39d21bf3a3187693e818846c92da0b5e7e3eeda522e536f86e9 SHA512 5bd4f80060e5b75f56b3a02489717f58bc39a33785c08bf3e308131f690437ab072860e3cc9cacc00eaa0f58da9cdf02491d75b31909f1d8f8423c1378d60ac6
-DIST firefox-90.0.2-zh-CN.xpi 588311 BLAKE2B 6656456291738d7b7651e14558a288eec053c1815fec33826e6db4c36058007d9131fb2c2847fda57f8ac75d8b5da9e7c0334db6c9cda0043c8bcb2a84db92c1 SHA512 6ee44936371e07a21903565bdacffb593a4a4fd64413bdc1f6998cb406afa11d934eea20e5ad5117468750d3eca53e80aa6afd9ece1c63ad4eae59a459a3b0c5
-DIST firefox-90.0.2-zh-TW.xpi 588723 BLAKE2B 295e5ebb3f810f1ab8b66f301ee5fcd67d147cc640daabbb12e481baf835a439992fc5e1d1195bcd8b28e91336281b2e94d207d77261ec1297c784fdc3fba5eb SHA512 a6b5747fc3986357f13db401dd93763f370e547e3fae61330108debd981fbc630f6af8003d6146e73cdcc948e4b79fc00614e6a257358155b3cfe0176d2e55de
-DIST firefox-90.0.2.source.tar.xz 380670372 BLAKE2B 782e548663d3538d834feeea54c9fa54ff5580472b967bb60be331e591b782fff2a6877f2e8db29511ac4b4b3dff847f30dc8f0a8333ece3d4156d6ac10a723d SHA512 4fda0b1e666fb0b1d846708fad2b48a5b53d48e7fc2a5da1f234b5b839c55265b41f6509e6b506d5e8a7455f816dfa5ab538589bc9e83b7e3846f0f72210513e
-DIST firefox-91-patches-01.tar.xz 22352 BLAKE2B 2761467fed0a288f5ed58a2806eb73a00ae91f35d62284b48adf39898603a1dade82f7fc9a98a6154ee580fa7b010dc4bc2e656e6505bf9e3682c23698d02829 SHA512 1149e413af3fea1756754fe7ce6a273b00f07918074e16576d25113408e9c5a99cebb7e3a5195ff8dda343b8249e90b2778186d103a88f117ca7a3ac50ffa968
 DIST firefox-91-patches-02.tar.xz 22332 BLAKE2B d323054441c9383ccc88b0522cd2a8732df19af670aab6e57689a69f299ed97fe8cfeda0aff8dc7353d591705ce2c42957b21da1f449a58145d9343474d35f2d SHA512 f70665c4dcf19b67ee7305fc3d683c03817e7089188a5033a6fe9ee32074820876b52e0bd32f585e1e5cb14e2fa4bcd1cf9928dab6f74f6753b4bf18919537c5
-DIST firefox-91.0-ach.xpi 465289 BLAKE2B 5caa3a3103616976d61880b893e48c5d5e425b409702b8cbd327a1111e1e359fa0341894500351fe24cc73deb8e7228b009e36332642c12d3afa92f9bc79c76c SHA512 42ca4fa331f7a53171717831bc3309782f7cd91ff2a91a7d8169b04efa8896b200cb2937e4365f0413f74cac71c7c5a41085d4716beb9bf39b70f3f1993457c1
-DIST firefox-91.0-af.xpi 433157 BLAKE2B 054cf19dbe8bead4d2a88ad5e8a2c6ad21569af45a10be1dddf7d44b179017fcb5575fe26063740bdc59b6b411e5decf2658bdc266f6bcb642207abf543bd9e5 SHA512 a7d07c25cee103086992e106f1448d6a5f7b614755045e6cc8d7e165a289bc7675034dc85be171a3677739fb9d88c38b5f5cdec58f120a129a022369185f8492
-DIST firefox-91.0-an.xpi 511816 BLAKE2B 4ded8e0e43194412cd7641af85f238165a6b5a3d0d215ba913665efec8d172f940207320c75b4d38243d9a6a23d9ed9fbf01dd7ca78daf81dd7ebb480d34b396 SHA512 4edaa0cb4f24b0bf20be96f95fba5d9cacf29d47cd9f93b95c8a4314bae50901bdd4031277ac596a2a2b5077b52faccd21a73c4db1481c3501671f5c65c13922
-DIST firefox-91.0-ar.xpi 573966 BLAKE2B 0dca5dced622775462cd0a1995c2c533c0393b93755e3719780a90517d1936e044abef2bc9ae80896fad5db4333aca9649f6e0f7cdb2ee3fd8452e1e57629a4e SHA512 a8fe66283f9817e628443cacec970d817e169ec903e6cab8c360d65adaaefa86f5e511ca4336e02655c27d09f11af9bf02da0fd75c30b8f62ceefce807881aca
-DIST firefox-91.0-ast.xpi 502946 BLAKE2B 951da964221af2f004595b2ae73cea80dbd9e7941f9e3f1705c32e30eafcfd7a71d75531defe1ac04d2ae6e06f1b725dccdd85cb7b3f434fc1b8e6c02b6f1d49 SHA512 170a7f17a70671e7408454536549bb6075076edf322a1b269c2f63b89e52d8734c193aa3a5d853cbec7af45b4c944a298f55c37fa653fcb859411b89f4dfbf07
-DIST firefox-91.0-az.xpi 500890 BLAKE2B 635160c21c321ff882528882af81518a1c3201aa255b4099f7f388bd690160bec68706c9a533bd1e68b77b6ebc6c5898d09c2d1fb5d79aaa0ffeca43f8627714 SHA512 9fc084bb22205cce52c7e900729a781f516daa504a089f454e026c2f1e4bab57aaf66e467a2398a37bcd5b45c4eb17cb17073599ca2031a6fbd02b5139715f7f
-DIST firefox-91.0-be.xpi 630156 BLAKE2B 8134ec1b2f0a953c370f80f50d61141c8fda8f53cfadc717c6de7a15328952ff9c0d94b6a0b39497ead48892c24c34d615a085a3ac6c4488b6a278fd8af5db52 SHA512 78edc9ad3dba1938058ead00d24ea5c0a7fe566e42e42fdcb2c44dcc4dd05175b6660b375515e2261b9cd73f271b630db479b7dafa0566eaab083bfe4145da5b
-DIST firefox-91.0-bg.xpi 585083 BLAKE2B 4f9c2945e2d06d12d7ea87af65a3a17012f74bc1c2dcab36abff75cff295a7d1497a624d93fd17b5c8c94a776d6e0d47d9b0d66e7b6430ccfd285cd01ec96de8 SHA512 bef93bc67062febfbbcfe8e311de1f2f469a035b9a954d2cdd7af1c3c974fa49862636738b787c6ae75af0b300fc3318e31977fa080ffa44ae8f76e24c2b0108
-DIST firefox-91.0-bn.xpi 576492 BLAKE2B 5b5494475cc9b83c5648fcb947129e4d034783f5408449b4c24ea3800019fbe9351b67540783ed6e6a775059cebac645ae43de1e60a42917af2a7d3be631c3c1 SHA512 8a072652885a163ec0d52859222dc517d9c9781326e5c66749ed41cc53989a53924b55ef7c868f9181d603c5f99b342c8f88acd7fb8fcbdd50698fff85d78aef
-DIST firefox-91.0-br.xpi 534798 BLAKE2B ff332548e1d18b8542bbbc9b934b3c4bda2e98332781c2f2d7b340f2680bddf83267e91235b63b3f59d07865dc6c15fe07f17412ebd313ec1c9b4bf6750e2968 SHA512 cabfd979e9753c111af45cab45c588f760a948432c7ee0dd4b51f39084f86da9925494441ac8e28bb5983472ff594f1f00349a5ac3aa917a7cf125c3df0d04c4
-DIST firefox-91.0-bs.xpi 473109 BLAKE2B 3511606332aec32aba83e127fc720445cf93ccfe484131df1effed727daadddde779a987398d18f477745f07998c6cb81532c10c0853febba6b6af6ab55c5b6e SHA512 cef96b038b392241938d3c1b55ef28a589e900d4ce3f08b62ec16e0aa5944d7a5e91d10424707d48a65ccaf767d46da9945462d65432376b10582ae5b54c85ea
-DIST firefox-91.0-ca-valencia.xpi 543231 BLAKE2B d02783b71d9a22074cf2483c916220c73dc2a7c0d0488230dc034789a0564128cd91647922e1ce0486c57b27ac46f5d519b4718c8a78f3ef31b05558fa9d9377 SHA512 c0ba6960dcfb2242a1f37b5de636a2d4e503649db6660908b80ad9efce8e903acb46c59a7723e72a7f8656a0c443a8225166aff2a1ecc5fee56fcdfd92b31a59
-DIST firefox-91.0-ca.xpi 541002 BLAKE2B b6ff41c7f0a665bdc0ec5a31aa4bacb228967fd05ea3fe25afc3cca8b65be30bc3b9162102a881d897a9c72638ba73730a10bc119b0e4eb4eab04d4ddc033db4 SHA512 0e457a1e7740ecad698cdc3941aeef593e5418def7f75e56fb5ebd8a6159bcebbe573a32aa2058b367b1f2435dd7886f3440a041b2434b5da100acfb1a29b1f8
-DIST firefox-91.0-cak.xpi 568027 BLAKE2B 798700b46c0e9249d1a958b0d5cf112b9b59dbfa1d6d2e50c195ed158f7f1a8fa674b13407f43bfdaffc28955fdd621072802362ded7519a3c80a84a3f0bae20 SHA512 0d31367c46905f39e1ffe53833f4b23d6c4f31b6f0b6024a585573de234234a67f0b8ebdac47ea53e83bec5f36f82cf3330ee773903d00fead6b51b0990a55ff
-DIST firefox-91.0-cs.xpi 571502 BLAKE2B 9899c0b7694c4ecc90f791f7c1a4ebc5f5a39fd9ceaf2df537d00142cbd631225b7727a1b162939455f03c9fa7b2b815105cd57eb7afa9a95fbbfebc8e10726e SHA512 c0c118d39c2c52b674f1aff66c412cc9b4dfe44c93c46a0920e8dbb46458111c2bec977114438e505e157f38b8d5776af544542ef8eae589cfd0ed666e9fc3e8
-DIST firefox-91.0-cy.xpi 548299 BLAKE2B b7f2669ae8ddafbde2a47b41043e0ff003700475b2e52f58a6a7ff6287f76f8b369d420e814e383d16acec522883d90b35c1f283b7fa615337030eda2326f53c SHA512 b5cac20a52cce8c92d17982c2836ad6d13e7df1148d6d73ea9c89a8e59a734c24ee8748570badd23bbfdbaf1087a1f407305d7673cad19ab39f6e912a880d0a4
-DIST firefox-91.0-da.xpi 540526 BLAKE2B f636bfab26c458d19cf40dd923543bd6180ff41b0c2ec27d124cdb91c686c6def368f12622f226c6f452636a39ef1e61d767146ee4dab7e5c5239954b0da9d3c SHA512 23506c3ebaec29486543050bcbb4946b03f2a27b9d951c2702c785e5ad6bde34f16a4b676043a51d8addfb384d4c1c8fbccd7d49148627687fa27cb24551b197
-DIST firefox-91.0-de.xpi 560086 BLAKE2B ad0674c865a939b20272b919e941586806e6015dbfed780c75e39fdeff42e191b46cd245d433d3f4a76fb7472a2a10562747d15245b6c2d6c98cd0e3ab8b5b29 SHA512 13369fe4af14708d408f577980a98be9edba511e1fd18e5a5cb6b33a9ecb4837915853d76297b16276031ae24292510e83010bbc4c74706018c782d564e69991
-DIST firefox-91.0-dsb.xpi 572864 BLAKE2B 894cbca3eac24e94b3f0853ef274f4b7178d80825fb64db87b9be507a2ec195799e979a29be39a7a237ad953b779c0fb49981fbb3afc4359fe75e5ec5a0f1922 SHA512 d7d52841790252f97fb0f55e444d4e2d5dcb939497daebb7584444d4d69e606ab36074e022578579b125402a8a40146f0cbcf608e4ddb23860c70ecb1bdd8745
-DIST firefox-91.0-el.xpi 646570 BLAKE2B c293b47413c863655717c7534ca4d35f8ce8a10cedb9f7c62758303510710fbac2572baf700091f3b840ffe3f15592dae5b99ebbebc7afe84c3e85a50943fd35 SHA512 924e852a974cd095368413b6e70ff6fd77b9db4e8588cd6e3eb79224b16f2ac9d7bc67f8c81fc39b7b3fa000d29a5916f1e0623f57a01bb5dae8473b62e182d3
-DIST firefox-91.0-en-CA.xpi 515718 BLAKE2B cd987596e082ec2e7fb919b0891fde74e6e911e159e7aaecbd0c28da453e53fa0a5e224b1f43cc08e66c0babfd85778b69d76b914a6d3e97adb6ad5e74750658 SHA512 c7da5c36e8ff434db4065d2d8173c4cb6d367f72b28592d20919d30d361a4ec5eab8cb11da4ed214dba1daf820debeae99825f4ed958a4b674e94de019084307
-DIST firefox-91.0-en-GB.xpi 515983 BLAKE2B 74b6ba2a8e506bdad24c39c5a4eda6d146dae134f6acf76851d852a75537a667ca0312490ce2b5b113f66bb83921451518bdc8d85c682100454784c4203474ac SHA512 4bdbeec68aecf02a16963bffe80f2b7f63ff59fe3e9a12fd1ed18a9437447507ee5d8c54f53313f41dcc056cd66fe1d3a1a4091d631e45b960c1a2d141c2edfe
-DIST firefox-91.0-eo.xpi 542040 BLAKE2B 6706e2a3ac2524b4ca1f9616e28569e05ef6efcd0e88e7029da5206b1842593f206e9fb6202caab3ec4aba145ebf8152dcf0b33120d037fd4e1c95e7ae8199cb SHA512 ba5bd1c10bfc1846feced56e587bcfda9c2002f481b8b79bec1a5a501833d8f5fb2369701227da8e1b4f6518713bc7865c2b11bc62c97494c8a57e721cb3bf27
-DIST firefox-91.0-es-AR.xpi 553515 BLAKE2B f0da3acb9e615d76a6fdbdce625ba5bee2b346e2cfe827aef0d0e2a961be13019759adca530bc81ca8a9afe22083f3aa0a43c309f37869c7fee05a72f75edbc1 SHA512 930323c03bb7b610d1cfba677b6d23428ba675e6a1fa5365ea6bfac6a975e0f84537b07b5240628eb976a074738bb45abb46ed4ce9595159acc32fdf789fcd58
-DIST firefox-91.0-es-CL.xpi 552538 BLAKE2B cc9b6f067ab109423552477f93ffc219f0fc9bc45ed39ab6b4a03c997c47dec79dcf4e8f0fbc04dd961ec6c1159e099bd520a5d0f07f256ae806e6e5a4e53672 SHA512 99b42b5ec117f17b5a06b20ae4880f902dbd42fe05b5da6fd6ef734ee6720a10a9cd0993c4742e7bb6a03fb89d5695e4c0b35ec3375f5a87a952befc998a70c3
-DIST firefox-91.0-es-ES.xpi 542520 BLAKE2B 6037ac0d852618fb67ce12435bb789c31eb9565114f2c3f07395ab44f530aac2f5aab9c46b6fd499c10320012cd62c0299bd529181bf9432fcba6c3c1ed79e0d SHA512 8fd364d3ca28b0f7feddab8fac78c32c36868d3bfc05a8f986bf5c0c46dfc3e32435a1e129740014cd6af19717f14fdef32ba3688ccf79abd3b5fb3bda5f5d50
-DIST firefox-91.0-es-MX.xpi 556671 BLAKE2B 23950c4d58151a3c382dc7d2b5413cf584a25a27cce19d3cd827e8394742ef1f074a791dee5431ae2ec214cf0893ce62fe003e1aaf756989c6bdcf44ae0dc4ca SHA512 12584dcc7c7ef60ea27f0cc30b2b80fe86c29c54af36d05706cbacda15fa73e4b79ea5d3d39eab3b89a98eaf9d2d123505f73c5210c6014851d0e3706558c69f
-DIST firefox-91.0-et.xpi 494137 BLAKE2B b28f36710c19f400d2a42f3ab7fbcfad794a31a7dc2aa2ff60eab16f2664f31501145a65427900e0b3f2bef4a40f5ec62da8bd49f79325e7586e9788fa318caa SHA512 75e41f9accf57c8ee361df2391b49d3ff43159ccbfec48c9e67b9dae24012c7be78c525246b71ea78e7751f458746933f9212db7761e804556f9488c8c2e7531
-DIST firefox-91.0-eu.xpi 539054 BLAKE2B d2e88f54c308159ebc6d3da8256562b34d5b5bec6db0fc65c04a296f59bf388d5e6d82e798ac002c395114f17a0ad67142866e7cf1211e3eaef7a310de7e7ec3 SHA512 f35028251321707f2b4033f27fb4981bdf6f8ffed7ba3c616aae994c8767cb5681362b65df359133528223ef2e444f303cc3d0bf794a1d450a70a5ceb12db786
-DIST firefox-91.0-fa.xpi 561641 BLAKE2B acd8b361e2d2a4b3e18dfe7b997be1cfcdc30384012b370118e6684cbc13c0d7a4f30d7f13d370c1d3f235bfe701e830e8ce7bcffcad4fcb2ab4c513dbf3a27c SHA512 fd397bd20adc1bd89cf6ffa48186176e911a63258db7de1515de2af0f1b6a69d252a3e152c421a3ea7686a33f65e1a1e64bc5d33ba823453cd64037cee390e4c
-DIST firefox-91.0-ff.xpi 485698 BLAKE2B e4e30306a77a2c9d6540deab07f375b38c143d6c71678f032aed2c20967474eb9d822dbd63d128d4689329e6d3257d196f3165c239da111372321a1b5bc1b0f8 SHA512 9c4641708c37641311f11a93412d49dfb53809fbe349fb2fed6e4d05fe29734af1d6004f18344b40cdc3d3f72ea8106d6cb33029df38a75c9cc8d11d03d8069b
-DIST firefox-91.0-fi.xpi 539818 BLAKE2B 3a6ccea3fef665e9ccf1e58e23e7cc737499a0edf736d22f07b639f9b9c52478c18390fe7a8d4babbdc8fc06c613ea3c9d2ed10a84c63fdd1f4d333272816bf0 SHA512 043dc0af8f994de82f2ee6dd6ea944412ae0b30b2e2a1c22a5d78d065a406b35cf4d25a165996ee102b3017c9d2b310dd5c535ed5779237b70cc4d1a1885fc15
-DIST firefox-91.0-fr.xpi 564065 BLAKE2B 81f89f497651c117857e41992c37991128448a399df17add0ca93e225f1a2d1703e751cbad855da5110d2332b968403e3375e28e58452b3dbf2655214b6cc1c4 SHA512 e9b619f3a1f657d4bb05eae658d597243a5d0579db1c524637a16346f8c574d279484a79b23c691a2c04ba0b864cad64a055e13790b21fe9095a2e7e85d8bed6
-DIST firefox-91.0-fy-NL.xpi 549216 BLAKE2B 44dbcb8405a419a1a7826fb834dd7cdd2ebb75c2c979fccd978e4a8822714ea8b092834effd7a2801d8320934d5a64f3defa06560a03f658db89ca0f1dcb179f SHA512 543b769c0fcce6fb08892197e8e071bd34a6090a6909d02d1cd65d1d7245e8d307b534696985a3751efaf30b85b217aa2a6b23b3edcfb3d062afe232e7e75122
-DIST firefox-91.0-ga-IE.xpi 470708 BLAKE2B 33e16c7215da016ba38f650612758b53a4e90d441faf424d224501bcdbb27f57f69cc56dfba27da4015b364870fc7439718ea4da7b3ade860d18db8a06850651 SHA512 12ee445cf04d63206c00c472de89e0fcd289619e0e1267d43a552e831c17c6201f734f96dd179fc1ef196f3bc2029233bcab5f649f4f403bb27ac34dce8d30f2
-DIST firefox-91.0-gd.xpi 545681 BLAKE2B 70a801a71dbc71ba53a41a8d3f47ce053b67f076ccff55abcddcb00ea8fff6f5002c43542a1e5d1daa719605a542bce288bcaf3ae92bd9244c8de6efdf9b422c SHA512 b8ebbb02f6d253c763e86237c65acfdcd855678a195c6ab5160d89e696f69f3668048e082ca0002a509bb690eb9d4695195965dc734ff4377d793b615fa1710f
-DIST firefox-91.0-gl.xpi 548395 BLAKE2B 93b842d01c577fdfd551c9fa4ff0d4b4c2985fbe8bc07ff014b37e34845ebfdd32d1163149e1617e91432d5d5fc1d8a5096584cba16f2baaab7d0d77b02f248f SHA512 ff0f89c571da15a253ca312bf37073b47689c60b96c4f78742a7c7b2f5e580c33fb666dd93839e5990f1d9cc49a8ef58ac94d3b996b71374f5795548270b7632
-DIST firefox-91.0-gn.xpi 565280 BLAKE2B a39b3d17003e6f1217b2b251b21e49b91808d1c68b8632c035bc2ce6616b81219a90f539a95e148d59181a2ce40ac1564853b7eb24e6a24154e4eefe7dc9208f SHA512 63c0f6a80f0134c6541b684e24574684cad8d365a8fe4d30b46996ed2781fca9e24796def22f4a8bdf72360e080c2640c34a2bb1f02b55f802a6817a9c41ba7f
-DIST firefox-91.0-gu-IN.xpi 544528 BLAKE2B 73ce4f8b615affaf33ecf45b798d67f00aa034a467dd2d5edba1e5d97ff6dfe40de5bc13cfe6d6d1972704566459d71e3e789ce6237825c637477ca531505374 SHA512 c378380aba51d2c39b2fb074d6e5e810f7d20a5c4eccde237d880f9953dfa051e71808c9243b52adb4df1a8f80a3d35bfe96666d9822786c51d6113a25791f61
-DIST firefox-91.0-he.xpi 563141 BLAKE2B fcf2159b718fab7126a2b8cfe09cb0ba361f2138d872e3a55e81b10e30bf3349eb2988d3716569e4243bc7c0cfcbbfcef89ce60cbada0eec855a9a4e80cdf77f SHA512 9cf94c33e7fe9662237c750117601a868f6d4a65c9d7af8b67e5e03fa308c515e9b8be9fabaccbb9177c2cd55a08c1f1b94a60ef8556cac1287cab8486f3019a
-DIST firefox-91.0-hi-IN.xpi 575683 BLAKE2B 3dbca885603431e569d3e2e6db32a43da8642f832b0fcffe32928abacdc2af583d4c67095242fa7c67d912a8d53e76254c70496e51537acae7cf95be24f0205b SHA512 7e237c94a3ddb8be408a02e23251e9ed913686a6b649fbfa78fdeef3f7383e684e8636a71a61a7d5cdabd6cdfd4fdce2594ac57a552870ec51a42062bfe5bd44
-DIST firefox-91.0-hr.xpi 544093 BLAKE2B f5eda58802fed3f6b86f49d3a150df4cd8103cafd14b686435fcad064fea87cf98b70400bac75262beecafd4efe556bd1c3de72e5199212fe6e51b0ac72a1722 SHA512 42689ceb500dd877c861c0232664a4891c72eb000ecabfc7c1fcddad200913d5c70ddce30f2a1d17b0117e9ad75e4b12eb67d886c1ec21c81429eff6e52e53a6
-DIST firefox-91.0-hsb.xpi 568939 BLAKE2B c0efffd5ede68d6f77d92fe77f9efae9e95f8dfeaf7c178b71676d390ffd0f8c6f0f8d84a39abf5fe469b6452b578b81208ffff778b01ba56a90fedcebcc604b SHA512 8cbfecabdfc073f181a646cb63942b3933c555a553d6ff439bd7e7a32fca76495c999976e894074acbd3d1453a0e1360583813fccc65ed1c10332f77422720e3
-DIST firefox-91.0-hu.xpi 572762 BLAKE2B 527214a323d73161090256b10075ee4fcb70e23b8139c9199ef61fab56a38138b7ce905c1f02170aeeafc104d8de4a509a7bca78c3ea7be8e9cc20b4bcf8d565 SHA512 e12fc1a9def1b2fd2eef35f691b1e0b577d3116b08c45f2178b6b3be9ac6de5e60381f825e915cd4f88a686c39ff5b8b71710ecf433eed2a525aee0679b39132
-DIST firefox-91.0-hy-AM.xpi 599015 BLAKE2B 9483aaebb1da4e0f266948d03c6e37a3f046f8c4f983e412353bf5ee5eeeabce1e6600a1656f88375290b1bff218b3aca697f5b1b79c8fa45ea86f50f6cabac3 SHA512 a11ebb2f338352aca351b789a835db0222cbfeee6a053d21c66fc0203aa17a8280c9a7ab4b9519101259526e32f276305ce1364c3c40a49b1bdde10c96f22166
-DIST firefox-91.0-ia.xpi 538518 BLAKE2B abbdbc9dc6e443ddc5b13dd391a789641949a1ae366021ef26e8fd461bc11e8b49ea22ac5bf1658fb80792589f0ee6084e64cacc231678cef2cb36b5e83c4d2c SHA512 b06a9dbf2a7e3b23df9255d5a2760164e27494cf2c70d2b37747c25e7e9ae9ba9ecc961d290209c1cb9be0695b0785ca1f41a07568b24857d996ab430af1360c
-DIST firefox-91.0-id.xpi 533876 BLAKE2B b176f16b6dbbc9ae26ae172f5f6bbeaf8347964aa21da33916022e108b04daa0cc8701b7f3488c5074f59d47d4d87d397192a4fc75559c37462f7df580a24ba5 SHA512 a50be6a95d968befa539c568ed8c62fa6e96b8795faf8593afe24b54a4ccaf75ef71e283479793d2ca83892959f7145fb0fdff4043890b95c92ce74c2fa1885b
-DIST firefox-91.0-is.xpi 481332 BLAKE2B 4f20dcbf6673fbd03d91f384f36f6b6de5bf3f374d6121451917845cd4fb69394e88cda98ef83f9915954582f460bae6e0c0a9ff5549d22c6dbad02b02c4083d SHA512 6dc16097867d9d9744f1ce90e8df62c70f8d314299811caf1149758468ae274539754a1ac14f1a8ebaf08c801901f42589e61307959cd2d480a18e50069eed26
-DIST firefox-91.0-it.xpi 467045 BLAKE2B 475b1884e036d4606d9e4ea41dea6e8163f6e343469b83060b182026235b8ed2aa7295388621828653752c810787789d4c16fc15518507f4b54a0790526e2e59 SHA512 480500cab9415ec3f851e325d04c8e9fd90d9e19b84c04f0f66f2e12361151c70ea2fdf2ac7bbf0f219d6a2a9c25776b07f201cde624c9cf44811aa1fe65613f
-DIST firefox-91.0-ja.xpi 599317 BLAKE2B ef486f48c54e6d0f4cef51c8202dfc73072c7b860cdfbba785b25443c6737c71a73335fbb1baa516937c05a3b33098414c4adcdedd529226149466d9e9494b64 SHA512 6e3d9cb272764b53a62b7dff03cc944623be38d0fdc9b4aca91992d314e7befeddea42ab59d4aaf8a6a536531a027ade5e185c7e0557bbc955841cc257cc7fcf
-DIST firefox-91.0-ka.xpi 600143 BLAKE2B 7d0477d2aa144231546d917f31777a657a4c973acf3bccd9cc743394c0ca86634df8f4fa2bfb6a5fdc22cf9f67c95e44999df801cb2284d3f266872149bd7a43 SHA512 9a952a328f0cfe6b994ba293974fd3542cef2286dd4adf441e09c49ca236b4549785bea97890608d2cbcce32c217d6d6a81197d931d0e676b4c1023a5996fb75
-DIST firefox-91.0-kab.xpi 557817 BLAKE2B 1dd2a6d9d471a0fed234b7912e3266b4890d1954a4d9c0c39e7db28d949e0d0d3aaadde70aa4f74603f686735b738e1f31c0c05d2b764aa58693e1f4091cf756 SHA512 361d2082f6b815b02a61257161efd3ffdec63e259ac10f60f18ea5621112fbd7285434f1d8cfcce4859db6ce9c9ab78b3d2b28dc25ab144c49d5c4962781a027
-DIST firefox-91.0-kk.xpi 614347 BLAKE2B fa493a734850f1d15de1cca43b3f3ac219f03df23a349c52637646b37205e4d3549323b72094fb14fa3153f4a997eeb2d65e667271bedbe0ba58d7150a010948 SHA512 960284bd5cd82b0335eeb4c59acec2ed1cf3e2239d60329c746a99350f2a0748def8cfb6677cf6cd84fa3d96afafeddd7cd7c9e3eea1eb3017a0260af68472fd
-DIST firefox-91.0-km.xpi 544984 BLAKE2B 16b1f51f6815ed86ba2be8306e3c4701ac34170d9c9a4b44006517f9c143b47d051578f01788976ab9e0e98555b66cbbf94964c32542d0d26fe022ce5c59f25f SHA512 daf94d05f4557fa0a4c0592c047660d44a2570737d346e0b837913b2c23394098b940b8d41a6c50a49c20855cd848c391f99b8f99370885ccd5ba367dc3ba2d0
-DIST firefox-91.0-kn.xpi 508509 BLAKE2B f157df3345e91c4a0db8561b5036ac45523e449e60ce2f97cc46f637257053d5b999140d9ce9ae8d2e529b50394b7f6a875b8d913053f93872636cea6d437330 SHA512 148d10e63e3b8a04a4d524d4b079cfaee4e5bcdaeab30e1f0ecf0250b0dd22f94ee6ce0f312ba5268d6a47f4d298e70ccff8b0275d0a47431a8e0696b358e928
-DIST firefox-91.0-ko.xpi 584341 BLAKE2B cc307a9e2a59b6c5702a27334a4ba03ac3d1db17c217d781880bc071ff6e8608bd463cd6772f05ccf39e5d1c16bc0622da2f37349653e904535d37ea0638d6f8 SHA512 7c43611c2bb301fde4058be2013da705f4fce857bd5997686e8f8e5c8b23237b65ea3d7966b9713f9ee969976fe2a39f18b270b9301776aba1aa45554e7bca90
-DIST firefox-91.0-lij.xpi 481935 BLAKE2B b53684a60ca34ff8bad862cf24edf9f0d1da536693c3314fb50653a0dc6a337bb3da80d92033b60294f365a5235ac3247787dbc813265f6218299ad3760c7c6d SHA512 625bf884951645c2a4b271948cf19d9e03fd0d11682f7fdfa95efbca6a0a2a0434561df3136324577629d71ce68d48ee3cf8a249fb3f401268c196e317e8b88e
-DIST firefox-91.0-lt.xpi 567601 BLAKE2B ca2618e06647ff5a3541248d95b9b93c85f239669b75c5876bf539c0c07cb30a7923b0d3135a1417782bb3bb41b2e21688663db02abfdd9ef3c8cdfe6ed23cd5 SHA512 a7190f62eedd11625c9c1791865b463877c98bf73ac6ef3abd10a89daf85d4f966307ae04b525b761ca5c7b18c188075cbb858d4b8c8b2aa8ca871c249aef3f0
-DIST firefox-91.0-lv.xpi 473335 BLAKE2B 86097eb1233969278f691db92ecdf0d259208fc2709434f90e57a39157b75d7319b0e3fc0cd5cce534b31634e84a3fc96157d14390d829f63fc84b35d629237b SHA512 fcc238b564ce02773640222b3b8b9de44586440729f59a702437751b37c259a0d3613d3b6296cce1656f3d36ca097ea3534f26e43c040ae2e0decc2caf8cd5d6
-DIST firefox-91.0-mk.xpi 473482 BLAKE2B 5404c3c38aa07977d5b09d29ec6a0c396c08b4c706bb549a103f8c98603d8ca87c844faf82a0d40cde680c91528add2fed66081501f963d0069d2e477763b2c8 SHA512 92aa41a4acec82a0b466ae7ac57f339d0d68be8e1787107647fcc343b152f85319c2d7f15dbef3850e414a01492eeb869b733b4909ff47048e0a2c557824c7d0
-DIST firefox-91.0-mr.xpi 544857 BLAKE2B a071cb0b89fe4bb5fd9e17934ea6c81bcccf212e22d46886e71608417ddab17d6a50cf686226ca18d00d595d9a0fc01b26bd6d71f6b64c0a8de2787543691d76 SHA512 d62ffd4a68cfe3a79ea9d51bd257046e1d35318561c43bcafecbe5ced002113d9b747499d7875288c0c18f39c097dfbd563e58877985396aff023b5f66f3c75a
-DIST firefox-91.0-ms.xpi 457208 BLAKE2B 3262d30d2f35eb49ee6d0465669f6fa6aad3a39750af0b02f138a125cf0e4616aaa9387dcc3dd2bd1013a9d5d8845457f45737482cb4c414bf13aa60a9aaff1d SHA512 4a388951a188451f0eb8f6d2bb18cb7e082c0842d441781fb0fe22b22b5f3322ba3eff7e55834e7a62464d8b06c6d760fb0d2ad81d46cd38360579ba4f4173d5
-DIST firefox-91.0-my.xpi 530139 BLAKE2B b62a2cb6f9c1398d0b6b8e15ed6cb3ab332b2a12b016402eb27bccc83507a4b425ab72f448c3c6ab75b23e290116cb8b47071e6aa739786982011846a32c29bf SHA512 78f965a40ea515a6e6f1ca2af88cf8609c04210d7471524c64a2d359634668b091a06d2280c3376babb59b767cfe2b6bd63d429dba45781aa6640d890f8d3e8b
-DIST firefox-91.0-nb-NO.xpi 534995 BLAKE2B 9e7118327229f119913e8ed956bc97d9f55665e46d5233a48404428ecb2c4ecd8c289dc6883ec6e12c0a1298a25803d14515394bb1349a1b47277bf0def19a22 SHA512 b05e123b56d9f01e35c47dc74366d7580fc2535b80856407b91ef222f75eff944348588667446b59f962f2c35cceb03c72398d6c55a89deda857fc4d7fb607b8
-DIST firefox-91.0-ne-NP.xpi 486180 BLAKE2B 056bc4ddb87578f7e8608848fe2bffcfe949d1ce31cb7a037fe8e3abe6213e3593aabdd067cd196920f4dcdddf1985cf78acc5f1c737f9e1b2fdef5b28f76d4f SHA512 60c0468a0cfe5bbcaad0a6d7b91f9df7879ef8603a469f83504b464ac1356be28fe0b16e2ad81939f79455a608c7f54ffa3136e6d8bd7e73d4c96572857c7c67
-DIST firefox-91.0-nl.xpi 543377 BLAKE2B 2814dd33998f8b200e1b6104a223dde198ec710313c29253c3f00f8e1308b940dd9d82a7c1ce8a9df46f4539993f5eb2f61909de34af66b06bb105efb4aa6d22 SHA512 5c06170f33e0f73d3d87c9bee1803fcb69e89b7e258b5f003b7a45365db8511fbf2088b515224d2197c0cf16e2eeac9198b9cc3b2fc80bb9ec3bcad785d11d57
-DIST firefox-91.0-nn-NO.xpi 537549 BLAKE2B 1024e59210b1f6ecb7bd4f9087b1100ada72527bec9243ec1f4ff7e9b79a647e52e86e926c1d87a96d40854a983ec91eb8ba1ec3b8ab152bc4a4174e23cad8b2 SHA512 9f8f0729977b4c0ce78f4c4ab0561b665743d003c66c4d7af1da81cff2d1e1ec1164f97a8342e6000ec552f162bd1a75634a5298a90b9d5231f08405245a07ae
-DIST firefox-91.0-oc.xpi 559030 BLAKE2B 9bfe51ea062bed0af912c899983ad903634e0072afda8746d6b50f15c96c0544a0f6087ad1e90474e4b46759795893f016c8e25636cd75fe45f9b695db244274 SHA512 1cbe98fa36343932f06b36464b4fb4d59cf1cd85f42ec1eeba8ba0ac5c55f870a1929c65e001efcd609a7d274615ba5508512326743ab29c28322a1c13dc9b22
-DIST firefox-91.0-pa-IN.xpi 605084 BLAKE2B 4df145130801eae8f102bc97d13cf7a5401fa742d437092b29ceba218055539d7f7d7a42d6dd303c4ef8f138ff2c093b4a8767dc3a3ddd36b44b2d5e71341821 SHA512 302e58a8e055c46a02e9126033c0f2971e59f6909d33b6e0fdc44b95937ad51db8147b181e4a13d62aef075f0776f9a8059fcbd3ab70625a14a6420b261eae35
-DIST firefox-91.0-pl.xpi 562847 BLAKE2B b493355e4b22e81eda20001abf25b2faf72933a39849188dd7ddf033bb42dd95a45bb59834ccccf841e417e8b6454eacd5ddd27aabeec5df446674356b1ae601 SHA512 183b78b428e5fdab7136bf0650c41564efc813f12fea9b0b2de43a81a0f18e79c7b667be9aac8907a0ccffcdec13a4043ca61691ff658c99c47e23c46b1b0146
-DIST firefox-91.0-pt-BR.xpi 549008 BLAKE2B dc488c58d6a9aeb7cd01d0ffb6b8091749bb043e87a3a85f6606658c5e7aeb0c1d31fb98d01ddff6dabf5eb170e779538ef953b4a90a580023bea38e9d8bdaa4 SHA512 fa560ec92e6efc682f7ba53112a5459199d2f49f6a5532c8f4b98473ed1fc7345da57acfb44c81aa2d887be0aa9c3feab920957eef643d5bbe4a3e2e1b9bc379
-DIST firefox-91.0-pt-PT.xpi 552660 BLAKE2B 585bf88ac927ca885aabcff8a4f1ebe7dd5081cbcbcde45615f2aa3bc0046090ecae14edf4d20198d3741bd25a317c265072455036cfa026515313db07a13a7b SHA512 44aba25a7169225c9b6f49bbe75a49033db25a801214ce113c01cb23bef48b0676e7e16abbbbb85509c8895b55d18fee4fe9923723b97819bbacfdc25e328bd5
-DIST firefox-91.0-rm.xpi 543750 BLAKE2B dd52ee4014a32fd0139ef9c9ce6a52da5e73a005ddd9daf33ab08f2e5c4ee2de4bd3839d6ed18f35211eaf8d7be48fce9ca12d8428e69297f6aaceabc9cd1123 SHA512 340936ac955f88dba046810cb98faf97f2fd1e82fe29320bb423cff9cdaa14a56cc8b301161e73a3d6fdc799910ba0629ec440c60f2fb49b4fc162711f3923a1
-DIST firefox-91.0-ro.xpi 544861 BLAKE2B df223fa4cf02cdf9b10a318059a20af93587051b405b5564425392d9021a28eef55bac3960f9c8030fe791801918840d8a53f4f01fe410399c6d7c181750d8fb SHA512 b00c3c77238d6b6d20811fedbafc3261e69569c305894b9ef79887741bc4b922f7b4847752658e989a0c04393b73d99a52b0dbbf4c0a50ff33af0710dbf1422d
-DIST firefox-91.0-ru.xpi 635030 BLAKE2B a2e492f36079e46997228a3be1dc7c26a2128d97fde32b6119bacbc389885a197c28a7fabfd28e554dff753da3d6986d716782e8728129dbd8de31638947a6c0 SHA512 affdd9b7c04cfd358fe59978a18796d84f6488df4f16e6ccaab6b30a478a34f34fc50c9a0b84fdd44b7bf356e0b7b4a644944e7b7c6356c72d2a7901cbea34a6
-DIST firefox-91.0-si.xpi 496839 BLAKE2B aa1615830c25f27756d4742ca97da6cd752918894ad19570c03b9d18c1372f301cc4e0b5b0cbc0ba85d8f94d63dc9b0e8d4473a7efd982c021e238d929d5a5ec SHA512 60f2b66781bf1584bd5d28fe92689bf9a7c3d8b5fcecc4867ad794e109d440d099654d47baac38e030f6d24bb8be68c43b0db28e1ea35f6bf5eb48809d226990
-DIST firefox-91.0-sk.xpi 572081 BLAKE2B 5e872b8e610d44e05474c9b60e00dbf38262cfc17dc56c57b3608af616efff65f0b15c86e3ed3dcca0e9ff3de9e1575408651fe0867c65058765f68f441f6b58 SHA512 79789c47680a6f34113845add7cf8470124ab5dcdd171dea6dfdff2a8a114ea133d660be68f3551709a723feac1566635179cab48f11ba8fcfee6811a4316db3
-DIST firefox-91.0-sl.xpi 542775 BLAKE2B a0c8f588a1ecf684b5da0d592ea174dccdd471c70f7712e3d06d3190a36063bab2c42ca543fc42d24bdc7b2cc30e76a1c2fbbc2bf158ffe510f5ff2b16c3132b SHA512 37df4cf7c8cb1c7e09e0c95bd514f51979c595d2c65a36615d9a645cc31df5fbe18de2f16bac04cd0b7a479165610905968ae3ce8513f889272becea52ae90e9
-DIST firefox-91.0-son.xpi 432944 BLAKE2B e2a6a2b2e1046659f40b0e8dc85b99d2d19e19ae0670c87ebb5f60c0d799eca264912ef9be0c1125fa33f172e340f9243eddc64121858babb54cb87e3a6e5fb0 SHA512 03156f7974e940be06e2ebeb9715131009bb3d6fd2d39393e5b08c43b7a77ffa2f26bc93cd76639f3e33168adb2d6f7ed34cd57a9d8079f355a162dcad926a81
-DIST firefox-91.0-sq.xpi 562217 BLAKE2B 118e5f4f8fe7642183bbf71c1e5cfa874b923b85e9db4d429f0d5338434e9712bd6b4072f19f77c56213f81b992f3bd5b53dc63cd9c4ff5131c3c85ddf4cbfe7 SHA512 2257a1f266c8045d0323154a5d9e4cb3bd5ff2de5895871df422124fff0422aa23b4c69271301daf2f62c6dca4143c68c906188e65965a15c446e49a7db0f256
-DIST firefox-91.0-sr.xpi 596023 BLAKE2B 1cd0a25c8c549ffa2364aee8fec38adab4fd954c6c2fef55a1be2637af9a3d7385d26d346b2ef86d6e2cd72121ad44d9cec9c0675f52632231ad30ce154344fd SHA512 1736e357869d10fa43a2224242827525831bfbd663690727b2cc1df93d15429afd1f81efd73a0ef2d0ac9b278467cce6c0b60671538cf87b464ff1022302a039
-DIST firefox-91.0-sv-SE.xpi 546381 BLAKE2B 4cf1e08885cefd27ef193be88953202e9657ac88a79972d6ce7cca6ec375e738673074b5de364965e51c589a674b2f16674cb0e44879b37192652a75c97db2d4 SHA512 b42fe4ce6f43282235e5966578d227c75d36ca34358fa968a38b4b77cfef862f732a5e2740553808d3abdf666413740fe2bd5ed1490cac71273ff8f849cba235
-DIST firefox-91.0-szl.xpi 522367 BLAKE2B 053749a0877aafa4199765ffc28faa5dc589000b43729df663541189bfeac9886728001f8bdad57ab7303582886abd5dce0ee04c10ff8aaec976156f591fa8a4 SHA512 0c8a3c0a9ea5d7265404fff4da03cd3ae02ab4399695c632f39169d67cbbc3fc623a645a8076139a6010c15d131351eb23673306fe387e69660b8f021e34b17a
-DIST firefox-91.0-ta.xpi 523938 BLAKE2B 84d2fe504c115eae4d9eebcaa7f5aa30a5dd0da73a178fcfbd0a6806d48454db7edb3f73e5a7740450043548fa8ac951b90307ec95565e14f91a3e3eadfdcd1c SHA512 dfbb51e925b77663d69e07c122a96eb15b7dcc9a0d9f8210cb7568dfe491cda8b7a42f8bfca20d3edad30228ef23b697b115cafd7d7df92b4b5cd149fd1a4d75
-DIST firefox-91.0-te.xpi 564760 BLAKE2B c1bdcdb64f2519074b3204c7a37815ce3022af8aaf042e49eef3a60f51c9acdb65ac0ee769127284a26b9faf85d02ab8693cf508b4bb94eade46b1b02162e44f SHA512 655bbc6e1fd8a87a596d230a0a680da43db7e86270af93e7947dd7cc32fa6cfc1d0c6d4f4a24fbb1c0f27bd6ee8cf9230262fe59a1908badc54fca071aa6e1e2
-DIST firefox-91.0-th.xpi 614160 BLAKE2B c8b4524f2d81908f32f0815775e6f6145738384ee8ed9a51557a9d5baed533572484b77a07129c70f863d5ccf2d6b9df0f7944b95ce63c8bf4f8b71b228b33a3 SHA512 76c7613d8779a0197159c6bdba0c311fad3ea624b4de944e2d0fd25e03e9385145c2097b80ffe37452a0509b780c35b27e1ccd73e87ef26398e03db56d62d18e
-DIST firefox-91.0-tl.xpi 531314 BLAKE2B 0b4f982c9b7ecf422da6c3dd14d8a92b01000b61ad0c643f7268ed39635459f9ad4aaa489484d986908d32fad5d15758c3054d6ef8b5901f087f93b2f76938bc SHA512 3df710d6fdf2ebcf20e4012055e109564e5c7b44257f8183fdbb39f0a49f2a165904f16a3e199aa5fc68c516a14e18d34806537e9c9c024b563e01e3bf8f3798
-DIST firefox-91.0-tr.xpi 558465 BLAKE2B eecb412388348299dad551aa0b154427a8033a3a72bbf0a5213125f215062e0e3f2a1e166da6eab33b024668d7fff20f15cdedce7230acb1a88cc34f5e5bbd32 SHA512 aff6632794bed53331b459a4e860547dc24433abdb2e3ffa1c20356fe2c811b0d617814c49f3e50f204c38a74503f38e6a9db02344693c7818f5b36d38dcf4fb
-DIST firefox-91.0-trs.xpi 503654 BLAKE2B bcc134641064241e938dc54de465438e28ee02b9fd14a704d6ef34b4c57842667ccb8b98a957383e797c7f9bd37750b4b0ef0993ae371c1ea050f263a29f8b2c SHA512 a2fdd43966650398273f02e0296078ceb478b90ed48f3531525e63918a607627e5651c81dcf338c29c8b0fc825f8fdef70994f2377513e0f04ff66a42174367e
-DIST firefox-91.0-uk.xpi 628573 BLAKE2B 5c5fa5b70ecc57bcb3d2871525ccffb85d6f50d526305674292e687b4cd3fbb8fbbd75f31604e43b36e011231f508d6c4cbabd281f4d0743bc253f392f755aaa SHA512 e9ab80fc640986d309fa0e938279ddba8498493bd4a779516f60e5acef62e5776fa98a802b6b68a065b57f10ae3525821191bdc73c9a674ef670d22a0de04731
-DIST firefox-91.0-ur.xpi 572682 BLAKE2B 59813662712c2a4d237ce0c8b623240fe8d19576d77eef0489655bfce728296fd6cb13a92525358a18339f54d0a97cdd4a3ddbc21a7180e8213a3ebe96b6fb58 SHA512 10a062fca9ef824159a8ad40ac111ff4d9d87cd7a5de7f2a9342159b5a2ca6adfe076940a94f58a6fb0e6d099a12c45a8c3fd2ae4d88f8f503ccee78a588a220
-DIST firefox-91.0-uz.xpi 480952 BLAKE2B 9c81c2b7e32ebfce449c44e19b823d5536c1ec08b34b6db304c639f90cb180e3a697dc1883fe173952f5ef08253c533f4fb7a00e780d033320275310f65195e5 SHA512 4533906fe6854abc703639a9260f262a1a4a53a13e90ebb8916a8a52998935102b8be2b7d04d2176d47b3efef6960f31dc860c0aa6dd727ac26d70fb2f3e31e8
-DIST firefox-91.0-vi.xpi 580502 BLAKE2B 7c6886328396a24e164fdd9fe8d61a012c09dc1cdeb26c858b16e73acce75e8bd542017c620d25f8f111b6decf36db02588b62b653a112eb7d9f4c00887a9103 SHA512 83d85d88605f20180f3d9c70e215345d5e74e4100faf589a2934d4eaf6d46b15ab5139a8bacbfa7373fa45d9bac77cd111793420c725c1a67cd5da2babfaf0cc
-DIST firefox-91.0-xh.xpi 435046 BLAKE2B 39d8bbf73f7360899ff2e3e17ea76aa23096b090d1941c69df45b58e4ccd32ea44fb8ac6f7bc73e7ca61871aca9f94f2b815a5484c3e46adaae36afe02ae82fb SHA512 68ea88ed0116d662f08f7ce581cd3f14d3685e7a41b1fc0cf104204f09750e5b1b6e3f7884385498888b419091b991907f2fe159465e00313dcc4e69511b9a4d
-DIST firefox-91.0-zh-CN.xpi 581935 BLAKE2B 346ca8b1d7d99c31544e58e679988f0b53277c0d59dcc6be642a5fac863c1691c1e1ec66b815f7644383b907d04eb3481c850d0c5919dbabd159475cce1de831 SHA512 0456290e208fa190ea6e0a9f07a86c0ddbfbbfbcda7fe5c2d292bc6718de38838b30ad9412b8d26e57f56d7d42be76122a6d6b409d0c2ee298f738bbe3b98d4c
-DIST firefox-91.0-zh-TW.xpi 582117 BLAKE2B 0f39cab747215ec9ab3e3da043e8650ab654f5dcaf8c26e7f96b373f6fa101a7c8960f3873fb5cadaae879170dcf27d67d06791b7e25732964c3f5f830e7e137 SHA512 5e504c968fae303241b8ba475f030fd228d19deeb54df80520e32dfd005b626dc6fcc4dfc4c906d614b8e747094d474734d0a9c47baabd5121271f8063df4985
+DIST firefox-91-patches-03.tar.xz 22948 BLAKE2B b65585a1c84000872ce675cd531033522cd7ec7e3d3c4bb660269709f02944e8d88cc76c3b9b0059cf3ca85a3caad22168cf607aa1f4f2426eb0dd161b5ea249 SHA512 e970f8fda3257b871f3d8f1e185724ebdf5b4d91bfba6061a777242b7aee5a613fa4450af4f758c0f440d09483e65ca48ae79c91e040ba9c5e63d32d329a7187
 DIST firefox-91.0.1-ach.xpi 465287 BLAKE2B 2d45551393247fda1a64aa05e8491c52e476c033a457cdd8872b3cab88028692f360b2310174116b93437e6523d86c19150045187f1392fa2973cab0f9141a8f SHA512 560cf7a68510d55909a15524af17b3e49c3c6acd84d61c509545ca0661733779b563699952f07d8efd6becd569b204f7114aa7434ff8889184f5c2f0a71d4d07
 DIST firefox-91.0.1-af.xpi 433153 BLAKE2B d7b7210a9dbe92e2e73493539e3245f265247a6a754461c96e3a29fcfdfc5714ddfb83025b08d862d76bd19fab03fbb9892665fc8987033a406cd6e0ed0be6d5 SHA512 65ac9bc81d3676b1dd7871596fb8ee3361bc1e6204571319adc2691c8969234c7c0a66c00a52244e1ff8bbf213f38ae4ea9c85a181d3c92039cfc47902305e8f
 DIST firefox-91.0.1-an.xpi 511815 BLAKE2B 286a6e19f1a882942f187204a2923ec7e8ec38eded208acb0fe01b0c0f83f3b9cb30dc9bfe622d5a66ef327732ad8aebd415177716133abb074e8e85c1d400a2 SHA512 df6c249c5f0f572c4d128ff62e4c49d13dc6c2e4e3d450f290f4f9e55c18da2d1ffc4d04f75359e827b7a2b0d8d242c3f3f40f9e08d64e64e2d0c27a8e1390e5
@@ -495,10 +204,105 @@ DIST firefox-91.0.1-xh.xpi 435057 BLAKE2B 02b8cd6ccd064c43111158efc842f305b497af
 DIST firefox-91.0.1-zh-CN.xpi 581947 BLAKE2B e536cd392e3eb452f7de9bb708974412e9e34f862fb9213917df4317f331005f29300e7a486302584a8c2e59c03088b8f4a1e3d780549e9006a62f22a495fdf3 SHA512 d2f1767782b9f9a3dd545bc3fd98c08da3fc9d4809c5eaed088518e0fb766813acfb498442486768aa90f0ecc9ed9e787b805a268c6a03a8ec381493ed694e4a
 DIST firefox-91.0.1-zh-TW.xpi 582122 BLAKE2B 1cc357c92eb9a3ea42fc1c30e9aec966b6368a6c0ca60fa41415ff561d86cfb7e5bfaecbc69bc99b2e0ea8d93f0026c0c48b41b0fe06df5b784eb76bdf25583e SHA512 9927feb39e7bf343414065d0ed8e308e9c754c393d59d0ad7fdc8a743d20d7eeb315b1fd0a8f5e004968d99ce2fb1cac3344ac973ecb31257ad8052612cd0f73
 DIST firefox-91.0.1.source.tar.xz 389052264 BLAKE2B 5372d65561ef5f52b2d71d8b9401c2402413fb5bc027167356bb491ca3c979a5516da11f9b855a1d796146640a9f1308e808218099cfd64f9c3e61578dfaf348 SHA512 9388789bfe3dca596542b082d0eca7b1a6d1bbbf69eb97cc445f563d1a5ff0c9b530f3be02ee290805e311b0fcb392a4f5341e9f256d9764a787b43b232bdf67
-DIST firefox-91.0.source.tar.xz 380788436 BLAKE2B 14cbe36c19b9dc64d3903994681bc42f2fbca30b97413088155620ec2a93433898bb1d247b55701bda61c4144cb8f1e460f6c2d5d5cdb57081a760f291c1a0d4 SHA512 a02486a3996570e0cc815e92c98890bca1d27ce0018c2ee3d4bff9a6e54dbc8f5926fea8b5864f208e15389d631685b2add1e4e9e51146e40224d16d5c02f730
-EBUILD firefox-78.12.0.ebuild 34230 BLAKE2B 0d4f4b33aa635820ac38bb1a9b6023fb2716646791e165505ec60e155f956d389a3e6c249473ef2271045a597b45e57b006db59391074446149448ce57c601bc SHA512 c37b7749a18d72327c7656d59277336aefd355ec3983e69843878bd39b58afd3f1383c8edcc76fe95cdc2c6635aa056d0b3ce0af023a58c541f21ce40b5250c4
+DIST firefox-91.0.2-ach.xpi 465284 BLAKE2B 1827b3beb7ee055d363f3d993a02a732363e0a8f37cf9ca15fd97f0702779a7a1a2ff4a7594b3c85034db42f3b50124b4cdf1e2b38e0fb01f1a7ee16f83f00e5 SHA512 6f9016adcce981dfe122282e5806ea690e615af4c2542f996813eeeea81bea81ec87eac38f12baf9e0daad19af546a65753fdedc1cb715ee93ab30250dd8ba78
+DIST firefox-91.0.2-af.xpi 433156 BLAKE2B ea445ac7e7b0080ee0b454a6839ef378359945b9aa6fe9c8e99accb8343982127cb42d64a7ffc1f24edd5f0358d3eedfbc58828bd1f3a37058ab41dd160db5fb SHA512 89866a7e818ecc53674b1bcebc7ef36af7b3ec8416cb8ad6b57f0ab4ad9a1445e99dd203aaa52631c5cbb9265adb9c13197abf593f0c5a4849660f40afa3e122
+DIST firefox-91.0.2-an.xpi 511823 BLAKE2B a0aee9d410bccda629ceae7cfb913519c31317bf2dae6290b36b764219154d4a7bc17dcabab0d7494b525edd374f5003f00acfada79d3efada0676a73c593963 SHA512 75a4a2ac929a629fa1392868abbdab4d3f86f94f93c15fa8f8029c84ad5c70054153a85b7fbdee47495a25efd7f829cad3992b3e87fcb950607a70fe58f1e48c
+DIST firefox-91.0.2-ar.xpi 573962 BLAKE2B 7e7cd41eacdeca1773d3bf97a15270249b4514ca3ce30bf44d2ec3ac19394f0e1eb1f0fafe991ae850bd35fbcccfadcb9a469f6af9ffae7c4fae9a8d9c3ef22b SHA512 2dca2e3828a381c08e48f5cf05449a62ce41d2ee5e86e5d74c6f128458e2ef7f748d8e93486dc40b942330e2481dc836bec38caaa957d18b512a3b48421f914b
+DIST firefox-91.0.2-ast.xpi 502953 BLAKE2B 129f446a8d4d7d704423426a22c2fc0fab4c11bab737f1395a8bb3f9b0b9071942e4d076e98fefd487f673da7f5fc7a7debd701764559132be8dcefc33328b5d SHA512 8af2bf2347ee42566c9e36872890212a08ec66c4b1d6eac97d43212d0b05617e5fdf8504eee6087344b4b4cff05b1b1e23b1433fa5fcfb9df6df7c0b8c57259e
+DIST firefox-91.0.2-az.xpi 500888 BLAKE2B cfaf3f2be8c9c2a99c68c91ecb05e2526e0caf6e80bf955708d6c6f35e0eb789ed8865e2c0343830865a201defb42ae1a09df8895bd38a1bc92c25e573212e51 SHA512 2e25186f03ced1a2c817dc05bef502b5eb62a46e58a42ef31f5fc8b1a6747e57bd2c132987e08aa4aea30745130b818c2acee0a685fb506d51964f6ff9348823
+DIST firefox-91.0.2-be.xpi 630158 BLAKE2B b01908e7234c26ce6bd1093639e6ffb9f184fe6bc9b3389bc70a405109dca768f98135e22989e7e071d6e49a61d9e5102d14785073cec6f458eabcfe54c1ac33 SHA512 589dd1b63468f2f6e08b769680f8217f21d73a2b16257eedbd5f100e9d17591476a7572a04e89c3a14e9d63662fd62ef9c56e9d756c2172461af015ea7bef0ab
+DIST firefox-91.0.2-bg.xpi 585089 BLAKE2B 6759da23207731cfc0ea46a14f64863c97aa8e1d4f030664819407a91c37b458b64a3fd6902f005c070aba5bb9c42f7dfd4f5752bde00277147670b728b647f8 SHA512 945b973fe302fbb7344e6152ae5680927ae4df45f9b836b79e9de89f0739a162a41565517db8591abe09762564ed07709c3b7175d89803df27b54c9308e5da2b
+DIST firefox-91.0.2-bn.xpi 576482 BLAKE2B b3c12715a82cad54cd607c3ba4d97f8863850ba52bfd48395376f48d11b7fb2854de003a4c497cc5af06fee31e52d9e5ebf150f7c28085b0e5033a65ab69d7d7 SHA512 899f6c151b0133d18516247549651fc0a008d2f8a5a329976201f5d60192d3715907c56848933c3f03883bbac86b1e933414379bcf207ec4d3c9ed1639e3d745
+DIST firefox-91.0.2-br.xpi 534790 BLAKE2B 66f419ae8b34b69c76e192f603d7b68aea2e9883fc74e1f24cfc010a5465cd3750310b29d06d674d861d634117efcb09f18e9fb186c12131a80db00a5bd95540 SHA512 6f97876cfa656d181c819beae2ec0d08bb13901538df0e5cfa27abafcfe43660b49f1db9e4dea3ac2da38f3a7f5925341449ca50c71cfffdf24aed9e93a94120
+DIST firefox-91.0.2-bs.xpi 473101 BLAKE2B 6228b43cfb0397be9d0303b84c17338a338e4c84ee05e578714b9212812066d7209ca11bc80ab16308a53372b202fe60fccb7792e520e14a0c3e4d2edf9ce342 SHA512 d3cd6bb28e5adc4a8effa3907c4843813d583a2d4a04c5ba1371c9b9cd086c38158b7aa8baf2b91c1f917b60b79fc2214bc1b956cc12996ba1d0c58356d6b261
+DIST firefox-91.0.2-ca-valencia.xpi 543235 BLAKE2B 80fc2be3f773136a409cc231321b21db4a7fcf1c927d460c4c10cd47fb14bffb9915a3d792d49646ea1798f164a7a00c994aacd376cc11c2d7634fefcfbd88d8 SHA512 e0a6e8d39d11caff521aad0fed3416a16097190b102db40970c63070eac4723831a428425abf9d6a1c4fb47ee18ef63cc3a7ef829938b528646f3ac14a46edf1
+DIST firefox-91.0.2-ca.xpi 541005 BLAKE2B 411c713142c91d73902d09667a2ee058a8f13c2ce7dd2655655a63e349176f15d998625a63b1b37e497bc5ef053ee5165f8a4552738ea1b4d92f541e955d68c7 SHA512 782878ed186ddc0e64aaed91c66f02d4387b2493f81357d73e6a7c2f2f5612929f6d2fc955b927dd7d12ef5e18f9890589691ea834ce6232aa60474b11e66d75
+DIST firefox-91.0.2-cak.xpi 568042 BLAKE2B 24f066877199909cbc65ae213e53f53f9393347d8ed16c09c54e9dd2e344715ee004d273e8a8720b60f71f993a93b986d0db80434e66ad9aeb7d998553ef5491 SHA512 14be651ab88b951617ae1f60b35ab61f4241268d261d9cbe2604e11bf2c4d0a8ccbc16a4ef980d88865d84112c4ff1577e7002b57a4af3cc1d90ccbf0693eb21
+DIST firefox-91.0.2-cs.xpi 571515 BLAKE2B ec03024b6e69364913f952b4ba56b7c4695f5067c7bb1115d7c27b1cf8f04abc7bc5ed023c3c5a6c673ee99356bff23af160a5ae642e741cb2b98b637fc9ed99 SHA512 b47773ce2f19f5e44de7ba59d27b01a533641d54b0354a2d0c1b4e6455f9ad9b8485f72dd03d2081d7780c2221c154b117b0f14e6669b2774fb11b19e1fd798b
+DIST firefox-91.0.2-cy.xpi 548289 BLAKE2B b0513e5f5eff768ad4061125a6de882a5046235115b115ec6da6e9d308b844a51482a189225c50906f675b7e47fa51cccd1028385ed69be809cc5ec22ef19ec7 SHA512 8eab5988490e1a0f396290f399ac47347bc269ea6ba6676a9e1ed6c52f9beb494687e1ee60eb1eb1b1a280be551c7c784a47925ce2652b4cac1cccd3712e14e2
+DIST firefox-91.0.2-da.xpi 540522 BLAKE2B 5c33f02e1940e8dbef839967276c9fe8fcc8011f814790825433c6960bb35e9d624af4c35d615516e43f5d65a2320266612d10516ff0d209ec49396f6154cd28 SHA512 50b8d81b568e1c29cabd304427ade67fae622d1a1af589773c148c9c2e45651baaba6b9707bbd54b1f103cbefcdd476ec5623773a9fb44fcb8c0a4377661e001
+DIST firefox-91.0.2-de.xpi 560089 BLAKE2B 47647865fa91e22e601b52ae2bcc8f2ac91619307551ef3dd260e258f7657d8ee164664eda40354a30e8c50be94402dca56b5ef9c53a2bc463c390130c8fd46b SHA512 8267c893cebec1cb3198045bbc5ec2cea821abbe8ade3488eec27b1d599d74de87df4396b686b509866f850dc3b996a0e665f8ff1e3b510f08fd8d7a9035b39d
+DIST firefox-91.0.2-dsb.xpi 572860 BLAKE2B 49debcc4b22fc28e7bd2b951b59898f4d60070dffb50f851759161731dabed3b8750424cb5d5517c9f71ef7c203b1f26ff370dcc0fdeae11fdb2a9606be4571b SHA512 bc045c295d4a33507a4037003e3dc32cd632d88c31c89b10543e5ee57b733659bee5ebcb45629fadf79ace5c6a47fc3fd9cc06aa2e75ac43edc3d32bcd67fe0f
+DIST firefox-91.0.2-el.xpi 646568 BLAKE2B 50a0fe00c2b14556f39d501232593289585213e66b65897f630e6688e1a3ab4b447ccd1634672148370c325712510e7dad884872360e8d8744db8901b51af849 SHA512 0e62e049b3a51ad1f2a2a95fa5ac62996a3e56a69a41355bc74e6af9ce487ec98e89a15237b351878c9a90f34f0ca5ce14d6d27659f432eafd11f960b4fa21a3
+DIST firefox-91.0.2-en-CA.xpi 515736 BLAKE2B f0de88e7c171910287fe40048c3c4e70c65856e6c7d6af06ff92edf4b0ff6600678f0f51164bb59b2315187200783068c0b28436d50004e64b944dc46c086684 SHA512 6b9b6a4fe029df7a283d78237b23f69bb57e84ff60055843dc422795dbec4fe92a396344c0be2467be7764d30f19d993c4af01e6935da688ad503090714ca610
+DIST firefox-91.0.2-en-GB.xpi 515982 BLAKE2B 034e89bbc4419c77913370b19f587b437588aa7f9ec27a84aeba27887ce2e31e967d695d67ecb725b31ac0d84e3fb56eb34491927cb4604bec658883a55f6a47 SHA512 fee033b59fb4305a373a902519537ef3293c74ad5ecc5016ce499bf845400d34e7ae5915ff5f95a3384f5eda20ddee97578f9c1d8c7f055936c4800e5341bfbc
+DIST firefox-91.0.2-eo.xpi 542048 BLAKE2B 374f51c5979d382e73c0bc4cbe7e4ea66112b4cea907f71cb140515632852a686ff0f3a1febd0f74e4c2c536977e7aec0c0eff43f33fe61ebaf3aa96238dc0c1 SHA512 cc0049d2b4b90833a66affb778a3481c1de0816bda7eb150616562c43fca9095d2d5704cc4c9edf346f29e30471c83848d15500a319caea5b04f7df8c0461708
+DIST firefox-91.0.2-es-AR.xpi 553517 BLAKE2B 311b2b0e5f4c0704b2bb993bd9da749b84c4780fe0b4dbfd960c11f6c0e33ac5b74bd7d88bf0e8a993019f52e093e5b5915d6a05660a655fd189363415939730 SHA512 792532867883d33fc234a204291c9966b06870db3d15d8710beba6be7892ad5d7ab0141191390372b44042f9ab6a3ef81c113ab7a6a675306fbdaffd2b3378e6
+DIST firefox-91.0.2-es-CL.xpi 552534 BLAKE2B 48891168c9de04fc35ee63cba20c0f0c03ae967e389a5cfdd6f6984663ccedd28d686f84d8ec4880b41938a5e64833c635c51b9b63c247f340aacc010beb2aea SHA512 e774fdbdab10bdaa97d81a8e05963b60921143aac2149cc03aacd0ad8b89689882617ad3052b78286300a2d8c44fb549577cc84d78048e725a7ecc1a831470e4
+DIST firefox-91.0.2-es-ES.xpi 542522 BLAKE2B 62d28273362e360317562939cfead517c5da7fe2d38b0e13123992e67dafe5ed4c06a5c426a28192719bbe6aee6cc59fc6d8e36bea10f8e544ec35e12c62b0ee SHA512 c50e56de633f981f0e8e5fb0c82f5ea0e347d71434bd467aa56c131a01d605b44f955e6cfffddd0e9a7a12fef98d811830d032aef2ede7a3b8576ae164e8ccdf
+DIST firefox-91.0.2-es-MX.xpi 556676 BLAKE2B ed87e4b73f9827a31c4b257c797f5b117d37f436ad7876f6aea71052ed858b700f535597372a49db9297bf51c8cb2c3a053661642fdbc228beb85f63d6542c65 SHA512 e07113691b8fc1a6b798dd8327f95d725f635fac7e198fde00f833528a073c69eab6b88c7e1d4c50340475c7fe2c1416498ca243cc6843bd93da8ef1342db95f
+DIST firefox-91.0.2-et.xpi 494142 BLAKE2B 4e8ace24cde2baf4826334e0fb7ae7209893bace1981f994fe3dd1c9b1cb4e7384eaa68db7974a8dfe0db2cba6ee468268f0852f47db81b975b02cd09c77185e SHA512 1f53ae61a22fe59935b7b7be506f466909e27ea3a541bcf36174ceea89bce56fd35b15372c7adecb92173e87ca0706c1bd39011fea40c136768410d9c2d49d8f
+DIST firefox-91.0.2-eu.xpi 539046 BLAKE2B 93cfe5c88109054e09fb0605d998bc4ebe9cde572332ed6fd8cef517e5afc50596175a08cbd041dceaa056c5a419cd494e6a75a2d19c54603b9d48be5b357424 SHA512 61bfe155b5abbcf15739576928e2f4f84f4898911fb862d2d51d45d4648d0f5ebfc7fab0770f64b295dbf604d6772883884d3f908dfeffbf6438f44ea1078f63
+DIST firefox-91.0.2-fa.xpi 561638 BLAKE2B f277a445a109761dea17a8601b62c1d03a53855d46ba17c5129aa5732695663499ae86ca279a1581db2bde6ee1b8dbec09506abb60ea8c39dd4550bdf735af8f SHA512 c0821849b254977c6002b92f0a48020476531f6485260155ef103e4564f6628f3b097c24877cb86adfa6ab0afaa15786924e65e3f60a2284753f7ba52514eda9
+DIST firefox-91.0.2-ff.xpi 485699 BLAKE2B 1d372646848dadb64a1ea0f084e762b8174f6f815fedd265dbe0b70af07a7fc472cc32ae755b18e4b9af8257dce5bfc18f67526a997e17734b4277573684b310 SHA512 bc34242897070e8593f8024f795d18e049fedd448d0084aff7b7d4765bd4d9b9458bb692cc54eae15872ebe7d2f22a00e732f1093a7628e216d4ccca0ba4615e
+DIST firefox-91.0.2-fi.xpi 539811 BLAKE2B d09217d946f8fdcdc9dd41b4d5c5bd9d9d30a37a1e1d4cc85b37c90d5e3a7874aa58c8297c7fb10ee437f738cdf64fef338c4aa0d92733c5f2c4a9aef877e0ab SHA512 4d87dc2bcaec4b3a1d653797fb3a56a609931ce3a24ca277fe0a050d0fd7336e5ddef881e03f7c161184c857aa0d361a7b9c80258ab42bc4e9fa73d335a8d8b1
+DIST firefox-91.0.2-fr.xpi 564055 BLAKE2B 7e6538a7246179fea01b20361334a7ce429e73f6cb7537c096ee512acc77192dc0e39546956c1cdffa9b497e4d14ba41ad38c5f5b583fe42f57032356086df28 SHA512 aa25c36a732d512c4d686698f69ed1467d82c02eb4476d8117959683f7aabd1ca580019e0450c39ecc95916b9e2765c4eeb5a94774ef3ca87e047830a8756925
+DIST firefox-91.0.2-fy-NL.xpi 549221 BLAKE2B b8b836dd7fa5f4f9bc0fb5ee9620db0ad2d1606ea26f49344433fbabb85321cfe760412d02fd61c010be25bc92f8793101e341527b8770375a20adfcc3c25666 SHA512 b452811f1fabc0240141996c393d2e0bc04a6d1163aa32e9cbcd381f2d505a0cc6b4d82192dfbfeb671346e111db16bbd6bf73712ce7015a3c4fbdcf438a0b2d
+DIST firefox-91.0.2-ga-IE.xpi 470699 BLAKE2B 1da8c8d70e28dddf138b6750b6bb5b03ce95349e1108f14e395993aae0c9c2631b40742b10ff4b5763e2d5c145fc316ca2394bf14715467e4ba75b542d51f23f SHA512 2d7cafdf455cf805ddb522152238dde6261964399f60bfaacf2c6cd70e54c047ae70fd0952254d34b7b1b4f9c85162687684f5e66c7d60ee0915571b96c78c84
+DIST firefox-91.0.2-gd.xpi 545686 BLAKE2B e6c5552211ca1b07426ae79e80fe9be7fb516ad831c4bb303f0aa1bb7e3f648062d0b29c9a617ed2bed3310dc51a28889232b4c413e93c6623126ff4fdb7a075 SHA512 5ebde92fbb0697745e8b8cb4d0eb40581a2a54f18fb967a90cbe7d90bf22ab9b1a40d04f7a52f1ef96c349167a4a50ef02476a68a5bf5d9fa911893a3a90f37b
+DIST firefox-91.0.2-gl.xpi 548390 BLAKE2B cacc1630f147ede28dab1c47d1eb4442077d0126fd5e02ab06572f33004e50f43a0a7365ef863ff0b3f983041b2b915cd34ce674c56602616912516dab39adfc SHA512 644cec199ab6f9919b82b3d903cda3fa12557c9e7ac0df4e4d41e854d04f54fb98775e80d052aee6a840c1de008c83390c4402cd3a0703de1edd94ec7ec37a37
+DIST firefox-91.0.2-gn.xpi 565276 BLAKE2B 7053cd1585af3a9f755a1f09132035e5b3e39f9b293364a411028fda8382dfe9ad91970a748c52dcad35fa526ddace25e0e032032dfcf8cd2008422b54be5117 SHA512 ca0476636fded14809fbc8549305b7f5d42382f973704f04fa6bd1cdfd378ce4340046a8ffc7959caf5345a5955cab235834d7830f77717a759e9404c8b74ba2
+DIST firefox-91.0.2-gu-IN.xpi 544513 BLAKE2B 414c5705c7b9116754c7a64b9b270d5fdf08589e50993643165c61e2a0874eeec5ca11156c9dd8bb7ec2edca05ba0c476f4df10927907b3a10aeb4f4a6a4f509 SHA512 2fc8ba1bb037a70e20c3914f304aa8798fe4f7bef9814d73f21df7e4deb2abd708ec90fe8c257640d66249fb21efea3226564416d326705f10258defbd84ccfb
+DIST firefox-91.0.2-he.xpi 563140 BLAKE2B f4a9fb78602318778be27806f67afc4d638248472386dd5f1140cda9922a3d62439d06e1ebe0b19ed8adf86f256bac14ff7cd5a53e6fa82ab05b5f596813e2a1 SHA512 0100acf0f6cce50fb382ba9e70c5b95e3862779308a6f6038726914226f1948b556335aac498f2737217f0a77037af2545788515bd1ea643af37c855ad0833ca
+DIST firefox-91.0.2-hi-IN.xpi 575682 BLAKE2B b93b1cfef22c48dc1fd7c1b6cf2f6198428aabcd19a002bd60c2b17e14cfa68e93253391783c179f20a4b619cb75ce2b4b09a58228525f73c8c9376075476bfe SHA512 8f9b0d18fb1ccac2df13faba3b84151e222b717b0110f3bed4b3800848bfd165c42388e3e81a76e7bd13356cbc1a85f4b6b8676f2c0179da3847beea5c7610cb
+DIST firefox-91.0.2-hr.xpi 544093 BLAKE2B 522e7738189dfdfa741bbf6e071a2a0af759830b9ef055d6397f22a95da390e6a22d6d08e4c5cf61588d8d6decf0e986c80be0720640c56d5081f9eae373bab6 SHA512 3284e8570ed98d6d453d87fc3d0805015b5219c4dab9d5413622a5bc95ff6026811b30a6e64546b138884f9e1bcdb04144efe6efaca6666ad37eb0a89ec1ffa9
+DIST firefox-91.0.2-hsb.xpi 568931 BLAKE2B 02948484c3d21a10bb1811921fbcc9a2e1d549358ba0436d4958edf85a5f3b5580d011ffa98c154c79c2349e3dbdd04f70993e70a62aaaf3a52d0a36d94b9540 SHA512 2767920e501cba28b842bb358dadea7a9b992b7324186dd1b4e6a8f3da404aa682a5f1e23d05c3c3ba79d5bd0550ed6631c07ceb3d35ec223974e6608c778dc4
+DIST firefox-91.0.2-hu.xpi 572766 BLAKE2B 85196c0e3107768d3b50c32d12a44156bae2ad7bfecd5f3588c9fbba4d122da4d8fb09bb2e9582a7c35f19e74f8622bac6e791da022f151e37727a5841c1b6aa SHA512 15be8f755bcdbd1c3f2ddb5f5e6861bb5b5eaac2fe6590c117b48d2a3dc841356d96c1385569a54eefb4232f3e0b9552f0082e9921f5dbd62a85e71519b4552f
+DIST firefox-91.0.2-hy-AM.xpi 599014 BLAKE2B 6a08d2427f3ed840cd88575d84e862bfc46998e6c1f5c51ed975b4e7f7e2f8bff373d11b59c71fdc4da34ff16cb4ac81ee2f803effd7e8cb4095086f6c43ead0 SHA512 6d6edbb1cc88a9d4af446f7979b559ec9fa848e6c89d45f00e0cd74278f2c0863bd1f7c78710c0238fcac7dd9fa1f62e79d9ef04931bf2df94d1899eada3c913
+DIST firefox-91.0.2-ia.xpi 538523 BLAKE2B 078f874a0252b40d0817ae333d157c0f18d9b3f84da9778702ef2ff96d55bab94395cfee04ae8b292fea36f7c8f7f3e62aea63a4aa4534073525532a60107760 SHA512 526712c639ced83b42602d160d020d66a1b5381db15e3be500d121820a697c48ba961ed5b874003e1df5b819da28107f620805b630b4fccd85613229841ebe47
+DIST firefox-91.0.2-id.xpi 533874 BLAKE2B 165ddea29605321b3296ade87e8cf276fecc45848b3df036527eaacb566ec3b44ccc5a90611a4f815279e0aabb06eaaba6c8b432460bc6bed8d92bf63247b174 SHA512 333874f55731dca69937a4f43fe335c0c066af4506955af8eb3da82764c5c05394f359429ee38992c51a714c7d7e0f4427235d54c52f176865a03b291dbd0bf9
+DIST firefox-91.0.2-is.xpi 481340 BLAKE2B bb8c5840492f47ef79c763e2677fbafcfd90b3d16c54f9492958fae73c12f575265873fe310dc9010fd55a62d42c74572351a828b78edbcd479aadaacba5ff93 SHA512 d74497fab93316d556002558768bb28ca26d39198d745e9d252b6c97a46179e9a33a207d0aafca098ee83de79522d5e73d75e1fbac3c0f83ebbbacd3d2d0a7a0
+DIST firefox-91.0.2-it.xpi 467043 BLAKE2B aca3186e0e425f0532f9be8c647c44f2edb934fdebfb0197d122e921e181093ff38485bc9f9e18e32bd2d3ae68a23219def152d00d0d435b7b643832d635b595 SHA512 070fadc60b7f06591a1e9714a12f3f60be04f6fc42ed4ff8713d8755fe39c1a99345f8e9fc0bdb94a825e5cc582e7d671275946a125597f08c57152927bbddf6
+DIST firefox-91.0.2-ja.xpi 599312 BLAKE2B 4535634b3469ee7e76f465ce87cb82baaff44bc69bf9b95c7691df876df4fe91bab899c48b3bbb2b665eef8259aa83251aa3c184b0296cd431a8e6c6ff82db0e SHA512 a1e813820de9b5e44d7adb18f1451c55e62924ed769e394b9a7b38ff24c6a96e49f674402e76b53eeb43d19e597f7df9083f0158987462157f48940808d6f057
+DIST firefox-91.0.2-ka.xpi 600142 BLAKE2B e1a2ebaa905ae3432c06f448f4a2e4414caebf92148abdd52d8077784f5d6d5c63770c7c797d5bbacf206ec7f5ed6410dfc3315229f7e13f67df1b225175a434 SHA512 d99056aec02d3c62a3b6fac4d44bd7bf35edd73de32500f9dcf2ac5320d6fdaf93bf495303873dd725d80651d393786a3fce5d7eb68ca5ecfaec5be199c9f3e6
+DIST firefox-91.0.2-kab.xpi 557813 BLAKE2B bd0baf375f7318ce8f88883f52368b0d35132674ccda5905e2154b03e493db6452267069b482c290d3db005bca450c038257262207b2547872d66136a0d864a5 SHA512 3afa8920925b1c54d7b37b26056bd170e246615544bd4e3efdac9404602e4c17d6b7f019c56819f4dbd53505bee220e7edec91d85ed442fbebccdfee7130b6bd
+DIST firefox-91.0.2-kk.xpi 614348 BLAKE2B 8cca4eaea30764e7156c55c13118d5ca1d9dda845be7894fe2bcfc734ace1d967e984cafd8e1a522298032a7f1f345847d806429cce0ea157ab12566c8f70d06 SHA512 12753ddc8419b830a0e6af938399902da277ee375cb29a144e32c1a71c5c5cb314c308ed1283bffea4127b70e5dada7449f141455fd148c0fbe0d85e56a817d2
+DIST firefox-91.0.2-km.xpi 544983 BLAKE2B 648abe7d2f3c4dfab206330886bf64e9e5e6a121612ef8589bd6f9bb2ce0f74a2db5336098e9f7b15fd959bc562be7aaa6e5c957f7b601ceab0f06be9eb5e7eb SHA512 5dedbefa7d088c87c009263ad6bf11b3c739478fb993a1b94fa10fa5d0e8771fe92db7548e52618543340f7d42774faf15a9ae834011577ad6a4f45d113163d9
+DIST firefox-91.0.2-kn.xpi 508521 BLAKE2B 70d6936f6b213428e3a09c94d6cdf9ede084c9c96dc0dcf43134bf31f1bbc356cc69354c3a6e9780b5f208e6ce254f7e307d31f39d2d38660260ad374c438b5c SHA512 e9bc6fa8cb3ebc9cd5d6f289b2d7f31a8f9063cf84819cd5e56e43db7a2d864ce2fcb09cf6602b53dd6cff595f62f50caa60343efd2ebed84c0c87bcf92c838b
+DIST firefox-91.0.2-ko.xpi 584343 BLAKE2B 58a4c560788b2b8f9c7e7f577cab11c7ca34cb243685bcecab8b8a5453f8634289b61b30c8717d2487d3ba10f59bf76a09af4e156fa7cfa4c2b7b81453355638 SHA512 7fbd65d20d1f72f6ce83b8efc2d2d37515360060b2a58d0395e03eb297aa136a13f919187b29027512f7558ab489cf73d7edec344e37a91578a2c03a346d2f7c
+DIST firefox-91.0.2-lij.xpi 481930 BLAKE2B 52dbe2aa33ce053073c0c157471d5c6be9c94743ec90523687f8ce70da96c17f64a59a1cf96c78f810e86a64b3ff573b366742184f617d7e4d713b3a8c85c564 SHA512 463bfffdae4e4969fdf9e1629dc44185e4774dd786d0a072b4ad3214230f0f6c8299b129b1dee1859a626cd2233e5c0af60128651b7722fb50b7892bcc873225
+DIST firefox-91.0.2-lt.xpi 567603 BLAKE2B f073ef003588d3fe0cfee368ddcfffbae6ef0b1a233f4e0ac9637b76b4724db5cc2452373098552103523d28426e71c6ab88149f0599cf40040c057dfc61b45c SHA512 664557a9e4d05ceac2fac9d51b89a672824b83eacfe14744cbb639866ae0efdf743c6d245f5c870dc97209b015ddc9ccc2feec9b71af717355f5073fc0fdbb08
+DIST firefox-91.0.2-lv.xpi 473333 BLAKE2B f53f90bb380bf60d960c998affdcf2d250fb84da847a6904d67a54f437e0e0c522346276a3db6967d5153998ddccb1916a98ff70ea44182117d300f0ce950582 SHA512 d59618421f4c3b8dd85e8a2eabe08c3a858eb3c8a06dec84da7451c4f12bd0a1161db3b300bae138558b552ebf5bcdba18494272b08871b4d7d1d05d280c7c34
+DIST firefox-91.0.2-mk.xpi 473479 BLAKE2B 6ff5f26980802fa7049fd550e56215807dda08fbf248f77c2d4d06255bf5d7c2897b5337582276b14ce7b11692c04c442d746559ac04b5d901dd6e53307e7cc6 SHA512 f8902b73f7dc119c960bf536817c47589f7d9bf4fad73ecbbb173bded865e96beeb1eee891ce69d4cd7be0732f7f07bf5a43290d79e32acb3b1d77ece720f1cf
+DIST firefox-91.0.2-mr.xpi 544869 BLAKE2B 8063812be027d53982c5b2c52c576622c4b5ee8add2deede210c70eb3a9fa77b4b82d8f78c2277cbcfec64955a76ef7f91d290b354aa01275c6d98cd15211b6d SHA512 75a95bd65b7caefd471a171fa56ceac1dcc73e65fb62d89af71da608fc44a802d3e239546f78340e9d61335765183dad85f1593cebbcfc7418d0e467a041e3f3
+DIST firefox-91.0.2-ms.xpi 457203 BLAKE2B 459bc8db9573053491d7708cf7136fd8b25f0ee406f1058d49b46868242ab2fbfcaa00fd5dd97bba830dd4fc3d98eed944adacf7fcdc3219b35b438bc76625bb SHA512 733971750312670a2345c3724585991e33e65d17126bd699be7c115da6f814700db01411776ea25adc2ee47ade78d6f8f18f4aa0b5e301dc749de5c1c2fdff26
+DIST firefox-91.0.2-my.xpi 530145 BLAKE2B 42909546ba46ed0e12a93703cdf356407e2b1bd0296d74748fbee32415bd1c8cd647602c7c7312eff94b31ef27fcfe9fe947dbbb999c10978c06027d6f90efeb SHA512 c24deca71aeaf03d083767b37758da97c20b735973bc7373d791b7d4f2d70175bd243b4ae8b65d3fd277cdf43d65133d7c536dec6e23aa395e68547176364ef9
+DIST firefox-91.0.2-nb-NO.xpi 534986 BLAKE2B 6393d435d9bc7f6afd76def4ebb3a03efde327a3bb8a3fd84eabcb485d4fd340bd0dbd84918102ff10fb9b5e9f3a5783d2404010c448a3eab34e0fcc5084b35b SHA512 bba89b13817da879d2fbc029dd42753122ef3ead9f24163c57f6e56daba4d83c69ec117dc729a87a8d217b073e0f623007e05bb5f15c5cc579a7a0c254ed9ad4
+DIST firefox-91.0.2-ne-NP.xpi 486178 BLAKE2B 22793df48a5a2f62169a441934aa8975470f7765b32d6097b19320c3cb4e3890cf95f9b5a91e7590781e342bdf0fcf26ce4949208fb8ce89001b4d3bf3adc5db SHA512 d4b67b1fde7c386cf0df744194e72df12e0341b85678378762d15ab86d0d9d1e03d9d251705986b5cf8bc67aaed54694d719b73426a2911b0ef3d1d00b76c14d
+DIST firefox-91.0.2-nl.xpi 543375 BLAKE2B 7089b4c42afb164560e45727f655255c8f6d0c0530dcd18535524520a9b011aa145f097c0d260b5a16df007ecca58dc63c8516ec55aee2559a5217b120c03db2 SHA512 5668f48b70798f5da84951c1f95ab60ad2d7e354abdb75546684d0df2749381c68ce0d3f8e481c29aa9d7e942cf092aa03e3967cd914dd8abd5c7f8fa7ba7366
+DIST firefox-91.0.2-nn-NO.xpi 537542 BLAKE2B 9bbb693c26e3776485d816cd032ecf380f3dde7785b9994f56c06d194127993bb22624b3d5a2d9e7c300b7676f9d1e8cb9627e9929cd80bce39c030e656e6949 SHA512 dab9c2c2bdb72fcf8463d82a351746c9cafa4b3400493098d8ebbb5c611a6b0563d070e36d7cc659351c45212551e7e77af023c91e13691d88a70afaea169484
+DIST firefox-91.0.2-oc.xpi 559028 BLAKE2B 341ad88da64ac06e86cff2ff2f2b3a31e420a1529e64f0b626c0374272d123a808cf47aa30104bc3821488d1051f3020fdb5a91c5ad590069857029b39d64038 SHA512 7fee4a09dfcfdc84372faa8ade371441985d235c73e1cd0349c7ac8d280ccd5f9ac1efb86530cb5dade4face156d6299f8d14a0b3d7972a49898da56b816a5d2
+DIST firefox-91.0.2-pa-IN.xpi 605086 BLAKE2B d31232b6ab3154ca7c1b4f69308c24fd9fa7ae5e367e02d089cb8f759ee95397b504f6a94c059b6c822597fecff69703af59cec5f299fac62b97c396ad132a06 SHA512 86a98ac48c729fb308ece202dec5116732dad5b13c75a8fcb6dd4a3e7f1888f432a5aaffa0b4fcef7de409d3f5d2e6e32c4b762f0e0c2e932d5510361835d0d4
+DIST firefox-91.0.2-pl.xpi 562852 BLAKE2B 45177be1a73deba99c21c00e92607567384fd93e632803b4babd3f6d0b2d4ee7106bb3cfaa713b44efa0f667bb524c0d4b0ed14f2cf3aef2ca46869e5dcec60f SHA512 913c5fd1618e09fdcf404af08754022249ac4dc3580efc823a3ffa14876eab949b28c41ea99d291d59d0012cee5306509108ebbcfbb97cd1d3396f9510831d09
+DIST firefox-91.0.2-pt-BR.xpi 549002 BLAKE2B a12c8b2d7dd6f5228a547a79f5f6527cbce47b599076d372d87501f8b965299c538072dd1845efa52f94c579506a82129dd5623d3d66ec8f7a325aabbfa63d9b SHA512 4de795d87061b9e4e6d484efd765d2cd68b68b98dcdcd58382095d8e4d7d3051650da3a28f01b632b5eb37c4c3e5f50f0a2dda3c97c02f5dd2097d472c957de4
+DIST firefox-91.0.2-pt-PT.xpi 552653 BLAKE2B a6b625df698b8dbb2686b140b8ad89a6e547197b91d397b72ce03b27357f037529eb4b9dc431b5a6c785f365dcbb0994060b87a11e77daad069687c7f39fba3a SHA512 499152aadb03b3721dda8ca4f1943b56122e4cb9ddccfc90d1eddd6f7c116ba2f3746e686ac1b4057a2c3a821beda3d1d6aada651b545fe144b5c86f3780bbce
+DIST firefox-91.0.2-rm.xpi 543758 BLAKE2B b5c6b7c255cf47d565379c2d09978d54fa84da46b29601c3ef23dccb244417080f22e6c18e96fdf5ba4c657da8e7f3adba1f1b44436e40fd615b4f2ec6ad70de SHA512 f3ffd1514fa4d664cbb5e0d1a3caa1c286dfce482665a111504d72c5e0c1f1db2148552c24e7daf801317c11732049df997134c481de790ae2962fa3c81a3183
+DIST firefox-91.0.2-ro.xpi 544870 BLAKE2B 638192c620112619abd447597f9d7db7bc09cc5b1fc7bafc1986863ff0904f78695fcebb4271d3ddb86167436d98052aa2b7fc5fdc919d1751beed00204c0f85 SHA512 b4700a3b946df0210683d463fc244cbe345f4ab34b4240ed746f15096a4a00448bbe5a3bbfd7bed1909c7df39cb9e234cf33db3650096a8d1b34767fb6694f81
+DIST firefox-91.0.2-ru.xpi 635037 BLAKE2B 1173448e8346105bf86e91be2467c5d5baa4f0afb8f79d83197acd3ede3fa88505a7f123f132a7dbab13c4bdc0aaf095815cc943056a1152569407b7d51afe63 SHA512 5e18f24daea284a47ec2a563d790e3dc8ae44ffdedffa684f737daee04fe480eedcf4ff60481d8c76becd0d1c16cb80954c612aa00162cf40390f9f2ac3727aa
+DIST firefox-91.0.2-sco.xpi 512252 BLAKE2B e91cd10d8db891b75f552cae391b9f20fc93e77ef9a01e13e3303425ec4758f63b5cf8806bbdecce2434f471f660148dc16c2bf9b872732f8156235995341809 SHA512 340626f186c46336b1b36c14f1b4e56d337ec0e04fe84a8cc2293b1cdf7b385d2068825fe81952ed28b983ad931a8e56d0e1828447a6fbad288a9016eca38375
+DIST firefox-91.0.2-si.xpi 496840 BLAKE2B 3609ada9163696aba196d9748e97f8e6ea16510b0f55145d23c16d8868def2236a178c4b429f0bf9f479c75ed83623e306443e102dc82c87be35de12fd4a8fde SHA512 7dfcfc0ebc6c2d9651c3274abfc25d100b451b55375a9e9380cc2586531ab08c0a5e1ce4d914f8b846f3d4f8c10ae33fe66c9d04817d01d5e7f3ef98239ea6d6
+DIST firefox-91.0.2-sk.xpi 572088 BLAKE2B 86020743034e7e00783038256231e1bcb3f2054d3c679db716d71ecc42e5b3be18e3151180250f82bbd03c99d72b71a886f5d8cb7b08da4fe596fcd1de62e5bb SHA512 5487d0ebf35a13368c3f2c4c6e933953ad43938f98a56660d7ee83156bfedfd5f766b8779ae0980aebebe6a4112cc3e90ad941159fed6767c4319c4bcbfed873
+DIST firefox-91.0.2-sl.xpi 542792 BLAKE2B 05b78a248eecd982251e83aea8d4e180388e5ba2424d8642c8b8c37e9024622bce4c7e268067bd2c959602326f7ded61f3268c25c6048abaff277f6eb53dd143 SHA512 684d20192df92823fdd853d8a79582748e2c1f3d95d40b2896952b931b34feaf4eedf222aea640ff576f0fe68efb661a48acfa616263a3d41d9777a23ddcd992
+DIST firefox-91.0.2-son.xpi 432937 BLAKE2B 592a2605a2fe3567e0dc5020382c3cad9ac152cfdd3793c679a1f776983cd9aa4cb83d59c39ff3dfca8c0e70c98fa8fa13ba5a11eed74ce906e2cd0c9f955aec SHA512 cac2639b2358550d50ba53cea726dbe65717d40296d63dc0eff85bbebb3cf0186c70ef6e8d83857e61b06bd5c425c1a72aec34723541e2aaded96ae6838e616d
+DIST firefox-91.0.2-sq.xpi 562223 BLAKE2B 49443861d6ecd85d6fe4383518a0b65b57055260d326778497042e771f62cbb830dc479e883fa154dd2f2a2dbf4061fde46f137f14e63b8bce76d4c90299f13a SHA512 c6a65bd7fc49ad9fd5af2c7b8b86c42a90b81074ea16411adeb6794195fda74cd13fc61762f0962ba6252da8011c8279deaf2352ec9be3439254fdc38c398d45
+DIST firefox-91.0.2-sr.xpi 596028 BLAKE2B 6ea53132a28738d54446b82fba65317a3f9f493f185f76595067d29a84551a69995d6676150946dc52df9df5f6836476d578b9609bb04f7ceda77f9bd8723e73 SHA512 c4e6b08d0e983bae2f76fc8b5d3c301dcb8103051d7d7d1766db7981972cfa8027cb178ddb854be6a95c4fb9c2b4a82336eee4fd5d4de7b6af4e98ad8d0526cd
+DIST firefox-91.0.2-sv-SE.xpi 546389 BLAKE2B 20dde060f8e0bb1a0117bd8d3135dd5593720eac58a946df6f6572fcc1a3c558052dd8db4d696b3c56326685af149d02ad023388539f45c71c959b0e5c24671a SHA512 42f66c348933a446aead3dbb115873e52a7f8ce428b75065ccac8e6bd6a3332f1f4a5e9fc30fd001f7e6fbce4c20f50c70f0aea52fe4f3bac605a1b94ba96e45
+DIST firefox-91.0.2-szl.xpi 522374 BLAKE2B 3100df810f0b26de1c4ba3e868e6855ef444654ddae1f15b1b28ff721f64b5807eebb154dc41d6d7ef30184e35a532e3357229148cb502e2a34a2b08b29060dd SHA512 4434ca0704390113fc22bcac26efdd376643b550d33f070493b2132421281983f1e0b4823b83319a3e11e274b9381d502fa193d52f7efe883ee6f801707b6e71
+DIST firefox-91.0.2-ta.xpi 523941 BLAKE2B 2c87a6ead3ba80ae2d31353dedaeb6f58da25751684e5341517720690f8ab52201259aad7ce33ed78816d817a5d3a3a2147ab3bba6513ea044971a8f7f273cdf SHA512 9c24dd0b1e17623af3166ca4078bee47a6958cd9287c8719a525f1c5ae8a88bc21044e8e83675c9e786be93fe6c1a4c30a91f1f68a880eae2351b4ad3bb050b7
+DIST firefox-91.0.2-te.xpi 564760 BLAKE2B 314220ed7b4ebe6bb27d740360b608c4702051a6f2762429868c9a116c568f87ae34eb062d86782e0e753febc70daf02ae844c3fdd3f1ccd67d13f2a4c404ce1 SHA512 4170d39649828e1c8395fdcd1b0e5555ca2ca32e4003c68ead981b108ac98c5cf955bcfc74486c3e940d8e5ce21c9853a7fda88b98b50698a979f7258d4bdeb4
+DIST firefox-91.0.2-th.xpi 614152 BLAKE2B 85b298f4dd95f35e7681fec5a736c3dcf27bea72d0c319292a342a8d5f72dd8764d02c98aac5e0d49326ac506cd8045715bbe8088e67062c97ec116e1f32779c SHA512 0ea959243a6edb9433bf86dffa7cabb09b4b69dbda218a4e040625c75d543d5e5cb065dcf6ebaa346b347abe6cf0d76237458cae8fab04f1ebef3e8a9320de63
+DIST firefox-91.0.2-tl.xpi 531316 BLAKE2B 0946e102605fc7c05c7e883b693cfeca11204f4d1d0793864e9c0f7a5c573b04f1714a72094e8e78b4106889068921a1c13b44ab77478352310c05507de9a087 SHA512 8f13de4fd691937296bb4c3e3d67b2d826b0e89ac0a972cf4ebe2bdabd4b5539bed9455a56f6211067900b9b003d388c90d96b2b25f4896ee9c78814a7bde6d2
+DIST firefox-91.0.2-tr.xpi 558469 BLAKE2B 1f6b73ada217f445cc9eb04358f7d6e84ffb20283d4bad63afc735536851af4a7198cc2a4e32a8c2b2659d212b89783844e006dbedc1a613353f76a523a0ab38 SHA512 c947f20755b5691bdb115e15108f6a6783a74b372dccc6912749e25ded9d01e463b4346bcd1b8d2d8ee017c95573b27431056ed3878c547b36be81a8f108fc9a
+DIST firefox-91.0.2-trs.xpi 503653 BLAKE2B ce6c5aceeffc3ce0f3980d64c6111c917ab984020d03b18302422a1db3dc8f9d56544e27b45dbdc12d4f394f41d133624932e390c358572b1a8f5df780d62717 SHA512 f1b16b1a9e97344d6f0326e29939ccd9a2e71dec21748310b4c76ea4ccd130f6e3c0ddaef7596eff073315d8d57602c12361aba45e85785720e73ccdcbf0768b
+DIST firefox-91.0.2-uk.xpi 628579 BLAKE2B 1276d8d95c61ab17748b3d5809b4fa1c0606b7eab417888e3e4f822295ffca7e1d5d38c6c3c5ee83b2dafd3fbef2462b942c245ab13e90775e252dadada43740 SHA512 314262e929bfeac9908709e01b78f0a42a9317e0c427cf47f87233353dcbee5ad12ca2b77a322c8a1bd481d43b42d133784170e5335429cf11ca16da838762a3
+DIST firefox-91.0.2-ur.xpi 572692 BLAKE2B 3726bed6a61448343fbe39dd952045d74ea16e9910c1b4712e0e4145fc852242b675265929f06f4f32daf31e648438cd95bcf2e3077005f12e21b28392283402 SHA512 f0d2ef0ee280096c905b29b8cf81e8a561d789e51b8cc45ffba4f56a79854fc0a9d28270fa85d1db85642690bfb1e3d8b2c77cd04fb81a0ffe5dbf3e9198c00a
+DIST firefox-91.0.2-uz.xpi 480939 BLAKE2B c992594e78b95eb6678ac7beba5a5c332b3af5d9ea09ffa77e052e0b4745a84c4e27abc9423d9ae0db44eee15ee3e05880da378a83f86754e3b55179b862ed20 SHA512 9b65130a52b0eb05cafda63960ac0bca6f499d1bf9422685b8e21647665daa837331d7f59fc82a6bf55cb7824e851cc86529e140e5316ebe319e06669bd8bf1e
+DIST firefox-91.0.2-vi.xpi 580492 BLAKE2B 9df06719539a0d9f9d55f6480bc438598eb632916b4254599df1aad25abb3ab3d379fb1d55d8dca39416dd9bd0e7f225c6579643a8a7883bf68aaf1d9783b56a SHA512 684ca1c7c994d3a67a27b3e3c1318bb6dd0b668a49da13c4c5cfb4fe695915a38f6f9cfbb7bc7ee3e322b6139f0ab561ef741b11a12ccd418e747b03a70e18b7
+DIST firefox-91.0.2-xh.xpi 435041 BLAKE2B e51f7abe34cd7e65be01e3a5c0288cced33e85c0e63e4bb33e62f0972724c689d40113f40cbdbeccb84ca536b540fa3a1653d8853c461c28b7f353fca11db1a9 SHA512 eb6ba0cc1446d67663270505e7f9b215733dd6d668218197c1b5a7c95b22c237ea5f66cea6b8a9ba7e74699d50643927e77c95b29f2922cf30aff5ac1bc9dc7c
+DIST firefox-91.0.2-zh-CN.xpi 581941 BLAKE2B 92ffe8fa9317e8240a522bf312333cf35359fc036e9caf6bdb8c56a4701163efbbe6f69145a0282963c255998c554a6f2f0876c31aa6c7396dc7bfd73f15ec85 SHA512 f09100f3d7555c00cdb33bc0b0a07488494baffe6bb8e7408c32196e91808625fcd9af24d4088bcbaa06637ccfc3f6e8772d29dc0c66b1335d09ca7a6e0ced55
+DIST firefox-91.0.2-zh-TW.xpi 582124 BLAKE2B 962fe6182f240fa5f1bce94f7e1038c958aefa0736a1b3b36a3565d26acd6361d19dc31cd4747dd723e9069490b073b2b2fdd328af440efaeeeed6531bb00a72 SHA512 3315585c1cc781c2f8707f7f092e70374e93166884149ee9123ddd1cc5e6c4950ce6ea5050637181a79096544d3567f0c4c46dbd88ddb6eb1d3e06c2c5b7346a
+DIST firefox-91.0.2.source.tar.xz 381193820 BLAKE2B 42e03ee63e9930a71716599fdeb538006e1a1404a81ecb0efc25511f4d2100b447c9c979d367c9f5fdd60c8ac667f50d36f250b1b755b8eb6eb8f7fdd909b612 SHA512 82084799524db6661d97d9942a01ca9edec2fae6b503c9dd2d79fca78bfef4ee0a888e5f5cf4cfa2b91d9c9392658bb8218bae2b9bec0fbcacfe73a174a4dbe7
 EBUILD firefox-78.13.0.ebuild 34230 BLAKE2B 0edb04cf5df6ab00f88e7007638864ebc2a7dd6367298dacfd91fd127c86f83e55c56c191d6b6d72bf2dfcf7864e752ffdc61b460881fffc581ef74e4c427493 SHA512 30b0440297c041a0cfeab994a82fc893ed386d4ee25aa838acb22d8926de7f65446d79fe9eae728686484c3c4f255d0c67f2ca84bb75915feeae72c229b1296e
-EBUILD firefox-90.0.2.ebuild 34223 BLAKE2B 037f674055e4d81adf41ca0f708a5c728a3932ff86673261031aa4ac94ba3e785af06ac1e13615bb836456049a37632f8c0301538863056702d702b564293e2e SHA512 e999a8e1f13e4d79ce8f346a0d3899cbe54e444641d445769f15075f932e60e4916b6082ec353ad1965411f180557654c087e6d171e9f59384c3d9f243659445
 EBUILD firefox-91.0.1.ebuild 33580 BLAKE2B 8760dfb1afa842d7ea346dc77a931793e094747d4a13575a6d488f0d0d2f5a1f9da188f7ed4957119596f4a216763458f7c6d979548d82817bcb26e87bd7444a SHA512 871c85b85851361e1f4c989a222b995c26753d1f6dddf8cea6460e49b743af8e513588cc06f7c8a86dfe99c647ba86f78256d3e078e37649bd0bf2ea3096177e
-EBUILD firefox-91.0.ebuild 33580 BLAKE2B 6e532de3d7bb288ae4166ea52d83c883880df2cb97455117c25b71b65119d537f263e652840cff2d3c0a702500fa0358b064d3444f02481cec0e5ac99e4ccf66 SHA512 cab70369f49292a9015a8310146aa0fb1de4d0d4579738d8a9c95e965744a1d3fd72f00ef4845e4840c51e56fd75613f1722cbedc3ba11852ce4642e4ea7e77d
+EBUILD firefox-91.0.2.ebuild 33584 BLAKE2B 93142a8e54ea4ae6d9cd3a071fb1d1b67a8a7dc7f09ba396cea793632da64c070aac1086be00b7de77eeaf16959b89744e9f2f2708df6f669a74f18fafa93547 SHA512 153e7cbdb260a3127d7e86c9e998b3afe9a0e2bd9b8b0f4f333df2a11690bd018e07166e5eedcdb3abfee8a308156bf9cc75cf54032ee79fca84714ec5478482
 MISC metadata.xml 2150 BLAKE2B cd105f3b1d98b1fde124c6362c2e23563c03086a507bdc0eb0e4944f2050787f96967c4cba6f4605e4adcdb200d0c0fded6cc2bcda7ea7720d270e1fd6f33525 SHA512 a588a09ad3481522b44097b3c5e51211d5fc918a6733f3b6f1b1cd7994523894917fa737de944c235d45bfb9b57def205ce645ff1ac62ef7d6c3f3c51d387556
diff --git a/www-client/firefox/firefox-78.12.0.ebuild b/www-client/firefox/firefox-78.12.0.ebuild
deleted file mode 100644
index 816f26e3bd2f..000000000000
--- a/www-client/firefox/firefox-78.12.0.ebuild
+++ /dev/null
@@ -1,1187 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-78esr-patches-15.tar.xz"
-
-LLVM_MAX_SLOT=12
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=yes
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-SLOT="0/esr$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
-	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux
-	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-libvpx +system-webp wayland wifi"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	screencast? ( wayland )
-	wifi? ( dbus )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.14.3
-	>=net-libs/nodejs-10.21.0
-	virtual/pkgconfig
-	>=virtual/rust-1.41.0
-	|| (
-		(
-			sys-devel/clang:12
-			sys-devel/llvm:12
-			clang? (
-				=sys-devel/lld-12*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:11
-			sys-devel/llvm:11
-			clang? (
-				=sys-devel/lld-11*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:10
-			sys-devel/llvm:10
-			clang? (
-				=sys-devel/lld-10*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-	)
-	lto? (
-		!clang? ( sys-devel/binutils[gold] )
-	)
-	amd64? ( >=dev-lang/yasm-1.1 )
-	x86? ( >=dev-lang/yasm-1.1 )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-CDEPEND="
-	>=dev-libs/nss-3.53.1
-	>=dev-libs/nspr-4.25
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/libffi-3.0.10:=
-	media-video/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	screencast? ( media-video/pipewire:0/0.3 )
-	system-av1? (
-		>=media-libs/dav1d-0.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.6.8:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-67.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			sys-apps/dbus
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
-	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
-	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
-	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
-	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
-	xh zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			# temp fix for https://bugs.gentoo.org/768543
-			# we can assume that rust 1.{49,50}.0 always uses llvm 11
-			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
-			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
-			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
-
-			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
-				local version_llvm_rust="11"
-			else
-				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-			fi
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# 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.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-install-strip \
-		--disable-strip \
-		--disable-updater \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-png \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
-		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable screencast pipewire
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-		else
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_add_options_ac "forcing ld=gold due to USE=lto" --enable-linker=gold
-
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		elif tc-ld-is-gold ; then
-			mozconfig_add_options_ac "linker is set to gold" --enable-linker=gold
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif tc-ld-is-gold || use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# 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
-
-	# Build system requires xargs but is unable to find it
-	mozconfig_add_options_mk 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menus
-	local wrapper_wayland="${PN}-wayland.sh"
-	local wrapper_x11="${PN}-x11.sh"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local display_protocols="auto X11"
-	local icon="${PN}"
-	local name="Mozilla ${MOZ_PN^}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		display_protocols+=" Wayland"
-		use_wayland="true"
-	fi
-
-	local app_name desktop_filename display_protocol exec_command
-	for display_protocol in ${display_protocols} ; do
-		app_name="${name} on ${display_protocol}"
-		desktop_filename="${PN}-${display_protocol,,}.desktop"
-
-		case ${display_protocol} in
-			Wayland)
-				exec_command="${PN}-wayland --name ${PN}-wayland"
-				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
-				;;
-			X11)
-				if ! use wayland ; then
-					# Exit loop here because there's no choice so
-					# we don't need wrapper/.desktop file for X11.
-					continue
-				fi
-
-				exec_command="${PN}-x11 --name ${PN}-x11"
-				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
-				;;
-			*)
-				app_name="${name}"
-				desktop_filename="${PN}.desktop"
-				exec_command="${PN}"
-				;;
-		esac
-
-		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-		sed -i \
-			-e "s:@NAME@:${app_name}:" \
-			-e "s:@EXEC@:${exec_command}:" \
-			-e "s:@ICON@:${icon}:" \
-			"${WORKDIR}/${PN}.desktop-template" \
-			|| die
-
-		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-		rm "${WORKDIR}/${PN}.desktop-template" || die
-	done
-
-	# Install generic wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}.sh" ${PN}
-
-	# Update wrapper
-	local wrapper
-	for wrapper in \
-		"${ED}/usr/bin/${PN}" \
-		"${ED}/usr/bin/${PN}-x11" \
-		"${ED}/usr/bin/${PN}-wayland" \
-	; do
-		[[ ! -f "${wrapper}" ]] && continue
-
-		sed -i \
-			-e "s:@PREFIX@:${EPREFIX}/usr:" \
-			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-			-e "s:@APULSELIB_DIR@:${apulselib}:" \
-			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-			"${wrapper}" \
-			|| die
-	done
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	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 "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information show_normandy_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 70 ; then
-				# Tell user only once about our DoH default
-				show_doh_information=yes
-			fi
-
-			if ver_test "${replacing_version}" -lt 74.0-r2 ; then
-				# Tell user only once about our Normandy default
-				show_normandy_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-}
diff --git a/www-client/firefox/firefox-90.0.2.ebuild b/www-client/firefox/firefox-90.0.2.ebuild
deleted file mode 100644
index b2acecd2054c..000000000000
--- a/www-client/firefox/firefox-90.0.2.ebuild
+++ /dev/null
@@ -1,1182 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-90-patches-01.tar.xz"
-
-LLVM_MAX_SLOT=12
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="0/$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
-	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast sndio selinux
-	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-libvpx +system-webp wayland wifi"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	screencast? ( wayland )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.19.0
-	>=net-libs/nodejs-10.23.1
-	virtual/pkgconfig
-	>=virtual/rust-1.47.0
-	|| (
-		(
-			sys-devel/clang:12
-			sys-devel/llvm:12
-			clang? (
-				=sys-devel/lld-12*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:11
-			sys-devel/llvm:11
-			clang? (
-				=sys-devel/lld-11*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:10
-			sys-devel/llvm:10
-			clang? (
-				=sys-devel/lld-10*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.13 )
-	x86? ( >=dev-lang/nasm-2.13 )"
-
-CDEPEND="
-	>=dev-libs/nss-3.66
-	>=dev-libs/nspr-4.29
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/libffi-3.0.10:=
-	media-video/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	screencast? ( media-video/pipewire:0/0.3 )
-	system-av1? (
-		>=media-libs/dav1d-0.8.1:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.7.4:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-67.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			sys-apps/dbus
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )
-	sndio? ( media-sound/sndio )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
-	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
-	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
-	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
-	si sk sl son sq sr sv-SE szl ta te th tl tr trs uk ur uz vi
-	xh zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			# temp fix for https://bugs.gentoo.org/768543
-			# we can assume that rust 1.{49,50}.0 always uses llvm 11
-			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
-			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
-			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
-
-			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
-				local version_llvm_rust="11"
-			else
-				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-			fi
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
-			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
-			# bug 792705
-			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
-			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# 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.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-install-strip \
-		--disable-strip \
-		--disable-updater \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-png \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
-		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable sndio
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif tc-ld-is-gold || use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# 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
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menus
-	local wrapper_wayland="${PN}-wayland.sh"
-	local wrapper_x11="${PN}-x11.sh"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local display_protocols="auto X11"
-	local icon="${PN}"
-	local name="Mozilla ${MOZ_PN^}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		display_protocols+=" Wayland"
-		use_wayland="true"
-	fi
-
-	local app_name desktop_filename display_protocol exec_command
-	for display_protocol in ${display_protocols} ; do
-		app_name="${name} on ${display_protocol}"
-		desktop_filename="${PN}-${display_protocol,,}.desktop"
-
-		case ${display_protocol} in
-			Wayland)
-				exec_command="${PN}-wayland --name ${PN}-wayland"
-				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
-				;;
-			X11)
-				if ! use wayland ; then
-					# Exit loop here because there's no choice so
-					# we don't need wrapper/.desktop file for X11.
-					continue
-				fi
-
-				exec_command="${PN}-x11 --name ${PN}-x11"
-				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
-				;;
-			*)
-				app_name="${name}"
-				desktop_filename="${PN}.desktop"
-				exec_command="${PN}"
-				;;
-		esac
-
-		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-		sed -i \
-			-e "s:@NAME@:${app_name}:" \
-			-e "s:@EXEC@:${exec_command}:" \
-			-e "s:@ICON@:${icon}:" \
-			"${WORKDIR}/${PN}.desktop-template" \
-			|| die
-
-		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-		rm "${WORKDIR}/${PN}.desktop-template" || die
-	done
-
-	# Install generic wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}.sh" ${PN}
-
-	# Update wrapper
-	local wrapper
-	for wrapper in \
-		"${ED}/usr/bin/${PN}" \
-		"${ED}/usr/bin/${PN}-x11" \
-		"${ED}/usr/bin/${PN}-wayland" \
-	; do
-		[[ ! -f "${wrapper}" ]] && continue
-
-		sed -i \
-			-e "s:@PREFIX@:${EPREFIX}/usr:" \
-			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-			-e "s:@APULSELIB_DIR@:${apulselib}:" \
-			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-			"${wrapper}" \
-			|| die
-	done
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	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 "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information show_normandy_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 70 ; then
-				# Tell user only once about our DoH default
-				show_doh_information=yes
-			fi
-
-			if ver_test "${replacing_version}" -lt 74.0-r2 ; then
-				# Tell user only once about our Normandy default
-				show_normandy_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-}
diff --git a/www-client/firefox/firefox-91.0.2.ebuild b/www-client/firefox/firefox-91.0.2.ebuild
new file mode 100644
index 000000000000..b606ecd707c3
--- /dev/null
+++ b/www-client/firefox/firefox-91.0.2.ebuild
@@ -0,0 +1,1149 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-91-patches-03.tar.xz"
+
+LLVM_MAX_SLOT=12
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="pgo"
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
+	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
+	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast sndio selinux
+	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
+	+system-libvpx +system-webp wayland wifi"
+
+REQUIRED_USE="debug? ( !system-av1 )
+	screencast? ( wayland )"
+
+BDEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.19.0
+	>=net-libs/nodejs-10.23.1
+	virtual/pkgconfig
+	>=virtual/rust-1.51.0
+	|| (
+		(
+			sys-devel/clang:12
+			sys-devel/llvm:12
+			clang? (
+				=sys-devel/lld-12*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:11
+			sys-devel/llvm:11
+			clang? (
+				=sys-devel/lld-11*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:10
+			sys-devel/llvm:10
+			clang? (
+				=sys-devel/lld-10*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
+			)
+		)
+	)
+	amd64? ( >=dev-lang/nasm-2.13 )
+	x86? ( >=dev-lang/nasm-2.13 )"
+
+CDEPEND="
+	>=dev-libs/nss-3.68
+	>=dev-libs/nspr-4.32
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=dev-libs/libffi-3.0.10:=
+	media-video/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	screencast? ( media-video/pipewire:0/0.3 )
+	system-av1? (
+		>=media-libs/dav1d-0.8.1:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.8.1:0=
+		>=media-gfx/graphite2-1.3.13
+	)
+	system-icu? ( >=dev-libs/icu-69.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wifi? (
+		kernel_linux? (
+			sys-apps/dbus
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+		)
+	)
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( media-sound/sndio )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4
+		)
+	)
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${CDEPEND}
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru sco
+	si sk sl son sq sr sv-SE szl ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			# temp fix for https://bugs.gentoo.org/768543
+			# we can assume that rust 1.{49,50}.0 always uses llvm 11
+			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
+			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
+			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
+
+			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
+				local version_llvm_rust="11"
+			else
+				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+			fi
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
+			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
+			# bug 792705
+			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
+			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# 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.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Make ICU respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py \
+		|| die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clearing checksums where we have applied patches
+	moz_clear_vendor_checksums target-lexicon-0.9.0
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		have_switched_compiler=yes
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=browser
+
+	# Set Gentoo defaults
+	export MOZILLA_OFFICIAL=1
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-install-strip \
+		--disable-strip \
+		--disable-updater \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-png \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
+		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	mozconfig_use_enable geckodriver
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	fi
+
+	mozconfig_use_enable jack
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
+	fi
+
+	mozconfig_use_enable sndio
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld when using clang
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+		else
+			# ThinLTO is currently broken, see bmo#1644409
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+			if use clang ; then
+				# Used in build/pgo/profileserver.py
+				export LLVM_PROFDATA="llvm-profdata"
+			fi
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+		else
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+	else
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# Modifications to better support ARM, bug #553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
+				--with-thumb=yes \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
+		local disable_elf_hack=
+		if use amd64 ; then
+			disable_elf_hack=yes
+		elif use x86 ; then
+			disable_elf_hack=yes
+		elif use arm ; then
+			disable_elf_hack=yes
+		fi
+
+		if [[ -n ${disable_elf_hack} ]] ; then
+			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
+		fi
+	elif tc-is-gcc ; then
+		if ver_test $(gcc-fullversion) -ge 10 ; then
+			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
+			append-cxxflags -fno-tree-loop-vectorize
+		fi
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif tc-ld-is-gold || use lto ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	if ! use elibc_glibc ; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# 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
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if use pgo ; then
+		virtx_cmd=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+	fi
+
+	local -x GDK_BACKEND=x11
+
+	${virtx_cmd} ./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+	fi
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install geckodriver
+	if use geckodriver ; then
+		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
+		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/browser/branding/official"
+	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^}"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	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 "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	local show_doh_information show_normandy_information show_shortcut_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+		show_shortcut_information=no
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 91.0 ; then
+				# Tell user that we no longer install a shortcut
+				# per supported display protocol
+				show_shortcut_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+
+	if [[ -n "${show_shortcut_information}" ]] ; then
+		elog
+		elog "Since firefox-91.0 we no longer install multiple shortcuts for"
+		elog "each supported display protocol.  Instead we will only install"
+		elog "one generic Mozilla Firefox shortcut."
+		elog "If you still want to be able to select between running Mozilla Firefox"
+		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
+	fi
+}
diff --git a/www-client/firefox/firefox-91.0.ebuild b/www-client/firefox/firefox-91.0.ebuild
deleted file mode 100644
index 5cb81b5976cf..000000000000
--- a/www-client/firefox/firefox-91.0.ebuild
+++ /dev/null
@@ -1,1149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-91-patches-01.tar.xz"
-
-LLVM_MAX_SLOT=12
-
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="0/$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
-	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast sndio selinux
-	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-libvpx +system-webp wayland wifi"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	screencast? ( wayland )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.19.0
-	>=net-libs/nodejs-10.23.1
-	virtual/pkgconfig
-	>=virtual/rust-1.51.0
-	|| (
-		(
-			sys-devel/clang:12
-			sys-devel/llvm:12
-			clang? (
-				=sys-devel/lld-12*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:11
-			sys-devel/llvm:11
-			clang? (
-				=sys-devel/lld-11*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:10
-			sys-devel/llvm:10
-			clang? (
-				=sys-devel/lld-10*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.13 )
-	x86? ( >=dev-lang/nasm-2.13 )"
-
-CDEPEND="
-	>=dev-libs/nss-3.68
-	>=dev-libs/nspr-4.32
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/libffi-3.0.10:=
-	media-video/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	screencast? ( media-video/pipewire:0/0.3 )
-	system-av1? (
-		>=media-libs/dav1d-0.8.1:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.8.1:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-69.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			sys-apps/dbus
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )
-	sndio? ( media-sound/sndio )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
-	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
-	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
-	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
-	si sk sl son sq sr sv-SE szl ta te th tl tr trs uk ur uz vi
-	xh zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			# temp fix for https://bugs.gentoo.org/768543
-			# we can assume that rust 1.{49,50}.0 always uses llvm 11
-			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
-			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
-			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
-
-			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
-				local version_llvm_rust="11"
-			else
-				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-			fi
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
-			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
-			# bug 792705
-			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
-			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# 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.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-install-strip \
-		--disable-strip \
-		--disable-updater \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-png \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
-		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable sndio
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif tc-ld-is-gold || use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# 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
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	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 "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information show_normandy_information show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since firefox-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla Firefox shortcut."
-		elog "If you still want to be able to select between running Mozilla Firefox"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index cfbf76fbdb08..2abc85ebcf26 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_93.0.4577.51-1_amd64.deb 82880952 BLAKE2B daeb5e7b8fd186e5dbbf4ca2a57072c2e85649dea103dc1f4a0e13c5127a8a06cf2a4d5f5f32ced7146c17ad972c0733e8bd8b060388dde9ac3a8be317daa5c8 SHA512 25d6f0a1acafcc6926eff0a12f660f066e7327458dc346d69dedde03956f4c83a512541758b2e933c7db23ff408ea4ed840cbf6e190c3662afef924e88e92669
-EBUILD google-chrome-beta-93.0.4577.51.ebuild 2715 BLAKE2B 7cd9a213c86f2d1f04ac87edca4b98effb216351022c23057e92eec7645506e828826f683475cec58b91931cffd3a653fac81a131034145c8132482d62d163e6 SHA512 dfa73944174bb17d911ed8746d22b86aa2785ba3b5f9d85f1016f98f7b001da41859a66569946f3f6b6e3552ffe1b350db45e500be01bc4efb2488fa94dc654b
+DIST google-chrome-beta_93.0.4577.58-1_amd64.deb 84625800 BLAKE2B 0e4d1f49cc800534f7fda342230986b4c50854967d7e0c8cfb875b90b3c075798adfb10a41570dfe773b979429961af1c533fc972f69d78b33e217a166e0355c SHA512 61999db9bce0b42b87995446d15875229ee391ddcbecb761101cfafba5afc9eb19b89cd00f84b187b94e9e06e24d6ac1bc7a5d52bd04198ca36897cfa9e7b19d
+EBUILD google-chrome-beta-93.0.4577.58.ebuild 2715 BLAKE2B 7cd9a213c86f2d1f04ac87edca4b98effb216351022c23057e92eec7645506e828826f683475cec58b91931cffd3a653fac81a131034145c8132482d62d163e6 SHA512 dfa73944174bb17d911ed8746d22b86aa2785ba3b5f9d85f1016f98f7b001da41859a66569946f3f6b6e3552ffe1b350db45e500be01bc4efb2488fa94dc654b
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-beta/google-chrome-beta-93.0.4577.51.ebuild b/www-client/google-chrome-beta/google-chrome-beta-93.0.4577.58.ebuild
index c92f2d8d73a3..c92f2d8d73a3 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-93.0.4577.51.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-93.0.4577.58.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index aa1842b37fed..5a1166c41cea 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,9 +1,10 @@
-DIST opera-developer_79.0.4135.0_amd64.deb 77553464 BLAKE2B 05d9831150e57660e2980b5bc32c96fbb93f2c0515c292a39fc2c04df063ad222aa5ae4e5643dd7adfa83c7e42ce80721dec59fc967b4bec96dbb703b1dd605d SHA512 a3be1314490a1e654e7baf8c62c88345942773fd33d3f1761f77a78e8192fe97f7bd6008a87bf399f8a94be5bcbf1178cd66368c22781b45c45562d950413279
 DIST opera-developer_79.0.4142.0_amd64.deb 77573852 BLAKE2B 1195809dc53f593350636168828fd43b45648059dbc752d203704b78a33629ec326005a696328c3a433f06cb8b74f42fc7a67d15d2ee87b9e3cba70936b37ecc SHA512 3a91e85fc045ad8d4e4a4c98d045a4cda85aaf9c5e238d1b99546cd26166712d4652c263dcc0af314913974fc139495ff0c45f741ee2048aa5d947413b573dab
 DIST opera-developer_80.0.4150.0_amd64.rpm 76215956 BLAKE2B 443b86a84615c9b7412baf929138703d9c0a8b52e9b82a23c36c927cd2594e19e1713a4062c945054def4e9b3702b2b6a40c1fa23e9b38722dd8e93cf5db1174 SHA512 2021cc6d1b6cec5801baf1973fabbe6643bfcae437792c38f98c4753e9c16787f49c07079ed68f3820e277013c179f3690bd5c7a0be8ab8d03aae7c2c7243e6c
+DIST opera-developer_80.0.4157.0_amd64.deb 79823544 BLAKE2B e39570f48b85efe5dfed9eee765964b876ab6d7b824b012132ac344cd863fe3396dda705b188123822fde0ba37784df65b3f05d1cebdfa6433bc640c942ad88d SHA512 441de56f3863044091e87849a36b31dda7385971322e31b99e66664a26ba744d38b83fe986c23d10d9cfc3997f8951d7f61dcc901b30bf742f30cb3650e3b2c2
 DIST opera-ffmpeg-codecs-93.0.4573.0.tar.xz 1389664 BLAKE2B 4efc7341655bed294d4c6237dd9e7d005a815c495a45bec6f0b7fcbec40345e22ad5199ec1db3c822c123663d3ce95e6b87af18b1ac6cad31793ae7fdb440918 SHA512 f7c62c6860d1440e91344c41d6c9b3fbef4745cb95262538dcb3af9147406b3b0c71e72605042c423cbdd618a53f902791bcb6b7fcc8a4cae92ebf3cb38e8407
 DIST opera-ffmpeg-codecs-94.0.4590.0.tar.xz 1388672 BLAKE2B 736debcdbdfa63f0e5afa3bca70783aadaad5db5751666099ff290b8bde1ba1ef8ab12612a5dc2f4db3ba3b79ed7bdd7b6091480639578c9610058d2dc3584fd SHA512 c6fabd319b048b068f6763cf99406f4431c22311cb14159af673ee4b8f39a3f4376cb299746de9e797ee1965dde1f597ef5a733c5fcf8e527ce59964c85921dd
-EBUILD opera-developer-79.0.4135.0.ebuild 3041 BLAKE2B 32064f91caae240abe16c35676047d2b60f2b34339fff8e5683854412141880622eaa5e536e8f7ce23b79e02956334a320b76a96bc5e04aba7bdb4761597b873 SHA512 0bf49ee79ba73339260a38b8dbfc8687716ce9268ec6e041abd0680fd38735daf499c74fd4a033bdcec6937df9a920f02eb90aa0b6a2283d7bfc3b9b7b2b79ac
+DIST opera-ffmpeg-codecs-94.0.4603.0.tar.xz 1388572 BLAKE2B 55a598883dfbab598f48a662009ab02c4974a95ba023e3b2d36bdad3267ab4586cfd05891f83a96933b6b0b02dc1d2a496bb796ecb5421635a370f6c79c60a98 SHA512 dfeb7174ad5d696f78a86735462757d0245aecf0d00c21ba6ff3c16f6af586979457ebb23db228f3769cf09636ed70421aafe29eb622ca658e766dafc860827a
 EBUILD opera-developer-79.0.4142.0.ebuild 3044 BLAKE2B 7f5c0830b51eb9e787efe446b9c387dc1689f291b0caa4d1b9dacf2a04825401327cd3e87be8fcc4711e6c50d176592afe828e31ded3cb2ddc8825c6af8680f3 SHA512 5cf7a1f43a47c42c8f32b91c2664aab10157c513732ed5e23d824dc6a6b9fa9b3ec9ceb113f704de35859fb652b74c5e1353b3301ec3015da60f63fb1065e64f
 EBUILD opera-developer-80.0.4150.0.ebuild 3214 BLAKE2B 2b2923ad1a4f1ffb4d440a061d8b91289a410567ea3b3789c6adc5d77ddafbe5387d6fb9f2ff3514b799b327236b0f5d3944529f3ca6af3c4933f40bfdc2f5ab SHA512 a1d1fdb2b0eedf1aad8372bd04bf04118176f2ac85854bb66979eecc556e7643e3fece4faa0f8175b358266081838db392c5090efa822bc6092109a926bd7249
+EBUILD opera-developer-80.0.4157.0.ebuild 3613 BLAKE2B f4b01de34aa2ec09d69828f7c6ec5a6e7981f5215515a439880bb1e8667ffb2e7faced40030a675ae597dcc9a910b43210168e251852dae558057f62bef3b988 SHA512 11a9124916cebcf441111fde3dceaed2b3159fb1fce3cb68d440a01ece085260c93e36473a82b579565fde4b311e5d42bc6fc708bb7c48dad17f37d19693aeba
 MISC metadata.xml 379 BLAKE2B 1945bc4341ba4a9e75097fec82275f5fd31fca881a432a31ee0cb5ebfb51ebea4cd707731673a5de3cee8797cb532a3e929db9f9f144b84fd54af545b4444118 SHA512 19c3f7dc99f1c71bf9e6b1ed440b660c2712000d543f40f454a2fdd43f4eb3ed2ea4907880859d4084ea8ac1591b03463a8f19ae56b2396eee442c4224fc60be
diff --git a/www-client/opera-developer/opera-developer-79.0.4135.0.ebuild b/www-client/opera-developer/opera-developer-79.0.4135.0.ebuild
deleted file mode 100644
index 7d03478f7a99..000000000000
--- a/www-client/opera-developer/opera-developer-79.0.4135.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib pax-utils unpacker xdg
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2018"
-SLOT="0"
-
-SRC_URI_BASE=(
-	"https://download1.operacdn.com/pub/${PN}"
-	"https://download2.operacdn.com/pub/${PN}"
-	"https://download3.operacdn.com/pub/${PN}"
-	"https://download4.operacdn.com/pub/${PN}"
-)
-
-if [[ ${PN} == opera ]]; then
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	MY_PN=${PN}
-fi
-
-KEYWORDS="-* ~amd64"
-
-FFMPEG_VERSION="93.0.4573.0"
-
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
-	proprietary-codecs? (
-		https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
-	)"
-
-IUSE="+proprietary-codecs suid"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gsettings-desktop-schemas
-	media-libs/alsa-lib
-	media-libs/mesa[gbm]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/pango
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="opt/opera${PN#opera}"
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "opera only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	# move to /opt, bug #573052
-	mkdir -p "${OPERA_HOME%${PN}}"
-	mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
-	rm -r "usr/lib" || die
-
-	# disable auto update
-	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
-
-	rm -r "usr/share/lintian" || die
-
-	# fix docs
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-
-	# fix desktop file
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-
-	# remove unused language packs
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# setup opera symlink
-	rm "usr/bin/${PN}" || die
-	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
-
-	# install proprietary codecs
-	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
-	if use proprietary-codecs; then
-		mv lib_extra "${OPERA_HOME}"
-	fi
-
-	# pax mark opera, bug #562038
-	pax-mark m "${OPERA_HOME}/opera"
-	# enable suid sandbox if requested
-	use suid && fperms 4711 "${OPERA_HOME}/opera_sandbox"
-}
diff --git a/www-client/opera-developer/opera-developer-80.0.4157.0.ebuild b/www-client/opera-developer/opera-developer-80.0.4157.0.ebuild
new file mode 100644
index 000000000000..1762ade8f2da
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-80.0.4157.0.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
+	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+
+# These are intended for ebuild maintainer use to force RPM if DEB is not available.
+: ${OPERA_FORCE_RPM=no}
+
+if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+	OPERA_UNPACKER="rpm"
+	OPERA_ARCHIVE_EXT="rpm"
+else
+	OPERA_UNPACKER="unpacker"
+	OPERA_ARCHIVE_EXT="deb"
+fi
+
+inherit chromium-2 multilib pax-utils ${OPERA_UNPACKER} xdg
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2018"
+SLOT="0"
+
+SRC_URI_BASE=(
+	"https://download1.operacdn.com/pub/${PN}"
+	"https://download2.operacdn.com/pub/${PN}"
+	"https://download3.operacdn.com/pub/${PN}"
+	"https://download4.operacdn.com/pub/${PN}"
+)
+
+if [[ ${PN} == opera ]]; then
+	MY_PN=${PN}-stable
+	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
+else
+	MY_PN=${PN}
+fi
+
+KEYWORDS="-* ~amd64"
+
+FFMPEG_VERSION="94.0.4603.0"
+
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
+	proprietary-codecs? (
+		https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
+	)"
+
+IUSE="+proprietary-codecs suid"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gsettings-desktop-schemas
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/pango
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="opt/opera${PN#opera}"
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "opera only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rpm_src_unpack "${A[0]}"
+	else
+		unpacker
+	fi
+
+	# move to /opt, bug #573052
+	mkdir -p "${OPERA_HOME%${PN}}"
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
+	else
+		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	fi
+	rm -r "usr/lib" || die
+
+	# disable auto update
+	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
+
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rm "${OPERA_HOME}/setup_repo.sh" || die
+	else
+		rm -r "usr/share/lintian" || die
+
+		# fix docs
+		mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+		gzip -d usr/share/doc/${PF}/changelog.gz || die
+	fi
+
+	# fix desktop file
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+
+	# remove unused language packs
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# setup opera symlink
+	rm "usr/bin/${PN}" || die
+	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
+
+	# install proprietary codecs
+	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
+	if use proprietary-codecs; then
+		mv lib_extra "${OPERA_HOME}"
+	fi
+
+	# pax mark opera, bug #562038
+	pax-mark m "${OPERA_HOME}/opera"
+	# enable suid sandbox if requested
+	use suid && fperms 4711 "${OPERA_HOME}/opera_sandbox"
+}
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 6c99451b9818..8afd94c6c9e4 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,4 @@
 DIST opera-ffmpeg-codecs-92.0.4515.20.tar.xz 1382256 BLAKE2B 1e00bb4ee655573ac7b6c2f04ae2ae9a073f839ff6deeba3e3c4c2c58a10b1152068f0549fb3c6de758628317ad7c568cf5d3031294208800b470e3ed00c938b SHA512 6aeec66a9fcea1fcf5ecfd23b56589598f5e612e788b4e417037250470b83f91e461e3b0c20caf7853677d314053ca9d489983736708f15d21a82d68d2cdd5c2
-DIST opera-stable_78.0.4093.147_amd64.deb 77024096 BLAKE2B 539c2ee2e8e26a54ec307f9111f39403dd0dd57ac3a0f0d3e25266b7bdca564d9b4fff6da8612cdb1c7a89493dd8723e92f52e69763675b9dbec85bcf037e4a4 SHA512 75f37ffe4488d9420a9345133acbe128b710817b836ba968bd83ec77b971e2b87a0d92c3b6ead1a1b90b83019c32642e500d13a5261e3f5eba7b64198f4f7141
-EBUILD opera-78.0.4093.147.ebuild 3044 BLAKE2B a2f33ffec142c1e74d77cca0f82a8687a285d1c2fa50a3b97aa5fb462db54cf74bca2c40805371dbc6448672ed39719291c63c13ded9dd4e29c7b3f12975f052 SHA512 3e685f1fa86970b788d425d365ca1ebda3c623374cbf8745cfb4123f2b2f32b9467ca1a891e2256e432ef928fffec3b38327bf57e21f09e0f780a6fb4e4f01c4
+DIST opera-stable_78.0.4093.184_amd64.deb 77080724 BLAKE2B 72166332c29711611b41c056add5f149ffd3ed224657d5ada1a555a4f19e13b77308b91ccead33918abf4a867cb29b4387d0393a8b4e6ecd08cde789f5766ddb SHA512 cbb3b14d8fee419c5a0bec71cc4891fb490ffa788e2176d1be319699112d4f53db1def179d522f8aae1f65070c9e3299ebfb0798f1ef888a245bd661551a9d14
+EBUILD opera-78.0.4093.184.ebuild 3044 BLAKE2B a2f33ffec142c1e74d77cca0f82a8687a285d1c2fa50a3b97aa5fb462db54cf74bca2c40805371dbc6448672ed39719291c63c13ded9dd4e29c7b3f12975f052 SHA512 3e685f1fa86970b788d425d365ca1ebda3c623374cbf8745cfb4123f2b2f32b9467ca1a891e2256e432ef928fffec3b38327bf57e21f09e0f780a6fb4e4f01c4
 MISC metadata.xml 589 BLAKE2B 6264d0b26100282d9399d5922ef7a49b99add9ebad066559201db4fddf7e33598eb5f8c1f8b4bf569ff9e636154be2d377df1326b653633a5bd7764302cf1a29 SHA512 2c3a8e587d5548372f0d27246aa439b532f9b61387a35dbf9752060ad9f013f7996c7524217e426498f3eb4b983a4fd674116f124a4b680ca78b328c02647f45
diff --git a/www-client/opera/opera-78.0.4093.147.ebuild b/www-client/opera/opera-78.0.4093.184.ebuild
index 9992d91bd2a7..9992d91bd2a7 100644
--- a/www-client/opera/opera-78.0.4093.147.ebuild
+++ b/www-client/opera/opera-78.0.4093.184.ebuild
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 64d589303992..4a5c080583f2 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-snapshot_4.1.2367.3-1_amd64.deb 85157012 BLAKE2B 9d857c360a9e9edc41dab9629f6b1b378852767b73409657f6d23a53501f00b7e73c66152c3ecbbb72585c65e47250c7bf505582a0c784fee0ff85efd1022dc9 SHA512 277d77414a2bb6ee8656390d8769fcc6c99d3247be22436fd78b0d370ba0b368dbbe24e7f5cd7da05fa4f076ae5ab526de371aff7a3299a534cbd85f76dbc60a
-DIST vivaldi-snapshot_4.1.2367.3-1_arm64.deb 80674668 BLAKE2B b28f6eba0d5cfec734435e493e8ec348974d9fb4efb9533ce6c4283223a8bc46d1a0b8772692a93f6dd1521744a30ad25edbf6f0bfab967a66fced915128216c SHA512 27244952e5ebc0271a9d05d2a792d90840ba59a5920c6767aab94459895c71cbefc721b582b81616021db73d7855634d0e01c6164719251375638774eb920547
-DIST vivaldi-snapshot_4.1.2367.3-1_armhf.deb 76537504 BLAKE2B 61e624822b2a0b54529e2213690fbc5c5c17c15e8fd57a8549466e016f11e42806796be1212da103e05d4327aa9a6a704e4adce75897f0274f7e0e1711885e97 SHA512 b5a62e6b6dfe1b7242dfb860ba8ba2cde188b7bbac1f22ee02e439030eabecfe5977d441cd6310d087d8ef301025cdae3f30285bed962289ef2b1bce038955dc
 DIST vivaldi-snapshot_4.1.2369.10-1_amd64.deb 84518232 BLAKE2B fd9d08f4fcc4bcd41890c37cbd9873e0fe666633c12c5286331b406a74b55ba222ed0343700a21bedb7f25e4f9182bbebefbcc11c6b8285eebbac2c78e231f8c SHA512 2b946221863a7b2b7514e83be8e639482135ddb4a04c2cc3c8eda37fa196ccfc16007c12f1d43541d70fea0660cb10268c1d358db2e62575521cd39e525e7b79
 DIST vivaldi-snapshot_4.1.2369.10-1_arm64.deb 80662848 BLAKE2B b3ad7300ba690b69ca5eae5e45599346b0197b694d93fa657754312c4e6a91089fe5b962dee7b1ec12d5fa953273333cc52827724f4fd6961d5f7de8d39230e3 SHA512 8774cca3850a7fd77da594d9015342cb3a86016a6674b630b2b397b6e4e472486e3d97acbc1932d4da815f6dc442a4cb3b11f2edf64377e715a9dbca9a1a68ab
 DIST vivaldi-snapshot_4.1.2369.10-1_armhf.deb 76550964 BLAKE2B 54501659c49199b928ad1e12f72fd1b7646be9766718cf35b6d4c36fbe3c68b692e707343e34f46004ca0b692c768248a2294602db67d7f2b2db6ee979311d3c SHA512 8bdc52e2edc084ae6c2316d9bc3727f47f46ef509c0176df439b7e9ef9ef8a93b1c22b0a7aa2f956feedc5399636638b528d9a369984717ab1dffce9f7d455b4
-EBUILD vivaldi-snapshot-4.1.2367.3.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
+DIST vivaldi-snapshot_4.2.2392.3-1_amd64.deb 85156812 BLAKE2B e4a6959a6285a8d3e062e7c3c6239029523fdcf6100f0d204ef6758d1cbdc3d9941d28d26d8b0d85241f8a7c058f4f7d9b92f8df5cd093a27c33522f6b0ef344 SHA512 577a7812f478ffbaefcd1c6acdda7ed0c37278c0862a0b027417ebcb7327c59ae5506085d5ca2e15604bbcc8ddd0007707b7ad4ee05dad4e7be23906a8fb593e
+DIST vivaldi-snapshot_4.2.2392.3-1_arm64.deb 80715664 BLAKE2B 46765b85166d5ff214c4f548ceb840d02cc1cff027819f64dc75c5b10206d5cd775f79bfaae6eb550d3f4cec67522a261a99bb27be8d976a4656f0b76ddcc590 SHA512 92e21498c94bf56e3df69c9f9c3d49513682edc796b5c3d887af3885251dc8c610c14157d26a8715952e9cec9a8b5ad301ae6e6b0a74586e793e70bbd969e9c0
+DIST vivaldi-snapshot_4.2.2392.3-1_armhf.deb 76571240 BLAKE2B 8bf8487a2dd51944d6fe4ce894c12f8957a197ca59f697770fa38506fb387bbdfeaba4a40603144b8dc5776f91b205b8af6552ac0b3532dabf41c5a5d8ebfada SHA512 cc9ccd3bb705de8ae7e29f6c9bbce4d6e5da7926a34d6143c21f8d265cc6174548cf0b20e76ddff6799eb29ad4c83f5f4b28f81a8a5ae877e04391ac1423ee42
 EBUILD vivaldi-snapshot-4.1.2369.10.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
+EBUILD vivaldi-snapshot-4.2.2392.3.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
 MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2367.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.2.2392.3.ebuild
index c2409d01a97f..c2409d01a97f 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2367.3.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.2.2392.3.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index a628f89e2650..f5a40f683838 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -2,15 +2,15 @@ DIST vivaldi-stable_3.7.2218.58-1_amd64.deb 78992560 BLAKE2B da8f3eacd8d0c826006
 DIST vivaldi-stable_3.7.2218.58-1_arm64.deb 71046428 BLAKE2B 8f0dd3e845f2e4587d238c8f48447e514ac7605acab8d67f30c30ce2df04fae600382218087aea68f75621887f5a71506389c81f9b31614e20d3d7611d7bfe0e SHA512 2126c24ae8a7e4370f4ced2b37580871394de1f38a02b88d24c974ee23c13a4264ca8c11e0c5b7ad542812531898d9ee425657d9c7eeba4e08c718c07c7337bd
 DIST vivaldi-stable_3.7.2218.58-1_armhf.deb 69900368 BLAKE2B a85b97405c80dd10907d9b0b9846b8c2b1101346cdce4b19ddeb1192de64c49056e086903829b30b9e6bb4928c3de500138cda460596dff7c2505fae0661d6ca SHA512 2d37b2080dbacbd6986e9d346be4e0aefd48a25f039668e2c1e697a025c294e4f945fdd3d86ae34688335e0d2b496355461756ae650e0b0fd212fbd983494ae0
 DIST vivaldi-stable_3.7.2218.58-1_i386.deb 76040556 BLAKE2B 4710993024a401a8b9e25dd5cae55d5e5077423a7f7bba7af55150675d7848427f6bdca1fa8666f338b7609cbb11254c75df901e3c33fc6b75c5824c17808b71 SHA512 d5a8658d80aa8a4b5ec38491f3a4f6fb16c5a0de7934d4f7f518efaee36afc1d9585695c121f5cd65d961ae134c7cae0cd6bf0b07858ef2f906d715ca424ead4
-DIST vivaldi-stable_4.1.2369.11-1_amd64.deb 85123092 BLAKE2B ac26efabb9fbd4bb7ee7fec29fab5a775feee72b9d570af497c0b68e16bfd32aac777f9d4403ea46097403d01bc78724ebc356e2b9b58d1e82595d8e28216808 SHA512 563608daaf13fa45e955adbc3118b5333e10095b88289e11fe4930bf6d0690194cf261f674782ef340a2d9c3b3b7bc13c6781ee17a5df539992e115adf01f441
-DIST vivaldi-stable_4.1.2369.11-1_arm64.deb 80693356 BLAKE2B 3493d13de4a9124bee575f63c2216cf191917e8131fef5ea84349c9d4768cb02690df230820adc39b2d5e58e37008e69aa864b9d1fb269da3e6b94b0362d0147 SHA512 c4e47a62923f17fb77ae799d5c073a2650c4d95d6822f992c97f71650d3d476407efd561487223ecbd112aa1ecb64e1bedfdbcd0b44e476900ed58753960c74c
-DIST vivaldi-stable_4.1.2369.11-1_armhf.deb 76550248 BLAKE2B 24946708b7d2d51fe6c02a20d33ecbec052c6b36ed239df65fc05a28ad8eab8777da514823ba22af562acc6c83a52b116f782eb43ac520ad226a2f893e5e587f SHA512 1f5f9e4303b42d192df26e3a135ef8f13ab49d0519ad1764d39371924b8bcfde577c67d7a69bfccec72d18137dec598e60fc24e0071e97fe96b20d5897e23fef
 DIST vivaldi-stable_4.1.2369.16-1_amd64.deb 84504976 BLAKE2B 46a06ab16bd528c2ca90a658a089345f5e2607409919cfe520f3aa3432a89506eef0f54a4e416fcbdd5c14fb98bfbb4047672d8d906e75f08bcfe4d20f4d23c0 SHA512 a0e463315cd47acc1176d9ef0f4a9ece5e980216e10b59b7ad1fd931bb7a4b144afb8ed915ce1bcbbfa337cbfa06720f1771d16a82bd0105bffdff94c2ed8f98
 DIST vivaldi-stable_4.1.2369.16-1_arm64.deb 80661148 BLAKE2B 6decaeada6ccb58968ef9951ba89fc516e9f8279cc2c236eae615b5e67d3edc625097ae79ded78642621c687ee3c93c479af313d15a3c22b57609347858568be SHA512 58178237b1bcf2645ac117cb202a8703bb91d1b90183e1c66e42707e06bc7045275e32e7ceae06b166aa00a1720cf40b9e331b6b79f10026c70f47302c9bcfa5
 DIST vivaldi-stable_4.1.2369.16-1_armhf.deb 76577948 BLAKE2B 98c839a0204a182e5ccbce600e73831436cdbdfd610247715c4e6436f26471831bd7d81f17cea8bb549ae3ca2f70edca60c2f14bb9f7a30a28fafc52f946f34c SHA512 fea8d399c7eb6b24b31863e7500a09509d8acbf643a71c730690b01ea97e21589c86a59ddb0e8e54022c99c828cd2761acb19b4312829a205b295a656b29e1c3
 DIST vivaldi-stable_4.1.2369.18-1_amd64.deb 85138584 BLAKE2B 0f115fd22136e6c56b7a0beb94a37c46bb294cb3a10542c81e1375b89659a6b424e41075f3997bef3d471a0b27ecd1229ab53c2e72c3e2a31b1900a9c8fd7bae SHA512 72ef29bf5e0455323f5ea96ee3397b5d2346d6027a709c2ec39333df5716ba86ce96a94f78a3e749b351ecaf904a9203155e8b426c8ffb4734b55ce655da6039
+DIST vivaldi-stable_4.1.2369.21-1_amd64.deb 85176340 BLAKE2B 7017231df566c4ba973a638ded298647c125c3dacf23a538596ce77f82832d9035a9b00a1f9e93c16abb2e93083c7b9831f6bbe957f64c5ef319c08d6bcbfed5 SHA512 a33dfb4152ee2cb36db38111f65d285cc78fad3f2b41f7ecccb8e4e96fd3a3a3dadbb2d2435c7120ec140b10567bac9e1a68393d7912c2f9528f0292c2f6abf4
+DIST vivaldi-stable_4.1.2369.21-1_arm64.deb 80663556 BLAKE2B 65a1dbd52eeca4eabbf5271436b6bf0319448e9ff070770e50f50f6b5eeaa5226339e53864a6bccd6923c3dae93ce1a6a5b4f0672eccc569e87e401cacb6582f SHA512 8a16a403d64c57e0d488a29043ff03070f8608ca663e6003bdd6b1f7e1ad412826002bcf435ff29aaec71eceed16c3782d5cff1e00280f85e31cdbc093a86227
+DIST vivaldi-stable_4.1.2369.21-1_armhf.deb 76573196 BLAKE2B 7103a117cc9b3094a1d76c90f6bd9e84e84b8b0c12e4c4e328c1f54a3dacfc10f4fe6669286a58ebfbdde28cac8f761f9b6e0f2ad8c52a1aef33176243bd701c SHA512 a219f24342e16ef43c681f288a2ac854f6d13272dade191d30272b1159c88d046b4523bcef7175dcbbcdf285064598e11c4f5039091a19ba976bede8f7734b85
 EBUILD vivaldi-3.7.2218.58.ebuild 3553 BLAKE2B 3b6cd7c057d571f6a40d6578fd6a973cf5462aa7b64a854b5b6c88ea56b855311b8f23e1ca34a3c1350929fdaa6aa029c693783665cb034f4e759bf4f57e208d SHA512 757316d9fa2eb0d653591bde29b1a3520aafe713475d61ce3f71ca7f709119448ccf172870a1c0fd3fbe9890938dbeb47bc5f01c0b02b6c70accc10f74402fef
-EBUILD vivaldi-4.1.2369.11.ebuild 3549 BLAKE2B 91580e4afcd928523049e88050387f7f18bca8c311d1dc9e82e4a369a125a786a7ee9fc1986bf98bbc9e98e00b50ab42ac9d0198d6e0834159a814c89197c2bd SHA512 bf2443fe71ff0f4289b766c012099b738647bd1782654754ff951d25c6ec85ac1c52a894a12db07f0b8b3dcc52748c3a212c673948c7c747f9c6f50e4cea28c8
 EBUILD vivaldi-4.1.2369.16.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
-EBUILD vivaldi-4.1.2369.18.ebuild 3538 BLAKE2B d53b5f982235ec2965c651d657606ef3a9a77446dd41ea67a365ea8048be5420d6a71b4a298f2c0180ff483a98007371418d9a17099787736efc33b4651d2554 SHA512 fff81a32f1357d44947ec374cf12b3bf54bf01b2956db739eb9d08ed770b8719cd6d27047a38cad803381c0d676b57e878668f3d804f76b30e7b8963d5038fbd
+EBUILD vivaldi-4.1.2369.18.ebuild 3537 BLAKE2B 15b907d6be2b7b4a17d9343add804b687c5a4a91df7c705463edaba2468876ffb8003d0dd9af354f83e94afd828a675a0d1f5beb9fbe1fee01cd158173e4fdb6 SHA512 3855d9584d165a115bf8cc98989477f7a24363dadab7189a749eb01f0a67c7b7b43562b834a02ba05685a9b781a83df498006a8f7e4595c87aeaf9ff42f15c61
+EBUILD vivaldi-4.1.2369.21.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
 MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi/vivaldi-4.1.2369.11.ebuild b/www-client/vivaldi/vivaldi-4.1.2369.11.ebuild
deleted file mode 100644
index ba5f6dc05f73..000000000000
--- a/www-client/vivaldi/vivaldi-4.1.2369.11.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CHROMIUM_LANGS="
-	af
-	am
-	ar
-	az
-	be
-	bg
-	bn
-	ca
-	cs
-	da
-	de
-	de-CH
-	el
-	en-GB
-	en-US
-	eo
-	es
-	es-419
-	es-PE
-	et
-	eu
-	fa
-	fi
-	fil
-	fr
-	fy
-	gd
-	gl
-	gu
-	he
-	hi
-	hr
-	hu
-	hy
-	id
-	io
-	is
-	it
-	ja
-	jbo
-	ka
-	kab
-	kn
-	ko
-	ku
-	lt
-	lv
-	mk
-	ml
-	mr
-	ms
-	nb
-	nl
-	nn
-	pa
-	pl
-	pt-BR
-	pt-PT
-	ro
-	ru
-	sc
-	sk
-	sl
-	sq
-	sr
-	sr-Latn
-	sv
-	sw
-	ta
-	te
-	th
-	tr
-	uk
-	vi
-	zh-CN
-	zh-TW
-"
-
-inherit chromium-2 desktop unpacker xdg
-
-VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-
-if [[ ${PV} = *_p* ]]; then
-	DEB_REV="${PV#*_p}"
-else
-	DEB_REV=1
-fi
-
-KEYWORDS="-* amd64 ~arm ~arm64"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
-
-RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
-RE="\barm\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm? ( ${VIVALDI_BASE_URI}armhf.deb )"
-RE="\barm64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm64? ( ${VIVALDI_BASE_URI}arm64.deb )"
-RE="\bx86\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" x86? ( ${VIVALDI_BASE_URI}i386.deb )"
-
-LICENSE="Vivaldi"
-SLOT="0"
-IUSE="proprietary-codecs widevine"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	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/libXtst
-	x11-libs/pango[X]
-	proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] )
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-QA_PREBUILT="*"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	# Rename docs directory to our needs.
-	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
-
-	# Decompress the docs.
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
-
-	# Remove cron job for updating from Debian repos.
-	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
-	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
-
-	# Remove scripts that will most likely break things.
-	rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
-
-	pushd ${VIVALDI_HOME}/locales > /dev/null || die
-	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use proprietary-codecs; then
-		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
-		rmdir ${VIVALDI_HOME}/lib || die
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	mv */ "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-
-	local logo size
-	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
-		size=${logo##*_}
-		size=${size%.*}
-		newicon -s "${size}" "${logo}" ${PN}.png
-	done
-
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so \
-			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
-	fi
-
-	if use widevine; then
-		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
-			  /${VIVALDI_HOME}/WidevineCdm
-	else
-		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
-	fi
-
-	[[ ${PN} = vivaldi-snapshot ]] &&
-		dosym ${PN} /${VIVALDI_HOME}/vivaldi
-}
diff --git a/www-client/vivaldi/vivaldi-4.1.2369.18.ebuild b/www-client/vivaldi/vivaldi-4.1.2369.18.ebuild
index d0a0e9f4ffc0..202fecd6f5be 100644
--- a/www-client/vivaldi/vivaldi-4.1.2369.18.ebuild
+++ b/www-client/vivaldi/vivaldi-4.1.2369.18.ebuild
@@ -95,7 +95,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
 
 RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
diff --git a/www-client/vivaldi/vivaldi-4.1.2369.21.ebuild b/www-client/vivaldi/vivaldi-4.1.2369.21.ebuild
new file mode 100644
index 000000000000..c2409d01a97f
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-4.1.2369.21.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHROMIUM_LANGS="
+	af
+	am
+	ar
+	az
+	be
+	bg
+	bn
+	ca
+	cs
+	da
+	de
+	de-CH
+	el
+	en-GB
+	en-US
+	eo
+	es
+	es-419
+	es-PE
+	et
+	eu
+	fa
+	fi
+	fil
+	fr
+	fy
+	gd
+	gl
+	gu
+	he
+	hi
+	hr
+	hu
+	hy
+	id
+	io
+	is
+	it
+	ja
+	jbo
+	ka
+	kab
+	kn
+	ko
+	ku
+	lt
+	lv
+	mk
+	ml
+	mr
+	ms
+	nb
+	nl
+	nn
+	pa
+	pl
+	pt-BR
+	pt-PT
+	ro
+	ru
+	sc
+	sk
+	sl
+	sq
+	sr
+	sr-Latn
+	sv
+	sw
+	ta
+	te
+	th
+	tr
+	uk
+	vi
+	zh-CN
+	zh-TW
+"
+
+inherit chromium-2 desktop unpacker xdg
+
+VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+
+if [[ ${PV} = *_p* ]]; then
+	DEB_REV="${PV#*_p}"
+else
+	DEB_REV=1
+fi
+
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
+
+RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
+RE="\barm\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm? ( ${VIVALDI_BASE_URI}armhf.deb )"
+RE="\barm64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm64? ( ${VIVALDI_BASE_URI}arm64.deb )"
+RE="\bx86\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" x86? ( ${VIVALDI_BASE_URI}i386.deb )"
+
+LICENSE="Vivaldi"
+SLOT="0"
+IUSE="proprietary-codecs widevine"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	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/libXtst
+	x11-libs/pango[X]
+	proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] )
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+QA_PREBUILT="*"
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	# Rename docs directory to our needs.
+	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
+
+	# Decompress the docs.
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	# The appdata directory is deprecated.
+	mv usr/share/{appdata,metainfo}/ || die
+
+	# Remove cron job for updating from Debian repos.
+	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
+	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
+
+	# Remove scripts that will most likely break things.
+	rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
+
+	pushd ${VIVALDI_HOME}/locales > /dev/null || die
+	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use proprietary-codecs; then
+		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
+		rmdir ${VIVALDI_HOME}/lib || die
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	mv */ "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+
+	local logo size
+	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
+		size=${logo##*_}
+		size=${size%.*}
+		newicon -s "${size}" "${logo}" ${PN}.png
+	done
+
+	if use proprietary-codecs; then
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so \
+			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
+	fi
+
+	if use widevine; then
+		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
+			  /${VIVALDI_HOME}/WidevineCdm
+	else
+		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
+	fi
+
+	[[ ${PN} = vivaldi-snapshot ]] &&
+		dosym ${PN} /${VIVALDI_HOME}/vivaldi
+}
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 2ce2196727a0..ab30ff8143e7 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/buku/Manifest b/www-misc/buku/Manifest
index bf16f6c27412..f9cc687b7e3c 100644
--- a/www-misc/buku/Manifest
+++ b/www-misc/buku/Manifest
@@ -2,5 +2,5 @@ AUX buku-4.5-hypothesis-fix.patch 17711 BLAKE2B fb5b57e25f36b15d8f3a48bb0291a657
 DIST buku-4.5.tar.gz 488913 BLAKE2B 29ed93fa9af4503f72a711889fbf17d86bcde1bc1abbfc88242c4ebd18f1c1a57077781eebdd79d9d993078d2f5b5883c9a0ec4fee94e37c0e7bfb727c5154d0 SHA512 7bbb598d5c970e8e594d58c0a18f9b85245d4a214c01d64b537a5ccaadab32c964521046b90754c2f2c721bf816dc7f4438cfeff3a7e7eec75ce958cc41dfa7d
 DIST buku-4.6.tar.gz 491809 BLAKE2B 82597b845c56dadf1cc6973d1f3ce6cc4970230d08ac700cf286a8c41420144fb1f42817ab808041600ab8414d96f3a3883c1bd8fbe89f29570d877a495dcd96 SHA512 1c46006d8c950811493a8c11453d51557cac3f6346ea28d66dcb2ae3e4c52727af7349b4b6ea088f9c08a7e9d09e3a4d80679b41497b6cd0844d811f81c9811a
 EBUILD buku-4.5.ebuild 3019 BLAKE2B 92c4deb07a3dfaca4762f5a877173d7fbf0576be73a2e485b17d17fc8a4c748da68a9c27ca7e6c5e1fcd1238a02cdf47b7aad0982f50f02079d9bed96b650059 SHA512 39ae35d6b80e5838bb7eb8792d52437c5ca961514ef2f0644fba06a14b4ff839599caf7172e18e82e8240f17441f598b9710885251c807456975568f0f2f3bfe
-EBUILD buku-4.6.ebuild 3020 BLAKE2B d6e967435d8fcd6f98a3d8777102e7e5cdf096e8ff55799cadbaa25a0cbb11f334495231a6a1996a2840b8ce4f483a90ddbee6b09756e4a3176b07abc392cf1b SHA512 5b8cfc0d9fc052a22d20bc1858030c974d2e64dabc47833b248785b93b977c150e8cc44e7b66d09bb61e6bdf034f9722e8105b0fa4e60516c3919c0ef4d9e401
+EBUILD buku-4.6-r1.ebuild 2959 BLAKE2B 85af080ad88fde7d867a3a72bc54a60c00bcdbe78b39081b850f418ef229561553275a30bbd781ba800bc8510d4036a21c974f2061d8579b2ee428eaeb0ae116 SHA512 a5291c2be92ed32e530b651124f797be08a875f2c4d029e7a1ce5192e6fc19baaddafa1776666d6021374051bef86c2ec0116aa28654abf13fb8ffc6cf615145
 MISC metadata.xml 579 BLAKE2B 3a044a07f97593dd2299dad004db229527759be278ff3b77d7cc70d505d45edde843754e52070fe0dadecd0250db66aa3f0f71e964d1180f493d698285088a34 SHA512 e887a1de3487f512b1cb48e256749e91171c72a7626458c22dfdbad6da73afe2418e25242f1ae9b20b85a508145ee69ec95a61b3c20c6049c3c71291e16b6405
diff --git a/www-misc/buku/buku-4.6-r1.ebuild b/www-misc/buku/buku-4.6-r1.ebuild
new file mode 100644
index 000000000000..27a0923bc31d
--- /dev/null
+++ b/www-misc/buku/buku-4.6-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Powerful command-line bookmark manager"
+HOMEPAGE="https://github.com/jarun/buku"
+SRC_URI="https://github.com/jarun/${PN}/archive/v$(ver_cut 1-2).tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/attrs[${PYTHON_USEDEP}]
+		>=dev-python/click-7.0[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		>=dev-python/py-1.5.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-4.2[${PYTHON_USEDEP}]
+		>=dev-python/vcrpy-4.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Remove support for bukuserver - complex depgraph which isn't all
+	# sufficiently packaged in Gentoo
+	sed -ie '/console_scripts/s/,.*/]/' setup.py || die
+	sed -ie 's/.*bukuserver.*//' tests/test_views.py || die
+	sed -ie 's/.*flask.*//' tests/test_views.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/zsh/site-functions
+	doins auto-completion/zsh/_*
+
+	newbashcomp auto-completion/bash/buku-completion.bash "${PN}"
+
+	doman buku.1
+}
+
+python_test() {
+	local skipped_tests=(
+		# Disable tests related to bukuserver
+		tests/test_setup.py::test_bukuserver_requirement
+		tests/test_views.py::test_bmv_create_form
+		tests/test_views.py::test_bookmark_model_view
+		tests/test_views.py::test_load_firefox_database
+		tests/test_views.py::test_tag_model_view_get_list
+		tests/test_views.py::test_tag_model_view_get_list_empty_db
+
+		# Broken with network-sandbox
+		tests/test_buku.py::test_network_handler_with_url
+		tests/test_bukuDb.py::TestBukuDb::test_tnyfy_url
+		tests/test_bukuDb.py::test_add_rec_exec_arg
+		tests/test_bukuDb.py::test_load_firefox
+		tests/test_bukuDb.py::test_print_db
+		tests/test_bukuDb.py::test_print_rec
+		tests/test_bukuDb.py::test_refreshdb
+
+		# Hard to debug sandbox issue - these pass when run outside portage
+		# There also appears to be some state issue between these, because
+		# skipping one can result in a later one failing.
+		tests/test_bukuDb.py::test_delete_rec_index_and_delay_commit[1-True-False]
+		tests/test_bukuDb.py::test_delete_rec_index_and_delay_commit[1-False-True]
+		tests/test_bukuDb.py::test_delete_rec_index_and_delay_commit[1-False-False]
+		tests/test_bukuDb.py::test_delete_rec_index_and_delay_commit[1-True-True]
+	)
+
+	# tests/test_server.py is bukuserver tests, ignore it
+	pytest -p no:verbose-parametrize -v --ignore tests/test_server.py ${skipped_tests[@]/#/--deselect } || die "Tests failed with ${EPYTHON}"
+}
diff --git a/www-misc/buku/buku-4.6.ebuild b/www-misc/buku/buku-4.6.ebuild
deleted file mode 100644
index d7dd628bd781..000000000000
--- a/www-misc/buku/buku-4.6.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Powerful command-line bookmark manager"
-HOMEPAGE="https://github.com/jarun/buku"
-SRC_URI="https://github.com/jarun/${PN}/archive/v$(ver_cut 1-2).tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		>=dev-python/click-7.0[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		>=dev-python/py-1.5.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-4.2[${PYTHON_USEDEP}]
-		>=dev-python/vcrpy-4.0.2[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	#"${FILESDIR}/${P}-hypothesis-fix.patch"
-)
-
-python_prepare_all() {
-	# Remove support for bukuserver - complex depgraph which isn't all
-	# sufficiently packaged in Gentoo
-	sed -ie '/console_scripts/s/,.*/]/' setup.py || die
-	sed -ie 's/.*bukuserver.*//' tests/test_views.py || die
-	sed -ie 's/.*flask.*//' tests/test_views.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/zsh/site-functions
-	doins auto-completion/zsh/_*
-
-	newbashcomp auto-completion/bash/buku-completion.bash "${PN}"
-
-	doman buku.1
-}
-
-python_test() {
-	local skipped_tests=(
-		# Disable tests related to bukuserver
-		tests/test_setup.py::test_bukuserver_requirement
-		tests/test_views.py::test_bmv_create_form
-		tests/test_views.py::test_bookmark_model_view
-		tests/test_views.py::test_load_firefox_database
-		tests/test_views.py::test_tag_model_view_get_list
-		tests/test_views.py::test_tag_model_view_get_list_empty_db
-
-		# Broken with network-sandbox
-		tests/test_buku.py::test_network_handler_with_url
-		tests/test_bukuDb.py::TestBukuDb::test_tnyfy_url
-		tests/test_bukuDb.py::test_add_rec_exec_arg
-		tests/test_bukuDb.py::test_load_firefox
-		tests/test_bukuDb.py::test_print_db
-		tests/test_bukuDb.py::test_print_rec
-		tests/test_bukuDb.py::test_refreshdb
-
-		# Hard to debug sandbox issue - these pass when run outside portage
-		# There also appears to be some state issue between these, because
-		# skipping one can result in a later one failing.
-		tests/test_bukuDb.py::test_delete_rec_index_and_delay_commit[1-True-False]
-		tests/test_bukuDb.py::test_delete_rec_index_and_delay_commit[1-False-True]
-		tests/test_bukuDb.py::test_delete_rec_index_and_delay_commit[1-False-False]
-		tests/test_bukuDb.py::test_delete_rec_index_and_delay_commit[1-True-True]
-	)
-
-	# tests/test_server.py is bukuserver tests, ignore it
-	pytest -v --ignore tests/test_server.py ${skipped_tests[@]/#/--deselect } || die "Tests failed with ${EPYTHON}"
-}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index ac5306a5ff60..243827387006 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index a3c7cb986078..8e3c7b0463cf 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_93.0.4577.51-1_amd64.deb 82880952 BLAKE2B daeb5e7b8fd186e5dbbf4ca2a57072c2e85649dea103dc1f4a0e13c5127a8a06cf2a4d5f5f32ced7146c17ad972c0733e8bd8b060388dde9ac3a8be317daa5c8 SHA512 25d6f0a1acafcc6926eff0a12f660f066e7327458dc346d69dedde03956f4c83a512541758b2e933c7db23ff408ea4ed840cbf6e190c3662afef924e88e92669
+DIST google-chrome-beta_93.0.4577.58-1_amd64.deb 84625800 BLAKE2B 0e4d1f49cc800534f7fda342230986b4c50854967d7e0c8cfb875b90b3c075798adfb10a41570dfe773b979429961af1c533fc972f69d78b33e217a166e0355c SHA512 61999db9bce0b42b87995446d15875229ee391ddcbecb761101cfafba5afc9eb19b89cd00f84b187b94e9e06e24d6ac1bc7a5d52bd04198ca36897cfa9e7b19d
 DIST google-chrome-stable_92.0.4515.159-1_amd64.deb 80228636 BLAKE2B e7b00822716be2b2f39a80d4db2c1e484c961d95ad6cc7d63aff796a6e597afdd0e14042bd9a6a5634418742ef364a1d8fe63323271e0c50132dcabcd6b061dc SHA512 1b2857dc82999583fd5baf539227be8c3a6961678f35019640555633ba6fdcadb924c3525e9042283f8ae8a743990fe7abe41cf07a70fd37f870fc3a76d2a9ac
 DIST google-chrome-unstable_94.0.4606.12-1_amd64.deb 90185592 BLAKE2B 8c3ad292527acc75fd962dc361f47451c7ffcda332d200ee3d8e4969def16218799ffa59ab0efdb50b382683faaac1dc1d01ecae6818e1488d807b955352846d SHA512 5c078f6d4a06e71a22c9390871f3b6a41014905174b92b6554237358f0d0b5ce5e48aeee9e0e3e434365bd67881a3305454fd3f96645645985807f8a2b2ac609
 EBUILD chrome-binary-plugins-92.0.4515.159.ebuild 1171 BLAKE2B e81b97fb2023b7dca16db3eb99b30a844f31546669b0e95a972777acbd37aa8765c3a5a40123d8c7f93dd2ec627d1417100c4cdcac6f013e9402c2ff392f13eb SHA512 7fbadae792a71fd25142c1fea11f26af0508be8d29b3e59c349a0e3d02d3c5f9898f9ad2914bc7b4d8bfe0ac53544ae87fd7367cf1b008774fbd3490169c1900
-EBUILD chrome-binary-plugins-93.0.4577.51_beta.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
+EBUILD chrome-binary-plugins-93.0.4577.58_beta.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
 EBUILD chrome-binary-plugins-94.0.4606.12_alpha.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
 MISC metadata.xml 262 BLAKE2B 6958ab33a832169dbd6b7077bfeae3f398c5d825430d3d85f7f37d732951fa0585a75d28766111d82e5103fa4078cfb3e3d16b98a4520b268d4fd6b670ce811e SHA512 b440c405c25f905f11aeaab1ee3721846ac26502b1e02656f773a3b3be4bc636e85af6185c043c8e94205a3297476d3d2230d6c519d477b5c7d42268916e1128
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4577.51_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4577.58_beta.ebuild
index 969dd2f57c6a..969dd2f57c6a 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4577.51_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4577.58_beta.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index e30c7fe8fb92..1f7392a2ad14 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
deleted file mode 100644
index ddd902926d94..000000000000
--- a/www-servers/resin/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX resin-4.0.48-build.xml.patch 2186 BLAKE2B 1864f7896312c7b2952f5aac8d73924b90d4a75e9f5021804b7ba9eed37a4a45541b611897d4eddb92f3f3834044a0206324e518b8e72cc196362c94a444e435 SHA512 9bc4e5f695473945fd9a18fd28eb18e8f306fd6054bc910b5dfd86382046e2b850c7e4b0f533f012f1c0b84ef58ab61051e6a33c0c94a7f44f1d9416ee14e49c
-AUX resin-4.0.48.conf 542 BLAKE2B 96cc8e582b5e5af4b72d29652fa690928bedf51f8ee74d7acfd16244690eb9f346cb616e20e8711f9b85b77ee1145e74d0dca04d026e04808ded22345c7b6b67 SHA512 61b34c022712f31d3cadcf8e78095900085c8cde5ba5b8cc46d603019f461ae3271fc41a9f6b63d89aeb675de9fb72b27123fc6c6774eaee5349d37cc2c9693f
-AUX resin-4.0.48.init 791 BLAKE2B dd8f14fdbdb5e7be3b8511d33db86781c4595a2f925be613d31036588c2444acfe149a1e215a9d26978fa612ef223c325d6f1bdefc19722c429bdbccdb663b11 SHA512 9fa5db204bf4a3a6e040493dda96adcf86e9fff271b6a98951b03c15f00a18a62c9469d48e155bf7847229e005f8c570fd10737bb120271122a2d746ea22e13a
-DIST resin-4.0.48-src.zip 40883010 BLAKE2B 33588d8ccb5692efd70ede4e25949aa71b61640c090379b36ec5160c16d90da465853c56015304435f15298a358c8a3ee9ad54b423ae0547c1a7f43ac4e4bb40 SHA512 a992ebbff8af9f10e825a259e831dc340f9d74c5a117033a7eda2eb59a453d9e7d0e5e6feaf7bb36526ac65c8a7e1f55f737bb68af3e7e9647381ada995542ee
-EBUILD resin-4.0.48-r1.ebuild 4255 BLAKE2B 3a07b03177c0eb689a017164a07615b1e13ce18ab57d30129aedbe55b11bf27330ee28abfccadf3fa6ee1376d8fe0f6d943705d851624d835dd50e40c8a2b222 SHA512 1d00de7cde95edeb7a16ef02d16a4fb9099bc7b9d72a225c7c5bfdb03f1338e6e334f0a88c278fedfd9c65b6ea477595ef6bf660ec079838ec4992d0df9a5c32
-MISC metadata.xml 305 BLAKE2B cd9ab46596ac556fb225d0d9d087c89a8f46a185aa3ed9524d6258d04b8690373efc1a587b28da5bb0485edbaa18e5f7db1b6dcc84656df09a01b7401027c48c SHA512 2f36d477675c49a8b3475b49891dd9eb45c02cbc5d83a3f60c3ba3b35252a3bdc34214dbdf2c3fb8da37138fec49281f95c3c70055fdf47a8cace006a46137e9
diff --git a/www-servers/resin/files/resin-4.0.48-build.xml.patch b/www-servers/resin/files/resin-4.0.48-build.xml.patch
deleted file mode 100644
index 5ef1abc63c56..000000000000
--- a/www-servers/resin/files/resin-4.0.48-build.xml.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -12,7 +12,7 @@
-   <property name="eclipse.home" value="${user.home}/eclipse"/>
- 
-   <target name="compile"
--          depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, resin-eclipselink, gae, jasper">
-+          depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, gae">
-   </target>
- 
-   <!--
-@@ -27,10 +27,6 @@
-     </antcall>
-   </target>
-   -->
--  <target name="resin-eclipselink" depends="eclipselink">
--    <copy file="modules/eclipselink/dist/resin-eclipselink.jar"
--          todir="${resin.lib}"/>
--  </target>
- 
-   <target name="richfaces" depends="init">
-     <antcall target="artifact" inheritRefs="true">
-@@ -92,13 +88,6 @@
-     </antcall>
-   </target>
- 
--  <target name="eclipselink" depends="init">
--    <antcall target="module" inheritRefs="true">
--      <param name="module.name" value="eclipselink"/>
--      <param name="module.jar" value="resin-eclipselink.jar"/>
--    </antcall>
--  </target>
--
-   <!-- gae APIs for quercus testing -->
-   <target name="gae" depends="init">
-     <antcall target="module" inheritRefs="true">
-@@ -437,13 +426,6 @@
-     </antcall>
-   </target>
- 
--  <target name="jasper" depends="init">
--    <antcall target="module" inheritRefs="true">
--      <param name="module.name" value="jasper"/>
--      <param name="module.jar" value="resin-jasper.jar"/>
--    </antcall>
--  </target>
--
-   <target name="version">
-     <copy file="${resin.modules}/kernel/src/com/caucho/Version.tmpl"
-           tofile="${resin.modules}/kernel/src/com/caucho/Version.java"
-@@ -903,7 +885,7 @@
-     <delete dir="${dist}/${dist.name}"/>
-   </target>
- 
--  <target name="dist" depends="dist.clean, configure, compile, update, junit, eclipselink, artifacts, resin.dist.build, dist.package, quercus.war"/>
-+  <target name="dist" depends="dist.clean, configure, compile, update, junit, artifacts, resin.dist.build, dist.package, quercus.war"/>
- 
-   <target name="configure" depends="init">
-      <copy tofile="modules/c/src/resin/Makefile.in"
diff --git a/www-servers/resin/files/resin-4.0.48.conf b/www-servers/resin/files/resin-4.0.48.conf
deleted file mode 100644
index a48840b5e9f2..000000000000
--- a/www-servers/resin/files/resin-4.0.48.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# JVM Runtime
-# Using the default setting, it will determine your JVM from the system-vm
-# set using java-config.
-# See java-config(1) manual page for assistance in determining this value.
-
-# You can override this value with whatever JDK you want.
-# For a list of valid values for GENTOO_VM see output of
-#   java-config -L
-#GENTOO_VM=sun-jdk-1.5
-
-# Verbose starting and stopping? (yes/no, defaults to no)
-#VERBOSE="yes"
-
-# Select which server will be started, this is an advanced feature, please refer
-# to Resin documentation.
-SERVER_ID=""
diff --git a/www-servers/resin/files/resin-4.0.48.init b/www-servers/resin/files/resin-4.0.48.init
deleted file mode 100644
index a0e5cfb49b67..000000000000
--- a/www-servers/resin/files/resin-4.0.48.init
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	use dns logger mysql postgresql
-}
-
-runResin() {
-	JAVA_HOME=$(java-config -O)
-	[ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O)
-	export JAVA_HOME
-
-	local extraArgs=
-	if [ "${VERBOSE}" = "yes" ]; then
-		extraArgs="-verbose"
-	fi
-
-	local msg="${1}"
-	shift
-
-	local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar -conf /etc/resin/resin.xml -server \"${SERVER_ID}\" -resin-home __RESIN_HOME__ -root-directory __RESIN_HOME__ ${extraArgs} ${@}"
-
-	ebegin "${msg}"
-	su - resin -c "${cmdline}"
-	eend $?
-}
-
-start()	{
-	runResin "Starting Resin" "start"
-}
-
-stop()	{
-	runResin "Stopping Resin" "shutdown"
-}
diff --git a/www-servers/resin/metadata.xml b/www-servers/resin/metadata.xml
deleted file mode 100644
index 42183598824f..000000000000
--- a/www-servers/resin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<use>
-		<flag name="admin">Enable Resin admin webapp</flag>
-	</use>
-</pkgmetadata>
diff --git a/www-servers/resin/resin-4.0.48-r1.ebuild b/www-servers/resin/resin-4.0.48-r1.ebuild
deleted file mode 100644
index a0c767c66282..000000000000
--- a/www-servers/resin/resin-4.0.48-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 epatch flag-o-matic multilib user
-
-DESCRIPTION="A fast Servlet and JSP engine"
-HOMEPAGE="http://www.caucho.com"
-SRC_URI="http://www.caucho.com/download/${P}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="admin doc"
-
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
-	dev-java/jsr101:0
-	dev-java/mojarra:2.2
-	dev-java/oracle-javamail:0
-	dev-java/validation-api:1.0
-	dev-java/resin-servlet-api:3.1
-	dev-java/glassfish-xmlrpc-api:0
-	dev-java/glassfish-deployment-api:1.2"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	dev-libs/openssl
-	>=virtual/jdk-1.6
-	dev-java/ant-core:0"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="
-	jsr101
-	mojarra-2.2
-	oracle-javamail
-	validation-api-1.0
-	glassfish-xmlrpc-api
-	resin-servlet-api-3.1
-	glassfish-deployment-api-1.2
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.48-build.xml.patch
-)
-
-pkg_setup() {
-	export RESIN_HOME="/usr/$(get_libdir)/resin"
-	java-pkg-2_pkg_setup
-	enewgroup resin
-	enewuser resin -1 /bin/bash "${RESIN_HOME}" resin
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	# No bundled JARs!
-	rm -rv "${S}"/modules/ext/*.jar "${S}"/project-jars || die
-
-	java-ant_bsfix_one "${S}/build.xml"
-	java-ant_bsfix_one "${S}/build-common.xml"
-
-	rm -rv lib/* || die
-
-	ln -s $(java-config --jdk-home)/lib/tools.jar || die
-}
-
-src_configure() {
-	append-flags -fPIC -DPIC
-
-	chmod 755 "${S}/configure" || die
-	econf --prefix=${RESIN_HOME}
-}
-
-src_compile() {
-	einfo "Building libraries..."
-	emake
-
-	einfo "Building jars..."
-	eant || die "ant failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	einfo "Moving configuration to /etc ..."
-	dodir /etc/
-	mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die
-	dosym /etc/resin ${RESIN_HOME}/conf
-
-	einfo "Rewriting resin.xml ..."
-	sed -i \
-		-e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
-		-e 's,${resin.root}/doc/admin,webapps/admin,' \
-		"${D}/etc/resin/resin.xml" || die
-
-	einfo "Fixing log directory ..."
-	rm -rv "${D}/${RESIN_HOME}"/log || die
-	keepdir /var/log/resin
-	dosym /var/log/resin ${RESIN_HOME}/log
-
-	einfo "Installing basic documentation ..."
-	dodoc README "${S}"/conf/*.xml
-
-	einfo "Installing init.d script ..."
-	newinitd "${FILESDIR}/${PN}-4.0.48.init" resin
-	newconfd "${FILESDIR}/${PN}-4.0.48.conf" resin
-
-	sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" || die
-
-	einfo "Fixing location of jars ..."
-	#rm -v "${S}"/lib/tools.jar || die
-	java-pkg_dojar "${S}"/lib/*.jar
-	rm -rv "${D}/${RESIN_HOME}"/lib || die
-	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
-
-	dodir /var/lib/resin/webapps
-	keepdir /var/lib/resin/hosts
-	keepdir /var/lib/resin/resin-data
-	keepdir /var/lib/resin/watchdog-data
-
-	mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || die
-	rm -rv "${D}/${RESIN_HOME}"/webapps || die
-	dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
-	dosym /var/lib/resin/hosts ${RESIN_HOME}/hosts
-	dosym /var/lib/resin/resin-data ${RESIN_HOME}/resin-data
-	dosym /var/lib/resin/watchdog-data ${RESIN_HOME}/watchdog-data
-
-	dosym \
-		"$(java-pkg_getjar resin-servlet-api-3.1 resin-servlet-api.jar)" \
-		"${JAVA_PKG_JARDEST}/resin-servlet-api.jar"
-
-	use admin && {
-		einfo "Installing administration app ..."
-		cp -a "${S}/doc/admin" "${D}/var/lib/resin/webapps/" || die
-	}
-	use doc && {
-		einfo "Installing documentation app ..."
-		cp -a "${S}/doc/resin-doc" "${D}/var/lib/resin/webapps/" || die
-	}
-
-	use source && {
-		einfo "Installing sources ..."
-		java-pkg_dosrc "${S}"/modules/*/src/* > /dev/null
-	}
-
-	einfo "Removing stale directories ..."
-	rm -rv "${D}/${RESIN_HOME}"/{bin,doc} || die
-	#rm -rv "${D}"/etc/resin/*.orig || die
-
-	einfo "Fixing ownerships and permissions ..."
-	fowners -R 0:root /
-	fowners -R resin:resin /etc/resin
-	fowners -R resin:resin /var/lib/resin
-	fowners -R resin:resin /var/log/resin
-
-	fperms 644 /etc/conf.d/resin
-	fperms 755 /etc/init.d/resin
-	fperms 750 /var/lib/resin
-	fperms 750 /etc/resin
-}
-
-pkg_postinst() {
-	elog
-	elog " User and group 'resin' have been added."
-	elog
-	elog " By default, Resin runs on port 8080. You can change this"
-	elog " value by editing /etc/resin/resin.properties."
-	elog
-}
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index ce56dfddd6b1..45abf2f08261 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -9,10 +9,10 @@ AUX varnishncsa.confd 84 BLAKE2B fbb338ec2163562d7679a7371cda3cd297449186bfcaa66
 AUX varnishncsa.initd 716 BLAKE2B 33fd6b044ab50aef629fa4501eb4a78bd3d690db52b86a33d1d4e87c1da28088b9f25ce917d16a9ed777b1d6e1ece5a916af0c4ff293db82b94d264fd5baafa9 SHA512 1d0c781675ecba5adce02c37a02c431c4b44d64310a0945bff4f6f57f7d0c87cb7dda874311e44d667317d5beda113b62f4ba49c81534a0c078314b3fa15a512
 DIST varnish-6.3.2.tgz 3323908 BLAKE2B 5bde1b2ececeb8aed884db22ed75bfd74f82d68416e71400a4c0d27483fcceb029fe8e724e30754899c872d7028da5cb759545f0743a11d0e90b0fd604af0ad7 SHA512 0f476c642df834737d446b3bc6ac8afa5981d1de5810dc6e8556eb22b2ca26d64eb531f4ad3332eb86e231a7443fe35393177ec6dbee97a837f405d1aa9d03cd
 DIST varnish-6.4.0.tgz 3404617 BLAKE2B 0ef0f7303f5c926bb1b80ec14cdd9755d65c1938fa8645240800ac2997f954022133625a74dd9c30ce21850674c3b00777fcc896309f528e6ba90d347333d7f7 SHA512 cda8f9e1d301a2b79db14685a23e25e36225f37065a1b7f37c5ae12fbb0483be51be9ffcc8ba72c1f65f5a022d1e408825694daed6780e206b9ba91feb2a07a1
-DIST varnish-6.5.0.tgz 3476969 BLAKE2B bafa8704f28dfa96f681805cc053dd6415e143016b1bbff7f8962f2c3ac5cd07be6dc2f4129a423ddfcbf9f9f8afc57388930685d0ed400f3c06ba03bd667d87 SHA512 43f8cd6429a903a353ac4448b6e9aff445b0d52178141a148d3b29b987c0974841820af0da4917731775b46899c12b0327d64d12e3ddbb8fd438e2802ac66a1c
-DIST varnish-6.5.1.tgz 3460024 BLAKE2B 20abebf1df826987623c951122dd8ab2b500c0a64aca192fb12db8846e60938c2f444cf5f471d02aee4f3aeea05f4074bec335e963ab8a2fd59bef47e77df501 SHA512 0f34f2c6fe68bfcdba488cda40cc387b3c10343923a75a6a1791c890d20e79c64069697c45720cd5f0cba666d506d3ab6bb814ef4f9120cf0c8519a01144844f
+DIST varnish-6.5.2.tgz 3464372 BLAKE2B 68a7bca159ed9539126f66d21450c87780b49b66a2d45a5abc7db6fe9d68c8526aa059546fb1d865de753736793e700611f4f110edb1c649f4e9753c4dfedacc SHA512 31673eaa95e5d3413cd3a4a6fb324c1f0ad2efb22b75409fc0e02c61446787eb167bd530ee5b0a199da4fc76cc36f3603984d86781f856cc6a4aac48260fe4ef
+DIST varnish-6.6.1.tgz 3518308 BLAKE2B 6a88165394c0578427de20588ac2c17f502242bf94f30e9284f7bc2c271b77c3d6511a9dfb8d1cb6d75e1fc4563360fb0bec762aa17481fa598cb5e9d9527705 SHA512 af3ee1743af2ede2d3efbb73e5aa9b42c7bbd5f86163ec338c8afd1989c3e51ff3e1b40bed6b72224b5d339a74f22d6e5f3c3faf2fedee8ab4715307ed5d871b
 EBUILD varnish-6.3.2.ebuild 2142 BLAKE2B 84d773d218c330e2b9dc0aaccd4460cb66e452562449d194f25688e23a1564692d6bd2da2e765c2d8fd592b7ab250690fd71790375119180a5cc30397f1d3753 SHA512 9ba6c279d716c158df6784949d450d3c755d664d75d78cdfd54d619389fa2984d205cb4f73da4e3f22ed38df6ad941886f80522a8babc40a9bfba625caf5a46b
 EBUILD varnish-6.4.0.ebuild 2144 BLAKE2B ed913f10eda43049bce760b54e4d032d8ef5fdd85f224f41d50e51fa57749875c6d00531fb31313fcda43b89e64e6301b7c28d3d2f2b9399927c296f2439112a SHA512 66d1273707e09f049d0095825eba1382332686ed441bc681582d3bf6485a53122ec510a786ea56c48f1506ac00ea5462c016537c72494bb13681bdd9dbe2e050
-EBUILD varnish-6.5.0.ebuild 2148 BLAKE2B 0a9046dc717ee032241f567e4835932d49b0f88adc5822670cff04b377a30ca8c440bf4f06119f9711de37c0d818ea612d47aee47714d889aeb9c039c3d947b8 SHA512 86a6d7af15583e3cbea9e9dd56d60801723a3d979c224a75ba22168c8afae0732d226837b23ff0d8619bec76275ec9977c581a8b49b85c6b25cd7f9671bd9fd9
-EBUILD varnish-6.5.1.ebuild 2241 BLAKE2B 1b16f9257c56dae4c4620a13437d18a03f5f14fd01b42da2028399fccd8f344239273d53d3fe9b92ed6fd3e095c91a7f05ff4fcf0d33f44c1ba3166b7f16500d SHA512 b87b067cb2c4ea0dcc048a4e6c7c7aeb9d2b12b7b48c0f0c3af7e2c517e833df82d710e53f23bb3f0d61a902f2cb0ca6a5930d12be43cc83026af8544e2a9aa6
+EBUILD varnish-6.5.2.ebuild 2250 BLAKE2B 9feb9dc308d07deeaa05fc5f26b5f76dc44e72d56a3eccfe452c2bb5dd7ed38b5bac422956c8dec67e50aa7b7baca032bae4cb063599d581808837494b2b10e3 SHA512 78acc8747a193d647c3e494b25546a41e8feaa51bc1b2976f71d3b6cb81273e6a89e39d3ef728b3049d3c31b388a36f33361446877e3a071fc29745220bc9fee
+EBUILD varnish-6.6.1.ebuild 2386 BLAKE2B a4dfd27b217b6b171da976bf5290dad54ece7691e7ccd1db0fbc2eba4d580bea81053e22262ffe7b3d307ac1518de98378d621892e16581df6b23477430ade18 SHA512 91de5039eb2b449eff5102228c88856264711f5d1b0cfe8243a1505abae1387a682d92532b30fc8db1216ce8f1533b0f7d0f7e18c7b887dedcb134437478d846
 MISC metadata.xml 1154 BLAKE2B eef29e16772e06a4b08bb7c2de3c02570a698eafe1eb9f3d1d6708cbf4ea3ef2644642b3040ebea108477e331aff164e4e540dc7f5620f15643b385d1523fd7f SHA512 a429d2e7604fb1e1f1d3ef48c13ab2151f7e2adab6a81021f473d7b56bdc9fc8d7700370125908b0278c2b0621afb3cccb73c4f3284b288cbceac05294e70f99
diff --git a/www-servers/varnish/varnish-6.5.0.ebuild b/www-servers/varnish/varnish-6.5.0.ebuild
deleted file mode 100644
index d8b86fe79c7d..000000000000
--- a/www-servers/varnish/varnish-6.5.0.ebuild
+++ /dev/null
@@ -1,98 +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 autotools systemd python-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="https://varnish-cache.org/"
-SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0/2"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="jemalloc jit static-libs"
-
-CDEPEND="
-	sys-libs/readline:0=
-	dev-libs/libpcre[jit?]
-	jemalloc? ( dev-libs/jemalloc )
-	sys-libs/ncurses:0="
-
-#varnish compiles stuff at run time
-RDEPEND="
-	${PYTHON_DEPS}
-	${CDEPEND}
-	acct-user/varnish
-	acct-group/varnish
-	sys-devel/gcc"
-
-DEPEND="
-	${CDEPEND}
-	dev-python/docutils
-	dev-python/sphinx
-	virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-src_prepare() {
-	# Remove -Werror bug #528354
-	sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
-
-	# Upstream doesn't put varnish.m4 in the m4/ directory
-	# We link because the Makefiles look for the file in
-	# the original location
-	ln -sf ../varnish.m4 m4/varnish.m4
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable jit pcre-jit ) \
-		$(use_with jemalloc)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
-
-	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
-	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
-
-	newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
-	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
-
-	newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
-	newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
-
-	diropts -m750
-
-	keepdir /var/lib/varnish
-	keepdir /var/log/varnish
-
-	systemd_dounit "${FILESDIR}/${PN}d.service"
-
-	insinto /etc/varnish/
-	doins lib/libvmod_std/vmod_std.vcc
-	doins etc/example.vcl
-
-	dodoc README.rst
-	dodoc doc/changes.rst
-
-	fowners root:varnish /etc/varnish/
-	fowners varnish:varnish /var/lib/varnish/
-	fperms 0750 /var/lib/varnish/ /etc/varnish/
-}
diff --git a/www-servers/varnish/varnish-6.5.1.ebuild b/www-servers/varnish/varnish-6.5.1.ebuild
deleted file mode 100644
index 87201493f019..000000000000
--- a/www-servers/varnish/varnish-6.5.1.ebuild
+++ /dev/null
@@ -1,103 +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 autotools systemd python-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="https://varnish-cache.org/"
-SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0/2"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="jemalloc jit static-libs"
-
-CDEPEND="
-	sys-libs/readline:0=
-	dev-libs/libpcre[jit?]
-	jemalloc? ( dev-libs/jemalloc )
-	sys-libs/ncurses:0="
-
-#varnish compiles stuff at run time
-RDEPEND="
-	${PYTHON_DEPS}
-	${CDEPEND}
-	acct-user/varnish
-	acct-group/varnish
-	sys-devel/gcc"
-
-DEPEND="
-	${CDEPEND}
-	dev-python/docutils
-	dev-python/sphinx
-	virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-PATCHES=(
-	"${FILESDIR}/${P}-autoconf-2.70.patch" #751190
-)
-
-src_prepare() {
-	# Remove -Werror bug #528354
-	sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
-
-	# Upstream doesn't put varnish.m4 in the m4/ directory
-	# We link because the Makefiles look for the file in
-	# the original location
-	ln -sf ../varnish.m4 m4/varnish.m4
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable jit pcre-jit)
-		$(use_with jemalloc)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
-
-	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
-	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
-
-	newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
-	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
-
-	newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
-	newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
-
-	diropts -m750
-
-	keepdir /var/lib/varnish
-	keepdir /var/log/varnish
-
-	systemd_dounit "${FILESDIR}/${PN}d.service"
-
-	insinto /etc/varnish/
-	doins lib/libvmod_std/vmod_std.vcc
-	doins etc/example.vcl
-
-	dodoc README.rst
-	dodoc doc/changes.rst
-
-	fowners root:varnish /etc/varnish/
-	fowners varnish:varnish /var/lib/varnish/
-	fperms 0750 /var/lib/varnish/ /etc/varnish/
-}
diff --git a/www-servers/varnish/varnish-6.5.2.ebuild b/www-servers/varnish/varnish-6.5.2.ebuild
new file mode 100644
index 000000000000..9901f81c14fc
--- /dev/null
+++ b/www-servers/varnish/varnish-6.5.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools systemd python-r1
+
+DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
+HOMEPAGE="https://varnish-cache.org/"
+SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="jemalloc jit static-libs"
+
+CDEPEND="
+	sys-libs/readline:0=
+	dev-libs/libpcre[jit?]
+	jemalloc? ( dev-libs/jemalloc )
+	sys-libs/ncurses:0="
+
+#varnish compiles stuff at run time
+RDEPEND="
+	${PYTHON_DEPS}
+	${CDEPEND}
+	acct-user/varnish
+	acct-group/varnish
+	sys-devel/gcc"
+
+DEPEND="
+	${CDEPEND}
+	dev-python/docutils
+	dev-python/sphinx
+	virtual/pkgconfig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test" #315725
+
+PATCHES=(
+	"${FILESDIR}/varnish-6.5.1-autoconf-2.70.patch" #751190
+)
+
+src_prepare() {
+	# Remove -Werror bug #528354
+	sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
+
+	# Upstream doesn't put varnish.m4 in the m4/ directory
+	# We link because the Makefiles look for the file in
+	# the original location
+	ln -sf ../varnish.m4 m4/varnish.m4
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable jit pcre-jit)
+		$(use_with jemalloc)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
+
+	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
+	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
+
+	newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
+	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
+
+	newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
+	newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
+
+	diropts -m750
+
+	keepdir /var/lib/varnish
+	keepdir /var/log/varnish
+
+	systemd_dounit "${FILESDIR}/${PN}d.service"
+
+	insinto /etc/varnish/
+	doins lib/libvmod_std/vmod_std.vcc
+	doins etc/example.vcl
+
+	dodoc README.rst
+	dodoc doc/changes.rst
+
+	fowners root:varnish /etc/varnish/
+	fowners varnish:varnish /var/lib/varnish/
+	fperms 0750 /var/lib/varnish/ /etc/varnish/
+}
diff --git a/www-servers/varnish/varnish-6.6.1.ebuild b/www-servers/varnish/varnish-6.6.1.ebuild
new file mode 100644
index 000000000000..5a49d8e6ee1c
--- /dev/null
+++ b/www-servers/varnish/varnish-6.6.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools systemd python-r1
+
+DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
+HOMEPAGE="https://varnish-cache.org/"
+SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="jemalloc jit static-libs"
+
+CDEPEND="
+	sys-libs/readline:0=
+	dev-libs/libpcre[jit?]
+	jemalloc? ( dev-libs/jemalloc )
+	sys-libs/ncurses:0="
+
+#varnish compiles stuff at run time
+RDEPEND="
+	${PYTHON_DEPS}
+	${CDEPEND}
+	acct-user/varnish
+	acct-group/varnish
+	sys-devel/gcc"
+
+DEPEND="
+	${CDEPEND}
+	dev-python/docutils
+	dev-python/sphinx
+	virtual/pkgconfig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test" #315725
+
+src_prepare() {
+	# Remove -Werror bug #528354
+	sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
+
+	# Upstream doesn't put varnish.m4 in the m4/ directory
+	# We link because the Makefiles look for the file in
+	# the original location
+	ln -sf ../varnish.m4 m4/varnish.m4
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable jit pcre-jit)
+		$(use_with jemalloc)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
+
+	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
+	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
+
+	newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
+	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
+
+	newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
+	newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
+
+	diropts -m750
+
+	keepdir /var/lib/varnish
+	keepdir /var/log/varnish
+
+	systemd_dounit "${FILESDIR}/${PN}d.service"
+
+	insinto /etc/varnish/
+	doins vmod/vmod_vtc.vcc
+	doins vmod/vmod_directors.vcc
+	doins vmod/vmod_blob.vcc
+	doins vmod/vmod_proxy.vcc
+	doins vmod/vmod_debug.vcc
+	doins vmod/vmod_std.vcc
+	doins vmod/vmod_unix.vcc
+	doins vmod/vmod_cookie.vcc
+	doins vmod/vmod_purge.vcc
+	doins etc/example.vcl
+
+	dodoc README.rst
+	dodoc doc/changes.rst
+
+	fowners root:varnish /etc/varnish/
+	fowners varnish:varnish /var/lib/varnish/
+	fperms 0750 /var/lib/varnish/ /etc/varnish/
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index acb81525f6cb..62ab6467c96b 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/colord-gtk/Manifest b/x11-libs/colord-gtk/Manifest
index 325e903c61ed..0f9e182397bb 100644
--- a/x11-libs/colord-gtk/Manifest
+++ b/x11-libs/colord-gtk/Manifest
@@ -1,4 +1,4 @@
 AUX colord-gtk-0.2.0-optional-introspection.patch 1471 BLAKE2B 3d4ce65f6241538fc4f8b6114c95ef229654093dabed26ebf1c66aabda2d5039749cce8580a4974c70afdd49e127b791a561a04202338c9b6512870804bce4db SHA512 a49618d773acb377c8015243ac6657e17b65e1f0f54228c391617118ae61199662a6d6398d5c5cd02ceb4cc74dc2b4cedf6488536fbe418768480285c5500773
 DIST colord-gtk-0.2.0.tar.xz 20480 BLAKE2B 73bbb349e84e5bfd28358cbe22609de84b86f90eb96a3fedc6e30a1764d9c667cd82408116cdf65591496ab4e2f59f2b415cd1aa8f995fe2162ee4d649c5d496 SHA512 797eebfd4451fcae4cf70835f5de3d9bdc9e8401ddb82a2fef2310002f28bf523b599c587ff35eb89ceff38a245a6311129ad90b107f837ac4f42f268c9aad97
-EBUILD colord-gtk-0.2.0.ebuild 1342 BLAKE2B 2e16b3335d5c913125630be0a3eed24eef278c333bcfdfa4b348d880634d9324291c73ddac1b7c0c11305502c3ca9641d02306fb249a68e8c5e6b68d74e0b710 SHA512 740e81dac17722912f243241ac1491af9a494a04198ad26b54a52c14c612e0f2e85bd6c7fbbe2a4582c8bab01575f1cd15ffb7576ef3c43a269eb3e689e218e3
+EBUILD colord-gtk-0.2.0.ebuild 1349 BLAKE2B dcffb41a0c1a73a35a1c507a5003006e2a229eb2172226e8f7b0ecd3aca7d47b4d871ca7a607ba3149af15dcf60a9dd3bc3bff5a20fafb6636c65a50ced0b030 SHA512 367aa2ec128152ec52e99724945dc1edef7c327b048fb7bc2dc976439456b9a144b84ff59d8c7d360a23106027f1d3d345f9b0022fe0a3e0a5896c2b7d0442a7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild b/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild
index 76e8886fef6c..4f7cfc86fec5 100644
--- a/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild
+++ b/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="0/1" # subslot = libcolord-gtk soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="doc +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 0d321b33d3ec..e2e6e9e201fc 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -8,7 +8,7 @@ DIST pango-1.48.8.tar.xz 2061300 BLAKE2B 0a7fc00e15ce5c0362c6d6e115c46037e8f92c1
 DIST pango-1.48.9.tar.xz 2063756 BLAKE2B d1610aaac783b95a35ad3e083b4bab33f3d4beff533386817addcb5eb9022de242087ffe4e62c043870b4aac1fbc0fe3e1c5d18744909a5a05015a702dfea2e3 SHA512 e3bba743bb596b0a34cedc893f9af0216bcc9fec521c2da09cfdeec9ad80a05b5c53c3fce1a225ab27536e9335725cffb87c66867d0522fd4632df00b1d4c056
 EBUILD pango-1.42.4-r2.ebuild 2310 BLAKE2B 6068b613ba19c35420774bfff3ff2f292d67430ca167246e8b7c4132f34f5165ad2e4f24df5080ce7c8f677f45d5e48ba555e04eefcb8c751243ed2354d2bf6a SHA512 5c05c5db53a1127119981966f9f144e95fa04c07dccde5df9341a24aef0479a6cddf3b0e7bae0f339f32737618efbd89f367d6f512ed0a01715008226ecc640a
 EBUILD pango-1.48.5-r1.ebuild 2140 BLAKE2B e53a8cab9f9de8c8e5828fbfe3784877ef4c416ee39a1780a49b0978c5f4a85ff21e2a53a3204c65a51458d25b143ce8361dc8323fa34167981066040cb982ab SHA512 ebadd72e5bfb7ed5fccc1da685d6b973c7931fcc076c6a466e49e8c41980e0a781f3ff42272b83b0b9db02224b9a30881fd2f0c484c9f0f163101f17e1b5b3c9
-EBUILD pango-1.48.7-r1.ebuild 2045 BLAKE2B b84a0812c4f72a3204e02ff8917d88c9666fad5f5d29bcd6f2bc06ebaf1bd4df5620984645d4d299fd46a32db73b92a31bd8e76d982f8182b68e117c7359dbd1 SHA512 1fa58098ce8fa6a8859e6f7a714b49686b36d4098993229b3447037ca65526ad527564cfa4119adcb1ed42c619efe73c307249abc8c0a3f724932fa6275fcb82
+EBUILD pango-1.48.7-r1.ebuild 2044 BLAKE2B f41c95cf047f668bd702cb1a22423b714093a6c19d5c43f9765d6db78adb7d94948a13bfbd7c4d055524afb17d23016d15c279d09e8e84c4a6114ccb4e5eec21 SHA512 c852bffff4a6801009fa576fd9ad3f3d675404135f8d836dbfadaa34b2508f70db820e1808621ab953cb727eb901da0c020066ee658eed80c286a23a7034dfed
 EBUILD pango-1.48.7.ebuild 2189 BLAKE2B 5039ee583f4d18dc93fe51f398e47ebf55acf617e320042cf8ed4ae431fd2b9829513a86e54125db65c3e6a384dabebe04e1c1a82ceb12cf0e3d372204f16573 SHA512 58bfe2f21bfb7a161a5cc3e0140313c0656f076f46aa5668b06b9537d754894abcd7a96438d2335ec070814853193b3e3e4b97e86a1a5f0628e097e16c29c4b4
 EBUILD pango-1.48.8.ebuild 2054 BLAKE2B 487470875c5a78508292841229e1600208c73dcf4bf10accbffeff3f7ff04e85c2cf3623d085af116e753efc172951b3b9c168996859c6253430a9ca1ab4c369 SHA512 1c87f5774542d295a7f5ef2d8fe3445654493ce426af739d0f823c03732021df5667195462f498daf670f908e23558f43cb7e81802fbaa7faf98a44dcdc290c9
 EBUILD pango-1.48.9.ebuild 2054 BLAKE2B 487470875c5a78508292841229e1600208c73dcf4bf10accbffeff3f7ff04e85c2cf3623d085af116e753efc172951b3b9c168996859c6253430a9ca1ab4c369 SHA512 1c87f5774542d295a7f5ef2d8fe3445654493ce426af739d0f823c03732021df5667195462f498daf670f908e23558f43cb7e81802fbaa7faf98a44dcdc290c9
diff --git a/x11-libs/pango/pango-1.48.7-r1.ebuild b/x11-libs/pango/pango-1.48.7-r1.ebuild
index 4f3edf6a571a..aef9e1d9db15 100644
--- a/x11-libs/pango/pango-1.48.7-r1.ebuild
+++ b/x11-libs/pango/pango-1.48.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 IUSE="debug +introspection sysprof X"
 
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 8d522a95b9ab..bb292ea68ce0 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/obmenu-generator/Manifest b/x11-misc/obmenu-generator/Manifest
index 2fecf1b875e7..554a0ead26e3 100644
--- a/x11-misc/obmenu-generator/Manifest
+++ b/x11-misc/obmenu-generator/Manifest
@@ -1,3 +1,5 @@
 DIST obmenu-generator-0.89.tar.gz 20583 BLAKE2B 0513713ed08fb47b212b07a8c8d1a2e496f6962f9940f6dc8e087043276b3d80a5c305fbebbc0c0a39c9c75058bf363adb4c8739f51ff08258e63b1305a320fd SHA512 a796b1a2c6a3080627129360cc67695b73ee7ce82a4e4e879b306fe45f73d9223c8a08d053e7c9c9e8fbb779c3ebad15737b81ec4dfb9a406d77ac74cecddde0
+DIST obmenu-generator-0.90.tar.gz 20649 BLAKE2B 073b93ac427ac20ba236746bf8072988afaa293065b056ec02701cdf1bca68bbadfcdf22cccb093e73788b38ede4a386ea481705a6c7f4926060115405267cc0 SHA512 871be843273e51ce66c87bba5c17f50c1c67920c116663f7314b011fe55d4466acdc929b7b3a0a1fa2673b351685c9e801626b33b903cb55d48af89cf4a40bfc
 EBUILD obmenu-generator-0.89.ebuild 818 BLAKE2B 9de2e9252661959a6adf708abb596158b014095581ee176c2bfcdf0dd6ce46c6a2787c2ef4cbd256a704d3917a1b6202707f9813f7aced7fd6a9d7a5b7d4d86c SHA512 d4d09778082141e3c9268fdae6aaa012a5a4b7d8e9adaa06e9e0e67c4baef074b398f05c46511a3c1afb2fe630d56733889aeaab6dca7b2ef99ff48ed2512bcf
+EBUILD obmenu-generator-0.90.ebuild 820 BLAKE2B 84912dbfeebbb6c023dbb3093d1b16ca3b6595ad12bce1b4ff537478c7e9960232d2911cd68f64523fcadd0a4174c79807f03ea866f60dfbb6876ee2ebc6ff6e SHA512 ccb1c87b299ee8200183c4bd5d1354a55d6507d42af80908aaa0dea2de8041895c6982219919e8d655fbe92397b4cb202bfb7121f1bffbec46b46073056e07bf
 MISC metadata.xml 445 BLAKE2B 6f47ae8ef7c079b03a0e8769bcf6ea35b0743dfb8f94f7ee99eba54f0dd1e66ac12a1d9198ffa246601965d02a0260ef667c4b48bac243fa1c82afe0e094be1d SHA512 8cf342329f67576b238d72043cc6485628f78874ee2a0ec54c0cba8e99ed5eeb0348c75396f035c82f6d3dbb501e338d090cca8bacd0a9c8ac969cf9e4de9d67
diff --git a/x11-misc/obmenu-generator/obmenu-generator-0.90.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.90.ebuild
new file mode 100644
index 000000000000..e3b74f93bace
--- /dev/null
+++ b/x11-misc/obmenu-generator/obmenu-generator-0.90.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature
+
+DESCRIPTION="A fast pipe/static menu generator for the Openbox Window Manager"
+HOMEPAGE="https://github.com/trizen/obmenu-generator"
+SRC_URI="https://github.com/trizen/obmenu-generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl[gdbm]
+	dev-perl/Data-Dump
+	>=dev-perl/Linux-DesktopFiles-0.90.0
+	x11-wm/openbox
+"
+
+src_install() {
+	dobin ${PN}
+
+	insinto /etc/xdg/obmenu-generator
+	doins schema.pl
+
+	dodoc README.md
+}
+
+pkg_postinst() {
+	optfeature_header "For icon (-i) functionality, install:"
+	optfeature "support via gtk+:2 (enabled via config)" dev-perl/Gtk2
+	optfeature "support via gtk+:3 (default)" dev-perl/Gtk3
+}
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index a1d55eef1bf4..64f5086e2c15 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -5,9 +5,10 @@ AUX sddm-0.18.0-Xsession.patch 606 BLAKE2B 0af5d0d6b8da47ead31b14ee6e21dc05e1737
 AUX sddm-0.18.0-sddmconfdir.patch 1894 BLAKE2B aef497f08bd11c4fa4fdfe584b73b69192b875fde9050dbb39d6a0b1924759fedd5c50ed4fa54316f5cc9bb25c667c96eaaabce60d2acd826a4fb0bda2bb7495 SHA512 ebfb026ffca4f450005ecdc64c816720b0714ffcec7c03316148c7835919f01bb47c4c6e5041fcdbb271b70b38de99d74d959fd94b6c30b415159035b0d2b784
 AUX sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch 6561 BLAKE2B 33919c3913fae2eb1e7277647a38567c70ee0fd4ca5c93de6d7597d6c216c9c1802e79a5f281821f8eac4a99d73d2fa8712471b2dff8ed50ec17004ae7d8b67a SHA512 4d2bbdb301e54aaa8673b8765ee2e63d105e8dd2199f636a523b2ef46a6123e8b5194fa778390d4ba8ac3b6970cb4fb3bafc9ee8e20335fbf9284517ea5d36c5
 AUX sddm-0.18.1-only-reuse-online-sessions.patch 1201 BLAKE2B cf1947f88fa1223c78bfd5c7d37884e7b9b80349f531d4593a0d1a59f4dfe2ed068abe5f2f0fe53b3d112826230ac9c481ce1db38661ece2ee93b1d0aeadba94 SHA512 62975ad657e46a6dc0157bcf749df1e165cd9f65fefa794d674aa7c2dc84e978d1e98bd2c5dad19a30a3e258d65155c9b93e89e12d32aaf80d0ba8b1e5cc594f
+AUX sddm-0.18.1-qt-5.15.2.patch 865 BLAKE2B 1198a2a7b9cd0b46648eddd3eddca444d502c01baf7fd686bd52489acefa8bb3cc53e20b1d8f154aec56f88f53b653c605f8b4905cd7bb445c37ad7bdd091369 SHA512 aae777ca15df43d7c5bfb7f15e2ede4632d598e05d565338880f644e0e8ed9f00e83c33128a85db8db01d4a22cf85ee4dd6fd2c66196c7093afcc9d5c18bade2
 AUX sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch 3616 BLAKE2B 71a4c6f592214160ff993e86582bf5f550be204193668f5bab7786db88ae9a1a09ee268beb3e3157c1b033e765053ba415f3d291f299b09606aa566c9c197370 SHA512 b33b26517173262194bdc98e63b84fbb1f03005abc3c079332dd9b275167d8ddc680ba5c2a9968be5c54963b64f291aab65ad9f04b9f3f69299d030753cd90f5
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
 EBUILD sddm-0.15.0-r2.ebuild 1477 BLAKE2B d9117fb9826beed879b15947f1830c5731fb192651f4e8d68984af87db5008a09c6e877605b13f88e8157477e4282007311106302f1c1574968ac8859b5f0908 SHA512 2864550f8a62a281f8211d93d5ccb1765b328323db83d13223626610122f6d36407508af55f35dcd834a915278c36da2c50270236e5f18fa052b4862218ab1a7
-EBUILD sddm-0.18.1-r5.ebuild 3134 BLAKE2B 0a19f7b1e791b1b698408e5b49e6b4a3b92d0d4607c018bc29db8de2846b58c2e7cf6959421954f3eca14b4f889d73164fd1d88d6af15a8f027da902afd3dbc7 SHA512 68c68efc0d77762f0100c6d0a2f5695706bb9e5329b4286aa2f466de503b02a354f5dcc753d277228efa9c598c1be8ee4abae3a376e1aa997375e075a113dc29
+EBUILD sddm-0.18.1-r5.ebuild 3202 BLAKE2B 8cf57535cca22b139e77581ac6fddb174331414c39fee01c3efe6b9d3b935021895eafcea20aa53d9e9c87622f87aabb96a43255a61de48f0940873ae44b68a1 SHA512 a9d7a4ccb051171caf58e245bc3de0f7ee67134e107d2ad6d05e8aa06535126e6fa85143903fd72e76091689dbb6f5f2bbcf0b1a8649f4d6766ec36f94bae58d
 MISC metadata.xml 818 BLAKE2B 2be9c3e50193b2c6117a5447ecc9e718d74a44997f8cbeea66905115ced465ea371cf596b5b366cbc4ebb46ecb41015668b96e44e23e7b3dba583e388e78b85a SHA512 c6910844830c10a5602afa3269ffd8eeb4a1a0b2ae345fea5ca0de11f3856cbbcec86cc95930070274d8e5025b4111f1ec0c7af1721c7ed71ce5ebc428adc0d7
diff --git a/x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch b/x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch
new file mode 100644
index 000000000000..7179d14e4c1e
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch
@@ -0,0 +1,23 @@
+From e93bf95c54ad8c2a1604f8d7be05339164b19308 Mon Sep 17 00:00:00 2001
+From: "aacid@kde.org" <aacid@kde.org>
+Date: Thu, 12 Nov 2020 23:42:48 +0100
+Subject: [PATCH] Fix compilation once QTBUG-88431 gets fixed
+
+And also comes closes to Qt6 compatibility
+---
+ src/daemon/XorgDisplayServer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
+index 5f93a1b3..d5f29a94 100644
+--- a/src/daemon/XorgDisplayServer.cpp
++++ b/src/daemon/XorgDisplayServer.cpp
+@@ -65,7 +65,7 @@ namespace SDDM {
+         // create a random hexadecimal number
+         const char *digits = "0123456789abcdef";
+         for (int i = 0; i < 32; ++i)
+-            m_cookie[i] = digits[dis(gen)];
++            m_cookie[i] = QLatin1Char(digits[dis(gen)]);
+     }
+ 
+     XorgDisplayServer::~XorgDisplayServer() {
diff --git a/x11-misc/sddm/sddm-0.18.1-r5.ebuild b/x11-misc/sddm/sddm-0.18.1-r5.ebuild
index 8f888089fe3c..20b127562993 100644
--- a/x11-misc/sddm/sddm-0.18.1-r5.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r5.ebuild
@@ -54,6 +54,8 @@ PATCHES=(
 	# TODO: fix properly
 	"${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
 	"${FILESDIR}/pam-1.4-substack.patch"
+	# upstream git develop branch:
+	"${FILESDIR}/${P}-qt-5.15.2.patch"
 )
 
 src_prepare() {
diff --git a/x11-misc/unclutter-xfixes/Manifest b/x11-misc/unclutter-xfixes/Manifest
index 42ff2b74e2a7..dc471d886c3f 100644
--- a/x11-misc/unclutter-xfixes/Manifest
+++ b/x11-misc/unclutter-xfixes/Manifest
@@ -1,3 +1,5 @@
 DIST unclutter-xfixes-1.5.tar.gz 7998 BLAKE2B 3eb6e259d85ca85eac3776fe1f4ff57dd3f2a8573f478880d174b3fb75ba23e54281e12b9d62243501539dee4225d3c64c5bf32a3c6aa1549f729ebd617ab5aa SHA512 0b8823d5ab64193f7e5fe03ceecbe0f475bbe36f78c4a0295705a80e9df1e5a8c4f65eb749b55e5b8b06aa3248e4f2fc1daac1b14b84aab157bdfbff39bba095
+DIST unclutter-xfixes-1.6.tar.gz 8965 BLAKE2B f0975c2fdf1409acf85cb44faf5d0e34a23bb934f8715fb19c9c67a2218f0f1ca85fd83b1a180be2d2362c2547ec040c4494247c63f5bb0bf74da9e779206aaf SHA512 aebcd85d0474471a3cd4a4e190692cf2fe91e47da1057b46e33ee79e5c47e3a488f4ac264530df71a0fbebeb679e0da33bafa19a29c73acd0ae62d0edf8acead
 EBUILD unclutter-xfixes-1.5-r2.ebuild 727 BLAKE2B 3088ec27606defbe47ec80e8beb5baa2f79e1099eff3059f3542203bb3478edd892f1422adb51a28b735d30195e6c432cfb449d47d419ce48dfb347025d92966 SHA512 30f102c84a2b7b5ea2f0e41093e82ce435c89b90c5428f8b4d7a826f3419ceec2816fd727580fe9c6f5d9551d4ab039cf1a8150fa8bf343cfdd547f4c9d12be0
+EBUILD unclutter-xfixes-1.6.ebuild 761 BLAKE2B d82fa6ddd0ecd182970ef0ae960aa2e299a51637938441c4ec458afa258a93cf28b7f9073837b6a999b2dcf5ddd986612e1bf2eaaea59ed1df3a7e1fb7f3fb0b SHA512 85313f6cee9e0cb5d5b705f60f0a7c59578c3025dcf27a1b789fcd26404e005a5bb18c55a77ac05fd5909e29bededd6dbef8d5cf8ab50140827cb2ac9dd78703
 MISC metadata.xml 336 BLAKE2B f6aeaa90ce878d78131f3ed04692eae6d49c77885ceb09b1ecab2a3684978eb194ba3dd5ba17fe43e8d618685206467be6c1eb6a4a152bd68450d9c7badc39bf SHA512 e66195b0b713c0eb9c165205c43c331fed9ec7fdf48fc47cd6e5e45e5199c153872ee8816ab0fb1fee8331328d15616f7b51fa57b2e79e371fff311d10cbbe84
diff --git a/x11-misc/unclutter-xfixes/unclutter-xfixes-1.6.ebuild b/x11-misc/unclutter-xfixes/unclutter-xfixes-1.6.ebuild
new file mode 100644
index 000000000000..72b8c10b9675
--- /dev/null
+++ b/x11-misc/unclutter-xfixes/unclutter-xfixes-1.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Hides mouse pointer while not in use (rewrite of unclutter)"
+HOMEPAGE="https://github.com/Airblader/unclutter-xfixes"
+SRC_URI="https://github.com/Airblader/unclutter-xfixes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libev
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXi
+	!x11-misc/unclutter"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	app-text/asciidoc
+	virtual/pkgconfig"
+
+src_compile() {
+	emake CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	dobin unclutter
+	newman man/${PN}.1 unclutter.1
+	einstalldocs
+}
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index bf89862c667c..88a4923a669a 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1,6 +1,6 @@
-DIST xwallpaper-0.7.1.tar.xz 86260 BLAKE2B b8327b15bc421275660cc81d14e4952b37a1310fd50eea61b772115e2c345c01cae9c4f908d9ca55427e642b10bea7277af02e1d3525db6c1d6e80a356db1b2b SHA512 706f814ee892f9d136ef20bb3c9bb4b8537e3ed7029b3b20fbebb1504426529d2fa6a45117a391419253543a48230f5786ffa3f871f85477699c08dfa3ba5c92
 DIST xwallpaper-0.7.2.tar.xz 86212 BLAKE2B 1958ad8eb3f80f2cccdd969230e32986e7d144bf820a4c820a93d0bfdbcaa5512f08eb4014a8b57edb40f1ed55ce54080835c2d2dd46205c399b2ea6adcf1df1 SHA512 2b7166b719edae0d21460682d6c8991739d1a753078920bccb253f905300c694cb6fb12695456be58707d895f8adacd6007023c8e1abd23a0e369e9e80e5106e
-EBUILD xwallpaper-0.7.1.ebuild 970 BLAKE2B f67defaa9be6474d998299b8e052e2682e0849434bd25ccb348b22250357e3e8406cbd4b3a5ca4c852d782357e88220143cd5e8720d1e65db342d899e32ea28d SHA512 0f44b45d7f56fc62a291a98727091c316555d560e4b6ddb686ac72aa9dc113c50e9bbdbafb037837fb28e4e1bc07040b293963b14a9a4dee34565905609f626f
+DIST xwallpaper-0.7.3.tar.xz 86388 BLAKE2B 45942dbe7e3627fbbf99ac5ab94c88ecea919e48131f268f0be10a0fba15a4feddf207c0787ac47f75bc6a5cc94f2b78d599e97950609196930a73073ae21ec1 SHA512 7fa9cc9ca2445afdfcb647724a6dc8bb3b52b9a6c91d237f6b443cf1fe6624c67d16d611bf4e435c5f3dcdae6cbf73bbde257a4e194bc127dc13dca1f8067c19
 EBUILD xwallpaper-0.7.2.ebuild 972 BLAKE2B b4311d7453e1e242967db28ac436806dea2bc2fa75cf6964264635a4f4bfc3d5dc757639c767c5b1a68d3f4efe195946220f583cdd724069e81cef1fccc91381 SHA512 3b9d7c425c81ee841e0c17d463d4b1e52ff9bee238c65ca2d39ffa8ac4686d45d437425050cb4e4fd2115680ee16c0aa6935ce046b506b566cd3f73472c3ce7c
+EBUILD xwallpaper-0.7.3.ebuild 976 BLAKE2B c68ae52bc82362e6d77a0243e82241a137dbcad52591196f2d44d3e9a434459b67c956d8177ec8f60a4cf6e46936ab705c1250627b132c037a42b07471cd8a3c SHA512 3a818859908b0c37b68cfa9b4f4621fdac43ec6466b2dc0b8c9903fdb6661b5eff65ea6cd371c3528b05acb429a5706ec18319024965be4241774dc44062a0e2
 EBUILD xwallpaper-9999.ebuild 967 BLAKE2B 015785bb4227a1269a03488df74bf4258cf6e39d621be80bf8b0c11d22dd863f9c1f9034dbf08b41717cd4a5b445cd6bd3cc22e987ccb0b7e859ca5376748e5d SHA512 ce4fb8f6f20922422e2f7ff1a5537f3f03f9664db850461e411b3a5f4e89e60c4cfc7e848f12d6f574dd5b7f12f3849c78b6ae56c23989a10d8cf444c34f4b37
 MISC metadata.xml 804 BLAKE2B db3ea33826679dd19ae2631256fb9570b190fed70efd5084059cd7b23d620f632e654658062ddb1d92ec1ac31a67285c2610282e2c5d0af0806e4c1b554dada2 SHA512 ecd6a763905744ab6a8aae1772027401810e0d18e806147a0bec305722a2a4dae39cc9fa5e400db6933b636ec9787b80fd0f1b0e2c0eaa4f5c87d2e3f4cb4991
diff --git a/x11-misc/xwallpaper/xwallpaper-0.7.1.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.1.ebuild
deleted file mode 100644
index 65b6db83de5c..000000000000
--- a/x11-misc/xwallpaper/xwallpaper-0.7.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Wallpaper setting utility for X"
-HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
-else
-	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ppc64 x86"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-IUSE="jpeg png seccomp xpm"
-
-RDEPEND="
-	x11-libs/pixman
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	png? ( media-libs/libpng:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
-	xpm? ( x11-libs/libXpm )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with seccomp)
-		$(use_with xpm)
-		--with-randr
-	)
-	econf "${myconf[@]}"
-}
diff --git a/x11-misc/xwallpaper/xwallpaper-0.7.3.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.3.ebuild
new file mode 100644
index 000000000000..548fe3496699
--- /dev/null
+++ b/x11-misc/xwallpaper/xwallpaper-0.7.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Wallpaper setting utility for X"
+HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
+else
+	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="+jpeg +png seccomp xpm"
+
+RDEPEND="
+	x11-libs/pixman
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( media-libs/libpng:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+	xpm? ( x11-libs/libXpm )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with seccomp)
+		$(use_with xpm)
+		--with-randr
+	)
+	econf "${myconf[@]}"
+}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 6f1627d5c040..d9bfe90cb196 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
index 19ff27495dcf..0381d5513dae 100644
--- a/x11-plugins/pidgin-telegram/Manifest
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -1,5 +1,3 @@
-DIST telegram-purple_1.4.6.orig.tar.gz 497757 BLAKE2B 1f666aaf4ef1913420cf735e3d85e1d91be8a2f07932785d55bc0be37e2cd8cabaf6b0be2b520afafc6636a692086be180d3bd4438215f8b14ae867da9891e18 SHA512 bf3e14a2d1dec7382833011ea891ba5bce81820766b3d6adee582bf0257baadeb7aa7eab7aa6e20adf8dd7728eb653db35b1d8f56bfffe7a92f9bf7506401e6e
 DIST telegram-purple_1.4.7.orig.tar.gz 498573 BLAKE2B 37f741f1e2106db55eaadab70e2bf226609ebd85fa3df28a60b686e207c341f7279ea36ef87137d465b5bedac63e6ec0388714171dd5a594fb28ae02f66bebc4 SHA512 ae3032b33bd2a20b58b2d66c83fbc405f43c38c0e93b00394ad3165b0bc5d5aba02a8e1946872e4bd082894679737fa20f3e1991e9bb16c3c3aba4c7abbbf7d8
-EBUILD pidgin-telegram-1.4.6.ebuild 1125 BLAKE2B 64491aa941b08a2160d497225b07d1fede1657995a6ff625f6072de0706ce19ee3ce6ed99e51f1830ed3fff5c7c1296c3bc5e8e33517ba4c4dc126ac4660a24f SHA512 31d2b45f61c0eb9038321650263780d5b1c8108aef7c75c66812eed87606966ab1eaa29ee032b676aeb43f4ea009ef1753ddbf061165e2ed58b21dca1b241822
-EBUILD pidgin-telegram-1.4.7.ebuild 1127 BLAKE2B beb36d76a67dfae6d6af348f31fd2fe8326bb0e4d7c147b804cebcb6ff9de0e503d820603b0dddcf5fb5711b9d74f896e530ad9e11846ea62121a46e5bf41768 SHA512 31cd4b48505938ea495a69ed6004ab750359b16345eb759ab81c8112586a81993b9d1cd3ca41a3b573aa0985069d4052ff23577c093ca5758a037d4e674ad05d
+EBUILD pidgin-telegram-1.4.7.ebuild 1125 BLAKE2B 64491aa941b08a2160d497225b07d1fede1657995a6ff625f6072de0706ce19ee3ce6ed99e51f1830ed3fff5c7c1296c3bc5e8e33517ba4c4dc126ac4660a24f SHA512 31d2b45f61c0eb9038321650263780d5b1c8108aef7c75c66812eed87606966ab1eaa29ee032b676aeb43f4ea009ef1753ddbf061165e2ed58b21dca1b241822
 MISC metadata.xml 722 BLAKE2B fb8498a592b6da08fda5cb1961fd84ea2a4e839233719330625166f487f2d01e8000860d2383488ea1c377105f8d74aae928871f349ed08efda1dd7c0420db10 SHA512 6b7e5121c5662de9943b7b7d30e6acf6c2df04b5c9d19b3ce942b6e403e62023f1a07076c4023d899ccb97f7fd2a29b331f9bf76391cb5db1c477d5bfce088c8
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.6.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.6.ebuild
deleted file mode 100644
index 7dac50fdb5bd..000000000000
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A libpurple protocol plugin that adds support for the Telegram messenger"
-HOMEPAGE="https://github.com/majn/telegram-purple"
-SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegram-purple_${PV}.orig.tar.gz"
-S="${WORKDIR}/telegram-purple"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="gcrypt +nls +png +webp"
-
-RDEPEND="
-	net-im/pidgin
-	sys-libs/zlib:=
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	!gcrypt? ( dev-libs/openssl:0= )
-	png? ( media-libs/libpng:0= )
-	webp? ( media-libs/libwebp:= )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "CHANGELOG.md" "HACKING.md" "HACKING.BUILD.md" "README.md" )
-
-src_prepare() {
-	default
-
-	# Remove '-Werror' to make it compile
-	find -name 'Makefile*' -exec sed -i -e 's/-Werror //' {} + || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable gcrypt)
-		$(use_enable nls translation)
-		$(use_enable png libpng)
-		$(use_enable webp libwebp)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.7.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.7.ebuild
index 5cb4ffba69c3..7dac50fdb5bd 100644
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.7.ebuild
+++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegr
 S="${WORKDIR}/telegram-purple"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE="gcrypt +nls +png +webp"
 
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 9e71adccca7b..e316203f2497 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/adwaita-qt/Manifest b/x11-themes/adwaita-qt/Manifest
index 2e17d0f8e39f..38ed0cddd229 100644
--- a/x11-themes/adwaita-qt/Manifest
+++ b/x11-themes/adwaita-qt/Manifest
@@ -1,5 +1,5 @@
-DIST adwaita-qt-1.2.1.tar.gz 438614 BLAKE2B 783372158d67e51cf869b3f4c0732735c68ccf6d43ce354de41609878e582509becd97348c749c1e3b4ef1c73a5b1acda1dd3251d8d567a720d0b8286d154fb6 SHA512 a4482d9ae8e9f1ae4f6baa411d68f5f7b2ccafd157635c5e142723414f28bd0a5b3331d3ba16e17404159d410fff029b779447e8832d69c020a1fa1d40d926da
 DIST adwaita-qt-1.3.1.tar.gz 438788 BLAKE2B 8c5585f51eeca86225f9162d47e6d7bee6e912120af0a692a85417b9d7c95b32a08e9329e3a60190148832cceeb154fcca932dafc84b4e9d26ced3a661c3eca4 SHA512 2f6f0e76a7ea35151ea6a2c7f6d8f4714b738935bfecf10be9abb243bee6f297bbe7a31593ca2a17eea1767b26d4d420aadb5ba2c4c11792169579eab4bdd439
-EBUILD adwaita-qt-1.2.1.ebuild 581 BLAKE2B a2ca77941bc43e72c247fe5f18ebb555acd3e789c1de38b2278f72f8dc88086ebfe0eaf21613a0f29c3e0a387e752869c1ddaefddeb497b5be350b89e805763b SHA512 72e5376fcd755fb99c32cc7932151802e84dfe510e39a5a33de7ae21c8b141b07a8d8e78f515a51e0966f61c63f8c152faf30d772655170f0beca28c9ee9cb8d
+DIST adwaita-qt-1.4.0.tar.gz 1543503 BLAKE2B 2fa9d6fe0736ce0e922f030db21c4e78b303758ea0cd55db48ddc5155ce9443f0460e2c7ed1314e0e8113d018377c422f2ca7df05f78b270c928a92a62b97fc1 SHA512 870076ec219fcaa8d5e24df5076b0dfe147ad2ba4562bccdced03cb0539a49590a59aee8bb029926b36e50d619906974ca70528f835ddc9067e14cdfb0648671
 EBUILD adwaita-qt-1.3.1.ebuild 581 BLAKE2B a2ca77941bc43e72c247fe5f18ebb555acd3e789c1de38b2278f72f8dc88086ebfe0eaf21613a0f29c3e0a387e752869c1ddaefddeb497b5be350b89e805763b SHA512 72e5376fcd755fb99c32cc7932151802e84dfe510e39a5a33de7ae21c8b141b07a8d8e78f515a51e0966f61c63f8c152faf30d772655170f0beca28c9ee9cb8d
+EBUILD adwaita-qt-1.4.0.ebuild 583 BLAKE2B 31ef4fadf0887d5926585b11731d65b9048c064c043d9c451e871f44c6459fbc5340bc472fc409002ed52bfef2c99d7a8a1c1128dcca002cce1e0d74fc0131d4 SHA512 237f0c254619affb7d7c778483e085a5b9a2b0d00bd51520a7049673dfaf0038d427fc0122d112741950cd53fd68fd353520af0a0ab2a9284f1e8e560575564f
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/x11-themes/adwaita-qt/adwaita-qt-1.2.1.ebuild b/x11-themes/adwaita-qt/adwaita-qt-1.2.1.ebuild
deleted file mode 100644
index c8407ccd926e..000000000000
--- a/x11-themes/adwaita-qt/adwaita-qt-1.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A style to bend Qt applications to look like they belong into GNOME Shell"
-HOMEPAGE="https://github.com/FedoraQt/adwaita-qt"
-SRC_URI="https://github.com/FedoraQt/${PN}/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="gnome"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-"
-RDEPEND="${DEPEND}"
-PDEPEND="gnome? ( x11-themes/QGnomePlatform )"
diff --git a/x11-themes/adwaita-qt/adwaita-qt-1.4.0.ebuild b/x11-themes/adwaita-qt/adwaita-qt-1.4.0.ebuild
new file mode 100644
index 000000000000..008c282fd64b
--- /dev/null
+++ b/x11-themes/adwaita-qt/adwaita-qt-1.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A style to bend Qt applications to look like they belong into GNOME Shell"
+HOMEPAGE="https://github.com/FedoraQt/adwaita-qt"
+SRC_URI="https://github.com/FedoraQt/${PN}/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="gnome"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+"
+RDEPEND="${DEPEND}"
+PDEPEND="gnome? ( x11-themes/QGnomePlatform )"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 30e8a6140799..ff90afbc5c7b 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 48a0f09a9bec..52ba2d85cd76 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,4 +1,3 @@
 DIST enlightenment-0.24.2.tar.xz 28716060 BLAKE2B 432722693beaece97eeb318a1120b6101bf76e1536347b824b00ba4378326c093f3333eefa634d7266a59c09dc4337c8bd1f9a4d89e0a4c9a223fdcacd924fa0 SHA512 5d96b17d89e822271048a0a6a8356658fd02680f54da2f15dde7c632752bbf0a396eaf23986164402e61f631e68937b3ba7c29d9dd787ddd470cff4a390abace
-EBUILD enlightenment-0.24.2-r1.ebuild 2982 BLAKE2B 4e5ddbbcd92bf0e4ab29e8337b8a0686f33a0ca060b1ff7be3a191a5331e2c11b327c2ede50e697d923ad194c91a205f32abd611b70e98f708cc0b926021f293 SHA512 3e30b91593ded6cf418c53e82c440966add60b0a5a751dc7061968f18a387112161933f1f3099e765e7f0fd2407fc6f4cb0380c4590d5a31633b5f1d7a5e4186
 EBUILD enlightenment-0.24.2-r2.ebuild 2977 BLAKE2B 6fac2c8f2a382bba4295237addcc95f87de65da9144b9b2c69743d8c4a89335c938e65256938fcc5f95c0a93d942e4be9b896a87cd2c7e045f8bcdc95e240962 SHA512 8192a1b4fe8f0f9d6ca888dbe9802861185698638c680ebe36d7eba6ce211d52e8c6436e97342958e6ddca998e8468c86867984b71c2382ec137cbe7d5048bb1
 MISC metadata.xml 721 BLAKE2B 85587a677b7e22cd1dbfe187c367574ccef7ad88a1bdde00acecc9fc5f62d48adb9e14c2086953287efc728cc616d6d286fde1b659a44404086fef5e6bde90b1 SHA512 6d22a2f8639b3b75fd1113c0b381edc2869d91e5d3d04d6c67c845c15fae9ba0e370918e30b45e89e91c695f873f1d0ef5966f7720ab5e9cd270c6254c792dc5
diff --git a/x11-wm/enlightenment/enlightenment-0.24.2-r1.ebuild b/x11-wm/enlightenment/enlightenment-0.24.2-r1.ebuild
deleted file mode 100644
index 1d2cd069eae8..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.24.2-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson optfeature xdg-utils
-
-DESCRIPTION="Enlightenment window manager"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0.17/${PV%%_*}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="acpi bluetooth connman doc geolocation nls pam policykit systemd udisks wayland wifi xwayland"
-
-REQUIRED_USE="xwayland? ( wayland )"
-
-RDEPEND=">=dev-libs/efl-1.24.1[eet,fontconfig,X]
-	virtual/udev
-	x11-libs/libXext
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	x11-misc/xkeyboard-config
-	acpi? ( sys-power/acpid )
-	bluetooth? ( net-wireless/bluez )
-	connman? ( dev-libs/efl[connman] )
-	geolocation? ( app-misc/geoclue:2.0 )
-	pam? ( sys-libs/pam )
-	policykit? ( sys-auth/polkit )
-	systemd? ( sys-apps/systemd )
-	udisks? ( sys-fs/udisks:2 )
-	wayland? (
-		|| (
-			dev-libs/efl[systemd]
-			dev-libs/efl[elogind]
-		)
-		dev-libs/efl[drm,wayland]
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-		x11-libs/pixman
-	)
-	xwayland? (
-		dev-libs/efl[X,wayland]
-		x11-base/xorg-server[wayland]
-	)"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local emesonargs=(
-		-D device-udev=true
-		-D install-enlightenment-menu=true
-
-		-D install-sysactions=true
-		-D install-system=true
-		-D mount-eeze=false
-
-		-D packagekit=false
-
-		$(meson_use udisks mount-udisks)
-		$(meson_use bluetooth bluez5)
-		$(meson_use connman)
-		$(meson_use geolocation)
-		$(meson_use nls)
-		$(meson_use pam)
-		$(meson_use policykit polkit)
-		$(meson_use systemd)
-		$(meson_use wayland wl)
-		$(meson_use wifi wireless)
-		$(meson_use xwayland)
-	)
-
-	if ! use wayland; then
-		emesonargs+=(
-			-D wl-buffer=false
-			-D wl-desktop-shell=false
-			-D wl-drm=false
-			-D wl-text-input=false
-			-D wl-weekeyboard=false
-			-D wl-wl=false
-			-D wl-x11=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/. )
-	meson_src_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-
-	optfeature_header "Additional programs to complement the full EFL suite:"
-	optfeature "efl-based pinentry interface" app-crypt/pinentry[efl]
-	optfeature "better monitor backlight and brightness controls" app-misc/ddcutil
-	optfeature "office file thumbnails" app-office/libreoffice app-office/libreoffice-bin
-	optfeature "an EFL-based IDE" dev-util/edi
-	optfeature "image viewer" media-gfx/ephoto
-	optfeature "ConnMan user interface for Enlightenment" net-misc/econnman
-	optfeature "system and process monitor" sys-process/evisum
-	optfeature "feature rich terminal emulator" x11-terms/terminology
-	optfeature "a modern flat enlightenment WM theme" x11-themes/e-flat-theme
-	optfeature "a matching GTK theme" x11-themes/e-gtk-theme
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-08-26 00:09:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-08-26 00:09:36 +0100
commit	b1c81de4fadbd00897700a7321f03b390d952b2e (patch)
tree	e6cc812351d4f105c110cfc363ebb497e996f47a
parent	7c59acba5699c9c58090a7a738669669a7307023 (diff)