diff --git a/Manifest.files.gz b/Manifest.files.gz
index 647825b6a685..46cad34ad743 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 10ba796ef39b..9cb7932c77e4 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index cf9eae40cbde..963ab4de3217 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -8,4 +8,5 @@ DIST awscli-1.22.31.tar.gz 2134102 BLAKE2B e1918352146b3176c8fc60cc6338a69b04a28
 DIST awscli-1.22.32.tar.gz 2135177 BLAKE2B 1e99a887e3b90c8fa81547677b4827f50afdad26136a02f225c66702f2f705ee140616cb3ebf407fc4c9bfd242df5cdefe35cf582c565ce1715fde229246173d SHA512 2df81763fbd2314fffe392b35e61f55451063d440a9aa8a62e36977faa49b808d2c0db9bed71c1d73696e53797d8f8f689942e9dd4636a4b6aec3e8f1f16297c
 DIST awscli-1.22.33.tar.gz 2146397 BLAKE2B d78f92b077141d7204b2e3c7b2eda589e4430f633c469eefa10f59e2b801d67fc833dcffd55efed379136ea050dfe03f72ef3061e1e3e98a372e61d44f0879cd SHA512 a3474eace16aa90017d985d6f9fc4d927ed27e727bb2e4bbfeda48f0be7d63c9d3648e95904252739a2a94a5d5822c855e2b6b840dad3b6c88da273ec92c9bb7
 DIST awscli-1.22.34.tar.gz 2146588 BLAKE2B 794fc2b579126e9c37eaca6aeb8f750cf91769e05ef7222b579e286ef6248d05d49e372abb5af63e1827f804127bfbd78cfe767b715a7f907e26e9c0af6f08a2 SHA512 5fc5f4f929fb64b494422db794cbd4dd2e8adf3d0a3436bc2368a2e9d036bac42e29beab13ee5f00c46b97bc875dbb3f1a7af684006a9dd96be7fcc61ff282fc
+DIST awscli-1.22.35.tar.gz 2147435 BLAKE2B 24fdb6d273dfeddeb7ef8adb15fad843a25edae0cc6dfd37465c294421de6cda0c0c0d49c931f5c2b28ac337d44c3be63f6fd15e7ce84ed493baa0a5c5aa8cc7 SHA512 64f297981987f8f6ab75c43f645624f1794b411f82885e3784c3dd55da0e0ed98ab6395edea7319cbc2c7a320451a6722bd558431a3acb1b7aaf94c2521b4c2d
 DIST awscli-1.22.5.tar.gz 2111679 BLAKE2B 970e472e8de43664d060023fdab9f54ce848c5655d8aa417efeae1b1efb52989fd021817521db9dc9cd64580cabbf0c30f3d0178034bdb1edf41feebbc690f46 SHA512 9177fe9da0fb8e9e28777bbf8f2c3fe089a08851b57a49fecefab43417fff187584638d17394289bf6df3d18d9052fd958bd3fbc8064327120af04a0cbe30494
diff --git a/app-admin/awscli/awscli-1.22.35.ebuild b/app-admin/awscli/awscli-1.22.35.ebuild
new file mode 100644
index 000000000000..5327b8227ea2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.35.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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}]
+"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+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/monit/monit-5.29.0.ebuild b/app-admin/monit/monit-5.29.0.ebuild
index 8c6bc6cb5fe1..d388c1122d50 100644
--- a/app-admin/monit/monit-5.29.0.ebuild
+++ b/app-admin/monit/monit-5.29.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux"
 IUSE="ipv6 pam ssl"
 
 RDEPEND="sys-libs/zlib:=
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 0c5bfe82388b..9c62908a5d8f 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/glean/Manifest b/app-emulation/glean/Manifest
index db2a974a4e34..2216109b949f 100644
--- a/app-emulation/glean/Manifest
+++ b/app-emulation/glean/Manifest
@@ -1 +1,2 @@
 DIST glean-1.18.2.tar.gz 67642 BLAKE2B b346fc63b361e7c7bf0b8fc100da4a047004950aff3e17fce96d47ae5a7887828a09f4b107f2af1afcf9d866e5bc0857049ddd2d9c49413e9fe4b61d1de99fd3 SHA512 de80c06952ebbbc24c8cf198f61be788fb32974652c8253787ed5a165e26bb162b48c84836779420bb7c331edeb50a7796f5a2ff578d2e612068c5fbadd343c7
+DIST glean-1.19.0.tar.gz 68806 BLAKE2B 14569fafe05ee0abd626c8302d54721d321b1c69bd0e72bb850c2fab7d7c49a0c5f27c20e4542e5c32a818d51f1fc29e8a14ff730ebbc4619399e710e6b9f9d4 SHA512 a4d063a921f6dac51d2e610121d359f289817cf57a52fadd6b8fd2c8c7f761433920c5d43b415edcaf3c4956bb67b3c19274aa6ec061b057a6bcb975d2662cd0
diff --git a/app-emulation/glean/glean-1.18.2.ebuild b/app-emulation/glean/glean-1.18.2.ebuild
index edd0b4838797..bd5b679fef7c 100644
--- a/app-emulation/glean/glean-1.18.2.ebuild
+++ b/app-emulation/glean/glean-1.18.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/app-emulation/glean/glean-1.19.0.ebuild b/app-emulation/glean/glean-1.19.0.ebuild
new file mode 100644
index 000000000000..2d07441e5a1c
--- /dev/null
+++ b/app-emulation/glean/glean-1.19.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Simple program to write static config from config-drive"
+HOMEPAGE="https://opendev.org/opendev/glean"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	distutils-r1_src_install
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 6e38628c88c1..6b686331e23b 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/opencc/opencc-1.1.2.ebuild b/app-i18n/opencc/opencc-1.1.2.ebuild
index 2121392df3d6..7a09d8d7becb 100644
--- a/app-i18n/opencc/opencc-1.1.2.ebuild
+++ b/app-i18n/opencc/opencc-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2021 Gentoo Authors
+# Copyright 2010-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -22,7 +22,7 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0/1.1"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 91a69ca34592..538e6bbd57fc 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch b/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch
new file mode 100644
index 000000000000..21f0c00554d2
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch
@@ -0,0 +1,219 @@
+https://bugs.gentoo.org/831161
+Backport of https://github.com/scribusproject/scribus/commit/80405ce
+
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Mon, 10 Jan 2022 20:38:51 +0000
+Subject: [PATCH] Rename byte() to to_byte() in order to avoid potential
+ conflict with std::byte in c++17 mode
+--- a/scribus/third_party/prc/oPRCFile.cc
++++ b/scribus/third_party/prc/oPRCFile.cc
+@@ -76,3 +76,3 @@
+ // Map [0,1] to [0,255]
+-inline uint8_t byte(double r) 
++inline uint8_t to_byte(double r) 
+ {
+@@ -451,5 +451,5 @@
+               {
+-                tess->rgba_vertices.push_back(byte(lit->color.red));
+-                tess->rgba_vertices.push_back(byte(lit->color.green));
+-                tess->rgba_vertices.push_back(byte(lit->color.blue));
++                tess->rgba_vertices.push_back(to_byte(lit->color.red));
++                tess->rgba_vertices.push_back(to_byte(lit->color.green));
++                tess->rgba_vertices.push_back(to_byte(lit->color.blue));
+               }
+@@ -595,19 +595,19 @@
+           {
+-            tessFace->rgba_vertices.push_back(byte(C[1].R));
+-            tessFace->rgba_vertices.push_back(byte(C[1].G));
+-            tessFace->rgba_vertices.push_back(byte(C[1].B));
++            tessFace->rgba_vertices.push_back(to_byte(C[1].R));
++            tessFace->rgba_vertices.push_back(to_byte(C[1].G));
++            tessFace->rgba_vertices.push_back(to_byte(C[1].B));
+             if(tessFace->is_rgba)
+-              tessFace->rgba_vertices.push_back(byte(C[1].A));
++              tessFace->rgba_vertices.push_back(to_byte(C[1].A));
+             
+-            tessFace->rgba_vertices.push_back(byte(C[2].R));
+-            tessFace->rgba_vertices.push_back(byte(C[2].G));
+-            tessFace->rgba_vertices.push_back(byte(C[2].B));
++            tessFace->rgba_vertices.push_back(to_byte(C[2].R));
++            tessFace->rgba_vertices.push_back(to_byte(C[2].G));
++            tessFace->rgba_vertices.push_back(to_byte(C[2].B));
+             if(tessFace->is_rgba)
+-              tessFace->rgba_vertices.push_back(byte(C[2].A));
++              tessFace->rgba_vertices.push_back(to_byte(C[2].A));
+             
+-            tessFace->rgba_vertices.push_back(byte(C[3].R));
+-            tessFace->rgba_vertices.push_back(byte(C[3].G));
+-            tessFace->rgba_vertices.push_back(byte(C[3].B));
++            tessFace->rgba_vertices.push_back(to_byte(C[3].R));
++            tessFace->rgba_vertices.push_back(to_byte(C[3].G));
++            tessFace->rgba_vertices.push_back(to_byte(C[3].B));
+             if(tessFace->is_rgba)
+-              tessFace->rgba_vertices.push_back(byte(C[3].A));
++              tessFace->rgba_vertices.push_back(to_byte(C[3].A));
+           }
+@@ -622,19 +622,19 @@
+           {
+-            tessFace->rgba_vertices.push_back(byte(C[0].R));
+-            tessFace->rgba_vertices.push_back(byte(C[0].G));
+-            tessFace->rgba_vertices.push_back(byte(C[0].B));
++            tessFace->rgba_vertices.push_back(to_byte(C[0].R));
++            tessFace->rgba_vertices.push_back(to_byte(C[0].G));
++            tessFace->rgba_vertices.push_back(to_byte(C[0].B));
+             if(tessFace->is_rgba)
+-              tessFace->rgba_vertices.push_back(byte(C[0].A));
++              tessFace->rgba_vertices.push_back(to_byte(C[0].A));
+             
+-            tessFace->rgba_vertices.push_back(byte(C[2].R));
+-            tessFace->rgba_vertices.push_back(byte(C[2].G));
+-            tessFace->rgba_vertices.push_back(byte(C[2].B));
++            tessFace->rgba_vertices.push_back(to_byte(C[2].R));
++            tessFace->rgba_vertices.push_back(to_byte(C[2].G));
++            tessFace->rgba_vertices.push_back(to_byte(C[2].B));
+             if(tessFace->is_rgba)
+-              tessFace->rgba_vertices.push_back(byte(C[2].A));
++              tessFace->rgba_vertices.push_back(to_byte(C[2].A));
+             
+-            tessFace->rgba_vertices.push_back(byte(C[3].R));
+-            tessFace->rgba_vertices.push_back(byte(C[3].G));
+-            tessFace->rgba_vertices.push_back(byte(C[3].B));
++            tessFace->rgba_vertices.push_back(to_byte(C[3].R));
++            tessFace->rgba_vertices.push_back(to_byte(C[3].G));
++            tessFace->rgba_vertices.push_back(to_byte(C[3].B));
+             if(tessFace->is_rgba)
+-              tessFace->rgba_vertices.push_back(byte(C[3].A));
++              tessFace->rgba_vertices.push_back(to_byte(C[3].A));
+           }
+@@ -646,19 +646,19 @@
+           {
+-            tessFace->rgba_vertices.push_back(byte(C[3].R));
+-            tessFace->rgba_vertices.push_back(byte(C[3].G));
+-            tessFace->rgba_vertices.push_back(byte(C[3].B));
++            tessFace->rgba_vertices.push_back(to_byte(C[3].R));
++            tessFace->rgba_vertices.push_back(to_byte(C[3].G));
++            tessFace->rgba_vertices.push_back(to_byte(C[3].B));
+             if(tessFace->is_rgba)
+-              tessFace->rgba_vertices.push_back(byte(C[3].A));
++              tessFace->rgba_vertices.push_back(to_byte(C[3].A));
+           
+-            tessFace->rgba_vertices.push_back(byte(C[1].R));
+-            tessFace->rgba_vertices.push_back(byte(C[1].G));
+-            tessFace->rgba_vertices.push_back(byte(C[1].B));
++            tessFace->rgba_vertices.push_back(to_byte(C[1].R));
++            tessFace->rgba_vertices.push_back(to_byte(C[1].G));
++            tessFace->rgba_vertices.push_back(to_byte(C[1].B));
+             if(tessFace->is_rgba)
+-              tessFace->rgba_vertices.push_back(byte(C[1].A));
++              tessFace->rgba_vertices.push_back(to_byte(C[1].A));
+           
+-            tessFace->rgba_vertices.push_back(byte(C[0].R));
+-            tessFace->rgba_vertices.push_back(byte(C[0].G));
+-            tessFace->rgba_vertices.push_back(byte(C[0].B));
++            tessFace->rgba_vertices.push_back(to_byte(C[0].R));
++            tessFace->rgba_vertices.push_back(to_byte(C[0].G));
++            tessFace->rgba_vertices.push_back(to_byte(C[0].B));
+             if(tessFace->is_rgba)
+-              tessFace->rgba_vertices.push_back(byte(C[0].A));
++              tessFace->rgba_vertices.push_back(to_byte(C[0].A));
+           }
+@@ -1650,17 +1650,17 @@
+     {
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].R));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].G));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].B));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].R));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].G));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].B));
+        if(tessFace->is_rgba)
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].A));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].A));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B));
+        if(tessFace->is_rgba)
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].R));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].G));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].B));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].R));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].G));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].B));
+        if(tessFace->is_rgba)
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].A));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].A));
+     }
+@@ -1794,33 +1794,33 @@
+        // first triangle
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].R));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].G));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].B));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].R));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].G));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].B));
+        if(tessFace->is_rgba)
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].A));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].A));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B));
+        if(tessFace->is_rgba)
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].R));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].G));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].B));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].R));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].G));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].B));
+        if(tessFace->is_rgba)
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].A));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].A));
+        // second triangle
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B));
+        if(tessFace->is_rgba)
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].R));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].G));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].B));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].R));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].G));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].B));
+        if(tessFace->is_rgba)
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].A));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].R));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].G));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].B));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].A));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].R));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].G));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].B));
+        if(tessFace->is_rgba)
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].A));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].A));
+     }
+@@ -1912,7 +1912,7 @@
+     {
+-       tess->rgba_vertices.push_back(byte(C[CI[i]].R));
+-       tess->rgba_vertices.push_back(byte(C[CI[i]].G));
+-       tess->rgba_vertices.push_back(byte(C[CI[i]].B));
++       tess->rgba_vertices.push_back(to_byte(C[CI[i]].R));
++       tess->rgba_vertices.push_back(to_byte(C[CI[i]].G));
++       tess->rgba_vertices.push_back(to_byte(C[CI[i]].B));
+        if(tess->is_rgba)
+-       tess->rgba_vertices.push_back(byte(C[CI[i]].A));
++       tess->rgba_vertices.push_back(to_byte(C[CI[i]].A));
+     }
diff --git a/app-office/scribus/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.5.7.ebuild
index 5f63eeb1aa19..2d3e677154da 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -78,6 +78,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
 	# upstream
 	"${FILESDIR}"/${PN}-1.5.8-harfbuzz-3.patch
+	"${FILESDIR}"/${PN}-1.5.7-osg-cpp17.patch
 )
 
 CMAKE_BUILD_TYPE="Release"
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 925166c944a1..25f27dc2e15a 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 10e8bd776dd6..c91f0c823670 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1 +1,2 @@
 DIST eix-0.36.0.tar.xz 640820 BLAKE2B 952e6a354cc5fd1145ef36fed6047bc6f10dd7a51166028581e3b392be66b5df07eabb96cba362dc4f7a50fbe19e6ccb3744d30928c4763a91af21ad02cee38d SHA512 891e343b01d3887cbc7e61933b43e79949ff702dcd8ada2f15ff57a628dc6ebc9a4b6817d3aa3d814474db3131aefcbbf56cec2520868dcb2182cbee780125b5
+DIST eix-0.36.1.tar.xz 640084 BLAKE2B 10014bb847d71b803967354f3a415dc1c74ad37385b7b440f0c162c573453042d06bbc575582831ffc0aad6b0f7abeedbcb4e23b869505d4f85d6bd6b7cfbba4 SHA512 915a364b0f63124c53e43eb35165ce553f6eadaf8708f0c075dc2f4871fe83378cd0c8650d5605c1f87c512563fdd62f28efdc586b358fc7cd63ae42a404981d
diff --git a/app-portage/eix/eix-0.36.1.ebuild b/app-portage/eix/eix-0.36.1.ebuild
new file mode 100644
index 000000000000..7d1c230fabe8
--- /dev/null
+++ b/app-portage/eix/eix-0.36.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 tmpfiles
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-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"
+IUSE="debug doc nls sqlite"
+
+DEPEND="
+	nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${DEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+BDEPEND="
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
+		-i src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoic-asserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+		--without-protobuf
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	dotmpfiles tmpfiles.d/eix.conf
+
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+}
+
+pkg_postinst() {
+	tmpfiles_process eix.conf
+
+	local obs=${EROOT}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT}/var/cache/${PN}" || die
+	fi
+}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 6c9817679202..bfc35a2f5edd 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index 4e11eea49ea8..4ee2d1995f49 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1,2 +1 @@
-DIST platformio-5.2.3.tar.gz 252483 BLAKE2B f60b83f6647333d42b5d864ea468c8104dcd5a83085a6d52f456a21792d9c94641a60f698c2a606ddd7d7b3a588723831f35ac0d3027cb0ff8b8226dabe3b62c SHA512 c11f58a984b15a3363cd29bf9a0234c1ffc772cc153310d420037416bb8834cb2b74899ccb465d69db862cc088cfcb17dcbc7d919f690b6e836dec982d5b136b
 DIST platformio-5.2.4.tar.gz 254337 BLAKE2B e29b69a514b5f3bc6faefb15dd4e3195152d74b763961c35c33cd9e44bcd430920dc2f4d553244c2ac1bb83d745c006c67d2d52973fa07562c8b98d8e74a2ac3 SHA512 f90c1f5d9dcada99c610003b26ccaa4e08c214757d0c26daeea3cae006a02179aea1eb0bc656751913d0b2c4161195b1afe9ab0eaab5ad594ff986f6b56728f8
diff --git a/dev-embedded/platformio/platformio-5.2.3-r2.ebuild b/dev-embedded/platformio/platformio-5.2.3-r2.ebuild
deleted file mode 100644
index d1a8b6826686..000000000000
--- a/dev-embedded/platformio/platformio-5.2.3-r2.ebuild
+++ /dev/null
@@ -1,73 +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,10} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 udev
-
-DESCRIPTION="An open source ecosystem for IoT development"
-HOMEPAGE="https://platformio.org/"
-SRC_URI="https://github.com/platformio/platformio-core/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-core-${PV}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		=dev-python/aiofiles-0.7.0*[${PYTHON_USEDEP}]
-		<dev-python/bottle-0.13[${PYTHON_USEDEP}]
-		>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
-		<dev-python/click-9[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		>=dev-python/pyserial-3[${PYTHON_USEDEP}]
-		<dev-python/pyserial-4[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.4[${PYTHON_USEDEP}]
-		<dev-python/requests-3[${PYTHON_USEDEP}]
-		>=dev-python/semantic_version-2.8.1[${PYTHON_USEDEP}]
-		<dev-python/semantic_version-3[${PYTHON_USEDEP}]
-		>=dev-python/tabulate-0.8.3[${PYTHON_USEDEP}]
-		<dev-python/tabulate-1[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		>=dev-python/pyelftools-0.25[${PYTHON_USEDEP}]
-		<dev-python/pyelftools-1[${PYTHON_USEDEP}]
-		>=dev-python/marshmallow-2.20.5[${PYTHON_USEDEP}]
-		dev-python/starlette[${PYTHON_USEDEP}]
-		=dev-python/uvicorn-0.15*[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-		dev-python/zeroconf[${PYTHON_USEDEP}]
-	')
-	virtual/udev"
-DEPEND="virtual/udev"
-BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/jsondiff[${PYTHON_USEDEP}]') )"
-
-# This list could be refined a bit to have individual tests which need network
-# (within EPYTEST_DESELECT) but so many need it that it doesn't seem worth it right now.
-EPYTEST_IGNORE=(
-	# Requires network access
-	tests/test_builder.py
-	tests/package/test_manager.py
-	tests/package/test_manifest.py
-	tests/commands/test_platform.py
-	tests/commands/test_test.py
-	tests/commands/test_ci.py
-	tests/commands/test_init.py
-	tests/commands/test_lib.py
-	tests/commands/test_lib_complex.py
-	tests/commands/test_boards.py
-	tests/commands/test_check.py
-	tests/test_ino2cpp.py
-	tests/test_maintenance.py
-	tests/test_misc.py
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-	udev_dorules scripts/99-platformio-udev.rules
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e2379e3973cb..4f485e25c321 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/boot-bin/boot-bin-2.8.3.ebuild b/dev-java/boot-bin/boot-bin-2.8.3.ebuild
index 03e79137c50c..58fcb200f386 100644
--- a/dev-java/boot-bin/boot-bin-2.8.3.ebuild
+++ b/dev-java/boot-bin/boot-bin-2.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -18,7 +18,7 @@ SRC_URI="
 "
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.7"
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
index 11fad8fe7e6b..ead3b203a195 100644
--- a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache-extras.beanshell:bsh:2.0b6"
 
 inherit java-pkg-2 java-ant-2
 
diff --git a/dev-java/javassist/javassist-3.18.2.ebuild b/dev-java/javassist/javassist-3.18.2.ebuild
deleted file mode 100644
index 6aa16a6c6f67..000000000000
--- a/dev-java/javassist/javassist-3.18.2.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
-
-JAVA_PKG_IUSE="doc source examples"
-MAVEN_ID="javassist:javassist:3.18.2"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Javassist makes Java bytecode manipulation simple"
-HOMEPAGE="http://www.csg.is.titech.ac.jp/~chiba/javassist/"
-SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga_build.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}-rel_${PV//./_}_ga_build"
-
-EANT_DOC_TARGET="javadocs"
-JAVA_ANT_REWRITE_CLASSPATH=y
-EANT_NEEDS_TOOLS="yes"
-
-java_prepare() {
-	find -name "*.jar" -delete || die
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	dohtml Readme.html
-	use doc && java-pkg_dojavadoc html
-	use source && java-pkg_dosrc src/main/javassist
-	use examples && java-pkg_doexamples sample/*
-}
diff --git a/dev-java/jython/jython-2.7.0-r4.ebuild b/dev-java/jython/jython-2.7.0-r4.ebuild
index 5abd3a99bb64..c24d236dc549 100644
--- a/dev-java/jython/jython-2.7.0-r4.ebuild
+++ b/dev-java/jython/jython-2.7.0-r4.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.python:jython:2.7.0"
 
 inherit java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
 
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild
index 95bcdeba00a6..dabdb239f42e 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -121,16 +121,4 @@ src_install() {
 
 pkg_postinst() {
 	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-11"
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
 }
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild
index 1fd28021ae50..12b3337375bf 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -121,16 +121,4 @@ src_install() {
 
 pkg_postinst() {
 	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-11"
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
 }
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index b3c54cbccc20..a34481edeae1 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,5 +1,3 @@
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz 42432277 BLAKE2B 18138eb163db4609790286cfe7bc951da9ea244eed50bafa10e5d84ec43e7a80ebc2f759f3e1547b9d785b1a6d560b5399a0449a8fe301e19625c2b98abba928 SHA512 5b8c1c16c5faa467bbb35a1d1e694afc50b0c2dbbe77abb29620f30602187a1a903f60169e2b691dcc81b6d902ed5a17239318f27765f19351281209befb0e96
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.12_7.tar.gz 42400222 BLAKE2B 4cb727bac0a68f2b7461569d96fb4b5b6f9d0d915edf1e869cc72ed9a0bcd977f365923f1b23031e15cba4ac46d336f011bcd5f2230454b436e839cc5e1371b8 SHA512 662a65f2d601b537f3b05d06cb1785d341d519c24cd86f2a4ef8886919d7793be363da1bb8833cb81c6bc4f2e1456cc0f34e5831c6ac80924a93002c2f156691
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.13_8.tar.gz 42404190 BLAKE2B 5825d8edcb890c4447354414fd5ad6a153fd7b5a36082607a0b41430c8a9be52dec025cb0c388adcc80877c23c389e031c0451d3e109312c0fc9878410633444 SHA512 41f84fb17afe142264a1e10612e67c201b090feda86858a257fe02fc4f4b65b61397e23585f3d9334e1ee407aea11b5b1affb734a2823f3cf749507d1e54ec4d
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz 41355668 BLAKE2B 761358d7e5dd9c96ed13d7302ea5f39719f044a37add7fcadb76ed799d41b17faee014c9e4bec3ce388d4a6965e2c14dd4ddf029baa6dd1f5f84cde7e7b1fcd5 SHA512 fd63dceddcd32b0f48b6d35c14ab3165f2b45152fdbc2bcaf833ed2624d833592cf1001627029fd04f9b77a033e2d4e993830d54c2e7c08adde5cd7a684447fd
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u302b08.tar.gz 41249161 BLAKE2B 643c8cdb50e6d7ff24bdda2fb8e99d0ee33dcf550313db879bcc4661d85b715de4e6e01b979e92005208b004ad1d6e0641e328dfacb81f70541a759f022826a8 SHA512 e435cf0d9e5a8edb26ada1568a6a041b685bd92302ddc60be73acc02aa1aaa43fda08d327d456749405866a0d1e3feaded2796d8a0db65fa650a9e60520bcb96
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.11_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.11_p9.ebuild
deleted file mode 100644
index 441b2550e44a..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.11_p9.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-IUSE="alsa cups +gentoo-vm headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED%/}/${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.12_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.12_p7.ebuild
deleted file mode 100644
index 9b85185774b8..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.12_p7.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-IUSE="alsa cups +gentoo-vm headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED%/}/${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8-r1.ebuild
index 57f5b0dac68d..163859345679 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8-r1.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -83,15 +83,4 @@ src_install() {
 
 pkg_postinst() {
 	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
 }
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8.ebuild
deleted file mode 100644
index 92fa295b7789..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-IUSE="alsa cups +gentoo-vm headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED%/}/${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk/openjdk-11.0.13_p8.ebuild b/dev-java/openjdk/openjdk-11.0.13_p8.ebuild
index 69df241d39c5..e7bcf7abf3cf 100644
--- a/dev-java/openjdk/openjdk-11.0.13_p8.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.13_p8.ebuild
@@ -269,16 +269,4 @@ src_install() {
 
 pkg_postinst() {
 	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-11"
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
-	fi
 }
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
index f56700c34bec..c5dc1412ea9e 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.sun.mail:javax.mail:1.5.6"
 
 inherit java-pkg-2 java-ant-2
 
diff --git a/dev-java/qdox/qdox-1.12.1-r2.ebuild b/dev-java/qdox/qdox-1.12.1-r2.ebuild
index 39a712868027..2c9a64624663 100644
--- a/dev-java/qdox/qdox-1.12.1-r2.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.thoughtworks.qdox:qdox:1.12.1"
 
 inherit java-pkg-2 java-ant-2
 
diff --git a/dev-java/rhino/rhino-1.7.7-r1.ebuild b/dev-java/rhino/rhino-1.7.7-r1.ebuild
index 0ed1121c184c..656ddd97e01f 100644
--- a/dev-java/rhino/rhino-1.7.7-r1.ebuild
+++ b/dev-java/rhino/rhino-1.7.7-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 JAVA_PKG_IUSE="doc examples source test"
+MAVEN_ID="org.mozilla:rhino:1.7.7"
+
 inherit java-pkg-2 java-ant-2 versionator
 
 # rhino -> Rhino
diff --git a/dev-java/xalan/xalan-2.7.2-r1.ebuild b/dev-java/xalan/xalan-2.7.2-r1.ebuild
index 332cb5588c95..9d2ccaa630dc 100644
--- a/dev-java/xalan/xalan-2.7.2-r1.ebuild
+++ b/dev-java/xalan/xalan-2.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,6 +8,7 @@ EAPI=7
 # Apache StyleBook, which is long dead though it is bundled here.
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="xalan:xalan:2.7.2"
 
 inherit java-pkg-2 java-ant-2
 
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 8112cbb5eb76..3df9c983dc99 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 5a034fe9670c..cb79b424baec 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -158,5 +158,38 @@ DIST rust-1.57.0-x86_64-unknown-linux-gnu.tar.xz 151033748 BLAKE2B 61ecece6a8aa3
 DIST rust-1.57.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B ea41b27fd25cc75efac73203688ee0882767fc76a2fe09b5e424c42467d3e332463c5560cc58f3b20f6e4b44289a25cfb0d36e38a7a9a7b3950ef875a59dc9ae SHA512 8b955bfce6c130e4b95054b98646f7f9b89e621256759ee1ff533df5f777312dd7adbb192ee0076c9b9baa6883a74a9def50ef598ba8c707762290d465c9a8b7
 DIST rust-1.57.0-x86_64-unknown-linux-musl.tar.xz 260333980 BLAKE2B 75342ae8637355e714d5217d78604cfa6a601d3f9bc0ed4667ff0ca57c6521567b19b9bdb10f79761e2e5fd21ca10e12f3fae0c65791118fdb0c35f8f88349f4 SHA512 204ed493528757b8e3e8df13d062c9ae74c75c3e3adc1a2efc0dfc33d2525629168a558dd32653f44a4365191bf203a4415a77152276288a8e122e6bd587394a
 DIST rust-1.57.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 506400c3ea70469cbda0e492e85d41b7f94fba790ec19d1c3491bf4a00d283f97c8fb37319ad6c4a43b22a2195c21d1b9e3c16a5b2a9a82833ff61ad49bdc793 SHA512 793369dc7a854c48a72d81446a0c8eb9d83a071af77758e0bcbb8e4d518fb87c5a23c085202b9b427a02bdd772ad9c82724b34295b851f26f384c3e801bf9a04
+DIST rust-1.58.0-aarch64-unknown-linux-gnu.tar.xz 229969508 BLAKE2B e7ba73742c6fbf5cff8593434167ddc8e981f473b292960ddf25bd6cdf5980776ddc0234dc711d6a341474ac1da8f33a788bda0d6d83f8e353e4e35eab95f635 SHA512 6ab276db164b400953b540f2c0f5884e44a16cb847a157dec1103e09b22e379f77d8561bf360c05f0bf2d085d4b3670b51675ae80aac05732310621bb2d9b597
+DIST rust-1.58.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 5ae37b9acce2bb0f1c8963e6581d09832290f4ffcbd26807f21ee5cee45a89ad279c22361f932feb72753a25092eb02431777dadbc8643d45905178c00504848 SHA512 ee6d99b1604b1e9efb470dfec00a9fc71f9603723ed292f20736d8c40de73660e23868d68b142e70d75216ed312534e364f2f5a092529e3276cdeee99c7d71af
+DIST rust-1.58.0-aarch64-unknown-linux-musl.tar.xz 226177016 BLAKE2B 0f4336d5df797515e4e82c716a3c2ec614b04f862c056992ced14f9263a977920e5544b5738d4588979b29e37de0a8348a6f28986bcbc8e41d301b1cd134172f SHA512 2a4d7225713516f1f6d4f1d32b998a73769636b39e74d791b2a2337a25069ba929b56b37c24b6f7c4287efdcbd56c993fd3a288fefb7d1e34bcfadafe53cc07a
+DIST rust-1.58.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B c26ad8bfb35539a26f8cd155755b5534bbb7eb5b92868195108ec9467242151aaa6e31db0f7e536836a20661a77e11955d21b2d61a4ff17c5db92d6e5305fd29 SHA512 fb85bcd3516cee414763b2a48e8021071cac113fb03cf980bbdc3520092b9c6cdaddf13ac30d75804e970a34a9a7ef697924a73a06df3a8b40d453b335ce15fe
+DIST rust-1.58.0-arm-unknown-linux-gnueabi.tar.xz 206375000 BLAKE2B 7d32aa903d631a2a27ff1982897a9235cdcad9cf02e98274c597986d7052f0fd6dbeab00a42bcc1fbe6a12c4461f5887a914e5ac9444541ded28450e50f48a49 SHA512 f4268ce45bb09ec26d67931278eae6b2eb5738aee6b8bffdda86a71d2cf23e3755ad3499d74184758581f7d5e2df6eac4f063ea77f988c59ba88b409360061a8
+DIST rust-1.58.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B ae562b09bf350d72977ce024044d84a3b328fa27f98b7bd12381b31b3964fd018da4d491cbe8cb558014e7ec8235d99cd45362de7f412cffc104b73ddcbcf271 SHA512 2ccfd4e669df977283421f46f162416d5de43cc29bf67e91b3b29c94876a24a82d6af1a35225c0cb74599fc11bc2a8180cbe600d8eef91fdcbafdbba6a2fb135
+DIST rust-1.58.0-arm-unknown-linux-gnueabihf.tar.xz 206325408 BLAKE2B ec1f3ab5c37ce06ee16c10f10071a8795ab601b9ee147dca98d6c94555a278b87cd04c93b7623fbc7c3b09f3847f41479eec02259c5fcff25a8f337d39ca02cc SHA512 b31c067c459aba84f8a34ca39298f42c09a0530a02d033562338f822e55e5b0e837f15983e233dd0401a9082a9f6b0def081dd9f870dd654607c654488986b24
+DIST rust-1.58.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 3f4d43a6dd2a45b44d48fc4d51a39ca2ace84f432c89f20703176c0b947c4b30bd7f3d7e17dd5ee8fbcffccedbe7f177150c68ee1c05164206478384152d09e8 SHA512 94fd5b0142016df3ad5cdaf40df3f1f68866cd68256da6127b36f70aa7d363466929227f1534972dfb6c458a9febbe8c7c8344aee0f26d48f1aa1a3f262750b4
+DIST rust-1.58.0-armv7-unknown-linux-gnueabihf.tar.xz 212531868 BLAKE2B 2a57a5f31504795086d6a0ecf2f29513c513d1840227c25832ce80264efbf3ab3392f369aa4d93f5f95d46f20fb8e074acf5925c0f6d1b5465ca6a8efa5c82e2 SHA512 c676cc1518e38fc36e62519bb9d4d356be689f9fcdeb56d5722bd3437879dfe9a30340c053ec75bd5b709d83b98faa647c46720df36a00daef1fd7680f4c900f
+DIST rust-1.58.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B d62fe00537a4a75f8f561f66e585f25d13e6ccabc2ef4ea964616b733caef4b56aec62e873059fb84200a47f3530aec8e0e4c20b9eb32f533b8bcf019b73a078 SHA512 9cdb5fa100aced4e0d3b64821251031aba0f05ea1e27f8fcf53a3ea32010fe04bab306462af7b10f1d3bebaaa76747b5aa564af5bc3383bf62f4da7bd74d7033
+DIST rust-1.58.0-i686-unknown-linux-gnu.tar.xz 224691416 BLAKE2B 8d1cff8ad5289de0b5787d958814b5f7517a6d4a9667be014b4103b95ccaebc7976aa3f969955732c9755561967fbe9bac2702531ed15effe3461dd3d8f019ab SHA512 23dd0c0a7700acee233e93d779733bb94788edff4a64df62b8e4ac55b58bc640ed72b0cfd9e1b8cfa5190e429ced6b2a6b0a75676c51e72351edb96b44b00e59
+DIST rust-1.58.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B db0615a16099bcbedd5e4e218be66147e6d659656565e8cd26fd89fe620abb6a72aa74bb077b826792c1e82ee87ac750c85fd171148a5bae0296765113377364 SHA512 ff0c4089106a08437618392f7d02ae3140dab4fe045eac47eae5b5c1d98355326f62ae24b52ec2cb7c8e0085028dca797f70f8c14c48fdbae5505f4e45b6c058
+DIST rust-1.58.0-mips-unknown-linux-gnu.tar.xz 164753920 BLAKE2B 1562131b76d2fc7a7bde61b88e025079fb54448bcd8c793ae8887916c480a2813adad15630904a512d5a7341c727dc14af7aaec8c0b7b5264c39f2878c05bbad SHA512 76f91a43a673045a824509f0211c635869ae8ff7ae45253ef6d6dc15c36487ddd6638968a07697cd047296b51821f4df484500c135d5342121e32b6940f3fa21
+DIST rust-1.58.0-mips-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e1614bbf7ef74a777dfa9dd7af473552b3356b984ad13ee0627c3ca691d21f4479ee5182751e54f01d0f084a83c10f55213f12417d64de158dcfde4251e497da SHA512 5db14bb832c854a8fe2802afe8154772e090adc9852d11c71a87b418d79dc27e942419b654bf69ce767a0a3ff474ef4e252832b2c3d6cb9458e7d574a7940dee
+DIST rust-1.58.0-mips64-unknown-linux-gnuabi64.tar.xz 169679760 BLAKE2B d3a474609b1eaabd7a6475810a41220899fef78b41e256c0c747397cc4fc5c5f75e02eba2b5db43b34f80de95033fee10882cfd2451e66f61158e04de2853aa3 SHA512 f078f5d0b444ab82ea369d4ade450168cde7ac0aad2936a9ec95ad02d7a0480bb31a4e691a68922a57d608301dec050100f71996360d4827795eea4cd951f323
+DIST rust-1.58.0-mips64-unknown-linux-gnuabi64.tar.xz.asc 801 BLAKE2B a6e8f4c24ebf7f71cfe783498e8cde70edcb5530a920b408d3c861cbcd2ee2df1aa0692ffcbf5ee3d6e2f7468ea3708c03eda67e514c98e4a9b5437373b408e9 SHA512 f97f2519860f588319b5b708adc6c2998e975692092185257d8f08f2356769b567e35d2e2d7098e81d6e2c936b054c025c42d0d1ac0837794c56c3211d1a7c7f
+DIST rust-1.58.0-mipsel-unknown-linux-gnu.tar.xz 168271536 BLAKE2B f3f6c5b4be89ad95a5e8a3a3eef80829558a2cd28f566e2c541f136b1dc49e14de66c8c4eaf02c54076ecc6d9ee78c0899481b9371683b705506212b2bc3bd4a SHA512 b166492159314c0a16362afc88f352ec556333f541dcaab42b342c9ccad77036894412d775687b8e2b5726a33339718872108b166bbc3acafbe158dddc0666f5
+DIST rust-1.58.0-mipsel-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B f3ca5c1c1950248bb5bc0cf5cf09eafd65acc7693b0d000f554b5a848455e6c9f396cf7fb7a8ed6e7f31d3bf6428766e84f883efa6f372b46663217ce25e1cb3 SHA512 9f62b47144068865009ec7665151653d2bbea0bab008eba3c0f693e425cb77c022189c7396287d03f9294afae4b76aa84deb7a1eb05a9ad4619e71c310fe2816
+DIST rust-1.58.0-powerpc-unknown-linux-gnu.tar.xz 183629256 BLAKE2B 7b24752fb58e79c87ed18d2bd7f79d869daeb186efa17985bb6f9e1eee998e9ef0fdf597597cbcfbf57b263d53bfb0f416fd14bd68da00b9252d8e43687e7669 SHA512 8b282efd6508ac52b603331c6c148388ffb843463a8e725407c676bc9e332ff99dbb16c869721dc0535787809dd9f03005b1833f0b8a7f17a4aef88aaa19b9a4
+DIST rust-1.58.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 331e8f732d1ff9243694f5baf10159ef674fa5ba57adfdb4b1f14f7e3f56443276c4405adee0383dd5b224bab7655ef503ac1a5c51c2d054ffe140ffc7ce1717 SHA512 a94407fa249441edf0aab56a76bcaa9ee8fb892e94c2255897200ee03594e6a887f488a93ccedcf1c2e90dadc9af17102b60e5b6dd8754509f82672efc6834d5
+DIST rust-1.58.0-powerpc64-unknown-linux-gnu.tar.xz 194135676 BLAKE2B 0c5e7e67a9a6df26c418ac94dac16401b126b367555a1d4e4306d803836dcd38538bc94f3fe170d8ad9339984a3af4a6beae9fdde47af82d7b57a1bd1441137d SHA512 ae195cc9c622a25ae23669e913bc73a1d31490bfcc3f69632a02cd050af22ac52cd46af6f8c1eb9514949a75ac2aa283b3dd52ddcfe506438eee23c75f995243
+DIST rust-1.58.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B a5db4ca38e9468f863be3e7a29a54f34364a37ad88b5073d6911e15592ff12c5f3af2b5a4c2df8d83a407d866c3cfef83495fad3b6b8f8dd1ed8be72fe06ccc8 SHA512 d2ddda9c2ec1023e93194427554bb7282bf3b6908f6410afe05b8ee9beeba236080ef8521a26f4f3efc46f79965e581157f973ec7bef300057e6cfa0098bc80c
+DIST rust-1.58.0-powerpc64le-unknown-linux-gnu.tar.xz 202604020 BLAKE2B db290d9c1c1a5d55b869b6c9ca6cbedf571da8b3289d5a2829bdf094788ee4fc028cd66ae9c287b3e680cbf35ebdee482f5c6576d5445d125cee2a090ae505ef SHA512 bd87ed72427102a1ce08e61d74ad8d34fcbde93e30b2597f9db29e49d53337c1d2e9794f2ce0209273b59c6c8be743870657a2da5eb1dc4d238adf2b548d0ce7
+DIST rust-1.58.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B fbc7d0aaf8e903edd42be16a561b0af79e064a2c5713a17b9d79eeeb33796a00321f1c1eac4ecbb8e48708db8f0a8eec57bb2d6d7304750d34b53d57003f6db6 SHA512 3d69abb8db74637327f18e4d54f8e175421a8348e6b0382793f0d4bc0a76cdfd60fa39b28a29bdada9ee29e7d5dd2d5b3a567d29d64b97722788f8264db4ae3f
+DIST rust-1.58.0-riscv64gc-unknown-linux-gnu.tar.xz 197456696 BLAKE2B 8f393de36ca9b8c8df43b1725cc0deafa1211917ac6c6aefed329daefc19f04563d8b886aac2c8917a047d918175fc04075a13cf3c197b30b2a7bec44fa4cd48 SHA512 f2739b42ad5fa444623f7c7818297361b2df4db4d12546f262feba246a8804da6f3d982eff1c558f15882d9b580ceaf39acfc54749924bd9eb8a383a5154893d
+DIST rust-1.58.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d23d62938b8a7832724c73d17253b3fd078bf1a6646a9d92298a297b8297ad93372be28e651b1001a273af9efb877c444e3af6b19217cbab4fffd4b437099a6b SHA512 73513a0323c2c5519a4311aacc98f400fc44c0c48223460939c485d4526736de26603da85dec341472dcab4c62a4e15927da8eeb89be04152969d97e542eef4a
+DIST rust-1.58.0-s390x-unknown-linux-gnu.tar.xz 198300224 BLAKE2B c31a5ac34d31e1080459aaf594a9ae373f6aed90096b6f6e7cf34cbc6672bde3d01f5d945d956010921c1b0db0bd32292dd71a8d2aa43a83a4e51ad7d6444919 SHA512 2bee2fed7d13d9fd5f10bb071ea8b91bff650d223b5e78fa8068fd841e3f757a4358befc26298c5477c2f9a4fe9e2e77c8f5911ed2630f8ff311491fb842fba3
+DIST rust-1.58.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B c86889d2592e951dd68e244e1e813086f2a253adbb3a68fa4fbfaf054f599072d9ec2a527885febf9f07fe22c9f4377d5e9e4304d13e2b00a2d9ffc294abd011 SHA512 e19bafd80078f1cc669a8998544f0bfbe976acbd010c3c2a078511ff4cce79c784db4a2c293af5fae04efc5551a05a30770665414622fed1a493a069cfc2e73d
+DIST rust-1.58.0-x86_64-unknown-linux-gnu.tar.xz 150248636 BLAKE2B 79dd4f08d65c1832e56629dadf8a0fab0105a2025d637053ba38a0f5a5b595866f97fdb67a728d036d4154a52e15b464d3d511b8f693ee2deebd10eedbd4bae0 SHA512 382a1b3ac5874a9e3f162ba06196074df703b0422dac70c9c38dd0770e86b7fbfbf0380ee1b520a6ef92d3f52c865e901d106f5beaf966fa036fba88f7912da9
+DIST rust-1.58.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 232a8e931fb5ba56cb4f5209650abf517748ce2112abb6d6b9c34437ae90813e5fa2e056cf7ae46795bda805a326416d4f7fee0bdeb7568b81b5d553ce795433 SHA512 4cdbef971b7afc1560ecc461c4da317ca831f2f3c04f806e5819ae38d2baa1815422ca569d724eb6ca5b8c1858a4e17e7791b1ca722e41f5ffafe105ce9da3c8
+DIST rust-1.58.0-x86_64-unknown-linux-musl.tar.xz 262715336 BLAKE2B 6a4d5202cae8ba404259f6c012faa801e3e6930a0d8851cc1fc6c35948dab5f74d196914c2b8b4344309a40c8c6324690a6920b61a2d545d945796f9149701ef SHA512 d97fd1b308c3f73ddbd8b10054062a37a05b445e2a2a91ad01844b9b7fd43d9e9dff00b8715fa2748ca1da9fb883eff14075b463bd808ee9a81b94fc85d9394f
+DIST rust-1.58.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 368cc50c5ffe74c790cdf18ea66694905b0fdde575854765279fe41cc529dd7efc60ca2493c1749dded7da2f1fe67d8a06ec0d4de4a75791352452c57ba78947 SHA512 7273afc1c371c70f0e44cc796f9dc7b25137d7afd5fa1323e98d512924353117ff0b3521aaf2a2af29336ca210fa891d4f2a8d9cd2f626b09912ba8eea36326f
 DIST rust-src-1.56.1.tar.xz 2456408 BLAKE2B 19cd9ac0c0c57d077e2a62e6ef202cf8f349582870d0acf28b105278da611e3e3884b1db59cb43c1a13c8f0ff546f83f8ac30783e46f99233a0a81df04dfd359 SHA512 6ebcb7e641031b269af244f0a14ef23c5a6c324d8c9f8f9ffe3b1802fb2aad522b10544f6c29789950dd2a9fe7cbbdb6587f793ec8f53881e707734bbaf3a3d6
 DIST rust-src-1.57.0.tar.xz 2536924 BLAKE2B bdc8bfcf6ee3fbd0be3b9bf1ea8faa34bb45247d35bad5a7c5684f74ce061de3399d05209cabd18d01c7f73703c5e11cc49765fd7a0230e95484922e96e187de SHA512 24d86a7e1f8cd63b9571003604374cc251c575ce351253cf5ce676f34fa8aff574bc9e305de0d62b42a0d699e792fc072867981908ceebcd75b2bd6aa71a0867
+DIST rust-src-1.58.0.tar.xz 2822920 BLAKE2B 8703fb119092473ce9bf822a35e3b6b2dc1644fad502140061d2787dca0bfd90878d8b2394e5b43522ba5b51a41d181f83e3025978633047460e80e5d6983de7 SHA512 9d2456d0c0f5649ab3bd4e3ae4540cf9f382ab43020306699657cf2dd0671c423f82ea17f66a07d8eb88845598e928106bc40de29a674625fa630f3be6ea47a1
diff --git a/dev-lang/rust-bin/rust-bin-1.58.0.ebuild b/dev-lang/rust-bin/rust-bin-1.58.0.ebuild
new file mode 100644
index 000000000000..9c28c049ad03
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.58.0.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+
+MY_P="rust-${PV}"
+# curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
+MY_SRC_URI="${RUST_TOOLCHAIN_BASEURL%/}/2022-01-13/rust-src-${PV}.tar.xz"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="$(rust_all_arch_uris ${MY_P})
+	rust-src? ( ${MY_SRC_URI} )
+"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="clippy cpu_flags_x86_sse2 doc prefix rls rust-src rustfmt"
+
+DEPEND=""
+RDEPEND=">=app-eselect/eselect-rust-20190311"
+BDEPEND="
+	prefix? ( dev-util/patchelf )
+	verify-sig? ( sec-keys/openpgp-keys-rust )
+"
+
+REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
+
+QA_PREBUILT="
+	opt/${P}/bin/.*
+	opt/${P}/lib/.*.so
+	opt/${P}/libexec/.*
+	opt/${P}/lib/rustlib/.*/bin/.*
+	opt/${P}/lib/rustlib/.*/lib/.*
+"
+
+# An rmeta file is custom binary format that contains the metadata for the crate.
+# rmeta files do not support linking, since they do not contain compiled object files.
+# so we can safely silence the warning for this QA check.
+QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/rust.asc"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
+		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
+	fi
+}
+
+src_unpack() {
+	# sadly rust-src tarball does not have corresponding .asc file
+	# so do partial verification
+	if use verify-sig; then
+		for f in ${A}; do
+			if [[ -f ${DISTDIR}/${f}.asc ]]; then
+				verify-sig_verify_detached "${DISTDIR}/${f}" "${DISTDIR}/${f}.asc"
+			fi
+		done
+	fi
+
+	default_src_unpack
+
+	mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
+}
+
+patchelf_for_bin() {
+	local filetype=$(file -b ${1})
+	if [[ ${filetype} == *ELF*interpreter* ]]; then
+		einfo "${1}'s interpreter changed"
+		patchelf ${1} --set-interpreter ${2} || die
+	elif [[ ${filetype} == *script* ]]; then
+		hprefixify ${1}
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+
+	# start native abi install
+	pushd "${S}" >/dev/null || die
+	local analysis std
+	analysis="$(grep 'analysis' ./components)"
+	std="$(grep 'std' ./components)"
+	local components="rustc,cargo,${std}"
+	use doc && components="${components},rust-docs"
+	use clippy && components="${components},clippy-preview"
+	use rls && components="${components},rls-preview,${analysis}"
+	use rustfmt && components="${components},rustfmt-preview"
+	# Rust component 'rust-src' is extracted from separate archive
+	if use rust-src; then
+		einfo "Combining rust and rust-src installers"
+		mv -v "${WORKDIR}/rust-src-${PV}/rust-src" "${S}" || die
+		echo rust-src >> ./components || die
+		components="${components},rust-src"
+	fi
+	./install.sh \
+		--components="${components}" \
+		--disable-verify \
+		--prefix="${ED}/opt/${P}" \
+		--mandir="${ED}/opt/${P}/man" \
+		--disable-ldconfig \
+		|| die
+
+	if use prefix; then
+		local interpreter=$(patchelf --print-interpreter ${EPREFIX}/bin/bash)
+		ebegin "Changing interpreter to ${interpreter} for Gentoo prefix at ${ED}/opt/${P}/bin"
+		find "${ED}/opt/${P}/bin" -type f -print0 | \
+			while IFS=  read -r -d '' filename; do
+				patchelf_for_bin ${filename} ${interpreter} \; || die
+			done
+		eend $?
+	fi
+
+	local symlinks=(
+		cargo
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	use rls && symlinks+=( rls )
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+
+	einfo "installing eselect-rust symlinks and paths"
+	local i
+	for i in "${symlinks[@]}"; do
+		# we need realpath on /usr/bin/* symlink return version-appended binary path.
+		# so /usr/bin/rustc should point to /opt/rust-bin-<ver>/bin/rustc-<ver>
+		local ver_i="${i}-bin-${PV}"
+		ln -v "${ED}/opt/${P}/bin/${i}" "${ED}/opt/${P}/bin/${ver_i}"
+		dosym "../../opt/${P}/bin/${ver_i}" "/usr/bin/${ver_i}"
+	done
+
+	# symlinks to switch components to active rust in eselect
+	dosym "../../../opt/${P}/lib" "/usr/lib/rust/lib-bin-${PV}"
+	dosym "../../../opt/${P}/man" "/usr/lib/rust/man-bin-${PV}"
+	dosym "../../opt/${P}/lib/rustlib" "/usr/lib/rustlib-bin-${PV}"
+	dosym "../../../opt/${P}/share/doc/rust" "/usr/share/doc/${P}"
+
+	# musl logic can be improved a bit, but fine as is for now
+	cat <<-_EOF_ > "${T}/50${P}"
+	LDPATH="${EPREFIX}/usr/lib/rust/lib"
+	MANPATH="${EPREFIX}/usr/lib/rust/man"
+	$(use amd64 && usex elibc_musl 'CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
+	$(use arm64 && usex elibc_musl 'CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
+	_EOF_
+	doenvd "${T}/50${P}"
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-_EOF_ > "${T}/provider-${P}"
+	/usr/bin/cargo
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	/usr/bin/rust-gdbgui
+	/usr/bin/rust-lldb
+	/usr/lib/rustlib
+	/usr/lib/rust/lib
+	/usr/lib/rust/man
+	/usr/share/doc/rust
+	_EOF_
+
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use rls; then
+		echo /usr/bin/rls >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+	popd >/dev/null || die
+	#end native abi install
+
+	else
+		local rust_target
+		rust_target="$(rust_abi $(get_abi_CHOST ${v##*.}))"
+		dodir "/opt/${P}/lib/rustlib"
+		cp -vr "${WORKDIR}/rust-${PV}-${rust_target}/rust-std-${rust_target}/lib/rustlib/${rust_target}"\
+			"${ED}/opt/${P}/lib/rustlib" || die
+	fi
+
+	# BUG: installs x86_64 binary on other arches
+	rm -f "${ED}/opt/${P}/lib/rustlib/"*/bin/rust-llvm-dwp || die
+}
+
+pkg_postinst() {
+	eselect rust update
+
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}."
+
+	if has_version app-editors/emacs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 33ce567a1506..c8dda48c543b 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -158,6 +158,38 @@ DIST rust-1.56.0-x86_64-unknown-linux-gnu.tar.xz 147894784 BLAKE2B 6cbdb8a82aba4
 DIST rust-1.56.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e0ed39db46b40631f69fa379a04ec37ba314587a4f081aa1f3251e01b7221ee8732b668cfcc4c24c1a3950f3f8dcfd542a1a73c603cea545b812d5d3a9527055 SHA512 3e9d0b159684a496e29c9e40af11f16f5ef5cadd8bc4852018a953310e77a4e29db6c14ffcc86198908aa4998550c83cfd3f2cc42e007122d56167d664776c44
 DIST rust-1.56.0-x86_64-unknown-linux-musl.tar.xz 255010720 BLAKE2B 286e91cbf001de6f888bd82139e6711b32f03d45c599f26b01f60222d98c3521a1933b3b9b7f8c46fa79d481780dc8dc47e5e24985b721a6998d620b446c38b4 SHA512 fb5a914a25ef3cb39393207a75c40f1313740167062feb4cda4084e738f4e93a51624a8a9591acc18553cfd6e2e232984c8c84acc3dfd77fbe38b17085850881
 DIST rust-1.56.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B bb7cfc775c1c44569276e687028e9a7ffac31577310052d9c354179a541ee13b0ca00a025e994e03ab17086d0abe6dda6845ed1cb10879425439c7651bdc9269 SHA512 cb23d98cfb1b59fcccaec575145b6f38846f3f49b16a3be199b06d6198b1db13720157ca65a01f6ef76abf742507bba39776d130f0fd03aa228acf5917457f7d
+DIST rust-1.57.0-aarch64-unknown-linux-gnu.tar.xz 228665060 BLAKE2B 98fe268d060a7f19c284bf02fec148550807b6c75fad042b85f07b22c127f911e4e7e6d9738b4bef42b5a46cc888e5a0df79307cc84e39adf3ed9da3fd531188 SHA512 71d32e1ed3fc4a2eaf3594112b3b43ab82bd28b35e547542f6c1ed006175d7cf805be373a4da8b962762962dd32fe951c8ca7c0a424addad5d4e828441d5386c
+DIST rust-1.57.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B fc832ff510b498a5763a26b420a6cdcf6b2b5fa8ce655f01ab23190f527cfaac144ac68378c6af3d3048440330f94b5d213d049c65ad87f0701b0555ebfa2b6f SHA512 a225f1db92c6e57b977873a3e5dbd07fa1288d2f8d79a879cc72dfc0dff66e70ce56619198cf36376b2774272c85363b8e8abf14efe8404f4cc038410c648ad3
+DIST rust-1.57.0-aarch64-unknown-linux-musl.tar.xz 224700500 BLAKE2B 2eb3122af42c499bf92b93946b20b6414d51ba895a77a8e9c53dc437a20093605b2e9f22d8f88b4fc3ca7f7b75d425a2442b36fcea54b583692c32f728f23bfc SHA512 0850861d9d2c22d76b1550e7d6b64c746c3cc24b51a68949948528bdd93621f74e6c07d23428fcdb280e884e469f2e4f2d3f9a7f81ccfa61d41265e31af3a9cb
+DIST rust-1.57.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B f594a31b48af2ee7835f89660a13e336f3cb2a01d99a5d48d280c06698d69712de190b35ddc682a9ac7bb6bad1edac9c3bde7262fc5a9732ea471984e1bb99a7 SHA512 aee3fd35c8e7c6b9ce651d940f8fbb17a2bd2a58d8b85421ecfb4a72d5c56878a5d129166896ea717c5b3e5b9c7f61376801d766af1c9a4d1a090327424e93db
+DIST rust-1.57.0-arm-unknown-linux-gnueabi.tar.xz 206890752 BLAKE2B 5d314766d333708158df7ef01d740e0cf0e71044edbdeb180f491c78a39dbf9460b62a1eb70076787e33a3199821b18734da59f892c0c251effed8e68c0eb22a SHA512 c01a6a408bf334474b2060ef70ed7c6c53e5f3a7453de74e36e59013292584a129b50530259327ae410830852173601dd9bccd1cd801d9f916d1a3e93820e481
+DIST rust-1.57.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B 494d4eec9795de0150da9a7f5ba6cfbabd8da99dc65e5e02360ed4961e42cc3761f147ca8f7155badf61ec85d2898ec866aa5dde53e555ab34ead6b4d32c737e SHA512 31e9f00de8252e905d4de279860ab7eb287237d7d5330122b989ef2199fa8d209ef7a0cc71b83db82b78ea632d4d3b9c00b8f49a272dafd6e1f78f62055fdf4c
+DIST rust-1.57.0-arm-unknown-linux-gnueabihf.tar.xz 206580040 BLAKE2B 3ff02d3308cc27e2422609055a82ed36dcfb3ed2180091653d7ec21ccbb07f3685c58dc5d20f4abf4e342ce18d1d98e47c0a82180b5dccd57d09d215984e6b3d SHA512 9351db6cbc029c1051da277292bd7c3728b6ef250da20a20ee619b45938ccdcd8da1ecfec143734cc692ca3a39690f2f8cd6c332e04d0fd048943a8203eb48fc
+DIST rust-1.57.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B e5495533d128a99505c7856b27eeae22f85b3f0783cc0c9d52e8e8e9fbcebee6b909fd3465a7b49d1e1da2477c1864fdd048f01f7ba684ed55133c925522aad2 SHA512 bf06cd5c1f6731b02351136c7682d05e6a7114702124768b5cde1935cae4dd1147352352ad9b8dded575b90a57a6cab7c09dbe179404da0e378e992e1a67f47f
+DIST rust-1.57.0-armv7-unknown-linux-gnueabihf.tar.xz 211614620 BLAKE2B e8c1f68d4e0846ee9425bd1747a423e1ab6161216a3cd276fd5afc13229dad33e3993d31305e3e38b4d3f6b21bb01fcdc9612d2217778a7f91915c65f1aa91d9 SHA512 667d8f6fb56408782c7a9e0c5086013d0350d6161d52ca4cd948ea39a02ebdf657dd45cb0a135ade8bc1e856c0962040969416fa1762e3bb55a03574fff3b1d1
+DIST rust-1.57.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 6bcb5e7c700a53d8420baa8747c06b291988b806aca6da447c283979f7324f31087482df5606c49d287c355e31b2952d7ed9f40713bce819ab8c02d1863413ce SHA512 164ae760f53820dddf93ce7432553d1698bcfb1af53dd6054d408db87f42b6ac2d7c71da375f8486675b2c6104fef295faff481e5167288e0df782ef74cc3006
+DIST rust-1.57.0-i686-unknown-linux-gnu.tar.xz 223062024 BLAKE2B d0e1d3aef1764403dcaa2b1d2a5ee887562f0b59b05b2f984e848da60f772c58bdd8a6073692c6b71dc741ff3d25a784c04478260104962d308529516a56cae3 SHA512 9dc7d650bbe35d3967a883e91bfd2a3dcad633c41c00a41d9ca78bc336b1e3262bbb4100a76d42169700dc3b15d4066fa065e785aed1c0a46df4736dfd00d7c6
+DIST rust-1.57.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 5d6f4d31e1418124cbd10a7cdb5ecbfe3334256d238e058e5524120438cebe85af68a8dfd604dc311d38e553a559b471dc71ef2870f89ed2cf05f6291e65ac0b SHA512 4957bef14da4bfc34f19d69cc64b2e06fd329566fc941e399105eea6fe4de0de90cd50c72baeaea6490f93bc4b0af14c9591584d97d84873d9c87fe7c177c6ea
+DIST rust-1.57.0-mips-unknown-linux-gnu.tar.xz 165094616 BLAKE2B ca5965c40ad81c24ee00f895e00e26cab1a2c0322e2517e4793872707facf03430a92934b79a3d59f349bfb7513be4d1914073fc3b20300d5fd5c332bcb08224 SHA512 1fbd2aeb8e24d236f97c81a4136917cc8c705724c72567be095323a878ee18ed646fc2f4bec446a9a505fc4c88a708efa901970fdb00a67179c34cf97906a3b4
+DIST rust-1.57.0-mips-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 230ccb3a534515c9ecd1ca2a3fced2e3688547a3ce42967eb06d7a04b79695eca74f1cf13583631139801a7ad60a31c7f6a1b2821dd13aceabc95386122034a0 SHA512 91313f0ed942d23bb490dffbc4b7eb9a441a09ff5925323df68a38c15aa4e3f5c1bad15c2700ccba8625fb35588135a9ba5f09c7bc5ba7d4f8486fed268a8000
+DIST rust-1.57.0-mips64-unknown-linux-gnuabi64.tar.xz 170276060 BLAKE2B 0c6defb288bdb11a8c81ab082944196c767424b8bab6997a51279c7c6ef6c1163c9715493b274420bca9d3f5e7fe7422d403a24162effc3cd880633641d23995 SHA512 339d1dc24e1227195b1fa1a72ceddf592026b4edf234141567e8b8c33c80e07aea71dd73962182783b60271829db8544e1ca6172aaf5ed5ae1cade848355508c
+DIST rust-1.57.0-mips64-unknown-linux-gnuabi64.tar.xz.asc 801 BLAKE2B 3b6ebc9e8678946f57e30452a880be3bf5a5a949683e7230cbda776511fd68a7278ecfc741c823d2d1362f200af19cbc25db7d67ab4ade8561a3d9224fd0313e SHA512 0a161f676162684da557d010de4833a6ef229592b6cb9cf55938cb85d12685e28fb0e4e204688b9c9f203b34095831de06c25a4fea48a8ef17226b15a214af0f
+DIST rust-1.57.0-mipsel-unknown-linux-gnu.tar.xz 168175700 BLAKE2B d544173e64d81b5cf74f16810f0c00fab0e2b628f90a554a33596b1b3140ef5183db5123f956ff71269761915469a7d51bdb945c02217f47529ae45f1200edc5 SHA512 7963364478ca613ca8670cc71b72e8423febe3062269ea1e5e82358d54c6d5e5006f85c69ae5c746bec296bd3e97883358ab27a9aaf59703984fa4186c5e01c7
+DIST rust-1.57.0-mipsel-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B a4056c8006cc5f3d7a548b55ff85f42003d19a7323bd3829c79ba370837c1982a0ca6d15e5d2dac9a4c75251662b375c8243ba0d2682b684b6fe258b25c32fbb SHA512 3db703e462c5c2e974e039c986094ae2bcbdf5e4b2163bbca4d20062be2e54b39f04d72d3f5929886f65e79f19a041e01cb17ec73db4611c3208b51efa2b7e89
+DIST rust-1.57.0-powerpc-unknown-linux-gnu.tar.xz 183173668 BLAKE2B 8d897751ce518f0e7fac16fa67645b73337cf2aeca20ffc8ceeace6591043a1b69cae9ba8af6271ad2b7b4448a64e4b5063a2efcb2cebc72c1d0a95c576dc07a SHA512 10ca7a769b53453c503d8da2ebd5da49e016d31a92e898c4aea4129cf1225330b2e1b4ac1893860741efd9ddc9ce409ff9d9fc00536b960efc928562f2e169a3
+DIST rust-1.57.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b7cfe911745b76e8b2a7090db19a6cc973ff361b0fc23c1d3d104c08554d7818866a6832c89cd8e1dbb519de72618ab362c9e6b1971a2babd0af607c9db9b0e0 SHA512 385c022053f6e102aa9c96c49703bd441b466129bffc5fb3c233f432edf2f2adad5e9979e0b657016eec33cf4b6c7bf31131a0e831c990d071d7da758f5e03d8
+DIST rust-1.57.0-powerpc64-unknown-linux-gnu.tar.xz 193868872 BLAKE2B f60c9d320fa6ca0d3b52dc27b22efb50115a1338ce12ea1071499d3abbd60e17c4866a59495fbca725eafef3675b9ca9417c87cad0262541955d2e308eb79f2e SHA512 4b5b2d461cd093f176c1624b29d4174bf9558e8760f7be84b9f9e353e09b622d89548e5bdc91305cf76a072ed2b64f4692b1864b90c86ba7e1a7a9e5df205adb
+DIST rust-1.57.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 26ea554afaca2e453130d400d3315d0c857e4ab92d5c0cfd21035548160a3c00f801adcbc24387aa6f56bc2907e3aaa3712b4bf35abc10128e3e712b3a451043 SHA512 90ff52af04044b073855c2a91bfe2bdb8fb8397a2d59ca50e38e5e235bd3379d993917546d1dacf3c25db6ec386f967cb8c9c5c7a1b76b06fa60d50a5c066176
+DIST rust-1.57.0-powerpc64le-unknown-linux-gnu.tar.xz 203489092 BLAKE2B 5174c149bd6565ed2b709356caf940f7c051a1933a35f9801a31331358277e80d5262a73ea47d484abb2c12ad26c52bbeea5d2ee30f4c8b45e163d5fc788d848 SHA512 7e0809b66086f1c9dde14df5bd9f08757e32bb58041b74150415f798d81cb4ca01a6d69d529efe8a93026f251aa8f1711520defa8d86de64f20d9055ee1568e5
+DIST rust-1.57.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 0ed205cf7d3712e3501c228ad7d116331eb3c831437040dc7d4cbfa86de80372db1b116bd2c88ef9c05c57279499dc7cb6a394c216e89a69a6b033d56e4108b0 SHA512 2a3fd37e32382c747227f35e144966bbd241d57b9e06acdb444ed0ac68cf174dd21c565448d9e7ec032d14dbf6de580ca37e6d10b66446dcbef35b0dd35a2c1d
+DIST rust-1.57.0-riscv64gc-unknown-linux-gnu.tar.xz 196918164 BLAKE2B b41e958b690a5f6f46744dd38a464a0de0b80d9b4974f1fea46bbce8b26c37b88ffeb3b42e9cd6a3006e8ad8b89a990945dcf1e814041399f6fa8831089c074f SHA512 43c11df8b6621c4e3ccbbb81c043cc3b2f8c897f5d80b03a39ec73d0d73f1a3fafa1a8a607fcf6e16204eb424ead7b9dee0ffd401c185440c4a7b80e84921f5a
+DIST rust-1.57.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B c55cc1c7c3e80bdb0527fcfe9b3a0bcb7edf84bea85e842ea425b5498247aaa8ffe19f05f1a2d8c93801dbf1d5e308760e8222311914179deb01f910aae279fe SHA512 df0d218a78eda0d005bb88e18a314f326165776449f28d4cd1aa014efa0e6870bacd2580f5958250e9a00de75c7327b20b4586606a8b120a7d658641759be61e
+DIST rust-1.57.0-s390x-unknown-linux-gnu.tar.xz 198621068 BLAKE2B 92af932e06c529ef27e389d35532cb7eed482c36bcc196d6c6934a442cc180815862ad7ee92c4ed97f69963ef6cfd617cab2bc254a81ffd35d88de267fb5d084 SHA512 4cc63e93bbafcbba2122a862200bf1dd241fe84f526778e1877c14237984fdeccdd3d2b3dfe73428b1b97bd253c1ddf98f4302f40709abbdd52ec721d5ccdb6e
+DIST rust-1.57.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B c088d5904ecaadcad09d21dcffcbe1856ea2165cb45fcdce31ebad6edddfeb292bb644548537219ec301c4f5e417091d879093a627ea5efb4409e1db36771431 SHA512 c1c2f43033ba1a2ed28e8c60a18cc0de1dfdc7f5361c101cb8318f0f2c3be911784e7d1cc3a61456f1b2c39a5b6df2915b9e56e20dbfdfeb959addf4dc93f01e
+DIST rust-1.57.0-x86_64-unknown-linux-gnu.tar.xz 151033748 BLAKE2B 61ecece6a8aa31a2cdf8dcf22514c19a54fcfda3a1248797a6a98e9bc42cf4f4278be21369270a6418b7c416875394055fceb49b5b1d21625e2759b97b2447e8 SHA512 54016b58fe85208c0d98e61cb52f2549bbb9731d7d631b4964663c91c91b7ea0ff4c224c3d29a770de433e6a0bcd92d2fe757563bf68e224a20c1cec6d031a7e
+DIST rust-1.57.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B ea41b27fd25cc75efac73203688ee0882767fc76a2fe09b5e424c42467d3e332463c5560cc58f3b20f6e4b44289a25cfb0d36e38a7a9a7b3950ef875a59dc9ae SHA512 8b955bfce6c130e4b95054b98646f7f9b89e621256759ee1ff533df5f777312dd7adbb192ee0076c9b9baa6883a74a9def50ef598ba8c707762290d465c9a8b7
+DIST rust-1.57.0-x86_64-unknown-linux-musl.tar.xz 260333980 BLAKE2B 75342ae8637355e714d5217d78604cfa6a601d3f9bc0ed4667ff0ca57c6521567b19b9bdb10f79761e2e5fd21ca10e12f3fae0c65791118fdb0c35f8f88349f4 SHA512 204ed493528757b8e3e8df13d062c9ae74c75c3e3adc1a2efc0dfc33d2525629168a558dd32653f44a4365191bf203a4415a77152276288a8e122e6bd587394a
+DIST rust-1.57.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 506400c3ea70469cbda0e492e85d41b7f94fba790ec19d1c3491bf4a00d283f97c8fb37319ad6c4a43b22a2195c21d1b9e3c16a5b2a9a82833ff61ad49bdc793 SHA512 793369dc7a854c48a72d81446a0c8eb9d83a071af77758e0bcbb8e4d518fb87c5a23c085202b9b427a02bdd772ad9c82724b34295b851f26f384c3e801bf9a04
 DIST rustc-1.53.0-src.tar.xz 115686332 BLAKE2B fa068f89d42f927fdc79ee31aad1386eaf2aa596a060e059c5a1a73fe48c48d008fc952cd6c7912b743e41d77a94b205639eed0f728b2539b62f18a772cabfe3 SHA512 70485cf7a0f7fc36ee31644e546374079dc387a85b44e5e793707fd0a4d7ca05d311291e78b86db955485d8f21c47ff9e1908acc4da68ba04929287213a40c24
 DIST rustc-1.53.0-src.tar.xz.asc 801 BLAKE2B 75d3aa4122968f10a119f7a04df897f496588c7a1a2ddf1ea2222099c9efb0e320f5677a26c3271f86e7f500120664485f54c6025ae3c6df30d2b0fe758f5826 SHA512 e337579b9ab4febca4594c2c5d42c279b51cfc745c383be9a430204188311a25319c04c73fde34fdb2bb98a88bfd8daaddc67765834330e6c279a6e5a5648247
 DIST rustc-1.54.0-src.tar.xz 116286856 BLAKE2B 5ac47822646a0b6205f09282168b4d4ddcace9f6bc8f242c890327ca4074626f129514f8bcae5c5556015745f718990cce490658076f5cd3526623439540416b SHA512 5162f85b43ca2c5af93fdbfb2597d75df8a838f7fcc025a5298499ce1043db50f1ea2fbba753e47ce5daad3d80d4b612acf6527ef902c34117763e687fdbbcfa
@@ -168,3 +200,5 @@ DIST rustc-1.56.1-src.tar.xz 121798264 BLAKE2B 09677b0332022f28a0d80949a6735929d
 DIST rustc-1.56.1-src.tar.xz.asc 801 BLAKE2B 70ed1c26971e864aa6cc9b05eb52c4a140d0d0cccb3ff66d4a13e1b1dbac958c5369f76524c4702311566ed26aff635f5e3d35d9da71d96e070f5f0e978dc2ba SHA512 f997e7962ef8b283c19c97d8b898f3642f1a58c89a9cc5470cf88682263a42e2054d670c12bf93c41e81edf8324a5b51453f402a74bccb7744c7f463cf689aa8
 DIST rustc-1.57.0-src.tar.xz 122681768 BLAKE2B 739fe2c34b01bb0c6beeb7717badeb2ba12f00b91831977bf0d8782d806071f8ed696e94bf51d53509ae6e5c5773544b2dcf4187e81682c2f765d0975c64ca7d SHA512 7903bcfc7c1db208da5d5991bd5b7f55dbe5917d4814274a8badf0d3b767211e81f8626c355ea93142f236abf116d5921c0b542ef309fbe84ece1ce84e5af30f
 DIST rustc-1.57.0-src.tar.xz.asc 801 BLAKE2B e5c2e91999d8d2bcb5be36ddc8559a59fc53445f639bd179239489f9fd2a2f00f2191cdbb2000b73866fbb332b51be090e95e348a3573676dc24e00cdbb071fa SHA512 fcf1393a1be3c585447e08078b804e7ffcddcb47d87877c13526592e317b889b15ad1786baef5d6adf020631a6773a9dd31c04779f475a528b28871920a4641f
+DIST rustc-1.58.0-src.tar.xz 124348768 BLAKE2B e5a0d919a1ca1202e218cec3da93fc69cba163069b1f2b4051778a49184715579c14cd6b03baa0225b10a8f1adf758aca427c910d95dfa2e647bbf8b7d133785 SHA512 70104f4d3b474dcb9935200ef0503f29cb15f10d38ba8630e1dadbb384924dd9137fced647794699efe83ac88083e4ae5f45712f0e1c8bc0a6f8c23eecdb0aeb
+DIST rustc-1.58.0-src.tar.xz.asc 801 BLAKE2B d8b3ae366d20e0a27b53973e0d215c0fd5f596116ede15ac0e729db4a92fff6c602fc3893674863040a97abaaab36b351413e87a2c6d77f823fcda5805d23daa SHA512 e4bffe84637b2708d00fae091e3eb868063a8f65da918a847ef7db3f1edd35f96068489cae77238decfc134f4456cf6e3122f993e61f1e4986d3ec7f029d7125
diff --git a/dev-lang/rust/rust-1.58.0.ebuild b/dev-lang/rust/rust-1.58.0.ebuild
new file mode 100644
index 000000000000..2b3cee83c811
--- /dev/null
+++ b/dev-lang/rust/rust-1.58.0.ebuild
@@ -0,0 +1,691 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing \
+	multilib multilib-build python-any-r1 rust-toolchain toolchain-funcs verify-sig
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	MY_P="rustc-beta"
+	SLOT="beta/${PV}"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz"
+else
+	ABI_VER="$(ver_cut 1-2)"
+	SLOT="stable/${ABI_VER}"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+
+SRC_URI="
+	https://static.rust-lang.org/dist/${SRC}
+	verify-sig? ( https://static.rust-lang.org/dist/${SRC}.asc )
+	!system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) )
+"
+
+# keep in sync with llvm ebuild of the same version as bundled one.
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="clippy cpu_flags_x86_sse2 debug doc miri nightly parallel-compiler rls rustfmt rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling more than one slot
+# simultaneously.
+
+# How to use it:
+# List all the working slots in LLVM_VALID_SLOTS, newest first.
+LLVM_VALID_SLOTS=( 13 )
+LLVM_MAX_SLOT="${LLVM_VALID_SLOTS[0]}"
+
+# splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
+# (-) usedep needed because we may build with older llvm without that target
+LLVM_DEPEND="|| ( "
+for _s in ${LLVM_VALID_SLOTS[@]}; do
+	LLVM_DEPEND+=" ( "
+	for _x in ${ALL_LLVM_TARGETS[@]}; do
+		LLVM_DEPEND+="
+			${_x}? ( sys-devel/llvm:${_s}[${_x}(-)] )"
+	done
+	LLVM_DEPEND+=" )"
+done
+unset _s _x
+LLVM_DEPEND+=" )
+	<sys-devel/llvm-$(( LLVM_MAX_SLOT + 1 )):=
+	wasm? ( sys-devel/lld )
+"
+
+# to bootstrap we need at least exactly previous version, or same.
+# most of the time previous versions fail to bootstrap with newer
+# for example 1.47.x, requires at least 1.46.x, 1.47.x is ok,
+# but it fails to bootstrap with 1.48.x
+# https://github.com/rust-lang/rust/blob/${PV}/src/stage0.txt
+RUST_DEP_PREV="$(ver_cut 1).$(($(ver_cut 2) - 1))*"
+RUST_DEP_CURR="$(ver_cut 1).$(ver_cut 2)*"
+BOOTSTRAP_DEPEND="||
+	(
+		=dev-lang/rust-"${RUST_DEP_PREV}"
+		=dev-lang/rust-bin-"${RUST_DEP_PREV}"
+		=dev-lang/rust-"${RUST_DEP_CURR}"
+		=dev-lang/rust-bin-"${RUST_DEP_CURR}"
+	)
+"
+
+BDEPEND="${PYTHON_DEPS}
+	app-eselect/eselect-rust
+	|| (
+		>=sys-devel/gcc-4.7
+		>=sys-devel/clang-3.5
+	)
+	system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
+	!system-llvm? (
+		>=dev-util/cmake-3.13.4
+		dev-util/ninja
+	)
+	test? ( sys-devel/gdb )
+	verify-sig? ( sec-keys/openpgp-keys-rust )
+"
+
+DEPEND="
+	>=app-arch/xz-utils-5.2
+	net-misc/curl:=[http2,ssl]
+	sys-libs/zlib:=
+	dev-libs/openssl:0=
+	elibc_musl? ( sys-libs/libunwind:= )
+	system-llvm? ( ${LLVM_DEPEND} )
+"
+
+# we need to block older versions due to layout changes.
+RDEPEND="${DEPEND}
+	app-eselect/eselect-rust
+	!<dev-lang/rust-1.47.0-r1
+	!<dev-lang/rust-bin-1.47.0-r1
+"
+
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
+	miri? ( nightly )
+	parallel-compiler? ( nightly )
+	rls? ( rust-src )
+	test? ( ${ALL_LLVM_TARGETS[*]} )
+	wasm? ( llvm_targets_WebAssembly )
+	x86? ( cpu_flags_x86_sse2 )
+"
+
+# we don't use cmake.eclass, but can get a warning
+CMAKE_WARN_UNUSED_CLI=no
+
+QA_FLAGS_IGNORED="
+	usr/lib/${PN}/${PV}/bin/.*
+	usr/lib/${PN}/${PV}/libexec/.*
+	usr/lib/${PN}/${PV}/lib/lib.*.so
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/bin/.*
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so
+"
+
+QA_SONAME="
+	usr/lib/${PN}/${PV}/lib/lib.*.so.*
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so
+"
+
+QA_PRESTRIPPED="
+	usr/lib/rust/${PV}/lib/rustlib/.*/bin/rust-llvm-dwp
+"
+# An rmeta file is custom binary format that contains the metadata for the crate.
+# rmeta files do not support linking, since they do not contain compiled object files.
+# so we can safely silence the warning for this QA check.
+QA_EXECSTACK="usr/lib/${PN}/${PV}/lib/rustlib/*/lib*.rlib:lib.rmeta"
+
+# causes double bootstrap
+RESTRICT="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc
+
+PATCHES=(
+	"${FILESDIR}"/1.55.0-ignore-broken-and-non-applicable-tests.patch
+	"${FILESDIR}"/1.49.0-gentoo-musl-target-specs.patch
+)
+
+S="${WORKDIR}/${MY_P}-src"
+
+toml_usex() {
+	usex "${1}" true false
+}
+
+bootstrap_rust_version_check() {
+	# never call from pkg_pretend. eselect-rust may be not installed yet.
+	[[ ${MERGE_TYPE} == binary ]] && return
+	local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
+	local rustc_toonew="$(ver_cut 1).$(($(ver_cut 2) + 1))"
+	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
+	rustc_version=${rustc_version[0]#rust-bin-}
+	rustc_version=${rustc_version#rust-}
+
+	[[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
+
+	if ver_test "${rustc_version}" -lt "${rustc_wanted}" ; then
+		eerror "Rust >=${rustc_wanted} is required"
+		eerror "please run 'eselect rust' and set correct rust version"
+		die "selected rust version is too old"
+	elif ver_test "${rustc_version}" -ge "${rustc_toonew}" ; then
+		eerror "Rust <${rustc_toonew} is required"
+		eerror "please run 'eselect rust' and set correct rust version"
+		die "selected rust version is too new"
+	else
+		einfo "Using rust ${rustc_version} to build"
+	fi
+}
+
+pre_build_checks() {
+	local M=4096
+	# multiply requirements by 1.5 if we are doing x86-multilib
+	if use amd64; then
+		M=$(( $(usex abi_x86_32 15 10) * ${M} / 10 ))
+	fi
+	M=$(( $(usex clippy 128 0) + ${M} ))
+	M=$(( $(usex miri 128 0) + ${M} ))
+	M=$(( $(usex rls 512 0) + ${M} ))
+	M=$(( $(usex rustfmt 256 0) + ${M} ))
+	# add 2G if we compile llvm and 256M per llvm_target
+	if ! use system-llvm; then
+		M=$(( 2048 + ${M} ))
+		local ltarget
+		for ltarget in ${ALL_LLVM_TARGETS[@]}; do
+			M=$(( $(usex ${ltarget} 256 0) + ${M} ))
+		done
+	fi
+	M=$(( $(usex wasm 256 0) + ${M} ))
+	M=$(( $(usex debug 2 1) * ${M} ))
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		M=$(( 15 * ${M} / 10 ))
+	fi
+	eshopts_pop
+	M=$(( $(usex system-bootstrap 0 1024) + ${M} ))
+	M=$(( $(usex doc 256 0) + ${M} ))
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+llvm_check_deps() {
+	has_version -r "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+	python-any-r1_pkg_setup
+
+	export LIBGIT2_NO_PKG_CONFIG=1 #749381
+
+	use system-bootstrap && bootstrap_rust_version_check
+
+	if use system-llvm; then
+		llvm_pkg_setup
+
+		local llvm_config="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+		export LLVM_LINK_SHARED=1
+		export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)"
+	fi
+}
+
+src_prepare() {
+	if ! use system-bootstrap; then
+		local rust_stage0_root="${WORKDIR}"/rust-stage0
+		local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
+
+		"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \
+			--without=rust-docs --destdir="${rust_stage0_root}" --prefix=/ || die
+	fi
+
+	default
+}
+
+src_configure() {
+	local rust_target="" rust_targets="" arch_cflags
+
+	# Collect rust target names to compile standard libs for all ABIs.
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
+	done
+	if use wasm; then
+		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
+		if use system-llvm; then
+			# un-hardcode rust-lld linker for this target
+			# https://bugs.gentoo.org/715348
+			sed -i '/linker:/ s/rust-lld/wasm-ld/' compiler/rustc_target/src/spec/wasm_base.rs || die
+		fi
+	fi
+	rust_targets="${rust_targets#,}"
+
+	local tools="\"cargo\","
+	if use clippy; then
+		tools="\"clippy\",$tools"
+	fi
+	if use miri; then
+		tools="\"miri\",$tools"
+	fi
+	if use rls; then
+		tools="\"rls\",\"analysis\",$tools"
+	fi
+	if use rustfmt; then
+		tools="\"rustfmt\",$tools"
+	fi
+	if use rust-src; then
+		tools="\"src\",$tools"
+	fi
+
+	local rust_stage0_root
+	if use system-bootstrap; then
+		local printsysroot
+		printsysroot="$(rustc --print sysroot || die "Can't determine rust's sysroot")"
+		rust_stage0_root="${printsysroot}"
+	else
+		rust_stage0_root="${WORKDIR}"/rust-stage0
+	fi
+	# in case of prefix it will be already prefixed, as --print sysroot returns full path
+	[[ -d ${rust_stage0_root} ]] || die "${rust_stage0_root} is not a directory"
+
+	rust_target="$(rust_abi)"
+
+	cat <<- _EOF_ > "${S}"/config.toml
+		changelog-seen = 2
+		[llvm]
+		download-ci-llvm = false
+		optimize = $(toml_usex !debug)
+		release-debuginfo = $(toml_usex debug)
+		assertions = $(toml_usex debug)
+		ninja = true
+		targets = "${LLVM_TARGETS// /;}"
+		experimental-targets = ""
+		link-shared = $(toml_usex system-llvm)
+		[build]
+		build-stage = 2
+		test-stage = 2
+		doc-stage = 2
+		build = "${rust_target}"
+		host = ["${rust_target}"]
+		target = [${rust_targets}]
+		cargo = "${rust_stage0_root}/bin/cargo"
+		rustc = "${rust_stage0_root}/bin/rustc"
+		rustfmt = "${rust_stage0_root}/bin/rustfmt"
+		docs = $(toml_usex doc)
+		compiler-docs = false
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		extended = true
+		tools = [${tools}]
+		verbose = 2
+		sanitizers = false
+		profiler = false
+		cargo-native-static = false
+		[install]
+		prefix = "${EPREFIX}/usr/lib/${PN}/${PV}"
+		sysconfdir = "etc"
+		docdir = "share/doc/rust"
+		bindir = "bin"
+		libdir = "lib"
+		mandir = "share/man"
+		[rust]
+		# https://github.com/rust-lang/rust/issues/54872
+		codegen-units-std = 1
+		optimize = true
+		debug = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		debug-assertions-std = $(toml_usex debug)
+		debuginfo-level = $(usex debug 2 0)
+		debuginfo-level-rustc = $(usex debug 2 0)
+		debuginfo-level-std = $(usex debug 2 0)
+		debuginfo-level-tools = $(usex debug 2 0)
+		debuginfo-level-tests = 0
+		backtrace = true
+		incremental = false
+		default-linker = "$(tc-getCC)"
+		parallel-compiler = $(toml_usex parallel-compiler)
+		channel = "$(usex nightly nightly stable)"
+		description = "gentoo"
+		rpath = false
+		verbose-tests = true
+		optimize-tests = $(toml_usex !debug)
+		codegen-tests = true
+		dist-src = false
+		remap-debuginfo = true
+		lld = $(usex system-llvm false $(toml_usex wasm))
+		# only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it
+		# https://github.com/rust-lang/rust/issues/74976
+		# https://github.com/rust-lang/rust/issues/76526
+		deny-warnings = $(usex wasm $(usex doc false true) true)
+		backtrace-on-ice = true
+		jemalloc = false
+		[dist]
+		src-tarball = false
+		compression-formats = ["gz"]
+	_EOF_
+
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
+
+		cat <<- _EOF_ >> "${S}"/config.env
+			CFLAGS_${rust_target}=${arch_cflags}
+		_EOF_
+
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.${rust_target}]
+			ar = "$(tc-getAR)"
+			cc = "$(tc-getCC)"
+			cxx = "$(tc-getCXX)"
+			linker = "$(tc-getCC)"
+			ranlib = "$(tc-getRANLIB)"
+		_EOF_
+		# librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
+		if use elibc_musl; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				crt-static = false
+			_EOF_
+		fi
+		if use system-llvm; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+			_EOF_
+		fi
+	done
+	if use wasm; then
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.wasm32-unknown-unknown]
+			linker = "$(usex system-llvm lld rust-lld)"
+		_EOF_
+	fi
+
+	if [[ -n ${I_KNOW_WHAT_I_AM_DOING_CROSS} ]]; then # whitespace intentionally shifted below
+	# experimental cross support
+	# discussion: https://bugs.gentoo.org/679878
+	# TODO: c*flags, clang, system-llvm, cargo.eclass target support
+	# it would be much better if we could split out stdlib
+	# complilation to separate ebuild and abuse CATEGORY to
+	# just install to /usr/lib/rustlib/<target>
+
+	# extra targets defined as a bash array
+	# spec format:  <LLVM target>:<rust-target>:<CTARGET>
+	# best place would be /etc/portage/env/dev-lang/rust
+	# Example:
+	# RUST_CROSS_TARGETS=(
+	#	"AArch64:aarch64-unknown-linux-gnu:aarch64-unknown-linux-gnu"
+	# )
+	# no extra hand holding is done, no target transformations, all
+	# values are passed as-is with just basic checks, so it's up to user to supply correct values
+	# valid rust targets can be obtained with
+	# 	rustc --print target-list
+	# matching cross toolchain has to be installed
+	# matching LLVM_TARGET has to be enabled for both rust and llvm (if using system one)
+	# only gcc toolchains installed with crossdev are checked for now.
+
+	# BUG: we can't pass host flags to cross compiler, so just filter for now
+	# BUG: this should be more fine-grained.
+	filter-flags '-mcpu=*' '-march=*' '-mtune=*'
+
+	local cross_target_spec
+	for cross_target_spec in "${RUST_CROSS_TARGETS[@]}";do
+		# extracts first element form <LLVM target>:<rust-target>:<CTARGET>
+		local cross_llvm_target="${cross_target_spec%%:*}"
+		# extracts toolchain triples, <rust-target>:<CTARGET>
+		local cross_triples="${cross_target_spec#*:}"
+		# extracts first element after before : separator
+		local cross_rust_target="${cross_triples%%:*}"
+		# extracts last element after : separator
+		local cross_toolchain="${cross_triples##*:}"
+		use llvm_targets_${cross_llvm_target} || die "need llvm_targets_${cross_llvm_target} target enabled"
+		command -v ${cross_toolchain}-gcc > /dev/null 2>&1 || die "need ${cross_toolchain} cross toolchain"
+
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.${cross_rust_target}]
+			ar = "${cross_toolchain}-ar"
+			cc = "${cross_toolchain}-gcc"
+			cxx = "${cross_toolchain}-g++"
+			linker = "${cross_toolchain}-gcc"
+			ranlib = "${cross_toolchain}-ranlib"
+		_EOF_
+		if use system-llvm; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+			_EOF_
+		fi
+		if [[ "${cross_toolchain}" == *-musl* ]]; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				musl-root = "$(${cross_toolchain}-gcc -print-sysroot)/usr"
+			_EOF_
+		fi
+
+		# append cross target to "normal" target list
+		# example 'target = ["powerpc64le-unknown-linux-gnu"]'
+		# becomes 'target = ["powerpc64le-unknown-linux-gnu","aarch64-unknown-linux-gnu"]'
+
+		rust_targets="${rust_targets},\"${cross_rust_target}\""
+		sed -i "/^target = \[/ s#\[.*\]#\[${rust_targets}\]#" config.toml || die
+
+		ewarn
+		ewarn "Enabled ${cross_rust_target} rust target"
+		ewarn "Using ${cross_toolchain} cross toolchain"
+		ewarn
+		if ! has_version -b 'sys-devel/binutils[multitarget]' ; then
+			ewarn "'sys-devel/binutils[multitarget]' is not installed"
+			ewarn "'strip' will be unable to strip cross libraries"
+			ewarn "cross targets will be installed with full debug information"
+			ewarn "enable 'multitarget' USE flag for binutils to be able to strip object files"
+			ewarn
+			ewarn "Alternatively llvm-strip can be used, it supports stripping any target"
+			ewarn "define STRIP=\"llvm-strip\" to use it (experimental)"
+			ewarn
+		fi
+	done
+	fi # I_KNOW_WHAT_I_AM_DOING_CROSS
+
+	einfo "Rust configured with the following flags:"
+	echo
+	echo RUSTFLAGS="${RUSTFLAGS:-}"
+	echo RUSTFLAGS_BOOTSTRAP="${RUSTFLAGS_BOOTSTRAP:-}"
+	echo RUSTFLAGS_NOT_BOOTSTRAP="${RUSTFLAGS_NOT_BOOTSTRAP:-}"
+	env | grep "CARGO_TARGET_.*_RUSTFLAGS="
+	cat "${S}"/config.env || die
+	echo
+	einfo "config.toml contents:"
+	cat "${S}"/config.toml || die
+	echo
+}
+
+src_compile() {
+	# we need \n IFS to have config.env with spaces loaded properly. #734018
+	(
+	IFS=$'\n'
+	env $(cat "${S}"/config.env) RUST_BACKTRACE=1\
+		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+	)
+}
+
+src_test() {
+	# https://rustc-dev-guide.rust-lang.org/tests/intro.html
+
+	# those are basic and codegen tests.
+	local tests=(
+		codegen
+		codegen-units
+		compile-fail
+		incremental
+		mir-opt
+		pretty
+		run-make
+	)
+
+	# fails if llvm is not built with ALL targets.
+	# and known to fail with system llvm sometimes.
+	use system-llvm || tests+=( assembly )
+
+	# fragile/expensive/less important tests
+	# or tests that require extra builds
+	# TODO: instead of skipping, just make some nonfatal.
+	if [[ ${ERUST_RUN_EXTRA_TESTS:-no} != no ]]; then
+		tests+=(
+			rustdoc
+			rustdoc-js
+			rustdoc-js-std
+			rustdoc-ui
+			run-make-fulldeps
+			ui
+			ui-fulldeps
+		)
+	fi
+
+	local i failed=()
+	einfo "rust_src_test: enabled tests ${tests[@]/#/src/test/}"
+	for i in "${tests[@]}"; do
+		local t="src/test/${i}"
+		einfo "rust_src_test: running ${t}"
+		if ! (
+				IFS=$'\n'
+				env $(cat "${S}"/config.env) RUST_BACKTRACE=1 \
+				"${EPYTHON}" ./x.py test -vv --config="${S}"/config.toml \
+				-j$(makeopts_jobs) --no-doc --no-fail-fast "${t}"
+			)
+		then
+				failed+=( "${t}" )
+				eerror "rust_src_test: ${t} failed"
+		fi
+	done
+
+	if [[ ${#failed[@]} -ne 0 ]]; then
+		eerror "rust_src_test: failure summary: ${failed[@]}"
+		die "aborting due to test failures"
+	fi
+}
+
+src_install() {
+	(
+	IFS=$'\n'
+	env $(cat "${S}"/config.env) DESTDIR="${D}" \
+		"${EPYTHON}" ./x.py install	-vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+	)
+
+	# bug #689562, #689160
+	rm -v "${ED}/usr/lib/${PN}/${PV}/etc/bash_completion.d/cargo" || die
+	rmdir -v "${ED}/usr/lib/${PN}/${PV}"/etc{/bash_completion.d,} || die
+	newbashcomp src/tools/cargo/src/etc/cargo.bashcomp.sh cargo
+
+	local symlinks=(
+		cargo
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	use miri && symlinks+=( miri cargo-miri )
+	use rls && symlinks+=( rls )
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+
+	einfo "installing eselect-rust symlinks and paths: ${symlinks[@]}"
+	local i
+	for i in "${symlinks[@]}"; do
+		# we need realpath on /usr/bin/* symlink return version-appended binary path.
+		# so /usr/bin/rustc should point to /usr/lib/rust/<ver>/bin/rustc-<ver>
+		# need to fix eselect-rust to remove this hack.
+		local ver_i="${i}-${PV}"
+		if [[ -f "${ED}/usr/lib/${PN}/${PV}/bin/${i}" ]]; then
+			einfo "Installing ${i} symlink"
+			ln -v "${ED}/usr/lib/${PN}/${PV}/bin/${i}" "${ED}/usr/lib/${PN}/${PV}/bin/${ver_i}" || die
+		else
+			ewarn "${i} symlink requested, but source file not found"
+			ewarn "please report this"
+		fi
+		dosym "../lib/${PN}/${PV}/bin/${ver_i}" "/usr/bin/${ver_i}"
+	done
+
+	# symlinks to switch components to active rust in eselect
+	dosym "${PV}/lib" "/usr/lib/${PN}/lib-${PV}"
+	dosym "${PV}/libexec" "/usr/lib/${PN}/libexec-${PV}"
+	dosym "${PV}/share/man" "/usr/lib/${PN}/man-${PV}"
+	dosym "rust/${PV}/lib/rustlib" "/usr/lib/rustlib-${PV}"
+	dosym "../../lib/${PN}/${PV}/share/doc/rust" "/usr/share/doc/${P}"
+
+	newenvd - "50${P}" <<-_EOF_
+		LDPATH="${EPREFIX}/usr/lib/rust/lib"
+		MANPATH="${EPREFIX}/usr/lib/rust/man"
+		$(use amd64 && usex elibc_musl 'CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
+		$(use arm64 && usex elibc_musl 'CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
+	_EOF_
+
+	rm -rf "${ED}/usr/lib/${PN}/${PV}"/*.old || die
+	rm -rf "${ED}/usr/lib/${PN}/${PV}/doc"/*.old || die
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-_EOF_ > "${T}/provider-${P}"
+		/usr/bin/cargo
+		/usr/bin/rustdoc
+		/usr/bin/rust-gdb
+		/usr/bin/rust-gdbgui
+		/usr/bin/rust-lldb
+		/usr/lib/rustlib
+		/usr/lib/rust/lib
+		/usr/lib/rust/libexec
+		/usr/lib/rust/man
+		/usr/share/doc/rust
+	_EOF_
+
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use miri; then
+		echo /usr/bin/miri >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-miri >> "${T}/provider-${P}"
+	fi
+	if use rls; then
+		echo /usr/bin/rls >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update
+
+	if has_version sys-devel/gdb || has_version dev-util/lldb; then
+		elog "Rust installs a helper script for calling GDB and LLDB,"
+		elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+	fi
+
+	if has_version app-editors/emacs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 174e81509117..277b9aca7ba0 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild b/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild
index 7fb42792909e..acc0a8d07169 100644
--- a/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild
+++ b/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2021 Gentoo Authors
+# Copyright 2003-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND=""
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index a6e92078fe5d..f7baf5561cb2 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -1,3 +1 @@
-DIST libbpf-0.5.0.tar.gz 815083 BLAKE2B 9097d808f03cbbe61cd59b24347075e2937603f51350f83f8897123900c911392d7545af8135f39f749132c6518296f1a4d22d37c0c7b4371631f5c63a0dd9ac SHA512 3c578d3e6e93a306a1f182978e54f35fec8acfa51fad5d7de72c5003f10c266d7474e82d6dd045311fcaf8c18aa8cebe64a3336a458a9ea477e5a58e5111dd85
-DIST libbpf-0.6.0.tar.gz 858210 BLAKE2B a6076ae7465eb9c99ff1b2c63a388ef2d15c71882d7de0b5279604ad7b91ef3fce583c88710126a9384d96a810775409daadb0adaea41dd9dfc12af183fa50d7 SHA512 923eac64dca015939cbbd51cb0a7daf609d9873d249d6e621d73776b51c52f6087f2a957976163474d359a471250b27b44ad93179948335e949a82ed9613ed43
 DIST libbpf-0.6.1.tar.gz 858232 BLAKE2B 239e7bf47c24d09eb8e177e61d00bd834a0155c8773918246514858fe27688911f79dc4a22d02ab256c7c137010875f8d39d4fec9cecfd7a2b77e6b4df7610ea SHA512 5a8ca70c571fb306dd280f0526db48b78b13b57b4012f7bd3933d6e07d5e41e9370b2db6ed9bbc283c6dcbb21036810bf3093f462906b66557ce0d850c89083a
diff --git a/dev-libs/libbpf/libbpf-0.5.0.ebuild b/dev-libs/libbpf/libbpf-0.5.0.ebuild
deleted file mode 100644
index 51d7b76615b5..000000000000
--- a/dev-libs/libbpf/libbpf-0.5.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-S="${WORKDIR}/${P}/src"
-
-DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
-HOMEPAGE="https://github.com/libbpf/libbpf"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0/${PV}"
-IUSE="static-libs"
-
-DEPEND="
-	sys-kernel/linux-headers
-	virtual/libelf"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/libbpf-9999-paths.patch
-)
-
-src_configure() {
-	append-cflags -fPIC
-	tc-export CC AR
-	export LIBSUBDIR="$(get_libdir)"
-	export V=1
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		install install_uapi_headers
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-}
diff --git a/dev-libs/libbpf/libbpf-0.6.0.ebuild b/dev-libs/libbpf/libbpf-0.6.0.ebuild
deleted file mode 100644
index f4feea29582b..000000000000
--- a/dev-libs/libbpf/libbpf-0.6.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-S="${WORKDIR}/${P}/src"
-
-DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
-HOMEPAGE="https://github.com/libbpf/libbpf"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0/$(ver_cut 1-2 ${PV})"
-IUSE="static-libs"
-
-DEPEND="
-	sys-kernel/linux-headers
-	virtual/libelf
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/libbpf-9999-paths.patch
-)
-
-src_configure() {
-	append-cflags -fPIC
-	tc-export CC AR
-	export LIBSUBDIR="$(get_libdir)" V=1
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		install install_uapi_headers
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-}
diff --git a/dev-libs/libbpf/libbpf-0.6.1.ebuild b/dev-libs/libbpf/libbpf-0.6.1.ebuild
index 078172192195..f4feea29582b 100644
--- a/dev-libs/libbpf/libbpf-0.6.1.ebuild
+++ b/dev-libs/libbpf/libbpf-0.6.1.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/${PN}/${PN}/archive/v${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
 S="${WORKDIR}/${P}/src"
 
diff --git a/dev-libs/mmtf-cpp/mmtf-cpp-1.0.0.ebuild b/dev-libs/mmtf-cpp/mmtf-cpp-1.0.0-r1.ebuild
similarity index 86%
rename from dev-libs/mmtf-cpp/mmtf-cpp-1.0.0.ebuild
rename to dev-libs/mmtf-cpp/mmtf-cpp-1.0.0-r1.ebuild
index 0fa3e97566a2..c31d0595eb2f 100644
--- a/dev-libs/mmtf-cpp/mmtf-cpp-1.0.0.ebuild
+++ b/dev-libs/mmtf-cpp/mmtf-cpp-1.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="The pure C++ implementation of the MMTF API, decoder and encoder"
 HOMEPAGE="https://github.com/rcsb/mmtf-cpp"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 0ac9ca07e914..44f45b0817e0 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
index 7c3455031b75..fbeee42c3a43 100644
--- a/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 MY_PV=${PV/_p/+}
 MY_P=${PN}-${MY_PV}
+
 DESCRIPTION="System for writing extensible parsers for programming languages"
 HOMEPAGE="https://github.com/camlp4/camlp4"
 SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/_p/-}"
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
@@ -17,9 +17,13 @@ IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
+	dev-ml/ocamlbuild[ocamlopt?]
 	dev-ml/findlib:="
 
+QA_FLAGS_IGNORED='.*'
+
+S="${WORKDIR}/${P/_p/-}"
+
 src_configure() {
 	./configure \
 		--bindir="${EPREFIX}/usr/bin" \
diff --git a/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
index 4df4e6606fe2..45915fd4cf46 100644
--- a/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,9 +17,11 @@ IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]"
 DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
+	dev-ml/ocamlbuild[ocamlopt?]
 	dev-ml/findlib:="
 
+QA_FLAGS_IGNORED='.*'
+
 S=${WORKDIR}/${P/_p/-}
 PATCHES=( "${FILESDIR}/reload.patch" )
 
diff --git a/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild b/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
index 539fe3cd8554..06d603572592 100644
--- a/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
+++ b/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,9 +17,11 @@ IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
+	dev-ml/ocamlbuild[ocamlopt?]
 	dev-ml/findlib:="
 
+QA_FLAGS_IGNORED='.*'
+
 S=${WORKDIR}/${P/_p/-}
 PATCHES=( "${FILESDIR}/reload.patch" )
 
diff --git a/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild b/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
index 24d6b91a79bb..f3e7028826d7 100644
--- a/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
+++ b/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
+	dev-ml/ocamlbuild[ocamlopt?]
 	dev-ml/findlib:="
 
 QA_FLAGS_IGNORED='.*'
diff --git a/dev-ml/camlp4/camlp4-4.12-r1.ebuild b/dev-ml/camlp4/camlp4-4.12-r1.ebuild
index e159ddff977f..06d603572592 100644
--- a/dev-ml/camlp4/camlp4-4.12-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
+	dev-ml/ocamlbuild[ocamlopt?]
 	dev-ml/findlib:="
 
 QA_FLAGS_IGNORED='.*'
diff --git a/dev-ml/camlp4/camlp4-4.13-r1.ebuild b/dev-ml/camlp4/camlp4-4.13-r1.ebuild
index e159ddff977f..06d603572592 100644
--- a/dev-ml/camlp4/camlp4-4.13-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
+	dev-ml/ocamlbuild[ocamlopt?]
 	dev-ml/findlib:="
 
 QA_FLAGS_IGNORED='.*'
diff --git a/dev-ml/logs/logs-0.7.0-r1.ebuild b/dev-ml/logs/logs-0.7.0-r1.ebuild
index e422a0867153..7df040fc0574 100644
--- a/dev-ml/logs/logs-0.7.0-r1.ebuild
+++ b/dev-ml/logs/logs-0.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,7 +47,7 @@ src_compile() {
 		--with-js_of_ocaml false \
 		--with-fmt $(usex fmt true false) \
 		--with-cmdliner $(usex cli true false) \
-		--with-lwt $(usex fmt true false) \
+		--with-lwt $(usex lwt true false) \
 		--tests $(usex test true false) \
 		--with-base-threads true \
 		|| die
diff --git a/dev-ml/opam-client/opam-client-2.0.9.ebuild b/dev-ml/opam-client/opam-client-2.0.9.ebuild
index 8b519bf71f8a..86cf70ebe60a 100644
--- a/dev-ml/opam-client/opam-client-2.0.9.ebuild
+++ b/dev-ml/opam-client/opam-client-2.0.9.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/opam-core/opam-core-2.0.9.ebuild b/dev-ml/opam-core/opam-core-2.0.9.ebuild
index 9d8bcce46aee..1300667af70c 100644
--- a/dev-ml/opam-core/opam-core-2.0.9.ebuild
+++ b/dev-ml/opam-core/opam-core-2.0.9.ebuild
@@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 
 RDEPEND="
 	dev-ml/ocamlgraph:=
diff --git a/dev-ml/opam-format/opam-format-2.0.9.ebuild b/dev-ml/opam-format/opam-format-2.0.9.ebuild
index 757e70bbc0cb..0f7882b1d5e3 100644
--- a/dev-ml/opam-format/opam-format-2.0.9.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.9.ebuild
@@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
index 81fe573e074f..0d7748530ef7 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 
 # Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
 PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
diff --git a/dev-ml/opam-repository/opam-repository-2.0.9.ebuild b/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
index 85cfd906d877..0b9bf91626f0 100644
--- a/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
+++ b/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
index 64fe23d5a69c..9dd373cc5af7 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/opam-state/opam-state-2.0.9.ebuild b/dev-ml/opam-state/opam-state-2.0.9.ebuild
index dab205640b97..f24b0cc3aab2 100644
--- a/dev-ml/opam-state/opam-state-2.0.9.ebuild
+++ b/dev-ml/opam-state/opam-state-2.0.9.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/opam/opam-2.0.9.ebuild b/dev-ml/opam/opam-2.0.9.ebuild
index 0fb983bec7d5..9c6caf213221 100644
--- a/dev-ml/opam/opam-2.0.9.ebuild
+++ b/dev-ml/opam/opam-2.0.9.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index bc9b91e16d4d..1e87ac7eb1c6 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/X11-Protocol-Other/X11-Protocol-Other-31.ebuild b/dev-perl/X11-Protocol-Other/X11-Protocol-Other-31.ebuild
index 54f9b4edc6b2..b8290d12fa57 100644
--- a/dev-perl/X11-Protocol-Other/X11-Protocol-Other-31.ebuild
+++ b/dev-perl/X11-Protocol-Other/X11-Protocol-Other-31.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="X11 Protocol related components not included in dev-perl/X11-Protoc
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-perl/X11-Protocol"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9df2d16cf9cc..5ce62545b4f5 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/adblock/adblock-0.5.1.ebuild b/dev-python/adblock/adblock-0.5.1.ebuild
index ed820b8a8806..bbe06f214840 100644
--- a/dev-python/adblock/adblock-0.5.1.ebuild
+++ b/dev-python/adblock/adblock-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -95,7 +95,7 @@ BDEPEND="
 QA_FLAGS_IGNORED=".*/site-packages/${PN}/${PN}.abi3.so"
 
 src_compile() {
-	maturin build $(usev !debug --release) --no-sdist || die
+	maturin build $(usev !debug --release) --no-sdist --skip-auditwheel || die
 
 	mv target/$(usex debug{,} release)/lib${PN}.so ${PN}/${PN}.abi3.so || die
 }
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild
index 9472d5fef57d..25951fee5005 100644
--- a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 1fcac0dbdc3b..5073d6de48e9 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -8,4 +8,5 @@ DIST boto3-1.20.31.tar.gz 458553 BLAKE2B 396acd8bbc47f76a0ba65da4b83f141f2536903
 DIST boto3-1.20.32.tar.gz 459036 BLAKE2B 21aaba2f5f5db65edc3570e44082cf394429407c0431bdfc19866e530b48358909ab730ecb5b871dcbb5f4c087af43f53474a7dca6ce9ca84e78ba480f5cc819 SHA512 a50f0724f4c6ab8b0fc0b329909ff35126bbdc9c73da5927dd1259565b2e43e87c718bbf8b2dd5433e75b4d35b8094d3fc122163febbbe66b6175ecfeb81fad9
 DIST boto3-1.20.33.tar.gz 459654 BLAKE2B bf2090e6af9cad5f4e9e5178d30e109c63c403137f9656c22358bb672da7e0ca2e9f36585b5721f2a7bbb2d3d3027fb3942e055d3db78ede0b03f5b6a2e6ad78 SHA512 877c8e59686cd7ac940aa7fb1f2adc75a89e4ce5c74e7a999bebe80e80819c6f909ee8f9acca1c85a6a11f3b7a8ba39a41221ec54a8b99c412da9208a791f4b3
 DIST boto3-1.20.34.tar.gz 460169 BLAKE2B d687bb3a90da0e8cd48e551dad68754edc97689350f43879c90e8c96470dc79d389b5332d06d079dd4d26f303d9260f1a83bfc2edfa2507e3a33020e4475e8f1 SHA512 ae13db5ed516a9166c14e72e078f45c911a9c16edc2e2d95dc296de09345fb311ecad92ec7615137b01edaae254d075b74e68c1c909a79b2eb1ac2416ab5bbad
+DIST boto3-1.20.35.tar.gz 460636 BLAKE2B 4ec04ae5caac912beb4933727ef0f8f1266b9ab27788a98d7ae10fc8b19a79e3deeed0ce6c1156f12ad12062df24828909fff070813fae4efc705b5e7babc2b1 SHA512 59fcaf477d5d67d68dcc007d93391b71ad8d04d46fc3c098c3f0fb7c82806a1a37999bdb292a240862dbaf83a6c2890d947315d1d9a4faeae68fb9e896cae73b
 DIST boto3-1.20.5.tar.gz 439166 BLAKE2B c140e15e497e6cdf6b4b77bb99e0a0f5ac01d5b5793f8bfb210b52bbc09e39e6fe06a957951375e0795210dc1c3b2a0afd2f498bc88e449d9e6846f2b357f016 SHA512 2823466e4851684253d4ce42a8c34e5cbdad6d04c823040fe2cebdf0cffb14d5d3f40e28d57ebec14533fab04ba74f27c25f078ddb8791b8f52d0424e11b39fc
diff --git a/dev-python/boto3/boto3-1.20.35.ebuild b/dev-python/boto3/boto3-1.20.35.ebuild
new file mode 100644
index 000000000000..0d5810a8ffe0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.35.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 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 ~riscv ~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 pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 79410dc555bc..d08b742613c6 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -8,4 +8,5 @@ DIST botocore-1.23.31.tar.gz 8706949 BLAKE2B 2e31bc09173a93806fe045e5217defcf17b
 DIST botocore-1.23.32.tar.gz 8710235 BLAKE2B 278189ae1ee9887e62092344543b6431425640c90c243161cc34448f5b4ed9cce624042bd21d445150f09e695608361633554d535aaaf1850b5987111a43657d SHA512 f33c9818d3985a0334d5c2cf2f9ec9aa34834a73dfc73f8e9298e59432141f6792acecf0380cb8d607cdd12156f182ee130952390d8f0e808cca12659317b2e3
 DIST botocore-1.23.33.tar.gz 8712535 BLAKE2B 97064bfe24db14e49ff37b515549a2294ed2fbba82f36cf4d5281db27add007c8524058cb208bcf168add9e739bb2d51e7980295938ac6ff6ff603ffd0cfccee SHA512 7373a9cac5efb12898ac1665b74a5eb3693d5e5defd55bc2972bc70cbfcdf69672a8cb4b8d0a6b2bfbc59e789fedea09014ac47ba9ef6af8cc038471330850f0
 DIST botocore-1.23.34.tar.gz 8718420 BLAKE2B 67325949a37c3a3ff61e66279626c30b8f225d74137512d9a45414e1af11a18dd5fba5f0f4e64dd71c3d0bbbabf210d6e8a63901bc6deba8f16e3cfc163ebb81 SHA512 8afdf0a186f4850e8905ef1cd6660ab8ea58546cc119a47085976adc51195c0b9d524c077a3dcef6687cc5977988532932a424023dfea83eb7efd1e19b19eb95
+DIST botocore-1.23.35.tar.gz 8719275 BLAKE2B 2bda51eef1ac3d420952751d610722fbb57e004e8503e17dddd0a31e7ab360ba719c97f97d4b9e5aa6440965bafea9966b11d246e85fe753633c88141881cbfa SHA512 84a8692d840d9c8930ad8f80756f4d6ce6350e6a655966ff33ffd7f2bf5f5997989d6cc9067b52dd5631f49c35b5120eaa3d533274f322581281810ab47b988a
 DIST botocore-1.23.5.tar.gz 8374467 BLAKE2B 467092e7d8aa5ccb756132669049865445a47205913964c1c944b20caaf100b1efdd1bf3af9c5416ff079b487e6d4d08ffe6208e2b352d09655cc5be21c88739 SHA512 6afca19b724f9019f21e5993ce970d605b95d31c1a4e969ec1b4080510a5a120b3fa0cfd5ade973a9203bd6b7983a3dbca2f7a03108a9167392efd60d5e2fe9b
diff --git a/dev-python/botocore/botocore-1.23.35.ebuild b/dev-python/botocore/botocore-1.23.35.ebuild
new file mode 100644
index 000000000000..5a7d2c6fb0f2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.35.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 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 ~riscv ~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/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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/django-timezone-field/Manifest b/dev-python/django-timezone-field/Manifest
index 65f47f6c837a..9f4d4cd4679b 100644
--- a/dev-python/django-timezone-field/Manifest
+++ b/dev-python/django-timezone-field/Manifest
@@ -1 +1,2 @@
 DIST django-timezone-field-4.2.1.gh.tar.gz 23457 BLAKE2B 72452a21e6e086363da2ef40389d12b79860f66706e54fb9050ffe48f7fa6ad2908c75d4c7e17a79df339eac76492599dd4533ddca69a5b8757b46a36ed4b0fc SHA512 4c2da420c3aaffa23d8cdb66dbbe4b2ea8638de5a45d9e381bf9af980e52eba77fc03a2b8fee8497662199cdc9436d56543c0f6316e74ae5da68187a305c34a2
+DIST django-timezone-field-4.2.3.gh.tar.gz 23605 BLAKE2B d183fb57254a6a1c86ca57558b88d5429d1d4d368c2cbf2f7a7f4d5414432fd80c5ae1df30793da185d5347afe8535dd821e7e605fb0693f26619b319894a6a3 SHA512 1a72ee557b5b527d2aeae9033c765272ebdd017d9e05708734e9bcdf6355e2747e1ce920a542dbead2d8fc6043024ece24adb3b27ccd6d0f2c8e5b3eb907e012
diff --git a/dev-python/django-timezone-field/django-timezone-field-4.2.3.ebuild b/dev-python/django-timezone-field/django-timezone-field-4.2.3.ebuild
new file mode 100644
index 000000000000..1f18eee3c76a
--- /dev/null
+++ b/dev-python/django-timezone-field/django-timezone-field-4.2.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 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 Django app providing database and form fields for pytz timezone objects"
+HOMEPAGE="https://github.com/mfogel/django-timezone-field"
+SRC_URI="
+	https://github.com/mfogel/django-timezone-field/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/djangorestframework[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x DB_ENGINE=sqlite
+	epytest
+}
diff --git a/dev-python/flask-assets/flask-assets-0.12.ebuild b/dev-python/flask-assets/flask-assets-0.12.ebuild
index fed6fba31d6a..851c9b12a082 100644
--- a/dev-python/flask-assets/flask-assets-0.12.ebuild
+++ b/dev-python/flask-assets/flask-assets-0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flit/Manifest b/dev-python/flit/Manifest
index 6c0aa26c52ba..40c6fd835521 100644
--- a/dev-python/flit/Manifest
+++ b/dev-python/flit/Manifest
@@ -1,4 +1,2 @@
-DIST flit-3.4.0.tar.gz 120418 BLAKE2B e99eb67daa9a1d8e738ff9b917117edaf7372bbe267163f8af64967e43c3bed94893849e9752d36d3965e70c798dd3fb3b454131cee2d34697cc389f11aaea69 SHA512 18f1d1cb86508e76b4e37e6c1ca2c414400c86e9163bcc52fd3358220e5b4362da4001da7ce427926c62ad67ee86799ea8d08e858e5e17230941c529b9995ce5
-DIST flit-3.5.0.tar.gz 122519 BLAKE2B 3c3eee652f090afd1c07e8a5cd1b154e7390ed621ab202ded3b4664d59ccfa2fd827928451f6d8928573d012cb9f6b44544c48540e03b2918d32ae3ba9169838 SHA512 e2239c209f735f11aeec8672aa14449fe4b6e1d2ed6523d661edb730f0b9f93b2794c6676bf878c09bd27966a9f8b9c19e6a7f14063c6efed4d8bc043b4cd2db
 DIST flit-3.5.1.tar.gz 122689 BLAKE2B 49be251df549783114c6758fa688d00fe18ed88d215f91783ce78eda722ee3d8578d83781a1a5c9ee61dd001c82df010c879dc742a1829c2ba8bcf5edb930556 SHA512 00e884774c7f59dfb54d6db09f65ac0ed47f1dd23872d6913f3a41de7242fb3829b2edacd03d08e080635c0a515521333aa74e6d26a2faa5fc02e56454b2b37a
 DIST flit-3.6.0.tar.gz 133365 BLAKE2B c4170eeded3c15a93c8e89b9483459247228136bc5ff32c6edb8cd9a4b5c3171fe381d0a1b4e325ed863457c2bce476efe3276455d5b9e4279a702dd35ed4512 SHA512 6506ecc73f9e0373e84b5b90a3d567f1edad6d95561886ff1f08f37addfc39006e75ab199c376a7d18452f6b8e2cbdd9e8f59a1fc96037702c3c682dc0b5a757
diff --git a/dev-python/flit/flit-3.4.0.ebuild b/dev-python/flit/flit-3.4.0.ebuild
deleted file mode 100644
index e0ffe8a26ea2..000000000000
--- a/dev-python/flit/flit-3.4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019-2022 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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules"
-HOMEPAGE="https://github.com/takluyver/flit https://flit.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
-	dev-python/intreehooks[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests_download[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/tomli-w[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	sys-apps/grep
-	test? (
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/flit-3.2.0-tests.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/pygments-github-lexers \
diff --git a/dev-python/flit/flit-3.5.0.ebuild b/dev-python/flit/flit-3.5.0.ebuild
deleted file mode 100644
index e0ffe8a26ea2..000000000000
--- a/dev-python/flit/flit-3.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019-2022 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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules"
-HOMEPAGE="https://github.com/takluyver/flit https://flit.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
-	dev-python/intreehooks[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests_download[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/tomli-w[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	sys-apps/grep
-	test? (
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/flit-3.2.0-tests.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/pygments-github-lexers \
diff --git a/dev-python/flit/flit-3.5.1.ebuild b/dev-python/flit/flit-3.5.1-r1.ebuild
similarity index 96%
rename from dev-python/flit/flit-3.5.1.ebuild
rename to dev-python/flit/flit-3.5.1-r1.ebuild
index 0b4c68459970..13d3a2cf3055 100644
--- a/dev-python/flit/flit-3.5.1.ebuild
+++ b/dev-python/flit/flit-3.5.1-r1.ebuild
@@ -18,7 +18,6 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
 	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
-	dev-python/intreehooks[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/requests_download[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]
diff --git a/dev-python/flit/flit-3.6.0.ebuild b/dev-python/flit/flit-3.6.0-r1.ebuild
similarity index 96%
rename from dev-python/flit/flit-3.6.0.ebuild
rename to dev-python/flit/flit-3.6.0-r1.ebuild
index d5541742237d..d40edb3cf264 100644
--- a/dev-python/flit/flit-3.6.0.ebuild
+++ b/dev-python/flit/flit-3.6.0-r1.ebuild
@@ -18,7 +18,6 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
 	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
-	dev-python/intreehooks[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/requests_download[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]
diff --git a/dev-python/flit_core/flit_core-3.5.1.ebuild b/dev-python/flit_core/flit_core-3.5.1-r1.ebuild
similarity index 88%
rename from dev-python/flit_core/flit_core-3.5.1.ebuild
rename to dev-python/flit_core/flit_core-3.5.1-r1.ebuild
index a27ed429b4ae..8a614e2b6daf 100644
--- a/dev-python/flit_core/flit_core-3.5.1.ebuild
+++ b/dev-python/flit_core/flit_core-3.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,6 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
-	dev-python/intreehooks[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/flit_core/flit_core-3.6.0.ebuild b/dev-python/flit_core/flit_core-3.6.0-r1.ebuild
similarity index 90%
rename from dev-python/flit_core/flit_core-3.6.0.ebuild
rename to dev-python/flit_core/flit_core-3.6.0-r1.ebuild
index 22ec64d9e025..dbf83cbd0820 100644
--- a/dev-python/flit_core/flit_core-3.6.0.ebuild
+++ b/dev-python/flit_core/flit_core-3.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
-	dev-python/intreehooks[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index 19a0ff522567..dba6d2f97e73 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,3 +1,2 @@
-DIST gmpy2-2.1.0.tar.gz 258571 BLAKE2B 942786c9a2e1220ecad15e97c26cbea0b93c7719e5081f6defe7b71d43be0c4ce259355eb34fa013a0b90679022535a271f26425c615e65103d3a2705b27ec8e SHA512 0d62354a1446708548b8dfdc6d7f8000151eb5901251f87f935144f615fd586726617c7a2bd05b91dc3e2a0cfc8797cd81d60afb8c705da153b537345eaddb34
 DIST gmpy2-2.1.1.tar.gz 258607 BLAKE2B 3c070d101066fb0ba5da61b8c1eacf6bbd334aed987161091f31bccc1e836430cb844e0fdcb5017718341761f54c0fc3290e37ace28a5c4fc07930a194e77256 SHA512 37a08b546476f1b49cdfdb04b3a6d4da266615f789eb03896d5e2dd326c91f0fb9523504414b0de30e7265840e2ef77362a5ff011906952100c8b1da4d88d709
 DIST gmpy2-2.1.2.tar.gz 258445 BLAKE2B 5fd89478bb7c48c317a7af74fd872e5a9c1141f8f23c110aba7298d1a325caa13e24f1a2e601d6b3c6f6af30d60505f9161a03def16df59dddabe611fb600ef4 SHA512 abfeb0d8a155235e3aa797ca7b34ab6947f0714273e9d381167a9f6273bad34689e1985c139080b146e072b5bfbb4fa2b937566a14f4b94cc09ed21b3f2082b7
diff --git a/dev-python/gmpy/gmpy-2.1.0.ebuild b/dev-python/gmpy/gmpy-2.1.0.ebuild
deleted file mode 100644
index 0e73fa850314..000000000000
--- a/dev-python/gmpy/gmpy-2.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
-HOMEPAGE="https://github.com/aleaxit/gmpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-libs/mpc-1.0.2:=
-	>=dev-libs/mpfr-3.1.2:=
-	dev-libs/gmp:0=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	# The tests program asks for input when running, disable that
-	"${FILESDIR}"/gmpy-2.1.0_beta5-test-input.patch
-)
-
-distutils_enable_sphinx docs
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/gmpy/gmpy-2.1.1.ebuild b/dev-python/gmpy/gmpy-2.1.1.ebuild
index ff00de624895..0e73fa850314 100644
--- a/dev-python/gmpy/gmpy-2.1.1.ebuild
+++ b/dev-python/gmpy/gmpy-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-libs/mpc-1.0.2:=
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 9de040ee5dfc..b7a968d1f3a4 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1 +1,2 @@
 DIST google-api-python-client-2.34.0.tar.gz 28469433 BLAKE2B aa2c8849b629fe489cf39cddd410a40a0af0bddfa5f370a4a41c1446aeadf69cd4592eeb1d76e6c63da9737906801aea9c8a4d706328b63a7bf5b34a43b83e00 SHA512 321dfdd3ba821beabc6c3a96575afd06c75a0c8e3db61b1ff5fa9db472e62de81b037c435a1051d6294c2a37e471bcaa068cd27ad7434a3416231d31931dd74e
+DIST google-api-python-client-2.35.0.tar.gz 28553015 BLAKE2B 8ff92145f280e090b8f43c10e425dd4a8fe65b4cf565c5b5a0df2813cdb8ba1bcea50e37556efb9dd0b270a21fe11b7d6d1b445c8fdaa83326c7dc6230ee1fdb SHA512 4d0325b79250a26ae252568759e8345d31d692aa1d8f1d7aae623bb9a1a950efae654cd689d39f30450789c6d4fa9ca264111f8a9e798820cf6d0c3acba904f6
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.35.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.35.0.ebuild
new file mode 100644
index 000000000000..b7db8f42faf4
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.35.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 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-5[${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
+
+python_test() {
+	local EPYTEST_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
+}
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index fda3cbd3382f..d0eea7315e1e 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -2,3 +2,4 @@ DIST identify-2.4.0.tar.gz 101312 BLAKE2B 1ba4fcf235518427fba8a59eb30ceb0c20ed23
 DIST identify-2.4.1.tar.gz 101282 BLAKE2B e7c04480159062ec25063d956dda6d904031bbcc30fdab6011ad24a8c3816490d0dfe08cec19fdfe660509a246da820ccfe41d4dcd909daa9c59b622bf506148 SHA512 69253bd364ed96ae64d83ee25da0d9aae97731e602f193008471dd99f47db2b87aa33dda1f87fb9edf939992e0452ca45f07f1d7d5e628352b50d4c2e68b7d0e
 DIST identify-2.4.2.tar.gz 101279 BLAKE2B f70bc1d493fb1fd94f95ea7cedfba6c522fb79ad9d94e1bc3c8937ff728e82fd450ea7b64f5769811dea4788eeac0e0b5fcbddd0c817443bf6005d59de1d9b83 SHA512 73b139effb62ec047aa3285a5e0e9b196b459e9e8efd5dfb82090dbdd8f020055680fbc381778a1c7a298e72ed6c1778fc74213812b2f30abe9b18b401e053e3
 DIST identify-2.4.3.tar.gz 101282 BLAKE2B 5ae76ac22ca462ae3dc7d71ed8d07344729ee54692cce52e1269057451733fab9c02647a51deed98cfa569b7758f37b4cc07353eb418314901b1eed2333eabdc SHA512 2c82cc90d98a149dc211680c96d8c3bfcdbf955fd61eb207ae4a62d9bdb8f159707a7578838582bd16f45c300d9a8e7c5e7009a9daecb6b334b27fd160cc0d40
+DIST identify-2.4.4.tar.gz 101270 BLAKE2B d5e31a8b74a724cfd0c169def52b434bd2b722aa7dfb9d92636a8eb28b1b1a7ccd9c9544d97d5fd359fb995b44b6d8a6428f484ee033f70292717053b1f5825f SHA512 34a93640ca96483599e0cfdb1d69f37f8f4cb659b68ee84824079ee177e93aeb259ebc654f5fb39d5a0b68d267ba3c963870c9c55b6676e12c21b7f7573438a4
diff --git a/dev-python/identify/identify-2.4.4.ebuild b/dev-python/identify/identify-2.4.4.ebuild
new file mode 100644
index 000000000000..eb1a8e60e930
--- /dev/null
+++ b/dev-python/identify/identify-2.4.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="File identification library for Python"
+HOMEPAGE="https://github.com/pre-commit/identify"
+SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-python/ukkonen[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/installer/Manifest b/dev-python/installer/Manifest
new file mode 100644
index 000000000000..2d38fa076c4d
--- /dev/null
+++ b/dev-python/installer/Manifest
@@ -0,0 +1,2 @@
+DIST installer-0.4.0-py2.py3-none-any.whl.zip 451433 BLAKE2B 933b7e63b3d0306213789d493d4df112df26b432d63ecd1f8f21449520c34bd2ad542aac25069043fbb535c44f988dca927625eafd0a5a20489fc3ce2bcf84a2 SHA512 cf303bb422e329a36007b361034144a232ba021d4013bb8678dc7c326544e74ec9a3b3fe8b9d3696433dbbe90d2ce4a0ae8967fb054bd5ed49321d470be729a8
+DIST installer-0.4.0.gh.tar.gz 466643 BLAKE2B 635854b3461995cda3b7afa507ca3fe35cae8210e79de0bbd46938c8f103d7840ceca8bb388c2c9533efc78150691f980c478485ee33bafe0bae6c08a6aef8c4 SHA512 13537c479bc8ead8f8b45c8e5c5182e8b1b32c2889df8015be7f517f390a9efbea6fa167e0886dfade6621a8a2d822bfd662ee0238d3d86689619ca4d5483b26
diff --git a/dev-python/installer/installer-0.4.0.ebuild b/dev-python/installer/installer-0.4.0.ebuild
new file mode 100644
index 000000000000..4fdc9bde6479
--- /dev/null
+++ b/dev-python/installer/installer-0.4.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A library for installing Python wheels"
+HOMEPAGE="
+	https://pypi.org/project/installer/
+	https://github.com/pradyunsg/installer/
+	https://installer.readthedocs.io/en/latest/
+"
+SRC_URI="
+	https://github.com/pradyunsg/installer/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	https://files.pythonhosted.org/packages/py2.py3/${PN::1}/${PN}/${P}-py2.py3-none-any.whl
+		-> ${P}-py2.py3-none-any.whl.zip
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# NB: newer git doesn't use mock anymore
+BDEPEND="
+	app-arch/unzip
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+# do not use any build system to avoid circular deps
+python_compile() { :; }
+
+python_test() {
+	local -x PYTHONPATH=src
+	epytest
+}
+
+python_install() {
+	python_domodule src/installer "${WORKDIR}"/*.dist-info
+}
diff --git a/dev-python/installer/metadata.xml b/dev-python/installer/metadata.xml
new file mode 100644
index 000000000000..090fe7139f47
--- /dev/null
+++ b/dev-python/installer/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">installer</remote-id>
+		<remote-id type="github">pradyunsg/installer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index ca83adf81f09..9e941d823b7b 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,4 +1,2 @@
-DIST ipykernel-6.4.2.tar.gz 121253 BLAKE2B 26f8f94df823dd7a4ac41cac574e70ae98eed64f88bbcd8ce600ce6dfe1c43c224d65b5d0f9586ad05829692142e37fbb685a5d577047791831f6138b8309556 SHA512 56f0a15a1f06628e8f74749e4bad4a65dcc78ba7ff45e4fa5802d232e427e4ec152a6b6697302488d2e05d6b0cfa0cbc106ea2a593ab43de9d9defa9c169d5a6
-DIST ipykernel-6.5.0.tar.gz 122962 BLAKE2B fa36ea41d7f2dc8d0d75144f421ea2a72dd50dcda6c6a91f625f18c35ed2ebb950aadfb1715dd57a1fda77bfb49e360bca87f0bd8b9ee8380399d41691db2b9a SHA512 440407818ed6f388f10a727a9be1a2588bf8c9699d66e1b954a1f64575c08b5bddb3978dd13f5ab26220a210ce7177e2be0374d48d3968df681d2d5311ce42d1
 DIST ipykernel-6.6.0.tar.gz 123747 BLAKE2B b1e836ac08e24baf3311e34e1323362bec94f8a59ba4cd824703f03370031226f9af41f864930c6fb59216d185e3c7e8798d6b91e88aa6ca0c214df33c6d7d37 SHA512 bf55e26a4bca0d02f4bbb87ce53a224d22a4765596f0f5d7a6d576bfa100436f676df59fa934e1d6ec66f8d802a1c7f787a9a31b906ecaa1ffd8a77fa3d96127
 DIST ipykernel-6.6.1.tar.gz 123915 BLAKE2B 136a3acdea6790d4666c3f5b0d040a91be405ff35e510456d920d0d2d2fb4f4076eb8e74089d08c42f0eba50caa48da929c1a684ad414919a67748f13d6fdf78 SHA512 bfe37f3d69c9b05f9bbbdec7f2103c353433b402474507a9d17c02f224e3a80eaea010b5a8bcebfd4410fbba661feae74107a4904c0af7835c6c1aa6bd0c1159
diff --git a/dev-python/ipykernel/ipykernel-6.4.2-r1.ebuild b/dev-python/ipykernel/ipykernel-6.4.2-r1.ebuild
deleted file mode 100644
index 2e632c2d5273..000000000000
--- a/dev-python/ipykernel/ipykernel-6.4.2-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=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 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=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}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	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
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${ED}"/usr/share/jupyter/kernels/python3/kernel.json || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.5.0-r1.ebuild b/dev-python/ipykernel/ipykernel-6.5.0-r1.ebuild
deleted file mode 100644
index 524e5e76b01c..000000000000
--- a/dev-python/ipykernel/ipykernel-6.5.0-r1.ebuild
+++ /dev/null
@@ -1,62 +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} )
-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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		<dev-python/importlib_metadata-5.0.0[${PYTHON_USEDEP}]
-		>=dev-python/argcomplete-1.12.3[${PYTHON_USEDEP}]
-	' python3_8 pypy3)
-	>=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-5.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}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.5.0-drop-pytest-cov.patch
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${ED}"/usr/share/jupyter/kernels/python3/kernel.json || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.6.0.ebuild b/dev-python/ipykernel/ipykernel-6.6.0.ebuild
index a2aa44976ede..b0138081d9a2 100644
--- a/dev-python/ipykernel/ipykernel-6.6.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/ipython/ipython-8.0.0.ebuild b/dev-python/ipython/ipython-8.0.0-r1.ebuild
similarity index 89%
rename from dev-python/ipython/ipython-8.0.0.ebuild
rename to dev-python/ipython/ipython-8.0.0-r1.ebuild
index d86fd0952f68..1f2f15baf27c 100644
--- a/dev-python/ipython/ipython-8.0.0.ebuild
+++ b/dev-python/ipython/ipython-8.0.0-r1.ebuild
@@ -21,17 +21,19 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/black[${PYTHON_USEDEP}]
 	dev-python/decorator[${PYTHON_USEDEP}]
 	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
 	dev-python/pickleshare[${PYTHON_USEDEP}]
 	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
 	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/stack_data[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
 	matplotlib? (
 		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
 	)
 "
 
@@ -39,12 +41,10 @@ BDEPEND="
 	test? (
 		app-text/dvipng[truetype]
 		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
 		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
 		dev-python/nbformat[${PYTHON_USEDEP}]
 		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/stack_data[${PYTHON_USEDEP}]
 		dev-python/testpath[${PYTHON_USEDEP}]
 	)
 	doc? (
@@ -102,16 +102,17 @@ python_compile_all() {
 
 python_test() {
 	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=()
+	local EPYTEST_DESELECT=(
+		# Internet
+		IPython/core/display.py::IPython.core.display.Image.__init__
+		# TODO
+		IPython/core/tests/test_oinspect.py::test_class_signature
+		IPython/core/tests/test_oinspect.py::test_render_signature_long
+	)
 	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
 		# TODO
 		IPython/core/tests/test_completer.py::TestCompleter::test_all_completions_dups
 		IPython/core/tests/test_completer.py::TestCompleter::test_deduplicate_completions
-		IPython/core/tests/test_oinspect.py::test_pinfo_docstring_if_detail_and_no_source
-		# fails due to changed argparse output
-		IPython/core/tests/test_magic_arguments.py::test_magic_arguments
-		# py3.10 API incompat, doesn't look important
-		IPython/lib/tests/test_pretty.py::test_pprint_heap_allocated_type
 	)
 	virtx epytest
 }
diff --git a/dev-python/isodate/Manifest b/dev-python/isodate/Manifest
index 2b123252cee2..b8cafbfbdce8 100644
--- a/dev-python/isodate/Manifest
+++ b/dev-python/isodate/Manifest
@@ -1,2 +1 @@
-DIST isodate-0.6.0.tar.gz 28480 BLAKE2B a7499c736b67193ac73026df7a7c9d9bd5b743a5d556fe5e8ba0a62e8a5238d64afb88547a27e4bcbe706483e3e1e97eecd437e4e1c730c20652cff5926502fc SHA512 e977748e13ee2c94ab47bfc47113d152280e9acff6f70e773de73717392148dd2c111a7db2d9fa3679d37936c6ed9a23dc526cb00bd601df45459b6a244f9f7d
 DIST isodate-0.6.1.tar.gz 28443 BLAKE2B 2b451e4dd9a9979feb930090cf045b21c984e962222edc59eff6f08a448258833ac5c368701ed2a703d48c1238122cbe7f628d136124920730bbd96fa04519dc SHA512 437e420ec7ee68dedded825f30d3289eeb0da526208443e5a8e50fe70f12309515e1285b21132d26e6d4c1683f90dfa1d401582042b5e4381fe7ab0e34af26b6
diff --git a/dev-python/isodate/files/isodate-0.6.0-py310.patch b/dev-python/isodate/files/isodate-0.6.0-py310.patch
deleted file mode 100644
index 81b38b48a2a9..000000000000
--- a/dev-python/isodate/files/isodate-0.6.0-py310.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 40358ac82b948ea8377d5ca32b576def31b39a84 Mon Sep 17 00:00:00 2001
-From: Jose Eduardo <jose.eduardo.gd@gmail.com>
-Date: Fri, 19 Jul 2019 16:21:56 +0100
-Subject: [PATCH 1/8] Avoid unclosed file warning
-
----
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index e39446f..9634625 100644
---- a/setup.py
-+++ b/setup.py
-@@ -30,7 +30,8 @@
- 
- 
- def read(*rnames):
--    return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
-+    with open(os.path.join(os.path.dirname(__file__), *rnames)) as read_file:
-+        return read_file.read()
- 
- 
- setup(name='isodate',
-
-From 91bf24dd1610d5f6ac5d4867457f0703046017d2 Mon Sep 17 00:00:00 2001
-From: Jose Eduardo <jose.eduardo.gd@gmail.com>
-Date: Fri, 19 Jul 2019 16:22:22 +0100
-Subject: [PATCH 2/8] Raise warnings produced by isodate as errors during tests
-
----
- src/isodate/tests/__init__.py | 3 +++
- tox.ini                       | 2 ++
- 2 files changed, 5 insertions(+)
-
-diff --git a/src/isodate/tests/__init__.py b/src/isodate/tests/__init__.py
-index b1d46bd..7208cbd 100644
---- a/src/isodate/tests/__init__.py
-+++ b/src/isodate/tests/__init__.py
-@@ -29,6 +29,7 @@
- '''
- 
- import unittest
-+import warnings
- from isodate.tests import (test_date, test_time, test_datetime, test_duration,
-                            test_strf, test_pickle)
- 
-@@ -37,6 +38,8 @@ def test_suite():
-     '''
-     Return a new TestSuite instance consisting of all available TestSuites.
-     '''
-+    warnings.filterwarnings("error", module=r"isodate(\..)*")
-+
-     return unittest.TestSuite([
-         test_date.test_suite(),
-         test_time.test_suite(),
-
-From fc0fb3278da5f463ca5b2f0a3acafbbf2869bd7a Mon Sep 17 00:00:00 2001
-From: Jose Eduardo <jose.eduardo.gd@gmail.com>
-Date: Fri, 19 Jul 2019 16:29:43 +0100
-Subject: [PATCH 4/8] Fix Python 3.8 DeprecationWarning
-
-Ref: https://docs.python.org/3.8/whatsnew/3.8.html
-
-> Many builtin and extension functions that take integer arguments will
-> now emit a deprecation warning for Decimals, Fractions and any other
-> objects that can be converted to integers only with a loss (e.g. that
-> have the `__int__()` method but do not have the `__index__()` method).
-> In future version they will be errors. (Contributed by Serhiy
-> Storchaka in bpo-36048.)
----
- src/isodate/duration.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/isodate/duration.py b/src/isodate/duration.py
-index 6d1848c..d923cee 100644
---- a/src/isodate/duration.py
-+++ b/src/isodate/duration.py
-@@ -180,7 +180,7 @@ def __add__(self, other):
-                 newday = maxdays
-             else:
-                 newday = other.day
--            newdt = other.replace(year=newyear, month=newmonth, day=newday)
-+            newdt = other.replace(year=int(newyear), month=int(newmonth), day=newday)
-             # does a timedelta + date/datetime
-             return self.tdelta + newdt
-         except AttributeError:
-@@ -264,7 +264,7 @@ def __rsub__(self, other):
-                 newday = maxdays
-             else:
-                 newday = other.day
--            newdt = other.replace(year=newyear, month=newmonth, day=newday)
-+            newdt = other.replace(year=int(newyear), month=int(newmonth), day=newday)
-             return newdt - self.tdelta
-         except AttributeError:
-             # other probably was not compatible with data/datetime
diff --git a/dev-python/isodate/isodate-0.6.0-r2.ebuild b/dev-python/isodate/isodate-0.6.0-r2.ebuild
deleted file mode 100644
index a7b6227bc1e5..000000000000
--- a/dev-python/isodate/isodate-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,27 +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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="ISO 8601 date/time/duration parser and formatter"
-HOMEPAGE="https://pypi.org/project/isodate/"
-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 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py310.patch
-)
-
-python_test() {
-	eunittest -s "${BUILD_DIR}/lib"
-}
diff --git a/dev-python/isodate/isodate-0.6.1.ebuild b/dev-python/isodate/isodate-0.6.1.ebuild
index e6be6118fb17..1d51b68f610e 100644
--- a/dev-python/isodate/isodate-0.6.1.ebuild
+++ b/dev-python/isodate/isodate-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 ~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/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index e3699d6f0989..a1400e3612e5 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1 +1,2 @@
 DIST jsonpickle-2.0.0.tar.gz 110336 BLAKE2B 574dab58418c5225a9364836d04eaabf3384e9dab404d191846a4bb41e9c8bbb51243a6a231ec8baf05ff9be337e12b5c96c46b74a327e9f05653ca81bf6ccf2 SHA512 acba11e5dfce116b27edfe0fdccdd74755e299aa43f873dd1ce547d947b58f14c1059c21d04007b5be0857f7ce69fe5355fb2edc47a99cc2217fe00297ca78d3
+DIST jsonpickle-2.1.0.tar.gz 186799 BLAKE2B a9e82a046fc77e1a4d5e7b1f13fc34f07e0e42e34922258bb0bd5aa4557bfec2b5fc06e450a0391522ae27380306111001204eb4f5429c2ad1f908fc4dec40a0 SHA512 46e8bcc2e24616da43b87bf8371ec9b39de1e8e33380684c05b7d7c6695f17bcc21150848c3306d235f89c5d74c69b6fda79e93fc823665d72cc88d9d89d8484
diff --git a/dev-python/jsonpickle/jsonpickle-2.1.0.ebuild b/dev-python/jsonpickle/jsonpickle-2.1.0.ebuild
new file mode 100644
index 000000000000..49cc08ae65f5
--- /dev/null
+++ b/dev-python/jsonpickle/jsonpickle-2.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
+HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
+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"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/ujson[${PYTHON_USEDEP}]
+		dev-python/feedparser[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/jaraco-packaging \
+	dev-python/rst-linker
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e 's:--flake8 --black --cov::' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# unpackaged bson dependency
+		tests/bson_test.py
+		# broken when gmpy is installed
+		# https://github.com/jsonpickle/jsonpickle/issues/328
+		# https://github.com/jsonpickle/jsonpickle/issues/316
+		tests/ecdsa_test.py
+	)
+	epytest
+}
+
+pkg_postinst() {
+	# Unpackaged optional backends: yajl, demjson
+	optfeature "encoding numpy-based data" dev-python/numpy
+	optfeature "encoding pandas objects" dev-python/pandas
+	optfeature "fast JSON backend" dev-python/simplejson
+}
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index fad0b0e4350f..d9853fb3ecd3 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,2 +1 @@
-DIST lxml-4.6.5.tar.gz 954972 BLAKE2B 79ddbc1556a70724f8def9621ecaf9fef45cf3437ce4ca721d54aeeecb28a88a283e14c5a6390fbda1cee023f2040a007dc6b8de769aabf36cba88a8cfc16cb2 SHA512 6354c1ef0c2e371142107b4bc9085dbde27378d819f2773656e4a6c017c34d6ce1501df42b1ccd524d10ed75032f8a3c8233e38e6908f521dcef5ace091480fc
 DIST lxml-4.7.1.tar.gz 958025 BLAKE2B d48a7aec9537235207fa387af7c49fe055ffa8e03bcea3e59807dfe35c72f1b1e01586aded550b53d5b7fac733baa1d47fbeea8fba937844de6dab10e02a3832 SHA512 33c88ff07152437a09268f3348ada97549686b5a59e2135631991ecc79ad02f35c20aae5d8363d2795bf058b05ef70fa6fbb56b081308cd89b073e176f4872d9
diff --git a/dev-python/lxml/lxml-4.6.5.ebuild b/dev-python/lxml/lxml-4.6.5.ebuild
deleted file mode 100644
index 47c2e6f13d96..000000000000
--- a/dev-python/lxml/lxml-4.6.5.ebuild
+++ /dev/null
@@ -1,97 +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} pypy3 )
-
-inherit distutils-r1 optfeature toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
-SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
-S=${WORKDIR}/lxml-${P}
-
-LICENSE="BSD ElementTree GPL-2 PSF-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 ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND="
-	>=dev-libs/libxml2-2.9.12-r2
-	>=dev-libs/libxslt-1.1.28"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/docutils[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		')
-	)
-	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
-	"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
-)
-
-python_check_deps() {
-	use doc || return 0
-	has_version "dev-python/docutils[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/pygments[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
-}
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/lxml/lxml-4.7.1.ebuild b/dev-python/lxml/lxml-4.7.1.ebuild
index 5669cfb3cd0a..8ddbda82c77d 100644
--- a/dev-python/lxml/lxml-4.7.1.ebuild
+++ b/dev-python/lxml/lxml-4.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-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 ~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/mistune/Manifest b/dev-python/mistune/Manifest
index 97fd3b90ac39..d58d530a65f1 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,2 +1,3 @@
 DIST mistune-0.8.4.tar.gz 58322 BLAKE2B e65d45c5c95706a49a7fd407afe5f10e82a475766ca272ec3bebba8c89e670fe6efced7b09537efb69d3fd36e75091e370170a15ad7488b5cbe9186e2ccaf4db SHA512 36c3ef5d5537f5cceaa43e4da20a84b27c378cb744a93f0380024faefde490bcb42c453f79002ca049083fc437278f4afb3e10de5462f9eeb9077ca2a2fcaea7
 DIST mistune-2.0.1.tar.gz 75657 BLAKE2B 399ad8902aeb88e8e3645f5200bbfea5011157d3251af33188d2a0298c46dfb5f8e70cd951b216762942a84d29df1bc12e0750bc928f2e0c8e96034246438f53 SHA512 f6a0e08fecfeaad7d4eb0cae155bdd5ab67c66ae15a3a067c9f6cbf47a229cb9b540d49ecdb5c2fa98c8344863e1249ef86f84bc4d966fe473ade18a266c1ec6
+DIST mistune-2.0.2.tar.gz 75778 BLAKE2B 6ed690a70c54a0a06f154d42151d7d857f0e70cfe32529d7176726bd1e2f7a4fb9bf66be476af139c338c9f8b0d0de6541727e18718f6537d3a07771f34441f8 SHA512 8250243bf6cd2496ca1309e1fb062507f37c197817a4c5ec1a8e3c5865b6cc58866b88158b3a2e2967ad53b1f1a668a2e4282c30179ce126242c528000215992
diff --git a/dev-python/mistune/mistune-2.0.2.ebuild b/dev-python/mistune/mistune-2.0.2.ebuild
new file mode 100644
index 000000000000..12109ffa7221
--- /dev/null
+++ b/dev-python/mistune/mistune-2.0.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 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} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="The fastest markdown parser in pure Python"
+HOMEPAGE="https://pypi.org/project/mistune/ https://github.com/lepture/mistune"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_tests pytest
diff --git a/dev-python/moto/moto-2.2.18.ebuild b/dev-python/moto/moto-2.2.18.ebuild
index 69c10257be0c..63992b93be1a 100644
--- a/dev-python/moto/moto-2.2.18.ebuild
+++ b/dev-python/moto/moto-2.2.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/pandas-1.3.5.ebuild b/dev-python/pandas/pandas-1.3.5.ebuild
index 68ec1d34ffd1..966a46f810b1 100644
--- a/dev-python/pandas/pandas-1.3.5.ebuild
+++ b/dev-python/pandas/pandas-1.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pika/Manifest b/dev-python/pika/Manifest
index df96926f2864..c8b991ef8ea2 100644
--- a/dev-python/pika/Manifest
+++ b/dev-python/pika/Manifest
@@ -1 +1,2 @@
 DIST pika-1.1.0.tar.gz 139407 BLAKE2B 2a2bb71d7f1222ca06dd6202a26e502f1e1e1977651e4fb405a938d493e4f525904568fb57ad5eea0f5117f02c7fa9f1b1c971d7d911d0d62a24b161b2cb2ef5 SHA512 15eab619cffe5b6d62a65a66730b03ee3de24978268afd82f608a96b96cc29695159e228dbbbc21c06f4c02a9591c73a686d9d283ceaa725f53782c3460140a7
+DIST pika-1.2.0.tar.gz 144945 BLAKE2B c8b163e4efeb4630da7f1901dfc087c2f3e53d5828eba7ee519e6f696d6c86d48d72c8c1ed98df9c3c0a6889265b072f5c709abec98522992ba699691e96acb1 SHA512 3ea4ecc3b2c722e8b1ec7d220e0cad7c7ed315a4800cbff6903d351885dc6a792318da1767f4bf1a4a40510be444ee18f3881f654c4ec84de8c3005aa2a404bf
diff --git a/dev-python/pika/pika-1.1.0.ebuild b/dev-python/pika/pika-1.1.0.ebuild
index 1bed10429589..caa31224cbae 100644
--- a/dev-python/pika/pika-1.1.0.ebuild
+++ b/dev-python/pika/pika-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
diff --git a/dev-python/pika/pika-1.2.0.ebuild b/dev-python/pika/pika-1.2.0.ebuild
new file mode 100644
index 000000000000..d84dd6dba9c9
--- /dev/null
+++ b/dev-python/pika/pika-1.2.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the AMQP"
+HOMEPAGE="https://pika.readthedocs.org/ https://github.com/pika/pika"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/pmw/pmw-2.0.1-r2.ebuild b/dev-python/pmw/pmw-2.0.1-r2.ebuild
index 94b2b97025c9..8469d86b5509 100644
--- a/dev-python/pmw/pmw-2.0.1-r2.ebuild
+++ b/dev-python/pmw/pmw-2.0.1-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="tk"
 
 inherit distutils-r1 virtualx
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index deefc6e7d329..1bd5b096bd8f 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,4 +1 @@
-DIST amqp-5.0.6.tar.gz 126856 BLAKE2B 3eae4d0f97477dc7b72eba65ee95ab74afa051bf2d745f86944c4236b4a90ff6c2a38f18a5bdc8441215f4607ed4e8eb867144695619eb08e0f1065e7a624415 SHA512 bf15fad413bedb2f57dfaa03986f4abfc8fb169d5e324d5741b94a1e3776f2590e7686774c69dfdda848b484dbc1e6d0fa78a4a3125cf08ab20eaf7192885252
-DIST amqp-5.0.7.tar.gz 127139 BLAKE2B 51fe6448b61c0899ef49c212ddea5eea108812ad744ffe8ab7ba2392177ef1b6cd6481c424530fb9111899c425081ad96988d36e872c6d32ee72c44a28de51e0 SHA512 3c0d051ad677fa410e4301ab86478583affc1e42651ce5c9b34a07a179aa4fb15811a81884facbdc393b0646a23cab20ee7943b276b8ef770e9707b9bd23d06a
-DIST amqp-5.0.8.tar.gz 127472 BLAKE2B f158b19c3844302151f6683758a78ec28150eb5204ddcde344f2313b2ac76d1b683aa25f2a7088e4b91d0a83928b343490677f9d7f2a327f8384520e52ac1dc0 SHA512 c71fc506cd0f3269956cb3e10ca8a27bc9eae30a0e1f5b1bbbfff3c3d2fff1fd206554c027ae0cf22eda5f43b64c12df8c0b2b31df21b8e4962a8620ce5edc39
 DIST amqp-5.0.9.tar.gz 127478 BLAKE2B f4e23c43ad66cf88e076e9542d8825daac9ad3cf93ca954fe0f1baf3648bfc00afa0002b86d73a95936fad7c859b0a75ee2996cc0d19c6bfcd3ec556e0c1eab3 SHA512 b94bf176e816b1dad4bbc2891a5324f7eb8e27fd475c34a01e6f39d27caf66447cfceab6a3cb3538fd1b610a250eed1423682deef4a174fdd201e0b3a7368bc9
diff --git a/dev-python/py-amqp/py-amqp-5.0.6.ebuild b/dev-python/py-amqp/py-amqp-5.0.6.ebuild
deleted file mode 100644
index 82ee3c01e5e4..000000000000
--- a/dev-python/py-amqp/py-amqp-5.0.6.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
-
-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_P:0:1}/amqp/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="extras"
-
-BDEPEND="
-	>=dev-python/vine-5.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-6.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_celery
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# rmq tests require a rabbitmq instance
-	t/integration/test_rmq.py
-)
-
-python_install_all() {
-	if use extras; then
-		insinto /usr/share/${PF}/extras
-		doins -r extra
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py-amqp/py-amqp-5.0.7.ebuild b/dev-python/py-amqp/py-amqp-5.0.7.ebuild
deleted file mode 100644
index eb3c94be5008..000000000000
--- a/dev-python/py-amqp/py-amqp-5.0.7.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-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_P:0:1}/amqp/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="extras"
-
-BDEPEND="
-	>=dev-python/vine-5.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-6.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_celery
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# rmq tests require a rabbitmq instance
-	t/integration/test_rmq.py
-)
-
-EPYTEST_DESELECT=(
-	# fails when gssapi is installed (how does that test make sense?!)
-	t/unit/test_sasl.py::test_SASL::test_gssapi_missing
-)
-
-python_install_all() {
-	if use extras; then
-		insinto /usr/share/${PF}/extras
-		doins -r extra
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py-amqp/py-amqp-5.0.8.ebuild b/dev-python/py-amqp/py-amqp-5.0.8.ebuild
deleted file mode 100644
index eb3c94be5008..000000000000
--- a/dev-python/py-amqp/py-amqp-5.0.8.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-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_P:0:1}/amqp/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="extras"
-
-BDEPEND="
-	>=dev-python/vine-5.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-6.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_celery
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# rmq tests require a rabbitmq instance
-	t/integration/test_rmq.py
-)
-
-EPYTEST_DESELECT=(
-	# fails when gssapi is installed (how does that test make sense?!)
-	t/unit/test_sasl.py::test_SASL::test_gssapi_missing
-)
-
-python_install_all() {
-	if use extras; then
-		insinto /usr/share/${PF}/extras
-		doins -r extra
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py-amqp/py-amqp-5.0.9.ebuild b/dev-python/py-amqp/py-amqp-5.0.9.ebuild
index eb3c94be5008..6b40a30bd15d 100644
--- a/dev-python/py-amqp/py-amqp-5.0.9.ebuild
+++ b/dev-python/py-amqp/py-amqp-5.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="extras"
 
 BDEPEND="
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index a39a9730da15..4ab9c06d2890 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,2 +1 @@
-DIST PyHamcrest-2.0.2.gh.tar.gz 55491 BLAKE2B 749f227b8cb1180a64e24cdbf97b6f610b9871b21215a761642d19fdd43ad8e175718b12cfb0de2cdb5c6ae8c3c5271e04b7c3b489e01ac689769e24202ece56 SHA512 d6e510ca1e6533b425b424d411e23c4ee2a6bad2d635695e4e68f991fbdc57269c3a433361e431cb5dda7891278951d5de7a05f5c1c167714eecdaf74644d1c8
 DIST PyHamcrest-2.0.3.gh.tar.gz 59353 BLAKE2B b393f250f1a5f3f2d3014ae8a6e20ec659e034d8e681fcbb16f4e9fbe69ba7a94ce342a79584cfc99dff6af57e1d9763efd5ff8b5d891951289d9047cab4270c SHA512 4a28c0ae04db11a86c44dff001e919a5bb6b820af8ffd60b1a1f2846f257d79daac76fbdeac4a0039d149e643043258a0685382a3a4b52c6d4586b8be95e1657
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
deleted file mode 100644
index 95693a93178d..000000000000
--- a/dev-python/pyhamcrest/pyhamcrest-2.0.2.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
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-MY_PN="PyHamcrest"
-
-DESCRIPTION="Hamcrest framework for matcher objects"
-HOMEPAGE="https://github.com/hamcrest/PyHamcrest"
-SRC_URI="https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz -> ${MY_PN}-${PV}.gh.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="examples"
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.0.3.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.0.3.ebuild
index d7f479376a63..b788e41820f5 100644
--- a/dev-python/pyhamcrest/pyhamcrest-2.0.3.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples"
 
 distutils_enable_sphinx doc \
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 66bea71a5cb0..5b7c50d0ddc2 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1 +1,2 @@
 DIST pytest-asyncio-0.16.0.tar.gz 15819 BLAKE2B c999b8680a45704bcb6f4690a910aa3d2edd9965e53cf4eb59dc8119696add4553d6b3e1b010c3cac52c8fd8563be8c86afe0616132a274e73df673630b032a7 SHA512 f0059a6d05bf0c4e208f0058e30d5baf8284e630b8b91fa217f52eec18abe6b057dabfdadce2c5282e02bd4ea4cdb27f9ef62c4c308375cce1795d75a036db22
+DIST pytest-asyncio-0.17.0.tar.gz 22275 BLAKE2B 0151b7e264b2c2435735bdc184020b6997d20b0ed82224b0b528ec366ab7554a0282619c5268d92f2544d700bed2dbaf85adaaf1752e333c417cc044bffb6aac SHA512 cfff79cf0632153819c511d3751777858e87081b074bfb49f3fe49417d1be647b4d07a4b64149acec36b4e6b1872ac03f1055703c70cccce18648482c9b727db
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.17.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.17.0.ebuild
new file mode 100644
index 000000000000..eba2bcf7d5c3
--- /dev/null
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.17.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2019-2022 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="Library for testing asyncio code with pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
+	https://pypi.org/project/pytest-asyncio/"
+SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+EPYTEST_DESELECT=(
+	# rely on precise warning counts
+	tests/modes/test_legacy_mode.py
+)
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index 34e22d134c82..0ef949925e15 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,2 +1 @@
-DIST pytest-timeout-2.0.0.tar.gz 16210 BLAKE2B 8e3c0436147b6cc680540329daabd7269d301c95663599f7e9c64313bc3a45fde5cc5ea297d5b8c85f43d1a80c2db44b8e150877c3c7b29eef5e38426dfd4efc SHA512 96e9b545b4ac1e4a615863f69d190e0265e85f23dc12df51e9035b8e6bceff23279bb042eed83aa0ddd6d06b0e02a2dcc29ee352fd44cc86f0682fb328264645
 DIST pytest-timeout-2.0.2.tar.gz 16683 BLAKE2B bc6ee17832dfa5c3e5a35efc34bda630f1f1f7e7ece5a71d68110ab12c08566ee89c3b0f68967807967d17e2622ca1d2bce24baf51986ad8921fd55df091b376 SHA512 ee151a55f6323ae23ddd7e54e39e1c014de2aa2a142a0e3ba81c80b5d36435fc6c2809e383df8c49e62df70361a03dbe73e4d96d03798323fe7f1304a197f770
diff --git a/dev-python/pytest-timeout/pytest-timeout-2.0.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-2.0.0.ebuild
deleted file mode 100644
index 96562f417271..000000000000
--- a/dev-python/pytest-timeout/pytest-timeout-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin to abort hanging tests"
-HOMEPAGE="https://pypi.org/project/pytest-timeout/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# do not rdepend on pytest, it won't be used without it anyway
-# pytest-cov used to test compatibility
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		!hppa? (
-			dev-python/pytest-cov[${PYTHON_USEDEP}]
-		)
-	)"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-timeout/pytest-timeout-2.0.2.ebuild b/dev-python/pytest-timeout/pytest-timeout-2.0.2.ebuild
index 5be23064f839..f11adfbb8c3a 100644
--- a/dev-python/pytest-timeout/pytest-timeout-2.0.2.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # do not rdepend on pytest, it won't be used without it anyway
 # pytest-cov used to test compatibility
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index 4c8c4f127e9a..3f446c05a092 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,3 +1,4 @@
 DIST python-socks-1.2.4.gh.tar.gz 32192 BLAKE2B fa06f9158348292bef874c81623c11a54556db9c36cd7428d7a835428d152f3a4925d59e14d87518dfaae9e6937324e35db99bb5e1000f29fe9caf11fa2f8318 SHA512 6e70d8d98b2901e97250d30b350002944d979356bb6cd7dd4022af420e166076259a7b1aa4845d771243b18ab3f06ee955f07482c527835bb0135f0622d804be
 DIST python-socks-2.0.0.gh.tar.gz 38176 BLAKE2B 84711bd6747dd9ef8d7f47d90e7e1beeb99db7c51a370c01a272789e7d5356cdf3d0e3b1e822e1beb88a29ebbe23acac8f68206cf7a3f8b924f79d3783426f93 SHA512 088a606ca6e13de79cfa8b180d76e91cca129b3e1ffad2243e5924dc10530340924ea815eb9af0e53b5369daa9cf3e66b2f623da6913ed32916b91d24a47c1e4
 DIST python-socks-2.0.1.gh.tar.gz 40710 BLAKE2B 185131be6e2ef85e3d1cb41ff03e57c1d3e8921c04d11df4d3e1d3c7ed6f3cd10459730d0cc5ad63981dcfe0f8cd987f0f287a70f6727727550d63c0ff6040bc SHA512 08afe55b9a5e8d1c0aa5150511e7d3918fd8c6da10bb80037baa4f3c8004fa9e50b30ce7bda26e73f77208b64cb85544029ffd2edf197f6a23614b3c7f56114b
+DIST python-socks-2.0.2.gh.tar.gz 40722 BLAKE2B cfcb3bf26ad9b306ea74ede172d4c8e7cf5412c1e212fb2b806e61bd5fa085c53c47a5846105bc84e9a197198f00d85689dee55c97c691cd1b8b48bad56cc449 SHA512 fac699e2d5898553cfb0045990e5f56c16f910a5434a2e5f9c549872761835170ad7e505833f1cbc4b31cba864c1c0dddc95a530c5b0a7c2002afe0766dd6029
diff --git a/dev-python/python-socks/python-socks-2.0.2.ebuild b/dev-python/python-socks/python-socks-2.0.2.ebuild
new file mode 100644
index 000000000000..df3a8952fe8d
--- /dev/null
+++ b/dev-python/python-socks/python-socks-2.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020-2022 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="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
+HOMEPAGE="
+	https://pypi.org/project/python-socks/
+	https://github.com/romis2012/python-socks/"
+SRC_URI="
+	https://github.com/romis2012/python-socks/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# curio is not packaged
+# asyncio is the only backend we have, so dep on its deps unconditionally
+# TODO: revisit
+RDEPEND="dev-python/async_timeout[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
+			dev-python/trio[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/async_timeout[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/yarl[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest
index 3516beb4dda5..e4e1eb9c9b3c 100644
--- a/dev-python/quantities/Manifest
+++ b/dev-python/quantities/Manifest
@@ -1 +1,2 @@
 DIST python-quantities-0.12.5.tar.gz 105130 BLAKE2B db1cf09fa2efc249bc722abe34ed71d0f59d85595f70baf44203785c32179a3598be8aac225adadfd7d5f09c44ec077dcef310ee2fe7ce4d49a1533b04cb9de6 SHA512 db81e45d464e65d6b144d05e1b990fccc5c17ab7fdd47c7bb0c0094ebcacd6af52a3692492561af3a694741810ddac03e4c887d7c6effed833f196493da5f156
+DIST python-quantities-0.13.0.tar.gz 107187 BLAKE2B ead5c223892f65c68ced2265356f8c1e5374f80a1507ec561370e56e28e8965217a7b99f5c46cb83a5f6a1b1f12eb9f501844650488871d48794f13a4383df38 SHA512 ec0a61d8df8e48e7ee08cab5c899a8c8ad96b964ee0132ab130f272f062436d91e6370aac9d85453eeb3d95e17e79e8dfb80412397eada1f0a4310c0494fa217
diff --git a/dev-python/quantities/quantities-0.13.0.ebuild b/dev-python/quantities/quantities-0.13.0.ebuild
new file mode 100644
index 000000000000..29b2720ff0ff
--- /dev/null
+++ b/dev-python/quantities/quantities-0.13.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020-2022 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
+
+MY_P="python-quantities-${PV}"
+DESCRIPTION="Support for physical quantities with units, based on numpy"
+HOMEPAGE="https://github.com/python-quantities/python-quantities"
+SRC_URI="
+	https://github.com/python-quantities/python-quantities/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/numpy-1.16[$PYTHON_USEDEP]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 574eec4056d7..97ad61aa334f 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,2 +1 @@
-DIST readme_renderer-31.0.tar.gz 27617 BLAKE2B 2705157cb0cb04e8891ac5b0c363dbe30559ce3fd5bd5c0014e9746d6334c68b458fc1dad69c8da3088ccf5c70dff31bcc957fb01c26ee37f7370d3ac7dbffc7 SHA512 8399d478f46c58a3abecbbc3242c7cc4801fc84c04dc4ab35b88159e65373fe91ccebb1ab6eba505651b0dcab6f12283f55aad902379a2b0056ddcbce5e76897
 DIST readme_renderer-32.0.tar.gz 27812 BLAKE2B 9e5052bd6d14c9ae6c405934919b2e2555094892f569c3acae2149607c5d94c9522e994110b1b9607429eaf865925a3fbbda5eb78e3ac9ce66024d229c6b223f SHA512 58f3dfe6e19074e8f0c5bb8125c9b414651008cc1246a5100018f24dbb199f5d9d920a0201afe06fc9921d86fca339bd1ebd1b4d8c0606aa59e6e2edd1e8bf56
diff --git a/dev-python/readme_renderer/readme_renderer-31.0.ebuild b/dev-python/readme_renderer/readme_renderer-31.0.ebuild
deleted file mode 100644
index a2eea87a8145..000000000000
--- a/dev-python/readme_renderer/readme_renderer-31.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 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 library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme-renderer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/readme_renderer/readme_renderer-32.0.ebuild b/dev-python/readme_renderer/readme_renderer-32.0.ebuild
index 1b1eb632f04d..a2eea87a8145 100644
--- a/dev-python/readme_renderer/readme_renderer-32.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-32.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/stack_data/stack_data-0.1.3.ebuild b/dev-python/stack_data/stack_data-0.1.3-r1.ebuild
similarity index 81%
rename from dev-python/stack_data/stack_data-0.1.3.ebuild
rename to dev-python/stack_data/stack_data-0.1.3-r1.ebuild
index 483a4209f565..8539a5918eca 100644
--- a/dev-python/stack_data/stack_data-0.1.3.ebuild
+++ b/dev-python/stack_data/stack_data-0.1.3-r1.ebuild
@@ -15,12 +15,12 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
+RDEPEND="dev-python/asttokens[${PYTHON_USEDEP}]
+	dev-python/executing[${PYTHON_USEDEP}]
+	dev-python/pure_eval[${PYTHON_USEDEP}]"
 BDEPEND="test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
 		dev-python/typeguard[${PYTHON_USEDEP}]
 		dev-python/littleutils[${PYTHON_USEDEP}]
-		dev-python/pure_eval[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/tomli/tomli-2.0.0.ebuild b/dev-python/tomli/tomli-2.0.0.ebuild
index c62c576ca961..6aa051210329 100644
--- a/dev-python/tomli/tomli-2.0.0.ebuild
+++ b/dev-python/tomli/tomli-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # please keep this ebuild at EAPI 7 -- sys-apps/portage dep
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~ppc-macos ~x64-macos"
 
 BDEPEND="
 	app-arch/unzip
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 96f0c168dd57..4439e3642865 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/dnsruby/Manifest b/dev-ruby/dnsruby/Manifest
index 9b64a8bd3308..1367d0312e0c 100644
--- a/dev-ruby/dnsruby/Manifest
+++ b/dev-ruby/dnsruby/Manifest
@@ -1,2 +1,3 @@
 DIST dnsruby-1.61.3.gem 259584 BLAKE2B 578d6f2b693de5007d4d15350a4fc6cb948f9e16ee9b0bb511e6b6dc92cf828d30e645522b834a6d42af5dd94b85f0675332b2363e0c2ba3b97c9b35b73bd82f SHA512 4cdf6d83c39c3209873e9bbd15ba33f851f3fb878cf746de98cf615b0f547dfc5af8b4be7d505f87f581755ff73de079b6ea3f6f8c5a11074c1c46d5bc9e8c07
 DIST dnsruby-1.61.7.gem 261632 BLAKE2B 28accc37bc8ca99ca348acea3ead30079f72deeff39d31b323344b758b874fca23f65ea7b6f8f8c780d74de491875b0e4a11354af14b5064cf7aa329a7a94a4f SHA512 454378b7eca03483533ca1c1e01a86361c20ce88971ecc6adc72e11bb9ef03709ea1332d2549eefc1c41ed13d5a752b1a7f76e2117ffc9076776663ab6e02d1f
+DIST dnsruby-1.61.9.gem 261632 BLAKE2B f86682fbc50bc0b20f59b3a7bb825081824a3dfa5a6de36f3083b39fac9617ff770d3a53c17f015bcaff5dfe5a96ddafd78b1aaf72bcba9bf990a649cf3a0c63 SHA512 ba692db6ab5234c0669076cb5290d5e4613886956d3cea23c22837f99ee2a970e7f86c7c7fdc7542ac4873d324f52b83b0f5e14bb9c3d5107b068fdf419f6ba1
diff --git a/dev-ruby/dnsruby/dnsruby-1.61.9.ebuild b/dev-ruby/dnsruby/dnsruby-1.61.9.ebuild
new file mode 100644
index 000000000000..b1b12dd543f6
--- /dev/null
+++ b/dev-ruby/dnsruby/dnsruby-1.61.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md"
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby DNS client library"
+HOMEPAGE="https://github.com/alexdalitz/dnsruby"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/simpleidn-0.1:0"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Cc]overall/d" Rakefile || die
+	sed -i -e '/display/d' \
+		-e '/Display/,/^}/d' test/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	# only run offline tests
+	#${RUBY} -I .:lib test/ts_dnsruby.rb || die "test failed"
+	${RUBY} -I .:lib test/ts_offline.rb || die "test failed"
+}
diff --git a/dev-ruby/excon/Manifest b/dev-ruby/excon/Manifest
index 5f2a3956d215..d88944613a2c 100644
--- a/dev-ruby/excon/Manifest
+++ b/dev-ruby/excon/Manifest
@@ -1,4 +1,3 @@
-DIST excon-0.73.0.tar.gz 216100 BLAKE2B 7830ac608c25ac42dd5fac85d2e4fa7a06713ba49340693f23886aa2e7bb5f29cde956eac99a13f17c1f7ef987f00d0cfb3bd306c5bffd16c1bdb469be4baa60 SHA512 a58556510d8c53c7d4f71dd4846497ee8ab17bd087d5ac9248784fcd1f1dc2e46bf4dbccd22ad8e467614428fdeacc7af6768380922749f92c7d78b849e08eff
-DIST excon-0.87.0.tar.gz 207823 BLAKE2B 1affb1b566afb18ad563806362f75b43704e7753f1aab1e356a38058f1cbb79d89e09d271e4f6f49f9e8ed775592fe78bc262979ecc73285deda056a1fd5fba4 SHA512 34149831783a51f792dcdad500691343e675c84d7d45766eebbb590080111dc790928455b7c885f731e01fa5637f531f7736e42496d9f77bb0337110aeb531f9
 DIST excon-0.88.0.tar.gz 210056 BLAKE2B abffad837a6a2a7337e43fc73d1f4004f6df01113f475e44daa48e21cef95f363bd5fbf88be0093fb18564d382fae5f4409e23689e11b5c47bc900f708ea7455 SHA512 5cb664e64973959dffb80f421bd70c300303fb6c4083b06f6bb42be8987a8822dc4ae38892467576583ec5dccd696b68dee7a946c3917df2066ebfc2afb72209
 DIST excon-0.89.0.tar.gz 210503 BLAKE2B 3988bdff1db39a84ba6230bb8d789662bbf589e89ea637a8b3208095d0d26f4bc83f0994fca5db92de162e2882d2a519f2d9f3c4f535d123d2b018d4abd82d60 SHA512 36e23d93983098ad14b9169b7ae65c28903e8a46a2d8cd341ce111387a83fb90a7f01973d401c8089844355d18a6e53da117df3c3fcb82cf66eb5367e065e2ee
+DIST excon-0.90.0.tar.gz 210538 BLAKE2B a3e5898e3985ebdfc4026355f4761b1b0d9367408e01a119101fa2453924ff751d888ab976382b654b846e0ed9908054aab6ac1f6410a2a96056b7c8d8d977ad SHA512 efcc9a13b8715306f980cd4593c44befcf895f5c42f9475211420e67247d9eeefecddae53ba771710a6894ca23bf880158e7cdf9db895baa42ef3c5436ac846a
diff --git a/dev-ruby/excon/excon-0.73.0.ebuild b/dev-ruby/excon/excon-0.73.0.ebuild
deleted file mode 100644
index 30a8df2cece3..000000000000
--- a/dev-ruby/excon/excon-0.73.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
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="changelog.txt README.md"
-RUBY_FAKEGEM_GEMSPEC="excon.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="EXtended http(s) CONnections"
-HOMEPAGE="https://github.com/excon/excon"
-SRC_URI="https://github.com/excon/excon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-ruby_add_bdepend "
-	dev-ruby/rake
-	test? (
-		dev-ruby/activesupport
-		>=dev-ruby/eventmachine-1.0.4
-		>=dev-ruby/json-1.8.5
-		dev-ruby/open4
-		dev-ruby/rdoc
-		dev-ruby/sinatra
-	)
-"
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# test that need network
-	rm -f spec/excon/test/server_spec.rb || die
-}
diff --git a/dev-ruby/excon/excon-0.87.0.ebuild b/dev-ruby/excon/excon-0.90.0.ebuild
similarity index 87%
rename from dev-ruby/excon/excon-0.87.0.ebuild
rename to dev-ruby/excon/excon-0.90.0.ebuild
index 44a58d833344..84ee1858942c 100644
--- a/dev-ruby/excon/excon-0.87.0.ebuild
+++ b/dev-ruby/excon/excon-0.90.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ ruby_add_bdepend "
 	)
 "
 all_ruby_prepare() {
-	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e 's/git ls-files --/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	# test that need network
 	rm -f spec/excon/test/server_spec.rb || die
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index f320839638e0..44e7fbcb908b 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -2,3 +2,4 @@ DIST ffi-git-1.14.2.tgz 165100 BLAKE2B 598d1771860a7884f8dc6a4cf0006cb42f741308b
 DIST ffi-git-1.15.1.tgz 167429 BLAKE2B 6012234f7145c5b291dd03f37d36c51b3ca0d14779b24c02da325b2075564a210566e64eb54caf4c32b4bbfe0c032f4d2c0a316c8c0cf559e14cbe6a922ebd7b SHA512 1e2cd70a8b921c6840b8b990d79819e2bc12f82c2bbef9952a59026de093002d1356642f6637f6bd7b0c94a6205401d88db6b83d1a479b4591c1041ca76f8e5a
 DIST ffi-git-1.15.3.tgz 167804 BLAKE2B a0d040cd87a0606ebf618bb1e5bf5189e03fa30d2a3681c8dcf2b075b8cba40fbc5d130d78bae0f31d1c20319299f106653576cdb89f355090df5de0c10d916b SHA512 25cf025aa51c5389c99f47043443d33859ce91e50d057dbd49b376b81b2d81c0d158785e9d7d8efba53b9ff450e49d43b475ad2c870822635d8350592f3bb3ce
 DIST ffi-git-1.15.4.tgz 167917 BLAKE2B 0694bc5baed1a902a444d75ca534f38c61e56db17e542311f78edad07cc40566aaced5849766b2cce2fdbb531a7ae5ccc3d2506d5871f15c382bbdb3a8302af3 SHA512 3278dd217669b5467e3e0b92b5879fea745c955be52de4096ee490efbfac4ad887018c07ecb5dcd8b0fefd8a02144740c2aba74a1e545d798e73f64f69c7cd79
+DIST ffi-git-1.15.5.tgz 168139 BLAKE2B 2ddd5bd7bfb7bcd39b6d740cbb1e0f4cd419ce6cb4ec12926f91f254b3f3142bc6166728a81a6f23dccfbf7aec911c63237c20fb0e2c70d30d48f4648e352585 SHA512 3668bafae936bf5010f014fbcf63258b023bcc318882775e7d2fcfc11334722ec2b6e8a8b9c910d406889fb173dd503c5c13f5af8e4f6927921f12f688461707
diff --git a/dev-ruby/ffi/ffi-1.15.5.ebuild b/dev-ruby/ffi/ffi-1.15.5.ebuild
new file mode 100644
index 000000000000..f14690edb137
--- /dev/null
+++ b/dev-ruby/ffi/ffi-1.15.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 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_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ffi.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/ffi_c/extconf.rb)
+
+inherit multilib ruby-fakegem toolchain-funcs
+
+DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
+HOMEPAGE="https://wiki.github.com/ffi/ffi"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND+=" dev-libs/libffi:="
+DEPEND+=" dev-libs/libffi:="
+
+ruby_add_bdepend "dev-ruby/rake"
+
+all_ruby_prepare() {
+	sed -i -e '/tasks/ s:^:#:' \
+		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
+
+	sed -e '/require/c\require "./lib/ffi/version"' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-e '/^  lfs/,/^  end/ s:^:#:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Fix Makefile for tests
+	sed -i -e '/CCACHE :=/ s:^:#:' \
+		-e 's/-O2//' \
+		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
+
+	# Remove bundled version of libffi.
+	rm -rf ext/ffi_c/libffi || die
+}
+
+each_ruby_compile() {
+	each_fakegem_compile
+
+	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
+}
+
+each_ruby_test() {
+	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc samples/*
+}
diff --git a/dev-ruby/font-awesome-rails/Manifest b/dev-ruby/font-awesome-rails/Manifest
index 19d6d339f411..5edb79b7878f 100644
--- a/dev-ruby/font-awesome-rails/Manifest
+++ b/dev-ruby/font-awesome-rails/Manifest
@@ -1,3 +1,2 @@
-DIST font-awesome-rails-4.7.0.5.gem 637952 BLAKE2B b4d4c8391fc3ff7fd9874c1c3d1ddcb60ea36999f8ab6ccaa5797c1d6b47adf9b70bf323b2f32c8c518ce8b96750e1cddcb9d2ff32f8718570f0c36ef18d2a48 SHA512 ffff431d5a76ba6618d9b505c599a28243038f6550c44b8bee930875e0294c724135aca40e5b591f999c98488fb35d362482eb5a53719a4e026c60ea08804781
-DIST font-awesome-rails-4.7.0.6.gem 637952 BLAKE2B de85a8135683bd72aeda32297c2ecddeeec8b48d51a17e9cdcf15a13890e85c6b302016c7006ca55acd4b6be8e42a2cb9acf14dc08956f5831bb84ba0828fb0a SHA512 4a62a41aa5bf2d7a70a027321110f97bed546a15a05eec51b95706d14f4fe2e9ce12692b648487d1ae9cbc81bac63161d50470aa638e3c5a8cfc31efe8edff3f
 DIST font-awesome-rails-4.7.0.7.gem 638464 BLAKE2B 2cd0a992377f88ae94db8b52260e5bd14138268bb901c808ec48f615d29311326cacf3f8e3c3fe0b6b6da6c2d8383fca9933d479fd72cb42b7c57e5277694112 SHA512 15db10613b41d122b5a4632226254de018d798e951391177322abf78294b1b7ddb2a13363410dff84903d1b6624a793a8c3af0591da9bdb56232d4e585eb5149
+DIST font-awesome-rails-4.7.0.8.gem 638464 BLAKE2B 5aaea78b2f8601004f349b6a526c6e19dfd42686dbe424dac112c9ae99eabe8f09ee571cf0b07fc2b1b0221a3fdeb7a005b9e466aa281a2d85d1c71804debc0c SHA512 011d2a3f66345f5629b98b1224ace1818657447635610c5b927def5595f8dd1878d7b65e526ab6f078fb717cf44804aa989d3502072c6e341f01b75d2f7b9936
diff --git a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.5.ebuild b/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.5.ebuild
deleted file mode 100644
index fc698ed9b0a6..000000000000
--- a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Font-awesome for the asset pipeline"
-HOMEPAGE="https://github.com/bokmann/font-awesome-rails https://rubygems.org/gems/font-awesome-rails"
-
-LICENSE="MIT OFL"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/railties-6.1:*
-	>=dev-ruby/railties-3.2:*"
diff --git a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.6.ebuild b/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.8.ebuild
similarity index 74%
rename from dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.6.ebuild
rename to dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.8.ebuild
index 1f1cbecd3ab8..4e4ca50caccf 100644
--- a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.6.ebuild
+++ b/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
@@ -17,5 +17,5 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-ruby_add_rdepend "<dev-ruby/railties-6.2:*
+ruby_add_rdepend "<dev-ruby/railties-8.0:*
 	>=dev-ruby/railties-3.2:*"
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index e5ead182cff7..d5df191d04d5 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1,2 +1,3 @@
 DIST octokit-4.20.0.tar.gz 3127939 BLAKE2B 30b251c95cf664ea83d23473ecbd5d1652586a567775253afa3f0c954490a6381c86da40cdc3761c8c43b17c850dfe9ba80f3814e946f1f3a008be81dd3c002a SHA512 180a4846052dc223b4d5444acc7af7d78151ac941687c75e6853c119ce75d9383fa5ec1ffc7ede97a6ee6d5780ef27030f2132761484099f634be6a3c4a9d7b6
 DIST octokit-4.21.0.tar.gz 3134804 BLAKE2B 67648f7dd3a04b8b5b397d94e1c73329fe6ea0a6db1abff3c5cb5ab443beb1e5874c2bc2f072ecbeee2a13b4de229791c03184eb5fa769ba52e2d8793bf0b9c1 SHA512 364ed578ddef4b4fe50c3848559820819a517d33e2140f2867f70de4fc1e9e5a14c0fcc9b34a6bb6b2240bfaf0b9ff95038e01ff7e857e2bd0ab707f546d9fd9
+DIST octokit-4.22.0.tar.gz 3141531 BLAKE2B c852f34dc99b10fb06194bda9f15bffb4242a2b5ee7909e74defa2a7ca6b90962fd30232eb8850d97af872bfb036c87f7623acd9088efa3afd07f01cad525fe4 SHA512 e8696176227c81d5f80080fbb3c660b7b6e1b28b149b664b20d7e8cf333450988ac2fb9f5327c5e4e46528dbf7eea1246e82c94b265e6008f8fd7cd98f87423c
diff --git a/dev-ruby/octokit/octokit-4.22.0.ebuild b/dev-ruby/octokit/octokit-4.22.0.ebuild
new file mode 100644
index 000000000000..e9e1d7a6daec
--- /dev/null
+++ b/dev-ruby/octokit/octokit-4.22.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby toolkit for the Github API"
+HOMEPAGE="https://github.com/octokit/octokit.rb"
+SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RUBY_S=octokit.rb-${PV}
+
+ruby_add_rdepend "
+	>=dev-ruby/faraday-0.9:*
+	=dev-ruby/sawyer-0.8*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/jwt
+	dev-ruby/mime-types
+	>=dev-ruby/netrc-0.7.7
+	>=dev-ruby/rbnacl-7.1.1:6
+	dev-ruby/vcr:3[json]
+	dev-ruby/webmock:3 )"
+
+all_ruby_prepare() {
+	sed -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' \
+		-e '/pry/ s:^:#:' \
+		-i spec/helper.rb || die
+}
diff --git a/dev-ruby/rainbow/Manifest b/dev-ruby/rainbow/Manifest
index a4d4ed878383..0eba94701f6c 100644
--- a/dev-ruby/rainbow/Manifest
+++ b/dev-ruby/rainbow/Manifest
@@ -1 +1,2 @@
 DIST rainbow-git-3.0.0.tgz 15105 BLAKE2B bc2c91b8ac726c080dbed45584adcdf4a4a496de070a92291042490009ae490efc4ab91cdd12d338f0cda156811358550507ad629e27dd54445a68427f8d4d2d SHA512 863b89152696b6a13606a1e92b68a788b9b5bcd6f521f02f26fb189fc6c9613e5db032dd5deed1aa95247ab0aa08a44981756f941af6eb786076c271881a38c1
+DIST rainbow-git-3.1.1.tgz 15785 BLAKE2B 9c5dffab817fa2b2b5f70acbe642990c6417de7a5b4347f7921ea57ea5c1017fea63656696544d870a3589f9ac8049e56baa6f4e70b8af902883d62046480d11 SHA512 5aff955e8baf78d99960ec9caa11626f07460085f35966c410bb867dd6454a932d2ee8742729a32eeca186fa338bbb02bce3ee8a452a8b4fb0044bb6ec751bc3
diff --git a/dev-ruby/rainbow/rainbow-3.1.1.ebuild b/dev-ruby/rainbow/rainbow-3.1.1.ebuild
new file mode 100644
index 000000000000..0cec82a9b17e
--- /dev/null
+++ b/dev-ruby/rainbow/rainbow-3.1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 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_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.markdown"
+RUBY_FAKEGEM_GEMSPEC="rainbow.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Colorize printed text on ANSI terminals"
+HOMEPAGE="https://github.com/sickill/rainbow"
+
+SRC_URI="https://github.com/sickill/rainbow/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c06432aea9b6..68459fd6352a 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index e9947665672f..f8bfaf2e5224 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,2 +1 @@
-DIST bcc-0.22.0.tar.gz 5247927 BLAKE2B 896d22c9540180e015f7be03b2ce8e6957fd7ba3e7f28fb57247bc8455b35bc82ecf321140e80f714bc01a2c01721e0544e249bc07be7b467c650788014793f0 SHA512 946ec8ed96a83cb7a9d7e44436901445588dc5e37c5cbc8b720a7a0d226b2769ab780294fa7c52099f579f4f1b6935f662be19c739d13979044723dce8ed7792
 DIST bcc-0.23.0.tar.gz 5254103 BLAKE2B 011559f081dd8f95b45b64e347ed191f585f6f5e395aadc3ef9726785aa41735b263c0d6e7743c969e390792f0f4f286930fee585c1a59878f301c4b4026dce8 SHA512 531626c920f5ef7d05617b3b418d55fdeef2dc8014f942a6e68ca457433d63445cc98303bbe331ee982e4aefe5d2df84764d373a6166638bd457992b371f037c
diff --git a/dev-util/bcc/bcc-0.22.0-r1.ebuild b/dev-util/bcc/bcc-0.22.0-r1.ebuild
deleted file mode 100644
index a5029626a40d..000000000000
--- a/dev-util/bcc/bcc-0.22.0-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7..10} )
-LLVM_MAX_SLOT=13
-
-inherit cmake linux-info llvm lua-single python-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+lua test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )"
-# tests need root access
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/elfutils-0.166:=
-	>=dev-libs/libbpf-0.5.0:=[static-libs(-)]
-	>=sys-kernel/linux-headers-5.13
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
-	${PYTHON_DEPS}
-	lua? ( ${LUA_DEPS} )
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	local bpf_link_path
-
-	# this avoids bundling
-	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
-	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
-
-	# bug 811288
-	local script scriptname
-	for script in $(find tools/old -type f -name "*.py" || die); do
-		scriptname=$(basename ${script} || die)
-		mv ${script} tools/old/old-${scriptname} || die
-	done
-
-	cmake_src_prepare
-}
-
-python_add_impl() {
-	bcc_python_impls+="${EPYTHON};"
-}
-
-src_configure() {
-	local bcc_python_impls
-	python_foreach_impl python_add_impl
-
-	local -a mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		-DENABLE_LLVM_SHARED=ON
-		-DCMAKE_USE_LIBBPF_PACKAGE=ON
-		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
-		-DPYTHON_CMD="${bcc_python_impls%;}"
-		-Wno-dev
-	)
-	if use lua && use lua_single_target_luajit; then
-		mycmakeargs+=( -DWITH_LUAJIT=1 )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
-	python_foreach_impl python_optimize
-
-	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-}
diff --git a/dev-util/bcc/bcc-0.22.0.ebuild b/dev-util/bcc/bcc-0.22.0.ebuild
deleted file mode 100644
index d3f591ee94f5..000000000000
--- a/dev-util/bcc/bcc-0.22.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit cmake linux-info llvm lua-single python-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+lua test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="
-	|| (
-		~dev-libs/libbpf-0.5.0
-		~dev-libs/libbpf-9999
-	)
-	dev-libs/libbpf:=[static-libs(-)]
-	>=sys-kernel/linux-headers-5.13
-	>=dev-libs/elfutils-0.166:=
-	<=sys-devel/clang-13:=
-	<=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
-	lua? ( ${LUA_DEPS} )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=12 llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	local bpf_link_path
-
-	# this avoids bundling
-	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
-	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
-
-	cmake_src_prepare
-}
-
-python_add_impl() {
-	bcc_python_impls+="${EPYTHON};"
-}
-
-src_configure() {
-	local bcc_python_impls
-	python_foreach_impl python_add_impl
-
-	local -a mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		-DENABLE_LLVM_SHARED=ON
-		-DCMAKE_USE_LIBBPF_PACKAGE=ON
-		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
-		-DPYTHON_CMD="${bcc_python_impls%;}"
-		-Wno-dev
-	)
-	if use lua && use lua_single_target_luajit; then
-		mycmakeargs+=( -DWITH_LUAJIT=1 )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	local script scriptname
-	cmake_src_install
-	find "${ED}/usr/share/bcc/tools/old" -type f | while read script; do
-		scriptname=$(basename "${pythonScript}")
-		mv "${script}" "${ED}/usr/share/bcc/tools/old/old-${scriptname}"
-	done
-	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
-	python_foreach_impl python_optimize
-
-	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-}
diff --git a/dev-util/bcc/bcc-0.23.0-r3.ebuild b/dev-util/bcc/bcc-0.23.0-r3.ebuild
deleted file mode 100644
index 20e896fce14b..000000000000
--- a/dev-util/bcc/bcc-0.23.0-r3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7..10} )
-LLVM_MAX_SLOT=13
-
-inherit cmake eapi8-dosym linux-info llvm lua-single python-r1 toolchain-funcs
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+lua test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )"
-# tests need root access
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/elfutils-0.166:=
-	>=dev-libs/libbpf-0.5.0:=[static-libs(-)]
-	sys-kernel/linux-headers
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
-	${PYTHON_DEPS}
-	lua? ( ${LUA_DEPS} )
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-	"${FILESDIR}/bcc-0.23.0-man-compress.patch"
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	local bpf_link_path
-
-	# this avoids bundling
-	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
-	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
-
-	# bug 811288
-	local script scriptname
-	for script in $(find tools/old -type f -name "*.py" || die); do
-		scriptname=$(basename ${script} || die)
-		mv ${script} tools/old/old-${scriptname} || die
-	done
-
-	cmake_src_prepare
-}
-
-python_add_impl() {
-	bcc_python_impls+="${EPYTHON};"
-}
-
-src_configure() {
-	local bcc_python_impls
-	python_foreach_impl python_add_impl
-
-	local -a mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		-DENABLE_LLVM_SHARED=ON
-		-DCMAKE_USE_LIBBPF_PACKAGE=ON
-		-DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')"
-		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
-		-DPYTHON_CMD="${bcc_python_impls%;}"
-		-Wno-dev
-	)
-	if use lua && use lua_single_target_luajit; then
-		mycmakeargs+=( -DWITH_LUAJIT=1 )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
-	python_foreach_impl python_optimize
-
-	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-
-	local tool name
-	for tool in "${ED}"/usr/share/bcc/tools/*; do
-		[[ ! -x ${tool} && ! -L ${tool} || -d ${tool} ]] && continue
-		name=${tool##*/}
-		dosym8 -r "${tool#${ED}}" /usr/sbin/${name}
-	done
-
-	docompress /usr/share/${PN}/man
-
-	newenvd - "70${P}" <<-_EOF_
-		MANPATH="${EPREFIX}/usr/share/${PN}/man"
-	_EOF_
-}
diff --git a/dev-util/uncrustify/uncrustify-0.71.0.ebuild b/dev-util/uncrustify/uncrustify-0.71.0.ebuild
index 5bd13fa54668..f1a9dd1829cd 100644
--- a/dev-util/uncrustify/uncrustify-0.71.0.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.71.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ fi
 
 inherit cmake ${scm_eclass}
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit python-any-r1
 
diff --git a/dev-util/weka/weka-3.8.0.ebuild b/dev-util/weka/weka-3.8.0.ebuild
index 134f1ad611ba..e5bc75967bf2 100644
--- a/dev-util/weka/weka-3.8.0.ebuild
+++ b/dev-util/weka/weka-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 HOMEPAGE="http://www.cs.waikato.ac.nz/ml/weka/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND=">=virtual/jdk-1.7
 	app-arch/unzip
 	>=dev-java/javacup-0.11a_beta20060608:0"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index de290506ca44..23777bbfb25f 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass
index 64caf3a55559..8c783eaf0610 100644
--- a/eclass/rust-toolchain.eclass
+++ b/eclass/rust-toolchain.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: rust-toolchain.eclass
 # @MAINTAINER:
 # Rust Project <rust@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: helps map gentoo arches to rust ABIs
 # @DESCRIPTION:
 # This eclass contains a src_unpack default phase function, and
@@ -14,6 +14,7 @@
 case ${EAPI} in
 	6) : ;;
 	7) : ;;
+	8) : ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index a5766b7f34e8..0b8a14e92a6a 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index bedf1cb5df0e..7234b85b9c96 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,3 +1,4 @@
 DIST gnome-desktop-40.5.tar.xz 722316 BLAKE2B 1f2e214eaea74295c892a465f767d29175ac0719a66d8d5b60b924c448f7b8317d3f9e23361d65b4d171018edd206dce764c38545a716ad9c83f20214fe5c4e9 SHA512 a65bf42be69d04efd80da6a8c8b08c4adc09db1c6627b93d4eecc3396376bc4407bfad914fc131d16d78b3b3263e635c925ed3dcff92af069525f809bea21afc
 DIST gnome-desktop-40.7.tar.xz 721452 BLAKE2B d9979be0131bbaafdc4ae808a5367ce1ac39ade3595f96999cfc7e2876c9cf380a6a6039c74db34a40f1747fec05081384ea1dbf487e849f32a1da67fe22e8a0 SHA512 b687c8b7de968544b14bc8801ba3762e0cc2f4d08a41b718813302fdbdcedc3b67ead19bea14050db6312bd807f28bf5e56eeec53c3e2d9005466c9e73e62d14
 DIST gnome-desktop-41.2.tar.xz 732788 BLAKE2B 5ae560fb31166db0fff56c3c3afd13a5890a540a748ba0602cee7a2f129facd023104198600379415a8f00f6edf1eba670769810cc0542e4c75dc1deb4da0f57 SHA512 1a520c84f7a781c59bfd8499c87c7049044a59b87033fac078c4a255c8bcaf79f9b614ad20985ea19c245424bb1972af744ad66fdafa5501800ad342b60fb531
+DIST gnome-desktop-41.3.tar.xz 732804 BLAKE2B 40a88ba4454455f85a46676d4b2f37159617f7eae9d0f5e1a27c3f0ed1e44953ae9475e81558b7cce1b6fd8cd8804cd3f452d060d843d4f58a7af8748b4c35fa SHA512 b02d9fe3bfad56993f9ed7225b38b4b0b685c7ad1480a9d9db5f9a6a8e13c16918d87e6a51160ee3101ab8ce24f4c0632ae351e7bb11cc473523e216ee9cf6bf
diff --git a/gnome-base/gnome-desktop/gnome-desktop-41.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-41.3.ebuild
new file mode 100644
index 000000000000..17f8768e560d
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-41.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson xdg
+
+DESCRIPTION="Library with common API for various GNOME modules"
+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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+COMMON_DEPEND="
+	>=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? ( virtual/libudev:= )
+	seccomp? ( sys-libs/libseccomp )
+
+	x11-libs/cairo:=
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${COMMON_DEPEND}
+	media-libs/fontconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	seccomp? ( sys-apps/bubblewrap )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	x11-base/xorg-proto
+	virtual/pkgconfig
+"
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
+
+PATCHES=(
+	"${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
+)
+
+src_prepare() {
+	# Don't build manual test programs that will never get run
+	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgnome_distributor=Gentoo
+		-Ddate_in_gnome_version=true
+		-Ddesktop_docs=true
+		$(meson_use debug debug_tools)
+		$(meson_use introspection)
+		$(meson_feature udev)
+		$(meson_feature systemd)
+		$(meson_use gtk-doc gtk_doc)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index b24182613817..787b3c0517ab 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1 +1,3 @@
 DIST gnome-session-40.1.1.tar.xz 482304 BLAKE2B 9a96f230dc793cc0b810bdaad6ce0103f923fbd2b22ee567316508c79bd6e7afe3961b593d094d0a4766a76f45ba6710f96e03a299f43d08a04aca776a172955 SHA512 91609915366839806729e066e5ca0d42daff0591732cda08c3da7d4951f7e27964d72988c4e61a64045443969b9fb0a9697c7ace82bdd8843310cb4d7e9dfd8c
+DIST gnome-session-40.8.tar.xz 483272 BLAKE2B 47cbc09885163bbae2cd6578cc506ce32c1514a3024e410d9bf0dd7bb4a8e5dd38f8957f17685c9847098579c3b5e46d5675a53b99ce6673c9f4905c9f55d3dd SHA512 1f0cc24ae140adfada4a343ad4542883779ac0e6343df2a5720458d62fa1c88e6703d6612c05c2af32b5cabc351daa432ef0b6981f852550ebb99eeed4a77b36
+DIST gnome-session-41.3.tar.xz 483396 BLAKE2B b5672868459b362452f62e6b543243df536a2edeaaa75dae09c5dedc9574fa58f6024aea5e0853361ae46cff6dcbfd257e6bc0da7ddfb028c3b0ae58d8ead63d SHA512 a75c038639301ccd1f0abf83f944890f74986e94dc32f45c97c1872ddc09bcebbb94116f7f865b1d9fa40a81133ec14fbfb75d585061750d9809af4abba3aa9a
diff --git a/gnome-base/gnome-session/gnome-session-40.8.ebuild b/gnome-base/gnome-session/gnome-session-40.8.ebuild
new file mode 100644
index 000000000000..d79d3e2348d7
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-40.8.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc elogind systemd"
+# There is a null backend available, thus ?? not ^^
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=dev-libs/glib-2.46.0:2
+	>=x11-libs/gtk+-3.22.0:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=gnome-base/gnome-desktop-3.34.2:3=
+	>=dev-libs/json-glib-0.10
+	media-libs/mesa[egl(+),gles2,X(+)]
+	media-libs/libepoxy
+	x11-libs/libXcomposite
+
+	systemd? ( >=sys-apps/systemd-242:0= )
+	elogind? ( >=sys-auth/elogind-239.4 )
+"
+
+# Pure-runtime deps from the session files should *NOT* be added here.
+# >=gnome-settings-daemon-3.35.91 for UsbProtection required component.
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+# sys-apps/dbus[X] is needed for session management.
+# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
+RDEPEND="${DEPEND}
+	>=gnome-base/gnome-settings-daemon-3.35.91
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	sys-apps/dbus[X]
+
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+"
+BDEPEND="
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	x11-libs/xtrans
+	virtual/pkgconfig
+	doc? ( app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.38.0-meson-Support-elogind.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	# Install USE=doc in ${PF} if enabled
+	sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddeprecation_flags=false
+		$(meson_use elogind)
+		-Dsession_selector=true # gnome-custom-session
+		$(meson_use systemd)
+		-Dsystemd_session=$(usex systemd default disable)
+		$(meson_use systemd systemd_journal)
+		$(meson_use doc docbook)
+		-Dconsolekit=false
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome"
+
+	newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
+
+	exeinto /etc/X11/xinit/xinitrc.d/
+	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+	# This should be done here as discussed in bug #270852
+	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+
+	# Set XCURSOR_THEME from current dconf setting instead of installing
+	# default cursor symlink globally and affecting other DEs (bug #543488)
+	# https://bugzilla.gnome.org/show_bug.cgi?id=711703
+	newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
+		ewarn "If you use a custom .xinitrc for your X session,"
+		ewarn "make sure that the commands in the xinitrc.d scripts are run."
+	fi
+
+	if ! use systemd && ! use elogind; then
+		ewarn "You are building without systemd or elogind support."
+		ewarn "gnome-session won't be able to correctly track and manage your session."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
diff --git a/gnome-base/gnome-session/gnome-session-41.3.ebuild b/gnome-base/gnome-session/gnome-session-41.3.ebuild
new file mode 100644
index 000000000000..d79d3e2348d7
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-41.3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc elogind systemd"
+# There is a null backend available, thus ?? not ^^
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=dev-libs/glib-2.46.0:2
+	>=x11-libs/gtk+-3.22.0:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=gnome-base/gnome-desktop-3.34.2:3=
+	>=dev-libs/json-glib-0.10
+	media-libs/mesa[egl(+),gles2,X(+)]
+	media-libs/libepoxy
+	x11-libs/libXcomposite
+
+	systemd? ( >=sys-apps/systemd-242:0= )
+	elogind? ( >=sys-auth/elogind-239.4 )
+"
+
+# Pure-runtime deps from the session files should *NOT* be added here.
+# >=gnome-settings-daemon-3.35.91 for UsbProtection required component.
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+# sys-apps/dbus[X] is needed for session management.
+# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
+RDEPEND="${DEPEND}
+	>=gnome-base/gnome-settings-daemon-3.35.91
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	sys-apps/dbus[X]
+
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+"
+BDEPEND="
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	x11-libs/xtrans
+	virtual/pkgconfig
+	doc? ( app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.38.0-meson-Support-elogind.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	# Install USE=doc in ${PF} if enabled
+	sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddeprecation_flags=false
+		$(meson_use elogind)
+		-Dsession_selector=true # gnome-custom-session
+		$(meson_use systemd)
+		-Dsystemd_session=$(usex systemd default disable)
+		$(meson_use systemd systemd_journal)
+		$(meson_use doc docbook)
+		-Dconsolekit=false
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome"
+
+	newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
+
+	exeinto /etc/X11/xinit/xinitrc.d/
+	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+	# This should be done here as discussed in bug #270852
+	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+
+	# Set XCURSOR_THEME from current dconf setting instead of installing
+	# default cursor symlink globally and affecting other DEs (bug #543488)
+	# https://bugzilla.gnome.org/show_bug.cgi?id=711703
+	newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
+		ewarn "If you use a custom .xinitrc for your X session,"
+		ewarn "make sure that the commands in the xinitrc.d scripts are run."
+	fi
+
+	if ! use systemd && ! use elogind; then
+		ewarn "You are building without systemd or elogind support."
+		ewarn "gnome-session won't be able to correctly track and manage your session."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild
index 2ffa475d7538..b0e196bea8d6 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ DEPEND="
 	>=x11-libs/libnotify-0.7.3
 	>=media-sound/pulseaudio-12.99.3[glib]
 	>=sys-auth/polkit-0.114
-	>=sys-power/upower-0.99.8:=
+	>=sys-power/upower-0.99.12:=
 	x11-libs/libX11
 	>=x11-libs/libXfixes-6.0.0
 	udev? ( dev-libs/libgudev:= )
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index b3a1b26e4bd8..7f73419708d3 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,2 +1,3 @@
 DIST nautilus-40.2.tar.xz 3250384 BLAKE2B 8f8bb0c1a060d57695b28df126d421f386d634cbeea007ca30e076eb1b432a4098b98e9a1f39f688f8a920d99ef42ae2d53fe14fb270ba1e7de16aadd037a8d7 SHA512 ff7beab2963231c6e5ccd88098260659dd7fedd38ef6c0b95d66ffa110bfe5adc86477e2c1657eb2fcfe6110384038f75a7e669158712dfc1e2bd3f9e273b268
 DIST nautilus-41.1.tar.xz 3246356 BLAKE2B 558cac6bacd4d4238e8ceb792baa4d85a6aa981e78ae380b6c1256d079cac8e78b3d9b850a01180e4952630eb7898b987f79c12844adca82ab3702b0213d3150 SHA512 1eb2f2a0187f8b6581fe64285f347e8522b971eeb4d1f575387f3767e177f0195e758da9187090155216807b8f49ebed0fbcc29dd3cce6f3e408d7a955ae5286
+DIST nautilus-41.2.tar.xz 3248212 BLAKE2B be4e4e8fc03751259a1a5d4d1eb726e3026d24376da3fa680c412598219bfb3ced52f9b809004913dffdb9bb1c176dede07288c440c100487b3a337d8eaab417 SHA512 adb14fa1cf37a4797f57ae5162bddcd5b012de270cf955051b69276bc266b1dbfd8027b835f627ae19a1252356b344b1c8a4b7ca79a22512f3138a2c13fd2f3e
diff --git a/gnome-base/nautilus/nautilus-41.2.ebuild b/gnome-base/nautilus/nautilus-41.2.ebuild
new file mode 100644
index 000000000000..d5d9b1ae7f2e
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-41.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="Default file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.67.1:2
+	>=media-libs/gexiv2-0.10.0
+	gstreamer? ( media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	>=app-arch/gnome-autoar-0.3.0
+	>=gnome-base/gnome-desktop-3.0.0:3=
+	>=x11-libs/gtk+-3.22.27:3[X,introspection?]
+	>=gui-libs/libhandy-1.1.90:1
+	>=x11-libs/pango-1.28.3
+	selinux? ( >=sys-libs/libselinux-2.0 )
+	>=app-misc/tracker-3.0:3=
+	x11-libs/libX11
+	>=dev-libs/libxml2-2.7.8:2
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
+	>=app-misc/tracker-miners-3.0:3=
+" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
+BDEPEND="
+	>=dev-util/gdbus-codegen-2.51.2
+	>=dev-util/meson-0.57.2
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.10
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PDEPEND="
+	gnome? ( x11-themes/adwaita-icon-theme )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-1.14[gtk(+)]
+" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
+
+PATCHES=(
+	"${FILESDIR}"/3.30.5-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
+	"${FILESDIR}"/41.1-optional-gstreamer.patch # Allow controlling audio-video-properties build
+)
+
+src_prepare() {
+	if use previewer; then
+		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
+			To activate the previewer, select a file and press space; to
+			close the previewer, press space again."
+	fi
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
+		$(meson_use gstreamer) # gstreamer audio-video-properties extension
+		$(meson_use introspection)
+		-Dlibportal=false # As of 40.2, all libportal usages are flatpak-specific
+		-Dpackagekit=false
+		$(meson_use selinux)
+		-Dprofiling=false
+		-Dtests=$(usex test all none)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	meson_src_install
+}
+
+src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use previewer; then
+		readme.gentoo_print_elog
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 1b3ba3f8eeb7..1a5921c8e8db 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 93097b28c300..ec5cd70934d7 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-boxes-40.3.tar.xz 1697444 BLAKE2B a7c1677224dde80142abdeeff8b99929c7b86ce38a3432bf0368ec93146df0a813cbeae033fc8cbcd2fb8cd5b28170e0385224f36a9517ed54244e94a3453b6c SHA512 1944414feb6fab054f46e32b5f245042c882cf0a1ecde0eafced81adda16af1018203139177d3f9fa1d2eaf1565ee9e3b3fdff63c4a4b06b0802e20a2f064890
 DIST gnome-boxes-41.2.tar.xz 1614708 BLAKE2B 9896d558951d36d60843e8e4bc237007b7917fe6cd672e6af0d801de1b8a44cefe5098666b5bce95b8aebf4c4cd4ebbbe5ec6c94d88dfeff54216f524554ba66 SHA512 ef14d4bfeb3202664bb96047de5656295f0186121599bf7a82184f4815e956e18f5ce60d0a45ec6e405ec4d22134cc4138018f0d3f86b8372303c0c639751803
+DIST gnome-boxes-41.3.tar.xz 1614656 BLAKE2B 1d2a53ba833cdf130f1b2a350871344b0fd4c3f223e069d707e8279748a2fbd21e0d618d0cb229bb3bcfaa84e41d32da763df1d84efd7b749d890f28aceae904 SHA512 6aa8daf03898b7ec28397897b054e220bf2eabb7acbf4ea4dab7035bbe24e44c8a75e488c788f2b8cc56d6e72785651574cffa84cc1a06e5c9c7e0772839bfe7
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild
new file mode 100644
index 000000000000..a2108ec7a02c
--- /dev/null
+++ b/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
+
+DESCRIPTION="Simple GNOME application to access remote or virtual systems"
+HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
+
+LICENSE="LGPL-2+ CC-BY-2.0"
+SLOT="0"
+
+IUSE="rdp"
+KEYWORDS="~amd64"
+
+# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
+# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
+# Technically vala itself still ships a libsoup vapi, but that may change, and it should be better to use the .vapi from the same libsoup version
+# gtk-vnc raised due to missing vala bindings in earlier ebuilds
+DEPEND="
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/gtk+-3.24.1:3
+	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
+	x11-libs/gtksourceview:4
+	>=sys-libs/libosinfo-1.7.0
+	app-crypt/libsecret
+	>=net-libs/libsoup-2.44:2.4
+	virtual/libusb:1
+	>=app-emulation/libvirt-glib-4.0.0
+	>=dev-libs/libxml2-2.7.8:2
+	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
+	app-misc/tracker:3
+	>=net-libs/webkit-gtk-2.26.0:4
+	>=gui-libs/libhandy-1.0.0:1=
+
+	>=dev-libs/gobject-introspection-1.56:=
+	>=dev-libs/libgudev-165:=
+	rdp? ( >=net-misc/freerdp-2.0.0:= )
+" # gobject-introspection needed for libovf subproject (and gtk-frdp subproject with USE=rdp)
+# These are called via exec():
+# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
+# app-cdr/cdrtools mkisofs is needed for unattended installer secondary disk image creation
+# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
+# sys-apps/policycoreutils restorecon is used for checking selinux context
+# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
+# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
+# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
+RDEPEND="${DEPEND}
+	app-cdr/cdrtools
+	app-misc/tracker-miners:3[iso]
+	app-emulation/spice[smartcard]
+	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
+	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
+	sys-fs/mtools
+	sys-auth/polkit
+"
+# gtk-frdp generates gir and needs gtk+ introspection for it
+# This is only needed for creating the .vapi file, but gnome-boxes needs it
+BDEPEND="
+	$(vala_depend)
+	net-libs/gtk-vnc[vala]
+	sys-libs/libosinfo[vala]
+	app-crypt/libsecret[vala]
+	net-libs/libsoup:2.4[vala]
+	app-emulation/libvirt-glib[vala]
+	net-misc/spice-gtk[vala]
+	x11-libs/vte:2.91[vala]
+	dev-libs/appstream-glib
+	rdp? ( x11-libs/gtk+:3[introspection] )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
+If you have an Intel Processor, run:
+# modprobe kvm-intel
+
+If you have an AMD Processor, run:
+# modprobe kvm-amd"
+
+pkg_pretend() {
+	linux-info_get_any_version
+
+	if linux_config_exists; then
+		if ! { linux_chkconfig_present KVM_AMD || \
+			linux_chkconfig_present KVM_INTEL; }; then
+			ewarn "You need KVM support in your kernel to use GNOME Boxes local VM support!"
+		fi
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddistributor_name=Gentoo
+		-Ddistributor_version=${PVR}
+		$(meson_use rdp)
+		-Dinstalled_tests=false
+		-Dflatpak=false
+		-Dprofile=default
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index a310bcf8efe6..9703069166d7 100644
Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index 3fc840736892..c255c9d71b50 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1 +1,2 @@
 DIST hikari-2.3.2.tar.gz 1022093 BLAKE2B 8e4df4377728cc1feab3509588a9f2d5138af6e3175682672eedce4ca45d5bb9b7e56568a860871b319b3ff1213468f38f0b6253927f6ab4b905dd495c05c53e SHA512 b7485be089064dd19c4614f60066b3f7b2f322328fa771d4383db27656695746fb00ab534cc754929141c23b7556992391529e537e0522080177068f3d0e2954
+DIST hikari-2.3.3.tar.gz 1022191 BLAKE2B 8b1d0f03460a170f2288c97790dc437a4bd4eafc6973e87c15ca44b1d032ab02ef1d75406fe15be6bb14f67c07945b16be47ec1e41d43b51961a1c69a4a67f9b SHA512 15b6244ef46b29ad069475e8fadbafb01a65c8f96d1f89dd315d36f79dfea9a542936a5472e42237000f506094c7e08be37961c92a7eeed31477f4ed548f39f3
diff --git a/gui-wm/hikari/hikari-2.3.3.ebuild b/gui-wm/hikari/hikari-2.3.3.ebuild
new file mode 100644
index 000000000000..aa2351de6ddc
--- /dev/null
+++ b/gui-wm/hikari/hikari-2.3.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing toolchain-funcs
+
+DESCRIPTION="Wayland compositor inspired by CWM"
+HOMEPAGE="https://hikari.acmelabs.space/"
+SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X suid"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/libinput:=
+	dev-libs/libucl
+	dev-libs/wayland
+	gui-libs/wlroots:0/15[X?]
+	sys-libs/pam
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman"
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-misc/xkeyboard-config"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/wayland-protocols"
+BDEPEND="
+	dev-util/wayland-scanner
+	sys-devel/bmake
+	virtual/pkgconfig"
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+
+	local bmake=(
+		bmake -j$(makeopts_jobs)
+		ETC_PREFIX="${EPREFIX}"
+		CFLAGS_EXTRA="${CFLAGS} ${CPPFLAGS}"
+		LDFLAGS_EXTRA="${LDFLAGS}"
+		VERSION=${PV}
+		-DWITH_GAMMACONTROL
+		-DWITH_LAYERSHELL
+		-DWITH_POSIX_C_SOURCE
+		-DWITH_SCREENCOPY
+		-DWITH_VIRTUAL_INPUT
+		$(usev X -DWITH_XWAYLAND)
+	)
+
+	# empty flags to avoid duplicates (some parts use only _EXTRA, others both)
+	echo "${bmake[*]}"
+	CFLAGS= LDFLAGS= "${bmake[@]}" || die
+}
+
+src_install() {
+	local bmake=(
+		bmake install
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		ETC_PREFIX="${EPREFIX}"
+		$(usev suid -DWITH_SUID)
+	)
+
+	echo "${bmake[*]}"
+	"${bmake[@]}" || die
+}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 59284126020b..d8d04de9791d 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index b84cf90d17fc..8e16b3e7d60b 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,2 +1,2 @@
 DIST postfix-3.6.3.tar.gz 4750833 BLAKE2B 2a68e0f18227e09c0ce855901503fa83a58805f036f57eff9003102f5933a241e624e5f3f7a7af4f3d89784d95bc0be6ac1d17f30712f61491808ed6a90ce2d3 SHA512 7179aaeeaf27838b867d9a07f9a889d7cd6b7f5053e123caef4dff2820d4df6d5be167effedde6c857b4468966b8449c631e56405e1ac2d589716fb4e3f15e3b
-DIST postfix-3.7-20220102.tar.gz 4812754 BLAKE2B 05ccd4681a6b2514b2d9b28ea47d04109e12754cc5fd3a4e9ba1cbaafb0093651f243d878716d7116639cc41d980b3f385b62fcc13df1b86f97e594527b63b5f SHA512 c6f8b0b538679775ac3008fecdd128c65bdffa4053f8e45d682c474bfa70ddfe39143b9179c9bfd79279d6f49657f883b4d1631ddd070a54bdc0fccb2ec3779d
+DIST postfix-3.7-20220103.tar.gz 4812964 BLAKE2B 40f883decaedf46428600f46fc934c0bb4d7a44a87db292e92cef71d13a69ba856bf289261e940022e9f439253868f024923c127870e0b47a00ef0381f21e8e6 SHA512 eef92f2414f41865bc684d492cb6be3b7cd445d13fd16c5e924544535b44233a08aff80768b13264bed46e8e7090a46b29e6e2652e4a446397531eb88308e866
diff --git a/mail-mta/postfix/postfix-3.7_pre20220102.ebuild b/mail-mta/postfix/postfix-3.7_pre20220103.ebuild
similarity index 100%
rename from mail-mta/postfix/postfix-3.7_pre20220102.ebuild
rename to mail-mta/postfix/postfix-3.7_pre20220103.ebuild
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 6f2df15e1095..adb1ce776f64 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild
index 334373277503..d7621529f14b 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="MIT"
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index b6f4684f04c1..2b7d63be9d2c 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1 +1,2 @@
 DIST ristretto-0.12.1.tar.bz2 610696 BLAKE2B 60aede252a7817ad1b008e01ce15e371aad13fcb2bea9b61dbca3ceffdae18d5fd2c4c1690bb699648a64769ba9d06b6b9d8eaa3b08ed56cdd15682f6d785f43 SHA512 58e61b7ead3f78770132d1ba3b480f0300279dd42bf78c248d7927c0a6703c75edce051bcaa23acd46d92865c4f5e03fd085bcc6cfdc3fe2bd2b4abd4eb3fa3c
+DIST ristretto-0.12.2.tar.bz2 612128 BLAKE2B d845da75f5139ca73702b2ea2154026ecadacc72587d81a22564d0c0ae84e605303a368ee42a9c915c3d00a0b8471f6a6e1a6c6c2f7d7626f766602a29022ee0 SHA512 39fc5868c3858e3667660b6411b3d39c19a2306be3d169e499aa11aff34a24e0ee8e745e15dfe301be48e1c6adce30129ed76270b025f5160cfa773467764379
diff --git a/media-gfx/ristretto/ristretto-0.12.2.ebuild b/media-gfx/ristretto/ristretto-0.12.2.ebuild
new file mode 100644
index 000000000000..ba292506bb40
--- /dev/null
+++ b/media-gfx/ristretto/ristretto-0.12.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit xdg-utils
+
+DESCRIPTION="A fast and lightweight picture viewer for Xfce"
+HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.44:2
+	media-libs/libexif:0=
+	sys-apps/file
+	x11-libs/cairo:0
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libX11:0=
+	>=xfce-base/libxfce4ui-4.16:0=
+	>=xfce-base/libxfce4util-4.16:0=
+	>=xfce-base/xfconf-4.12.1:0="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index b27ff7422cd3..d612ed7916e7 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index ede2f360c809..b7ee47e5c54a 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,4 +1,4 @@
 DIST picard-2.6.4.tar.gz 4319362 BLAKE2B 78768b4a8a22c51c118ba03a9e97ba6c4bec9180e5739867b5756170083930a942a0a1ceaeb74bbe724af3ca392b92139cbc4acdde9556e9031be16a968a0240 SHA512 5f44f91f9f44cb17ecd27e204b75c83b776a2c55e2a6e42f96018c83f4073d92f028ef74006d6acbe42b1ed374543a65e177f34c561bfdf13ded1085515bf353
 DIST picard-2.7.1.tar.gz 4884448 BLAKE2B b9f5ac2b6205aadbb707dcaee2dc6c89c333568d8fc6ca85da3fe8f9d308d0a54076d17b3f14be52e0154767c4f24ee2fd89d9df909ce1c74b9fc57c970ff0b1 SHA512 e3cffc538bdb7bf851e378b5ce7d4155fd6a2c13e77c42eb4c10a6cd129d45bb0c52d295bc209694fd89eadd60b0f04eb2d7c9eedbcec0a03ab00b7ee1f4e0be
-DIST picard-2.7.2.tar.gz 4887243 BLAKE2B 5e2e42c5b46249e85abd8bfb33b6cf69d75e15335b3abc14e08249bc6ffc122aa776f5e053e169f31c2f9596b52a525e9aacdc7bd09363179ef318162590d95e SHA512 0840f2560bb8624598bf9493736a14bb9f43ec5150640ecd7a992ea74d9336c75166f3aa3ab1c901731aeb12dfd9288d37def872417b055429c46830970f05eb
+DIST picard-2.7.3.tar.gz 4887533 BLAKE2B 65a10be3dafcdd99e20d6c193d1238b0edfa66425a28c705bd6df0f57f75ddcf874f3bf09cef3c331e583a35f49ec780a63d2960081188081c8f0687f6a0b4d1 SHA512 33cd37ce19e261d14882b4400054c289bf921d3c74313db634f3876bc7f51ecca184aa29a9cb1d673fe799c53eda81de45d23c83caaf2f71b74fe341c258d2f7
 DIST picard-2.7.tar.gz 4868049 BLAKE2B 87f04056843623f81165bdae181699125d5aa8e41e5da47d645026bb1b3ee4a70edeeef0399f3230584026caf8f014cfe27b5d9f3f2e6b71a8e2de48a832655a SHA512 b88d2cc24a9b6a01e6bb1a54f93bb8ec62c901fe9ff352641ea402b5e091d71241665b067fd12bbf77cf219b951db9a570400adda82fa9da9406f9cfa6aee4e5
diff --git a/media-sound/picard/picard-2.7.2.ebuild b/media-sound/picard/picard-2.7.3.ebuild
similarity index 100%
rename from media-sound/picard/picard-2.7.2.ebuild
rename to media-sound/picard/picard-2.7.3.ebuild
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 918ffa7ff292..09026425152e 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 6f1262817c99..88808e6ac529 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 13 Jan 2022 13:39:18 +0000
+Fri, 14 Jan 2022 13:09:20 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 6bf5c57e6aac..88808e6ac529 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 13 Jan 2022 13:39:19 +0000
+Fri, 14 Jan 2022 13:09:20 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index a769596d525b..5aa752408bf1 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index ae12136d09eb..e79f16baea06 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/awscli-1.22.35 b/metadata/md5-cache/app-admin/awscli-1.22.35
new file mode 100644
index 000000000000..826cdbfa5b57
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.22.35
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/botocore-1.23.35[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/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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=8
+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.23.35[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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.22.35.tar.gz -> awscli-1.22.35.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=6a85ff20ecc109363bdb12dc0d47aab8
diff --git a/metadata/md5-cache/app-admin/monit-5.29.0 b/metadata/md5-cache/app-admin/monit-5.29.0
index 5ae65c6d05bf..1a9b5a54f283 100644
--- a/metadata/md5-cache/app-admin/monit-5.29.0
+++ b/metadata/md5-cache/app-admin/monit-5.29.0
@@ -5,10 +5,10 @@ DESCRIPTION=Monitoring and managing daemons or similar programs running on a Uni
 EAPI=7
 HOMEPAGE=http://mmonit.com/monit/
 IUSE=ipv6 pam ssl
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv 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	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=60992a6fc7cfbbc3e2060023fb2873aa
+_md5_=cc462639fd22d805211161957eca55eb
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index bd5104213db7..92c313598e56 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/glean-1.18.2 b/metadata/md5-cache/app-emulation/glean-1.18.2
index a1aa9867ffe9..edf49ebf60e6 100644
--- a/metadata/md5-cache/app-emulation/glean-1.18.2
+++ b/metadata/md5-cache/app-emulation/glean-1.18.2
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=Simple program to write static config from config-drive
 EAPI=7
 HOMEPAGE=https://opendev.org/opendev/glean
-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=Apache-2.0
-RDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.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/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/g/glean/glean-1.18.2.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ad5b4060ad54175e53a6c9edd7b3b02e
+_md5_=e32e3979458a427861638b1d8ec6b8bc
diff --git a/metadata/md5-cache/app-emulation/glean-1.19.0 b/metadata/md5-cache/app-emulation/glean-1.19.0
new file mode 100644
index 000000000000..9361f96d07af
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/glean-1.19.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=Simple program to write static config from config-drive
+EAPI=7
+HOMEPAGE=https://opendev.org/opendev/glean
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/g/glean/glean-1.19.0.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=a7f0e459e46219a98648d98d013ca8e2
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index e2546e76c963..7ec66a568a59 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/opencc-1.1.2 b/metadata/md5-cache/app-i18n/opencc-1.1.2
index c1ca9bb7a344..c5b71a9b2696 100644
--- a/metadata/md5-cache/app-i18n/opencc-1.1.2
+++ b/metadata/md5-cache/app-i18n/opencc-1.1.2
@@ -5,11 +5,11 @@ DESCRIPTION=Library for conversion between Traditional and Simplified Chinese ch
 EAPI=7
 HOMEPAGE=https://github.com/BYVoid/OpenCC
 IUSE=doc test
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/marisa:0=
 RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=https://github.com/BYVoid/OpenCC/archive/ver.1.1.2.tar.gz -> opencc-1.1.2.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=e5f20e387a2bdff95a6331462c9fc6e7
+_md5_=8bd042a1b32326974b60ff4076fe4ca7
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 08213f600a08..dd8c61a044d9 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/scribus-1.5.7 b/metadata/md5-cache/app-office/scribus-1.5.7
index c6986a8d0a94..4c556009d3ec 100644
--- a/metadata/md5-cache/app-office/scribus-1.5.7
+++ b/metadata/md5-cache/app-office/scribus-1.5.7
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://pilotfiber.dl.sourceforge.net/project/scribus/scribus-devel/1.5.7/scribus-1.5.7.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	9783802d3840cbbd78c02b313df760cc	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=11ed13cb962217dd1bca7ec8388333d8
+_md5_=ddd8871f13e32d66f4954ba1a99208fc
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index b8046fd481a2..5d9b5f569317 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/eix-0.36.1 b/metadata/md5-cache/app-portage/eix-0.36.1
new file mode 100644
index 000000000000..50e58988a0d0
--- /dev/null
+++ b/metadata/md5-cache/app-portage/eix-0.36.1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/xz-utils 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
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= )
+DESCRIPTION=Search and query ebuilds
+EAPI=7
+HOMEPAGE=https://github.com/vaeth/eix/
+IUSE=debug doc nls sqlite
+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=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
+SLOT=0
+SRC_URI=https://github.com/vaeth/eix/releases/download/v0.36.1/eix-0.36.1.tar.xz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=88685312ace5be5ce2222f8ae8887b00
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 0dcd406ab13c..4ee623b88893 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/platformio-5.2.3-r2 b/metadata/md5-cache/dev-embedded/platformio-5.2.3-r2
deleted file mode 100644
index a96c472d631f..000000000000
--- a/metadata/md5-cache/dev-embedded/platformio-5.2.3-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_8? ( dev-python/jsondiff[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/jsondiff[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/jsondiff[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_8? ( =dev-python/aiofiles-0.7.0*[python_targets_python3_8(-)] <dev-python/bottle-0.13[python_targets_python3_8(-)] >=dev-python/click-7.1.2[python_targets_python3_8(-)] <dev-python/click-9[python_targets_python3_8(-)] dev-python/colorama[python_targets_python3_8(-)] >=dev-python/pyserial-3[python_targets_python3_8(-)] <dev-python/pyserial-4[python_targets_python3_8(-)] >=dev-python/requests-2.4[python_targets_python3_8(-)] <dev-python/requests-3[python_targets_python3_8(-)] >=dev-python/semantic_version-2.8.1[python_targets_python3_8(-)] <dev-python/semantic_version-3[python_targets_python3_8(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_8(-)] <dev-python/tabulate-1[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] >=dev-python/pyelftools-0.25[python_targets_python3_8(-)] <dev-python/pyelftools-1[python_targets_python3_8(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_8(-)] dev-python/starlette[python_targets_python3_8(-)] =dev-python/uvicorn-0.15*[python_targets_python3_8(-)] dev-python/wsproto[python_targets_python3_8(-)] dev-python/zeroconf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( =dev-python/aiofiles-0.7.0*[python_targets_python3_9(-)] <dev-python/bottle-0.13[python_targets_python3_9(-)] >=dev-python/click-7.1.2[python_targets_python3_9(-)] <dev-python/click-9[python_targets_python3_9(-)] dev-python/colorama[python_targets_python3_9(-)] >=dev-python/pyserial-3[python_targets_python3_9(-)] <dev-python/pyserial-4[python_targets_python3_9(-)] >=dev-python/requests-2.4[python_targets_python3_9(-)] <dev-python/requests-3[python_targets_python3_9(-)] >=dev-python/semantic_version-2.8.1[python_targets_python3_9(-)] <dev-python/semantic_version-3[python_targets_python3_9(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_9(-)] <dev-python/tabulate-1[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] >=dev-python/pyelftools-0.25[python_targets_python3_9(-)] <dev-python/pyelftools-1[python_targets_python3_9(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_9(-)] dev-python/starlette[python_targets_python3_9(-)] =dev-python/uvicorn-0.15*[python_targets_python3_9(-)] dev-python/wsproto[python_targets_python3_9(-)] dev-python/zeroconf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( =dev-python/aiofiles-0.7.0*[python_targets_python3_10(-)] <dev-python/bottle-0.13[python_targets_python3_10(-)] >=dev-python/click-7.1.2[python_targets_python3_10(-)] <dev-python/click-9[python_targets_python3_10(-)] dev-python/colorama[python_targets_python3_10(-)] >=dev-python/pyserial-3[python_targets_python3_10(-)] <dev-python/pyserial-4[python_targets_python3_10(-)] >=dev-python/requests-2.4[python_targets_python3_10(-)] <dev-python/requests-3[python_targets_python3_10(-)] >=dev-python/semantic_version-2.8.1[python_targets_python3_10(-)] <dev-python/semantic_version-3[python_targets_python3_10(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_10(-)] <dev-python/tabulate-1[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] >=dev-python/pyelftools-0.25[python_targets_python3_10(-)] <dev-python/pyelftools-1[python_targets_python3_10(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_10(-)] dev-python/starlette[python_targets_python3_10(-)] =dev-python/uvicorn-0.15*[python_targets_python3_10(-)] dev-python/wsproto[python_targets_python3_10(-)] dev-python/zeroconf[python_targets_python3_10(-)] ) virtual/udev python_single_target_python3_8? ( >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-6.2.5-r2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-6.2.5-r2[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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(-)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/udev
-DESCRIPTION=An open source ecosystem for IoT development
-EAPI=8
-HOMEPAGE=https://platformio.org/
-IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_single_target_python3_8? ( =dev-python/aiofiles-0.7.0*[python_targets_python3_8(-)] <dev-python/bottle-0.13[python_targets_python3_8(-)] >=dev-python/click-7.1.2[python_targets_python3_8(-)] <dev-python/click-9[python_targets_python3_8(-)] dev-python/colorama[python_targets_python3_8(-)] >=dev-python/pyserial-3[python_targets_python3_8(-)] <dev-python/pyserial-4[python_targets_python3_8(-)] >=dev-python/requests-2.4[python_targets_python3_8(-)] <dev-python/requests-3[python_targets_python3_8(-)] >=dev-python/semantic_version-2.8.1[python_targets_python3_8(-)] <dev-python/semantic_version-3[python_targets_python3_8(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_8(-)] <dev-python/tabulate-1[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] >=dev-python/pyelftools-0.25[python_targets_python3_8(-)] <dev-python/pyelftools-1[python_targets_python3_8(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_8(-)] dev-python/starlette[python_targets_python3_8(-)] =dev-python/uvicorn-0.15*[python_targets_python3_8(-)] dev-python/wsproto[python_targets_python3_8(-)] dev-python/zeroconf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( =dev-python/aiofiles-0.7.0*[python_targets_python3_9(-)] <dev-python/bottle-0.13[python_targets_python3_9(-)] >=dev-python/click-7.1.2[python_targets_python3_9(-)] <dev-python/click-9[python_targets_python3_9(-)] dev-python/colorama[python_targets_python3_9(-)] >=dev-python/pyserial-3[python_targets_python3_9(-)] <dev-python/pyserial-4[python_targets_python3_9(-)] >=dev-python/requests-2.4[python_targets_python3_9(-)] <dev-python/requests-3[python_targets_python3_9(-)] >=dev-python/semantic_version-2.8.1[python_targets_python3_9(-)] <dev-python/semantic_version-3[python_targets_python3_9(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_9(-)] <dev-python/tabulate-1[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] >=dev-python/pyelftools-0.25[python_targets_python3_9(-)] <dev-python/pyelftools-1[python_targets_python3_9(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_9(-)] dev-python/starlette[python_targets_python3_9(-)] =dev-python/uvicorn-0.15*[python_targets_python3_9(-)] dev-python/wsproto[python_targets_python3_9(-)] dev-python/zeroconf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( =dev-python/aiofiles-0.7.0*[python_targets_python3_10(-)] <dev-python/bottle-0.13[python_targets_python3_10(-)] >=dev-python/click-7.1.2[python_targets_python3_10(-)] <dev-python/click-9[python_targets_python3_10(-)] dev-python/colorama[python_targets_python3_10(-)] >=dev-python/pyserial-3[python_targets_python3_10(-)] <dev-python/pyserial-4[python_targets_python3_10(-)] >=dev-python/requests-2.4[python_targets_python3_10(-)] <dev-python/requests-3[python_targets_python3_10(-)] >=dev-python/semantic_version-2.8.1[python_targets_python3_10(-)] <dev-python/semantic_version-3[python_targets_python3_10(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_10(-)] <dev-python/tabulate-1[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] >=dev-python/pyelftools-0.25[python_targets_python3_10(-)] <dev-python/pyelftools-1[python_targets_python3_10(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_10(-)] dev-python/starlette[python_targets_python3_10(-)] =dev-python/uvicorn-0.15*[python_targets_python3_10(-)] dev-python/wsproto[python_targets_python3_10(-)] dev-python/zeroconf[python_targets_python3_10(-)] ) virtual/udev python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-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/platformio/platformio-core/archive/refs/tags/v5.2.3.tar.gz -> platformio-5.2.3.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	9783802d3840cbbd78c02b313df760cc	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=893aef01f303e4a8886c0012f052549b
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 431ce785556c..b4528083dcab 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/boot-bin-2.8.3 b/metadata/md5-cache/dev-java/boot-bin-2.8.3
index 77c91640323c..891eb4957cc9 100644
--- a/metadata/md5-cache/dev-java/boot-bin-2.8.3
+++ b/metadata/md5-cache/dev-java/boot-bin-2.8.3
@@ -3,11 +3,11 @@ DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Build tooling for Clojure
 EAPI=6
 HOMEPAGE=https://boot-clj.com/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/boot-clj/boot/releases/download/2.8.3/boot.jar -> boot-2.8.3.jar https://raw.githubusercontent.com/boot-clj/boot/2.8.3/README.md -> boot-2.8.3-README.md https://raw.githubusercontent.com/boot-clj/boot/2.8.3/CHANGES.md -> boot-2.8.3-CHANGES.md
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e76097b893582d39694e48afa1de2633
+_md5_=22354732b248da37c5382ba6684b680f
diff --git a/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1 b/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
index 41400bf6b8d5..aa2d0600f3ca 100644
--- a/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
+++ b/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beanshell/beanshell/archive/2.0b6.tar.gz -> bsh-2.0b6.tar.gz
 _eclasses_=java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=e98a6c226c5b8fb77c221f13c03d5b9b
+_md5_=c3a61360fb8c1450e51dc796bf358959
diff --git a/metadata/md5-cache/dev-java/javassist-3.18.2 b/metadata/md5-cache/dev-java/javassist-3.18.2
deleted file mode 100644
index f1b6cfb45d55..000000000000
--- a/metadata/md5-cache/dev-java/javassist-3.18.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Javassist makes Java bytecode manipulation simple
-EAPI=5
-HOMEPAGE=http://www.csg.is.titech.ac.jp/~chiba/javassist/
-IUSE=doc source examples
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MPL-1.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3
-SRC_URI=https://github.com/jboss-javassist/javassist/archive/rel_3_18_2_ga_build.tar.gz -> javassist-3.18.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b5b83c9ff5ae93676a003ab7172fdba8
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0-r4 b/metadata/md5-cache/dev-java/jython-2.7.0-r4
index 5357c8f7faee..abb7ab7026d5 100644
--- a/metadata/md5-cache/dev-java/jython-2.7.0-r4
+++ b/metadata/md5-cache/dev-java/jython-2.7.0-r4
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.7
 SRC_URI=https://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6e3965343bebd4445e890c148ac97bcd
+_md5_=c7ec45275e06e975895ad6bc230b2af9
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.13_p8 b/metadata/md5-cache/dev-java/openjdk-11.0.13_p8
index ec5aa25ea347..cdb79642706d 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.13_p8
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.13_p8
@@ -11,4 +11,4 @@ REQUIRED_USE=javafx? ( alsa !headless-awt )
 SLOT=11
 SRC_URI=https://github.com/openjdk/jdk11u-dev/archive/refs/tags/jdk-11.0.13-ga.tar.gz -> openjdk-11.0.13_p8.tar.gz
 _eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	java-vm-2	13d8685b21341659c8861cf747ee8ab2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=8ae1918b24a0821880df22495ba7aeb3
+_md5_=43b5a1ced82b1f58dac07fb260bb6fef
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.13_p8 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.13_p8
index 3a4ba5fd0742..10b5143c86e6 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.13_p8
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.13_p8
@@ -11,4 +11,4 @@ RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=arm? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.13_8.tar.gz ) arm64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.13_8.tar.gz ) ppc64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.13_8.tar.gz ) amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_x64_mac_hotspot_11.0.13_8.tar.gz )
 _eclasses_=java-vm-2	13d8685b21341659c8861cf747ee8ab2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=e31730e02df9078efcbb319dfb3a4e88
+_md5_=3f272d3be56e61133a0d26f26112db46
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.13_p8-r1 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.13_p8-r1
index 50ae81244ae4..b1dae0f09ecb 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.13_p8-r1
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.13_p8-r1
@@ -11,4 +11,4 @@ RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=arm? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.13_8.tar.gz ) arm64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.13_8.tar.gz ) ppc64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.13_8.tar.gz ) amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_x64_mac_hotspot_11.0.13_8.tar.gz )
 _eclasses_=java-vm-2	13d8685b21341659c8861cf747ee8ab2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=dc41be4a9ef3aacdb88d1303899f4162
+_md5_=6b668909bf330ae136b734a17296d990
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.11_p9 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.11_p9
deleted file mode 100644
index 8a8212894c9e..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.11_p9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Prebuilt Java JRE binaries provided by AdoptOpenJDK
-EAPI=6
-HOMEPAGE=https://adoptopenjdk.net
-IUSE=alsa cups +gentoo-vm headless-awt selinux
-KEYWORDS=~amd64
-LICENSE=GPL-2-with-classpath-exception
-RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) dev-java/java-config app-eselect/eselect-java
-RESTRICT=preserve-libs splitdebug
-SLOT=11
-SRC_URI=amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11+9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz )
-_eclasses_=java-vm-2	13d8685b21341659c8861cf747ee8ab2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=6e5bc3b9fa48c1b336deea6d1ab03a4d
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.12_p7 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.12_p7
deleted file mode 100644
index 73568caf42ae..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.12_p7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Prebuilt Java JRE binaries provided by Eclipse Temurin
-EAPI=6
-HOMEPAGE=https://adoptium.net
-IUSE=alsa cups +gentoo-vm headless-awt selinux
-KEYWORDS=~amd64
-LICENSE=GPL-2-with-classpath-exception
-RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) dev-java/java-config app-eselect/eselect-java
-RESTRICT=preserve-libs splitdebug
-SLOT=11
-SRC_URI=amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12+7/OpenJDK11U-jre_x64_linux_hotspot_11.0.12_7.tar.gz )
-_eclasses_=java-vm-2	13d8685b21341659c8861cf747ee8ab2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=b3bde8919d670e5ccc24aaa659535c59
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.13_p8 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.13_p8
deleted file mode 100644
index 9fa8adb8d87f..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.13_p8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Prebuilt Java JRE binaries provided by AdoptOpenJDK
-EAPI=6
-HOMEPAGE=https://adoptopenjdk.net
-IUSE=alsa cups +gentoo-vm headless-awt selinux
-KEYWORDS=~amd64
-LICENSE=GPL-2-with-classpath-exception
-RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) dev-java/java-config app-eselect/eselect-java
-RESTRICT=preserve-libs splitdebug
-SLOT=11
-SRC_URI=amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jre_x64_linux_hotspot_11.0.13_8.tar.gz )
-_eclasses_=java-vm-2	13d8685b21341659c8861cf747ee8ab2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=e72a6ac157316f976e78867571776910
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.13_p8-r1 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.13_p8-r1
index e3d2af8260ff..c0f3b1d25462 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.13_p8-r1
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.13_p8-r1
@@ -11,4 +11,4 @@ RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jre_x64_linux_hotspot_11.0.13_8.tar.gz )
 _eclasses_=java-vm-2	13d8685b21341659c8861cf747ee8ab2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=cd3ad36954100082433dfb8115750518
+_md5_=15f089430b1b64d896bf2acd1e906ea0
diff --git a/metadata/md5-cache/dev-java/oracle-javamail-1.5.6-r1 b/metadata/md5-cache/dev-java/oracle-javamail-1.5.6-r1
index 4c37544d19a4..f08af0e4b585 100644
--- a/metadata/md5-cache/dev-java/oracle-javamail-1.5.6-r1
+++ b/metadata/md5-cache/dev-java/oracle-javamail-1.5.6-r1
@@ -10,4 +10,4 @@ RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://java.net/projects/javamail/downloads/download/source/javamail-1.5.6-src.zip -> oracle-javamail-1.5.6.zip
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=06079a0bc4404a846516da80d66ed06d
+_md5_=c886c413c843830b7dd1e0c99df6d010
diff --git a/metadata/md5-cache/dev-java/qdox-1.12.1-r2 b/metadata/md5-cache/dev-java/qdox-1.12.1-r2
index 2760846da705..3bcb06e7a3b4 100644
--- a/metadata/md5-cache/dev-java/qdox-1.12.1-r2
+++ b/metadata/md5-cache/dev-java/qdox-1.12.1-r2
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=1.12
 SRC_URI=https://github.com/codehaus/qdox/archive/qdox-1.12.1.tar.gz
 _eclasses_=java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=365726bc2a7a7e577a8405cef263d5b2
+_md5_=6ba1fb1febbbbb7c992b5a5d0ab19f24
diff --git a/metadata/md5-cache/dev-java/rhino-1.7.7-r1 b/metadata/md5-cache/dev-java/rhino-1.7.7-r1
index aec535c9537b..efca69571f96 100644
--- a/metadata/md5-cache/dev-java/rhino-1.7.7-r1
+++ b/metadata/md5-cache/dev-java/rhino-1.7.7-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=1.6
 SRC_URI=https://github.com/mozilla/rhino/archive/Rhino1_7_7_RELEASE.zip
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5663998e90cb4970d41ec70da33d85b3
+_md5_=02a4216c8c184464990c8dd6326b23b9
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.2-r1 b/metadata/md5-cache/dev-java/xalan-2.7.2-r1
index 1a8d11b79d02..e47ab786ad5c 100644
--- a/metadata/md5-cache/dev-java/xalan-2.7.2-r1
+++ b/metadata/md5-cache/dev-java/xalan-2.7.2-r1
@@ -11,4 +11,4 @@ RDEPEND=dev-java/javacup:0 dev-java/bcel:0 >=virtual/jre-1.8:* ~dev-java/xalan-s
 SLOT=0
 SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz doc? ( mirror://apache/xalan/xalan-j/binaries/xalan-j_2_7_2-bin.zip )
 _eclasses_=java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=51cdba989588670e28fdb87cf8f67551
+_md5_=f76b5f3e572c89e4034b9e7611b7fcdf
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 510b77618aba..5e7257fd5fe4 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/rust-1.53.0 b/metadata/md5-cache/dev-lang/rust-1.53.0
index 1dd3d0a13c43..cc79851f11e7 100644
--- a/metadata/md5-cache/dev-lang/rust-1.53.0
+++ b/metadata/md5-cache/dev-lang/rust-1.53.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=test
 SLOT=stable/1.53
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.53.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.53.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.52.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.52.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.52.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.52.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.52.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.52.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.52.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.52.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cb4023cea20c098e7026225ad6c9acb7
diff --git a/metadata/md5-cache/dev-lang/rust-1.54.0 b/metadata/md5-cache/dev-lang/rust-1.54.0
index 3aa1483e9100..daec04ee508a 100644
--- a/metadata/md5-cache/dev-lang/rust-1.54.0
+++ b/metadata/md5-cache/dev-lang/rust-1.54.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=test
 SLOT=stable/1.54
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.54.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.54.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.53.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.53.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.53.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.53.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=956f72001d282c197183313233c42f03
diff --git a/metadata/md5-cache/dev-lang/rust-1.55.0 b/metadata/md5-cache/dev-lang/rust-1.55.0
index b335a537b2b1..ff0e6376bd5e 100644
--- a/metadata/md5-cache/dev-lang/rust-1.55.0
+++ b/metadata/md5-cache/dev-lang/rust-1.55.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=test
 SLOT=stable/1.55
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.55.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.55.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.54.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.54.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.54.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.54.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.54.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.54.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.54.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.54.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=62509738b05103d5153945ee754b82a6
diff --git a/metadata/md5-cache/dev-lang/rust-1.56.1 b/metadata/md5-cache/dev-lang/rust-1.56.1
index 130755777d00..ef84b77f99fa 100644
--- a/metadata/md5-cache/dev-lang/rust-1.56.1
+++ b/metadata/md5-cache/dev-lang/rust-1.56.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=test
 SLOT=stable/1.56
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.56.1-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.56.1-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.55.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.55.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.55.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.55.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.55.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.55.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.55.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.55.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.55.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.55.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.55.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.55.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.55.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.55.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.55.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.55.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=73ba6ecc3092a4d48a0ebaa8016ae7f6
diff --git a/metadata/md5-cache/dev-lang/rust-1.57.0 b/metadata/md5-cache/dev-lang/rust-1.57.0
index 53ecf9eaf578..ea7fb3023e6f 100644
--- a/metadata/md5-cache/dev-lang/rust-1.57.0
+++ b/metadata/md5-cache/dev-lang/rust-1.57.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=test
 SLOT=stable/1.57
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.57.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.57.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.56.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.56.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.56.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.56.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.56.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.56.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.56.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.56.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.56.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.56.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.56.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.56.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.56.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.56.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.56.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.56.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6032d64b0e956df5a7ff86a096525343
diff --git a/metadata/md5-cache/dev-lang/rust-1.58.0 b/metadata/md5-cache/dev-lang/rust-1.58.0
new file mode 100644
index 000000000000..2621d50f3bd5
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.58.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) app-eselect/eselect-rust || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) system-bootstrap? ( || ( =dev-lang/rust-1.57* =dev-lang/rust-bin-1.57* =dev-lang/rust-1.58* =dev-lang/rust-bin-1.58* ) ) !system-llvm? ( >=dev-util/cmake-3.13.4 dev-util/ninja ) test? ( sys-devel/gdb ) verify-sig? ( sec-keys/openpgp-keys-rust ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= elibc_musl? ( sys-libs/libunwind:= ) system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:13[llvm_targets_AArch64(-)] ) llvm_targets_AMDGPU? ( sys-devel/llvm:13[llvm_targets_AMDGPU(-)] ) llvm_targets_ARM? ( sys-devel/llvm:13[llvm_targets_ARM(-)] ) llvm_targets_AVR? ( sys-devel/llvm:13[llvm_targets_AVR(-)] ) llvm_targets_BPF? ( sys-devel/llvm:13[llvm_targets_BPF(-)] ) llvm_targets_Hexagon? ( sys-devel/llvm:13[llvm_targets_Hexagon(-)] ) llvm_targets_Lanai? ( sys-devel/llvm:13[llvm_targets_Lanai(-)] ) llvm_targets_Mips? ( sys-devel/llvm:13[llvm_targets_Mips(-)] ) llvm_targets_MSP430? ( sys-devel/llvm:13[llvm_targets_MSP430(-)] ) llvm_targets_NVPTX? ( sys-devel/llvm:13[llvm_targets_NVPTX(-)] ) llvm_targets_PowerPC? ( sys-devel/llvm:13[llvm_targets_PowerPC(-)] ) llvm_targets_RISCV? ( sys-devel/llvm:13[llvm_targets_RISCV(-)] ) llvm_targets_Sparc? ( sys-devel/llvm:13[llvm_targets_Sparc(-)] ) llvm_targets_SystemZ? ( sys-devel/llvm:13[llvm_targets_SystemZ(-)] ) llvm_targets_WebAssembly? ( sys-devel/llvm:13[llvm_targets_WebAssembly(-)] ) llvm_targets_X86? ( sys-devel/llvm:13[llvm_targets_X86(-)] ) llvm_targets_XCore? ( sys-devel/llvm:13[llvm_targets_XCore(-)] ) ) ) <sys-devel/llvm-14:= wasm? ( sys-devel/lld ) ) !!sys-devel/llvm:0
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=7
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=clippy cpu_flags_x86_sse2 debug doc miri nightly parallel-compiler rls rustfmt rust-src system-bootstrap system-llvm test wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore 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=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= elibc_musl? ( sys-libs/libunwind:= ) system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:13[llvm_targets_AArch64(-)] ) llvm_targets_AMDGPU? ( sys-devel/llvm:13[llvm_targets_AMDGPU(-)] ) llvm_targets_ARM? ( sys-devel/llvm:13[llvm_targets_ARM(-)] ) llvm_targets_AVR? ( sys-devel/llvm:13[llvm_targets_AVR(-)] ) llvm_targets_BPF? ( sys-devel/llvm:13[llvm_targets_BPF(-)] ) llvm_targets_Hexagon? ( sys-devel/llvm:13[llvm_targets_Hexagon(-)] ) llvm_targets_Lanai? ( sys-devel/llvm:13[llvm_targets_Lanai(-)] ) llvm_targets_Mips? ( sys-devel/llvm:13[llvm_targets_Mips(-)] ) llvm_targets_MSP430? ( sys-devel/llvm:13[llvm_targets_MSP430(-)] ) llvm_targets_NVPTX? ( sys-devel/llvm:13[llvm_targets_NVPTX(-)] ) llvm_targets_PowerPC? ( sys-devel/llvm:13[llvm_targets_PowerPC(-)] ) llvm_targets_RISCV? ( sys-devel/llvm:13[llvm_targets_RISCV(-)] ) llvm_targets_Sparc? ( sys-devel/llvm:13[llvm_targets_Sparc(-)] ) llvm_targets_SystemZ? ( sys-devel/llvm:13[llvm_targets_SystemZ(-)] ) llvm_targets_WebAssembly? ( sys-devel/llvm:13[llvm_targets_WebAssembly(-)] ) llvm_targets_X86? ( sys-devel/llvm:13[llvm_targets_X86(-)] ) llvm_targets_XCore? ( sys-devel/llvm:13[llvm_targets_XCore(-)] ) ) ) <sys-devel/llvm-14:= wasm? ( sys-devel/lld ) ) app-eselect/eselect-rust !<dev-lang/rust-1.47.0-r1 !<dev-lang/rust-bin-1.47.0-r1
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) miri? ( nightly ) parallel-compiler? ( nightly ) rls? ( rust-src ) test? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
+RESTRICT=test
+SLOT=stable/1.58
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.58.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.58.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.57.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.57.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.57.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.57.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.57.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.57.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.57.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.57.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.57.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.57.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.57.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.57.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.57.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.57.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.57.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.57.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=bf425bdfe2840e8f58633cd8b0098f4c
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.53.0 b/metadata/md5-cache/dev-lang/rust-bin-1.53.0
index 4cb4b58da239..b658c6537671 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.53.0
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.53.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.53.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.53.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.53.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.53.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	f8649e83cfccc3989141e2437a787c88	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267
 _md5_=684661764a1eb3a99a12249257b163fe
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.54.0 b/metadata/md5-cache/dev-lang/rust-bin-1.54.0
index 4f537bad07f9..8f258159ba72 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.54.0
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.54.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.54.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.54.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.54.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.54.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.54.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.54.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.54.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.54.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	f8649e83cfccc3989141e2437a787c88	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267
 _md5_=cf20ecc2eb2812d481d28ed7d716fd87
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.55.0 b/metadata/md5-cache/dev-lang/rust-bin-1.55.0
index ade664b90273..41fd44243b97 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.55.0
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.55.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.55.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.55.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.55.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.55.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.55.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.55.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.55.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.55.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.55.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.55.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.55.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.55.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.55.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.55.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.55.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.55.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	f8649e83cfccc3989141e2437a787c88	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267
 _md5_=cf20ecc2eb2812d481d28ed7d716fd87
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.56.1 b/metadata/md5-cache/dev-lang/rust-bin-1.56.1
index 8cc08e08d2de..4c81fc1d8335 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.56.1
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.56.1
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.56.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.56.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.56.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.56.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.56.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.56.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.56.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.56.1-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.56.1-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.56.1-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.56.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.56.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.56.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.56.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.56.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.56.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2021-11-01/rust-src-1.56.1.tar.xz )
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	f8649e83cfccc3989141e2437a787c88	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267
 _md5_=b3d3f843eaf35cd18ffd262f6937b67b
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.57.0 b/metadata/md5-cache/dev-lang/rust-bin-1.57.0
index 4441b7349ab3..6f1d13799215 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.57.0
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.57.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.57.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.57.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.57.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.57.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.57.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.57.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.57.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.57.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.57.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.57.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.57.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.57.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.57.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.57.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.57.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.57.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.57.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2021-12-02/rust-src-1.57.0.tar.xz )
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	f8649e83cfccc3989141e2437a787c88	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267
 _md5_=c1cadb9475a91ff90e2865bcad5ca60a
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.58.0 b/metadata/md5-cache/dev-lang/rust-bin-1.58.0
new file mode 100644
index 000000000000..87fa30cb66f0
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.58.0
@@ -0,0 +1,14 @@
+BDEPEND=prefix? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm pretend test unpack
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=8
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=clippy cpu_flags_x86_sse2 doc prefix rls rust-src rustfmt 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=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=app-eselect/eselect-rust-20190311
+REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
+SLOT=stable
+SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.58.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.58.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.58.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.58.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.58.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.58.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.58.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.58.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.58.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.58.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.58.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.58.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.58.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.58.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.58.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.58.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2022-01-13/rust-src-1.58.0.tar.xz )
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267
+_md5_=5f1af0f76aaa268d858f4583741e5d02
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 87464018cf85..318b79ccc687 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/darts-0.32h_pre20181117064816 b/metadata/md5-cache/dev-libs/darts-0.32h_pre20181117064816
index 2f5fc87e8ebf..5e355011c64f 100644
--- a/metadata/md5-cache/dev-libs/darts-0.32h_pre20181117064816
+++ b/metadata/md5-cache/dev-libs/darts-0.32h_pre20181117064816
@@ -3,9 +3,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Darts-clone (Double-ARray Trie System) C++ library
 EAPI=7
 HOMEPAGE=https://github.com/s-yata/darts-clone https://code.google.com/archive/p/darts-clone/
-KEYWORDS=amd64 arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/s-yata/darts-clone/archive/e40ce4627526985a7767444b6ed6893ab6ff8983.tar.gz -> darts-0.32h_pre20181117064816.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=dda06ee8a914ca6fbda6ddbe9960cc86
+_md5_=24ee984361291d04ac3b05702371c5db
diff --git a/metadata/md5-cache/dev-libs/libbpf-0.5.0 b/metadata/md5-cache/dev-libs/libbpf-0.5.0
deleted file mode 100644
index 24b52b6bc1fc..000000000000
--- a/metadata/md5-cache/dev-libs/libbpf-0.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-kernel/linux-headers virtual/libelf
-DESCRIPTION=Stand-alone build of libbpf from the Linux kernel
-EAPI=8
-HOMEPAGE=https://github.com/libbpf/libbpf
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2 LGPL-2.1 BSD-2
-RDEPEND=sys-kernel/linux-headers virtual/libelf
-SLOT=0/0.5.0
-SRC_URI=https://github.com/libbpf/libbpf/archive/v0.5.0.tar.gz -> libbpf-0.5.0.tar.gz
-_eclasses_=flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=3dd43cbe3cfb0bce66890b42ea2a21cf
diff --git a/metadata/md5-cache/dev-libs/libbpf-0.6.0 b/metadata/md5-cache/dev-libs/libbpf-0.6.0
deleted file mode 100644
index 4a00212cfe8c..000000000000
--- a/metadata/md5-cache/dev-libs/libbpf-0.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-kernel/linux-headers virtual/libelf
-DESCRIPTION=Stand-alone build of libbpf from the Linux kernel
-EAPI=8
-HOMEPAGE=https://github.com/libbpf/libbpf
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2 LGPL-2.1 BSD-2
-RDEPEND=sys-kernel/linux-headers virtual/libelf
-SLOT=0/0.6
-SRC_URI=https://github.com/libbpf/libbpf/archive/v0.6.0.tar.gz -> libbpf-0.6.0.tar.gz
-_eclasses_=flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=17a17648cc086527e703cff4d2d10e15
diff --git a/metadata/md5-cache/dev-libs/libbpf-0.6.1 b/metadata/md5-cache/dev-libs/libbpf-0.6.1
index 35be4b87a399..06869c03511a 100644
--- a/metadata/md5-cache/dev-libs/libbpf-0.6.1
+++ b/metadata/md5-cache/dev-libs/libbpf-0.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=Stand-alone build of libbpf from the Linux kernel
 EAPI=8
 HOMEPAGE=https://github.com/libbpf/libbpf
 IUSE=static-libs
-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 LGPL-2.1 BSD-2
 RDEPEND=sys-kernel/linux-headers virtual/libelf
 SLOT=0/0.6
 SRC_URI=https://github.com/libbpf/libbpf/archive/v0.6.1.tar.gz -> libbpf-0.6.1.tar.gz
 _eclasses_=flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=a06ed8913b1b2993befe9a5751498108
+_md5_=17a17648cc086527e703cff4d2d10e15
diff --git a/metadata/md5-cache/dev-libs/mmtf-cpp-1.0.0 b/metadata/md5-cache/dev-libs/mmtf-cpp-1.0.0
deleted file mode 100644
index 420c09e6091f..000000000000
--- a/metadata/md5-cache/dev-libs/mmtf-cpp-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/msgpack
-DESCRIPTION=The pure C++ implementation of the MMTF API, decoder and encoder
-EAPI=7
-HOMEPAGE=https://github.com/rcsb/mmtf-cpp
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-libs/msgpack
-SLOT=0
-SRC_URI=https://github.com/rcsb/mmtf-cpp/archive/v1.0.0.tar.gz -> mmtf-cpp-1.0.0.tar.gz
-_eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=f08877a23a7038f1d23685891d2946bf
diff --git a/metadata/md5-cache/dev-libs/mmtf-cpp-1.0.0-r1 b/metadata/md5-cache/dev-libs/mmtf-cpp-1.0.0-r1
new file mode 100644
index 000000000000..7ebaf02c95fd
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/mmtf-cpp-1.0.0-r1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/msgpack
+DESCRIPTION=The pure C++ implementation of the MMTF API, decoder and encoder
+EAPI=8
+HOMEPAGE=https://github.com/rcsb/mmtf-cpp
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=MIT
+RDEPEND=dev-libs/msgpack
+SLOT=0
+SRC_URI=https://github.com/rcsb/mmtf-cpp/archive/v1.0.0.tar.gz -> mmtf-cpp-1.0.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=fd19388229b99fe598d545f115cd75a5
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index fe1d90bae8f5..f182b7d29574 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.05_p1-r1 b/metadata/md5-cache/dev-ml/camlp4-4.05_p1-r1
index a287dc5ed19f..80434af9d576 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.05_p1-r1
+++ b/metadata/md5-cache/dev-ml/camlp4-4.05_p1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-lang/ocaml:0/4.05[ocamlopt?] dev-ml/ocamlbuild dev-ml/findlib:=
+DEPEND=dev-lang/ocaml:0/4.05[ocamlopt?] dev-ml/ocamlbuild[ocamlopt?] dev-ml/findlib:=
 DESCRIPTION=System for writing extensible parsers for programming languages
 EAPI=7
 HOMEPAGE=https://github.com/camlp4/camlp4
@@ -9,4 +9,4 @@ LICENSE=LGPL-2-with-linking-exception
 RDEPEND=dev-lang/ocaml:0/4.05[ocamlopt?]
 SLOT=0/4.05_p1
 SRC_URI=https://github.com/camlp4/camlp4/archive/4.05+1.tar.gz -> camlp4-4.05_p1.tar.gz
-_md5_=4597d66ccb59eb89f42d90a6e4a0cffb
+_md5_=20c74ed1f3d1a66e929c946378dbefe8
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.09_p1-r1 b/metadata/md5-cache/dev-ml/camlp4-4.09_p1-r1
index 725e39a7e141..bed2a8197c99 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.09_p1-r1
+++ b/metadata/md5-cache/dev-ml/camlp4-4.09_p1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-lang/ocaml:0/4.09[ocamlopt?] dev-ml/ocamlbuild dev-ml/findlib:=
+DEPEND=dev-lang/ocaml:0/4.09[ocamlopt?] dev-ml/ocamlbuild[ocamlopt?] dev-ml/findlib:=
 DESCRIPTION=System for writing extensible parsers for programming languages
 EAPI=7
 HOMEPAGE=https://github.com/camlp4/camlp4
@@ -9,4 +9,4 @@ LICENSE=LGPL-2-with-linking-exception
 RDEPEND=dev-lang/ocaml:0/4.09[ocamlopt?]
 SLOT=0/4.09_p1
 SRC_URI=https://github.com/camlp4/camlp4/archive/4.09+1.tar.gz -> camlp4-4.09_p1.tar.gz
-_md5_=61561fc1418e9b385bb274002a40facd
+_md5_=092cd4fcac863dc9f332e937f726c511
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.10_p1-r2 b/metadata/md5-cache/dev-ml/camlp4-4.10_p1-r2
index f9129bc0016b..e99e89141d83 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.10_p1-r2
+++ b/metadata/md5-cache/dev-ml/camlp4-4.10_p1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-lang/ocaml:0/4.10[ocamlopt?] dev-ml/ocamlbuild dev-ml/findlib:=
+DEPEND=dev-lang/ocaml:0/4.10[ocamlopt?] dev-ml/ocamlbuild[ocamlopt?] dev-ml/findlib:=
 DESCRIPTION=System for writing extensible parsers for programming languages
 EAPI=7
 HOMEPAGE=https://github.com/camlp4/camlp4
@@ -9,4 +9,4 @@ LICENSE=LGPL-2-with-linking-exception
 RDEPEND=dev-lang/ocaml:0/4.10[ocamlopt?]
 SLOT=0/4.10_p1
 SRC_URI=https://github.com/camlp4/camlp4/archive/4.10+1.tar.gz -> camlp4-4.10_p1.tar.gz
-_md5_=b7326a6021cc4010e03dad17b3ee4c07
+_md5_=7db28d232cbe772e382fe5f0f8f85d9f
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.11_p1-r2 b/metadata/md5-cache/dev-ml/camlp4-4.11_p1-r2
index d7f2e651c326..09d1c01f724a 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.11_p1-r2
+++ b/metadata/md5-cache/dev-ml/camlp4-4.11_p1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-lang/ocaml:0/4.11[ocamlopt?] dev-ml/ocamlbuild dev-ml/findlib:=
+DEPEND=dev-lang/ocaml:0/4.11[ocamlopt?] dev-ml/ocamlbuild[ocamlopt?] dev-ml/findlib:=
 DESCRIPTION=System for writing extensible parsers for programming languages
 EAPI=7
 HOMEPAGE=https://github.com/camlp4/camlp4
@@ -9,4 +9,4 @@ LICENSE=LGPL-2-with-linking-exception
 RDEPEND=dev-lang/ocaml:0/4.11[ocamlopt?]
 SLOT=0/4.11_p1
 SRC_URI=https://github.com/camlp4/camlp4/archive/4.11+1.tar.gz -> camlp4-4.11_p1.tar.gz
-_md5_=f263c07f27be32c17a6f92e6bc4adc57
+_md5_=cc1388b5cbcb4349eefc449aa968a8bb
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.12-r1 b/metadata/md5-cache/dev-ml/camlp4-4.12-r1
index 8f09bef938b2..3494cbab6039 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.12-r1
+++ b/metadata/md5-cache/dev-ml/camlp4-4.12-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-lang/ocaml:0/4.12[ocamlopt?] dev-ml/ocamlbuild dev-ml/findlib:=
+DEPEND=dev-lang/ocaml:0/4.12[ocamlopt?] dev-ml/ocamlbuild[ocamlopt?] dev-ml/findlib:=
 DESCRIPTION=System for writing extensible parsers for programming languages
 EAPI=7
 HOMEPAGE=https://github.com/camlp4/camlp4
@@ -9,4 +9,4 @@ LICENSE=LGPL-2-with-linking-exception
 RDEPEND=dev-lang/ocaml:0/4.12[ocamlopt?]
 SLOT=0/4.12
 SRC_URI=https://github.com/camlp4/camlp4/archive/4.12.tar.gz -> camlp4-4.12.tar.gz
-_md5_=6c6ae8400a5986c8b6e4eb412b4238d2
+_md5_=7db28d232cbe772e382fe5f0f8f85d9f
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.13-r1 b/metadata/md5-cache/dev-ml/camlp4-4.13-r1
index 8c55f1084f64..1048fd048f61 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.13-r1
+++ b/metadata/md5-cache/dev-ml/camlp4-4.13-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-lang/ocaml:0/4.13[ocamlopt?] dev-ml/ocamlbuild dev-ml/findlib:=
+DEPEND=dev-lang/ocaml:0/4.13[ocamlopt?] dev-ml/ocamlbuild[ocamlopt?] dev-ml/findlib:=
 DESCRIPTION=System for writing extensible parsers for programming languages
 EAPI=7
 HOMEPAGE=https://github.com/camlp4/camlp4
@@ -9,4 +9,4 @@ LICENSE=LGPL-2-with-linking-exception
 RDEPEND=dev-lang/ocaml:0/4.13[ocamlopt?]
 SLOT=0/4.13
 SRC_URI=https://github.com/camlp4/camlp4/archive/4.13.tar.gz -> camlp4-4.13.tar.gz
-_md5_=6c6ae8400a5986c8b6e4eb412b4238d2
+_md5_=7db28d232cbe772e382fe5f0f8f85d9f
diff --git a/metadata/md5-cache/dev-ml/logs-0.7.0-r1 b/metadata/md5-cache/dev-ml/logs-0.7.0-r1
index 96bcb30dbb29..3787275d5154 100644
--- a/metadata/md5-cache/dev-ml/logs-0.7.0-r1
+++ b/metadata/md5-cache/dev-ml/logs-0.7.0-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.7.0
 SRC_URI=https://erratique.ch/software/logs/releases/logs-0.7.0.tbz
 _eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
-_md5_=85a309608f98e25b0b914db2c602e790
+_md5_=34938443f9c901c3b9b9cae95e726b87
diff --git a/metadata/md5-cache/dev-ml/opam-2.0.9 b/metadata/md5-cache/dev-ml/opam-2.0.9
index 715a302ea24b..c33a2b9334a2 100644
--- a/metadata/md5-cache/dev-ml/opam-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-2.0.9
@@ -5,10 +5,10 @@ DESCRIPTION=A source-based package manager for OCaml
 EAPI=7
 HOMEPAGE=http://opam.ocaml.org/
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/cmdliner:= dev-ml/cudf:= >=dev-ml/dose3-6.0:= dev-ml/extlib:= ~dev-ml/opam-client-2.0.9:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
 _eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
-_md5_=ef798b91da312e961d34df5209c417da
+_md5_=2033c6717afb4246b3a56eedcf8d908f
diff --git a/metadata/md5-cache/dev-ml/opam-client-2.0.9 b/metadata/md5-cache/dev-ml/opam-client-2.0.9
index f54177469d94..3091940889f2 100644
--- a/metadata/md5-cache/dev-ml/opam-client-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-client-2.0.9
@@ -5,10 +5,10 @@ DESCRIPTION=opam client libraries
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/cmdliner:= ~dev-ml/opam-repository-2.0.9:= ~dev-ml/opam-state-2.0.9:= ~dev-ml/opam-solver-2.0.9:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
 _eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
-_md5_=8b73aa20b190f3825daa147513856397
+_md5_=d2078f276c79004102e69187ce78ef74
diff --git a/metadata/md5-cache/dev-ml/opam-core-2.0.9 b/metadata/md5-cache/dev-ml/opam-core-2.0.9
index 3d0bb47cc018..fcb2464dc4ec 100644
--- a/metadata/md5-cache/dev-ml/opam-core-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-core-2.0.9
@@ -4,10 +4,10 @@ DEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner
 DESCRIPTION=Core libraries for opam
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner:= >=dev-lang/ocaml-4:=
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
 _eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
-_md5_=320c50e2b5b60b6eef97798656cd633d
+_md5_=f4ae1cb89c89ff0240bfe92a968bbe2b
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.0.9 b/metadata/md5-cache/dev-ml/opam-format-2.0.9
index bcc0f9b8c9cc..707289637a17 100644
--- a/metadata/md5-cache/dev-ml/opam-format-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-format-2.0.9
@@ -5,10 +5,10 @@ DESCRIPTION=Core libraries for opam
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=~dev-ml/opam-core-2.0.9:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-ml/dose3-6.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
 _eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
-_md5_=2fd3be84e398b26fbc1ab3ab7b07c1df
+_md5_=10f98403a74ab22ae8e2deeb46382740
diff --git a/metadata/md5-cache/dev-ml/opam-installer-2.0.9 b/metadata/md5-cache/dev-ml/opam-installer-2.0.9
index e814aafa1f45..b896e77d545a 100644
--- a/metadata/md5-cache/dev-ml/opam-installer-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-installer-2.0.9
@@ -4,10 +4,10 @@ DEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.9 >=dev
 DESCRIPTION=Core installer for opam packages
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.9 >=dev-ml/dose3-6 >=dev-lang/ocaml-4:=
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/releases/download/2.0.9/opam-full-2.0.9.tar.gz
 _eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
-_md5_=8cbc46ac54f6450e456a24cc5373234f
+_md5_=5c0ddbf6e392d6668e04f63e68febcd8
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.0.9 b/metadata/md5-cache/dev-ml/opam-repository-2.0.9
index ec1d7c8c9074..b1520b183f2e 100644
--- a/metadata/md5-cache/dev-ml/opam-repository-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.0.9
@@ -5,11 +5,11 @@ DESCRIPTION=opam repository libraries
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=~dev-ml/opam-format-2.0.9:= dev-ml/re:= >=dev-ml/dose3-6.0:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
 _eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
-_md5_=d512bf2f140281218885d19975dbd128
+_md5_=2da85880b276e2b49c504bd99b076237
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.0.9 b/metadata/md5-cache/dev-ml/opam-solver-2.0.9
index fc68a4357db7..6f05c2fbe226 100644
--- a/metadata/md5-cache/dev-ml/opam-solver-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-solver-2.0.9
@@ -5,11 +5,11 @@ DESCRIPTION=opam solver
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt test
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=~dev-ml/opam-format-2.0.9:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-ml/mccs-1.1.4:= >=dev-ml/dose3-6.0:= dev-ml/cudf:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
 _eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
-_md5_=13b90a9f8574e87024fed965b0251d00
+_md5_=ca400287b6f3a26d26933f8b9705f4d4
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.0.9 b/metadata/md5-cache/dev-ml/opam-state-2.0.9
index 5fe10f05028e..9941c94e9f21 100644
--- a/metadata/md5-cache/dev-ml/opam-state-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-state-2.0.9
@@ -5,11 +5,11 @@ DESCRIPTION=opam state libraries
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.0.9:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
 _eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
-_md5_=b2c4fff88fc3e71f0a334f340b40a131
+_md5_=b7e262884728b903845ec96f673d73a5
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index c3caa4b60f4a..19cb8b443b79 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/X11-Protocol-Other-31 b/metadata/md5-cache/dev-perl/X11-Protocol-Other-31
index 4d1f89c22695..a73b5998d02f 100644
--- a/metadata/md5-cache/dev-perl/X11-Protocol-Other-31
+++ b/metadata/md5-cache/dev-perl/X11-Protocol-Other-31
@@ -5,11 +5,11 @@ DESCRIPTION=X11 Protocol related components not included in dev-perl/X11-Protoco
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/X11-Protocol-Other
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-perl/X11-Protocol dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KR/KRYDE/X11-Protocol-Other-31.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1
-_md5_=482e048a3663b9866934a2779f1d57d6
+_md5_=e8dfbc2c142c4714809dc9d464162300
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 11015cd3f506..7a1f16c95008 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/adblock-0.5.1 b/metadata/md5-cache/dev-python/adblock-0.5.1
index 39442ee5e0da..cde0e341e0d5 100644
--- a/metadata/md5-cache/dev-python/adblock-0.5.1
+++ b/metadata/md5-cache/dev-python/adblock-0.5.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ArniDagur/python-adblock/archive/refs/tags/0.5.1.tar.gz -> adblock-0.5.1.tar.gz https://crates.io/api/v1/crates/adblock/0.3.13/download -> adblock-0.3.13.crate https://crates.io/api/v1/crates/addr/0.14.0/download -> addr-0.14.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.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.4.3/download -> byteorder-1.4.3.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/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/flate2/1.0.20/download -> flate2-1.0.20.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/idna/0.2.2/download -> idna-0.2.2.crate https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/libc/0.2.93/download -> libc-0.2.93.crate https://crates.io/api/v1/crates/lock_api/0.4.3/download -> lock_api-0.4.3.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.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/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.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/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.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.26/download -> proc-macro2-1.0.26.crate https://crates.io/api/v1/crates/psl/2.0.18/download -> psl-2.0.18.crate https://crates.io/api/v1/crates/psl-types/2.0.7/download -> psl-types-2.0.7.crate https://crates.io/api/v1/crates/pyo3/0.15.1/download -> pyo3-0.15.1.crate https://crates.io/api/v1/crates/pyo3-build-config/0.15.1/download -> pyo3-build-config-0.15.1.crate https://crates.io/api/v1/crates/pyo3-macros/0.15.1/download -> pyo3-macros-0.15.1.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.15.1/download -> pyo3-macros-backend-0.15.1.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/redox_syscall/0.2.5/download -> redox_syscall-0.2.5.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/rmp/0.8.10/download -> rmp-0.8.10.crate https://crates.io/api/v1/crates/rmp-serde/0.13.7/download -> rmp-serde-0.13.7.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/seahash/3.0.7/download -> seahash-3.0.7.crate https://crates.io/api/v1/crates/serde/1.0.125/download -> serde-1.0.125.crate https://crates.io/api/v1/crates/serde_derive/1.0.125/download -> serde_derive-1.0.125.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/syn/1.0.69/download -> syn-1.0.69.crate https://crates.io/api/v1/crates/tinyvec/1.2.0/download -> tinyvec-1.2.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/twoway/0.2.1/download -> twoway-0.2.1.crate https://crates.io/api/v1/crates/unchecked-index/0.2.2/download -> unchecked-index-0.2.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.17/download -> unicode-normalization-0.1.17.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/unindent/0.1.7/download -> unindent-0.1.7.crate https://crates.io/api/v1/crates/url/2.2.1/download -> url-2.2.1.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-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
 _eclasses_=cargo	7ea27a358c2ff39754bf66a96c06f3de	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ea5dc9cae9f911babe95d1e50a86f3e1
+_md5_=2e266e8113e0e3743c3aad8fe88ff7b4
diff --git a/metadata/md5-cache/dev-python/argon2-cffi-21.3.0-r1 b/metadata/md5-cache/dev-python/argon2-cffi-21.3.0-r1
index 6f9a59a81989..7ae5731471d4 100644
--- a/metadata/md5-cache/dev-python/argon2-cffi-21.3.0-r1
+++ b/metadata/md5-cache/dev-python/argon2-cffi-21.3.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=CFFI bindings to the Argon2 password hashing library
 EAPI=8
 HOMEPAGE=https://github.com/hynek/argon2-cffi
 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 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/argon2-cffi-bindings-21.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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/argon2-cffi/argon2-cffi-21.3.0.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2dc0471ad521635bd24a8eb400b31900
+_md5_=768ab4c05ebd7225c28459440525930f
diff --git a/metadata/md5-cache/dev-python/boto3-1.20.35 b/metadata/md5-cache/dev-python/boto3-1.20.35
new file mode 100644
index 000000000000..45091bafbb08
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.20.35
@@ -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.0_p1-r1:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.23.35[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/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.23.35[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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.20.35.tar.gz -> boto3-1.20.35.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=7d11de52730353eae5d28d2d661e17f6
diff --git a/metadata/md5-cache/dev-python/botocore-1.23.35 b/metadata/md5-cache/dev-python/botocore-1.23.35
new file mode 100644
index 000000000000..3ead3725969a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.23.35
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1: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/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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 ~riscv ~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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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.23.35.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=f8678e6f18f4d106178476192e76bf66
diff --git a/metadata/md5-cache/dev-python/django-timezone-field-4.2.3 b/metadata/md5-cache/dev-python/django-timezone-field-4.2.3
new file mode 100644
index 000000000000..91090d0f215d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-timezone-field-4.2.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/djangorestframework[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(-)?] dev-python/pytest-lazy-fixture[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/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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 Django app providing database and form fields for pytz timezone objects
+EAPI=8
+HOMEPAGE=https://github.com/mfogel/django-timezone-field
+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/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/mfogel/django-timezone-field/archive/4.2.3.tar.gz -> django-timezone-field-4.2.3.gh.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=05be50678e905502dd14425df66ff7ab
diff --git a/metadata/md5-cache/dev-python/flask-assets-0.12 b/metadata/md5-cache/dev-python/flask-assets-0.12
index c25758b9a7d2..b0029e13be6f 100644
--- a/metadata/md5-cache/dev-python/flask-assets-0.12
+++ b/metadata/md5-cache/dev-python/flask-assets-0.12
@@ -1,14 +1,14 @@
-BDEPEND=>=dev-python/flask-0.8 dev-python/webassets python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+BDEPEND=>=dev-python/flask-0.8 dev-python/webassets python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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 webassets integration
 EAPI=7
 HOMEPAGE=https://github.com/miracle2k/flask-assets
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=BSD
-RDEPEND=>=dev-python/flask-0.8 dev-python/webassets python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 )
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=>=dev-python/flask-0.8 dev-python/webassets python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/miracle2k/flask-assets/archive/0.12.tar.gz -> flask-assets-0.12.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=4a3c778b6c0c3d244552708bb6ebbab2
+_md5_=80b32589b670ab2e8ea68c1f80cef8ae
diff --git a/metadata/md5-cache/dev-python/flit-3.4.0 b/metadata/md5-cache/dev-python/flit-3.4.0
deleted file mode 100644
index 8010d92be75a..000000000000
--- a/metadata/md5-cache/dev-python/flit-3.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[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/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/grep test? ( dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[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/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/pygments-github-lexers[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/pygments-github-lexers[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-)] dev-python/pygments-github-lexers[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinxcontrib-github-alt[python_targets_pypy3(-)] dev-python/pygments-github-lexers[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simplified packaging of Python modules
-EAPI=8
-HOMEPAGE=https://github.com/takluyver/flit https://flit.readthedocs.io/
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[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/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/f/flit/flit-3.4.0.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=a7b27a0914d59950dda609490211f5cd
diff --git a/metadata/md5-cache/dev-python/flit-3.5.0 b/metadata/md5-cache/dev-python/flit-3.5.0
deleted file mode 100644
index 3f1b3bff126b..000000000000
--- a/metadata/md5-cache/dev-python/flit-3.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[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/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/grep test? ( dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[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/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/pygments-github-lexers[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/pygments-github-lexers[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-)] dev-python/pygments-github-lexers[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinxcontrib-github-alt[python_targets_pypy3(-)] dev-python/pygments-github-lexers[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simplified packaging of Python modules
-EAPI=8
-HOMEPAGE=https://github.com/takluyver/flit https://flit.readthedocs.io/
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[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/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/f/flit/flit-3.5.0.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=a7b27a0914d59950dda609490211f5cd
diff --git a/metadata/md5-cache/dev-python/flit-3.5.1 b/metadata/md5-cache/dev-python/flit-3.5.1
deleted file mode 100644
index 2553e75f47f4..000000000000
--- a/metadata/md5-cache/dev-python/flit-3.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[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/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/grep test? ( dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[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/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/pygments-github-lexers[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/pygments-github-lexers[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-)] dev-python/pygments-github-lexers[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinxcontrib-github-alt[python_targets_pypy3(-)] dev-python/pygments-github-lexers[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simplified packaging of Python modules
-EAPI=8
-HOMEPAGE=https://github.com/takluyver/flit https://flit.readthedocs.io/
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[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/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/f/flit/flit-3.5.1.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=cb5473c55672eebb773b1be10a2f2823
diff --git a/metadata/md5-cache/dev-python/flit-3.5.1-r1 b/metadata/md5-cache/dev-python/flit-3.5.1-r1
new file mode 100644
index 000000000000..be7dbc295802
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flit-3.5.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[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/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/grep test? ( dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[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/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/pygments-github-lexers[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/pygments-github-lexers[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-)] dev-python/pygments-github-lexers[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinxcontrib-github-alt[python_targets_pypy3(-)] dev-python/pygments-github-lexers[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simplified packaging of Python modules
+EAPI=8
+HOMEPAGE=https://github.com/takluyver/flit https://flit.readthedocs.io/
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[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/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/f/flit/flit-3.5.1.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=35d326673cbc69b2676582fabb50fa05
diff --git a/metadata/md5-cache/dev-python/flit-3.6.0 b/metadata/md5-cache/dev-python/flit-3.6.0
deleted file mode 100644
index bc5957c72844..000000000000
--- a/metadata/md5-cache/dev-python/flit-3.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[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/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/grep test? ( dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[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/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/pygments-github-lexers[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/pygments-github-lexers[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-)] dev-python/pygments-github-lexers[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinxcontrib-github-alt[python_targets_pypy3(-)] dev-python/pygments-github-lexers[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simplified packaging of Python modules
-EAPI=8
-HOMEPAGE=https://github.com/pypa/flit https://flit.readthedocs.io/
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[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/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/f/flit/flit-3.6.0.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=0075fe3d00aae5acd2b76a935f85f68c
diff --git a/metadata/md5-cache/dev-python/flit-3.6.0-r1 b/metadata/md5-cache/dev-python/flit-3.6.0-r1
new file mode 100644
index 000000000000..3416bf963486
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flit-3.6.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[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/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/grep test? ( dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[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/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/pygments-github-lexers[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/pygments-github-lexers[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-)] dev-python/pygments-github-lexers[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinxcontrib-github-alt[python_targets_pypy3(-)] dev-python/pygments-github-lexers[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simplified packaging of Python modules
+EAPI=8
+HOMEPAGE=https://github.com/pypa/flit https://flit.readthedocs.io/
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[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/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/f/flit/flit-3.6.0.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=62ff06d2de8645317fc850379646781c
diff --git a/metadata/md5-cache/dev-python/flit_core-3.5.1 b/metadata/md5-cache/dev-python/flit_core-3.5.1
deleted file mode 100644
index 1363f8a8e7c6..000000000000
--- a/metadata/md5-cache/dev-python/flit_core-3.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pyproject2setuppy-11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simplified packaging of Python modules (core module)
-EAPI=8
-HOMEPAGE=https://pypi.org/project/flit-core/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
-LICENSE=BSD
-RDEPEND=dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/f/flit_core/flit_core-3.5.1.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=a2ba7c12568faf2b15b90fa94391553b
diff --git a/metadata/md5-cache/dev-python/flit_core-3.5.1-r1 b/metadata/md5-cache/dev-python/flit_core-3.5.1-r1
new file mode 100644
index 000000000000..41b916c419d2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flit_core-3.5.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/pyproject2setuppy-11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simplified packaging of Python modules (core module)
+EAPI=8
+HOMEPAGE=https://pypi.org/project/flit-core/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
+LICENSE=BSD
+RDEPEND=dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/f/flit_core/flit_core-3.5.1.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=309e84b0ad5472603fbf3c737db0a4d0
diff --git a/metadata/md5-cache/dev-python/flit_core-3.6.0 b/metadata/md5-cache/dev-python/flit_core-3.6.0
deleted file mode 100644
index 49b684ced3f5..000000000000
--- a/metadata/md5-cache/dev-python/flit_core-3.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pyproject2setuppy-11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simplified packaging of Python modules (core module)
-EAPI=8
-HOMEPAGE=https://pypi.org/project/flit-core/ https://github.com/pypa/flit/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/f/flit_core/flit_core-3.6.0.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=cbc1952445ede75843c67b085c8d9caf
diff --git a/metadata/md5-cache/dev-python/flit_core-3.6.0-r1 b/metadata/md5-cache/dev-python/flit_core-3.6.0-r1
new file mode 100644
index 000000000000..802d27dc2229
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flit_core-3.6.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/pyproject2setuppy-11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simplified packaging of Python modules (core module)
+EAPI=8
+HOMEPAGE=https://pypi.org/project/flit-core/ https://github.com/pypa/flit/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/f/flit_core/flit_core-3.6.0.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=81c4416c405371a014c6bf785b5e79a4
diff --git a/metadata/md5-cache/dev-python/gmpy-2.1.0 b/metadata/md5-cache/dev-python/gmpy-2.1.0
deleted file mode 100644
index e2b6d8894751..000000000000
--- a/metadata/md5-cache/dev-python/gmpy-2.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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-libs/mpc-1.0.2:= >=dev-libs/mpfr-3.1.2:= dev-libs/gmp:0=
-DESCRIPTION=Python bindings for GMP, MPC, MPFR and MPIR libraries
-EAPI=8
-HOMEPAGE=https://github.com/aleaxit/gmpy
-IUSE=doc 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=LGPL-3+
-RDEPEND=>=dev-libs/mpc-1.0.2:= >=dev-libs/mpfr-3.1.2:= dev-libs/gmp:0= python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=2
-SRC_URI=mirror://pypi/g/gmpy2/gmpy2-2.1.0.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=58c7b2dd0a3531986d72b5e45adadfa1
diff --git a/metadata/md5-cache/dev-python/gmpy-2.1.1 b/metadata/md5-cache/dev-python/gmpy-2.1.1
index 07923fe0172d..48f3f7d63134 100644
--- a/metadata/md5-cache/dev-python/gmpy-2.1.1
+++ b/metadata/md5-cache/dev-python/gmpy-2.1.1
@@ -5,11 +5,11 @@ DESCRIPTION=Python bindings for GMP, MPC, MPFR and MPIR libraries
 EAPI=8
 HOMEPAGE=https://github.com/aleaxit/gmpy
 IUSE=doc 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/mpc-1.0.2:= >=dev-libs/mpfr-3.1.2:= dev-libs/gmp:0= python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=2
 SRC_URI=mirror://pypi/g/gmpy2/gmpy2-2.1.1.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=b251ff0115ec703474e4c1237bf5ffe8
+_md5_=58c7b2dd0a3531986d72b5e45adadfa1
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.35.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.35.0
new file mode 100644
index 000000000000..4cdce80edbb6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.35.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-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.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-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.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.35.0.tar.gz -> google-api-python-client-2.35.0.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=75da439c5571463edd77e98f502aaeb5
diff --git a/metadata/md5-cache/dev-python/identify-2.4.4 b/metadata/md5-cache/dev-python/identify-2.4.4
new file mode 100644
index 000000000000..aa80e4f04dd2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/identify-2.4.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/ukkonen[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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=File identification library for Python
+EAPI=8
+HOMEPAGE=https://github.com/pre-commit/identify
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/ukkonen[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/pre-commit/identify/archive/refs/tags/v2.4.4.tar.gz -> identify-2.4.4.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=2ec127439eb615f81969e217d2a7e175
diff --git a/metadata/md5-cache/dev-python/installer-0.4.0 b/metadata/md5-cache/dev-python/installer-0.4.0
new file mode 100644
index 000000000000..50edbdb62c61
--- /dev/null
+++ b/metadata/md5-cache/dev-python/installer-0.4.0
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library for installing Python wheels
+EAPI=8
+HOMEPAGE=https://pypi.org/project/installer/ https://github.com/pradyunsg/installer/ https://installer.readthedocs.io/en/latest/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/pradyunsg/installer/archive/0.4.0.tar.gz -> installer-0.4.0.gh.tar.gz https://files.pythonhosted.org/packages/py2.py3/i/installer/installer-0.4.0-py2.py3-none-any.whl -> installer-0.4.0-py2.py3-none-any.whl.zip
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=3aced8f5acaf287aff816a5f6a49bfaa
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.4.2-r1 b/metadata/md5-cache/dev-python/ipykernel-6.4.2-r1
deleted file mode 100644
index cf7d8b57252d..000000000000
--- a/metadata/md5-cache/dev-python/ipykernel-6.4.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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(-)?] 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/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=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 arm arm64 hppa ppc ppc64 ~riscv sparc x86
-LICENSE=BSD
-RDEPEND=dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
-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.4.2.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=187e16883f76af1c31e5954e1dfdc7ab
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.5.0-r1 b/metadata/md5-cache/dev-python/ipykernel-6.5.0-r1
deleted file mode 100644
index af38183a2a63..000000000000
--- a/metadata/md5-cache/dev-python/ipykernel-6.5.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( <dev-python/importlib_metadata-5.0.0[python_targets_python3_8(-)?] >=dev-python/argcomplete-1.12.3[python_targets_python3_8(-)?] ) >=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-5.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(-)?] 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? ( python_targets_python3_8? ( <dev-python/importlib_metadata-5.0.0[python_targets_python3_8(-)?] >=dev-python/argcomplete-1.12.3[python_targets_python3_8(-)?] ) >=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-5.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-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( <dev-python/importlib_metadata-5.0.0[python_targets_python3_8(-)?] >=dev-python/argcomplete-1.12.3[python_targets_python3_8(-)?] ) >=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-5.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.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
-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.5.0.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=168a0d3fd5972fd0ee0b917323051346
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.6.0 b/metadata/md5-cache/dev-python/ipykernel-6.6.0
index e81eb50f8300..74a5bb9ede11 100644
--- a/metadata/md5-cache/dev-python/ipykernel-6.6.0
+++ b/metadata/md5-cache/dev-python/ipykernel-6.6.0
@@ -4,7 +4,7 @@ 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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( <dev-python/importlib_metadata-5.0.0[python_targets_python3_8(-)?] >=dev-python/argcomplete-1.12.3[python_targets_python3_8(-)?] ) >=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/traitlets-5.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.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
 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/ipykernel/ipykernel-6.6.0.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=884b7cd459da0bfc9ff94370cddc8f12
+_md5_=ed889f7a4d937d0db067909f15c600ae
diff --git a/metadata/md5-cache/dev-python/ipython-8.0.0 b/metadata/md5-cache/dev-python/ipython-8.0.0
deleted file mode 100644
index a2b5473384de..000000000000
--- a/metadata/md5-cache/dev-python/ipython-8.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-text/dvipng[truetype] >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[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/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/stack_data[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[readline,sqlite,threads(+)] ) >=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 postinst prepare test
-DESCRIPTION=Advanced interactive shell for Python
-EAPI=8
-HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/
-IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64
-LICENSE=BSD
-PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/widgetsnbextension[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) qt5? ( dev-python/qtconsole[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipyparallel-6.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-RDEPEND=dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) nbconvert? ( dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[readline,sqlite,threads(+)] ) >=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 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipython/ipython-8.0.0.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=0cf6201ad5eb8f49566f42eb59639b81
diff --git a/metadata/md5-cache/dev-python/ipython-8.0.0-r1 b/metadata/md5-cache/dev-python/ipython-8.0.0-r1
new file mode 100644
index 000000000000..66421a9f1535
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipython-8.0.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-text/dvipng[truetype] >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[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/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/stack_data[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[readline,sqlite,threads(+)] ) >=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 postinst prepare test
+DESCRIPTION=Advanced interactive shell for Python
+EAPI=8
+HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/
+IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=~amd64
+LICENSE=BSD
+PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/widgetsnbextension[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) qt5? ( dev-python/qtconsole[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipyparallel-6.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+RDEPEND=dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/stack_data[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) nbconvert? ( dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[readline,sqlite,threads(+)] ) >=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 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipython/ipython-8.0.0.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=9460216791ec5cf2a67c758df4c56ed1
diff --git a/metadata/md5-cache/dev-python/isodate-0.6.0-r2 b/metadata/md5-cache/dev-python/isodate-0.6.0-r2
deleted file mode 100644
index e71474a47126..000000000000
--- a/metadata/md5-cache/dev-python/isodate-0.6.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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=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 ~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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/i/isodate/isodate-0.6.0.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d7a6d0bcb75c7317d1835bdce85740c4
diff --git a/metadata/md5-cache/dev-python/isodate-0.6.1 b/metadata/md5-cache/dev-python/isodate-0.6.1
index 316f1f283aa4..fade49d58fa8 100644
--- a/metadata/md5-cache/dev-python/isodate-0.6.1
+++ b/metadata/md5-cache/dev-python/isodate-0.6.1
@@ -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 ~riscv ~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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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.1.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=51734d257597a7b99d1506a3c821c61c
+_md5_=701e39fc7931c034f83b06c5b0c0eb0a
diff --git a/metadata/md5-cache/dev-python/jsonpickle-2.1.0 b/metadata/md5-cache/dev-python/jsonpickle-2.1.0
new file mode 100644
index 000000000000..52a1278abdfa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonpickle-2.1.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[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(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sqlalchemy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ujson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/feedparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/jaraco-packaging[python_targets_python3_10(-)] dev-python/rst-linker[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/jaraco-packaging[python_targets_python3_9(-)] dev-python/rst-linker[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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 library for serializing any arbitrary object graph into JSON
+EAPI=8
+HOMEPAGE=https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-2.1.0.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=be16bb754d34f98db13f3e8a12520147
diff --git a/metadata/md5-cache/dev-python/lxml-4.6.5 b/metadata/md5-cache/dev-python/lxml-4.6.5
deleted file mode 100644
index f36839e431dd..000000000000
--- a/metadata/md5-cache/dev-python/lxml-4.6.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/docutils[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/docutils[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/docutils[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 dev-python/docutils[python_targets_pypy3(-)] dev-python/pygments[python_targets_pypy3(-)] dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) test? ( dev-python/cssselect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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-libs/libxml2-2.9.12-r2 >=dev-libs/libxslt-1.1.28
-DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
-EAPI=8
-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 ~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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/lxml/lxml/archive/lxml-4.6.5.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=28c6a093aef2405d0477c9a2933be064
diff --git a/metadata/md5-cache/dev-python/lxml-4.7.1 b/metadata/md5-cache/dev-python/lxml-4.7.1
index 098f986a5a3d..9501022347cc 100644
--- a/metadata/md5-cache/dev-python/lxml-4.7.1
+++ b/metadata/md5-cache/dev-python/lxml-4.7.1
@@ -5,7 +5,7 @@ DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
 EAPI=8
 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 ~m68k ~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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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.7.1.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=38c95d1de2fb15b174b1f0d8efd48cf2
+_md5_=8dbf53c38a15dc868a8701ad5002f86b
diff --git a/metadata/md5-cache/dev-python/mistune-2.0.2 b/metadata/md5-cache/dev-python/mistune-2.0.2
new file mode 100644
index 000000000000..6d1769d376f6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mistune-2.0.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The fastest markdown parser in pure Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/mistune/ https://github.com/lepture/mistune
+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
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/m/mistune/mistune-2.0.2.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=09f2be093eeccda553b3f0c50f21c059
diff --git a/metadata/md5-cache/dev-python/moto-2.2.18 b/metadata/md5-cache/dev-python/moto-2.2.18
index 8c0b215c653e..988f89cd2f5e 100644
--- a/metadata/md5-cache/dev-python/moto-2.2.18
+++ b/metadata/md5-cache/dev-python/moto-2.2.18
@@ -4,7 +4,7 @@ DESCRIPTION=Mock library for boto
 EAPI=8
 HOMEPAGE=https://github.com/spulec/moto
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/boto3-1.20.24[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/botocore-1.23.24[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-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[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/pytz[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/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[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/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/m/moto/moto-2.2.18.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1f875ff21fcfe39887bf4edeac437d2c
+_md5_=8948335e26ae6c6c097f8963f6fa8de0
diff --git a/metadata/md5-cache/dev-python/pandas-1.3.5 b/metadata/md5-cache/dev-python/pandas-1.3.5
index a1d9c45be929..e4079c86c2db 100644
--- a/metadata/md5-cache/dev-python/pandas-1.3.5
+++ b/metadata/md5-cache/dev-python/pandas-1.3.5
@@ -5,7 +5,7 @@ DESCRIPTION=Powerful data structures for data analysis and statistics
 EAPI=8
 HOMEPAGE=https://pandas.pydata.org/ https://github.com/pandas-dev/pandas/
 IUSE=doc full-support minimal test X python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.17.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1-r3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2017.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !minimal? ( >=dev-python/bottleneck-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numexpr-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) full-support? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blosc[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/html5lib[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/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytables-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xarray-0.12.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlwt-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) X? ( || ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
 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://github.com/pandas-dev/pandas/releases/download/v1.3.5/pandas-1.3.5.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=11cbe5f4b5e581cff9b41269b4deea4e
+_md5_=7db6ccd3753307dde45d14f70f085549
diff --git a/metadata/md5-cache/dev-python/pika-1.1.0 b/metadata/md5-cache/dev-python/pika-1.1.0
index ba11fb9bd805..5f4840b18e27 100644
--- a/metadata/md5-cache/dev-python/pika-1.1.0
+++ b/metadata/md5-cache/dev-python/pika-1.1.0
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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=Pure-Python implementation of the AMQP
 EAPI=7
 HOMEPAGE=https://pika.readthedocs.org/ https://github.com/pika/pika
-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=MPL-2.0
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pika/pika-1.1.0.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8ef4ab7c261e33f86367deec35a753ba
+_md5_=25a41b5df2b8080b4527e348e2f4943b
diff --git a/metadata/md5-cache/dev-python/pika-1.2.0 b/metadata/md5-cache/dev-python/pika-1.2.0
new file mode 100644
index 000000000000..a826d70747b4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pika-1.2.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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=Pure-Python implementation of the AMQP
+EAPI=8
+HOMEPAGE=https://pika.readthedocs.org/ https://github.com/pika/pika
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pika/pika-1.2.0.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=ae094d5941479d9e4712fd410d7e7550
diff --git a/metadata/md5-cache/dev-python/pmw-2.0.1-r2 b/metadata/md5-cache/dev-python/pmw-2.0.1-r2
index b85b837d390c..78daa5760059 100644
--- a/metadata/md5-cache/dev-python/pmw-2.0.1-r2
+++ b/metadata/md5-cache/dev-python/pmw-2.0.1-r2
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[tk] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[tk] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[tk] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!dev-python/pmw:0
 DESCRIPTION=Toolkit for building high-level compound Python widgets using the Tkinter module
 EAPI=7
 HOMEPAGE=http://pmw.sourceforge.net/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 test
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
 KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
-RDEPEND=!dev-python/pmw:0 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[tk] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=!dev-python/pmw:0 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[tk] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[tk] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test
 SLOT=py3
 SRC_URI=mirror://pypi/P/Pmw/Pmw-2.0.1.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=07c5c68b2e1b4beacf4afffd91a63ccc
+_md5_=e122b83fac93b0e678b63f65b172cd44
diff --git a/metadata/md5-cache/dev-python/py-amqp-5.0.6 b/metadata/md5-cache/dev-python/py-amqp-5.0.6
deleted file mode 100644
index edfa4382db2c..000000000000
--- a/metadata/md5-cache/dev-python/py-amqp-5.0.6
+++ /dev/null
@@ -1,15 +0,0 @@
-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.0_p1-r1:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_celery[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_celery[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_celery[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=71eb87d7c04363ddde431a9b383fa49e
diff --git a/metadata/md5-cache/dev-python/py-amqp-5.0.7 b/metadata/md5-cache/dev-python/py-amqp-5.0.7
deleted file mode 100644
index e9d281a0f871..000000000000
--- a/metadata/md5-cache/dev-python/py-amqp-5.0.7
+++ /dev/null
@@ -1,15 +0,0 @@
-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.0_p1-r1:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_celery[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_celery[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_celery[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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=8
-HOMEPAGE=https://github.com/celery/py-amqp https://pypi.org/project/amqp/
-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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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.7.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=bc25625fbe4dd47d270907203eb1f22c
diff --git a/metadata/md5-cache/dev-python/py-amqp-5.0.8 b/metadata/md5-cache/dev-python/py-amqp-5.0.8
deleted file mode 100644
index c7e3c3d38b87..000000000000
--- a/metadata/md5-cache/dev-python/py-amqp-5.0.8
+++ /dev/null
@@ -1,15 +0,0 @@
-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.0_p1-r1:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_celery[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_celery[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_celery[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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=8
-HOMEPAGE=https://github.com/celery/py-amqp https://pypi.org/project/amqp/
-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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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.8.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=bc25625fbe4dd47d270907203eb1f22c
diff --git a/metadata/md5-cache/dev-python/py-amqp-5.0.9 b/metadata/md5-cache/dev-python/py-amqp-5.0.9
index 3713eea57686..678529ba0e81 100644
--- a/metadata/md5-cache/dev-python/py-amqp-5.0.9
+++ b/metadata/md5-cache/dev-python/py-amqp-5.0.9
@@ -4,7 +4,7 @@ DESCRIPTION=Low-level AMQP client for Python (fork of amqplib)
 EAPI=8
 HOMEPAGE=https://github.com/celery/py-amqp https://pypi.org/project/amqp/
 IUSE=extras doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/a/amqp/amqp-5.0.9.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=bc25625fbe4dd47d270907203eb1f22c
+_md5_=6833e17dea1363258909b7be9ac8737c
diff --git a/metadata/md5-cache/dev-python/pyhamcrest-2.0.2 b/metadata/md5-cache/dev-python/pyhamcrest-2.0.2
deleted file mode 100644
index a22f2f09710e..000000000000
--- a/metadata/md5-cache/dev-python/pyhamcrest-2.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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=Hamcrest framework for matcher objects
-EAPI=7
-HOMEPAGE=https://github.com/hamcrest/PyHamcrest
-IUSE=examples doc 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 ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/hamcrest/PyHamcrest/archive/V2.0.2.tar.gz -> PyHamcrest-2.0.2.gh.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=e1a99a70b83d5eac4b148ca75f9f3266
diff --git a/metadata/md5-cache/dev-python/pyhamcrest-2.0.3 b/metadata/md5-cache/dev-python/pyhamcrest-2.0.3
index 26e8b89f2fba..2bd96ad3f1fb 100644
--- a/metadata/md5-cache/dev-python/pyhamcrest-2.0.3
+++ b/metadata/md5-cache/dev-python/pyhamcrest-2.0.3
@@ -4,7 +4,7 @@ DESCRIPTION=Hamcrest framework for matcher objects
 EAPI=8
 HOMEPAGE=https://github.com/hamcrest/PyHamcrest
 IUSE=examples doc 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 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/hamcrest/PyHamcrest/archive/V2.0.3.tar.gz -> PyHamcrest-2.0.3.gh.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=9985902907db569650bd8fc3568e0722
+_md5_=1a87fd5b0f0eed33a0d443911e36726f
diff --git a/metadata/md5-cache/dev-python/pytest-asyncio-0.17.0 b/metadata/md5-cache/dev-python/pytest-asyncio-0.17.0
new file mode 100644
index 000000000000..e326e8d7c6cd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-asyncio-0.17.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/flaky[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hypothesis-3.64[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-5.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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=Library for testing asyncio code with pytest
+EAPI=8
+HOMEPAGE=https://github.com/pytest-dev/pytest-asyncio https://pypi.org/project/pytest-asyncio/
+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
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pytest-5.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/pytest-dev/pytest-asyncio/archive/v0.17.0.tar.gz -> pytest-asyncio-0.17.0.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=e2248d609e5feaaee5af43c305f2d66a
diff --git a/metadata/md5-cache/dev-python/pytest-timeout-2.0.0 b/metadata/md5-cache/dev-python/pytest-timeout-2.0.0
deleted file mode 100644
index 908167e2573a..000000000000
--- a/metadata/md5-cache/dev-python/pytest-timeout-2.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( dev-python/pytest-cov[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) test? ( >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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=pytest plugin to abort hanging tests
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pytest-timeout/
-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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/pytest-timeout/pytest-timeout-2.0.0.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=f886bee0b13ff76f085ced3c7b89bad6
diff --git a/metadata/md5-cache/dev-python/pytest-timeout-2.0.2 b/metadata/md5-cache/dev-python/pytest-timeout-2.0.2
index 835680338164..a712037a3818 100644
--- a/metadata/md5-cache/dev-python/pytest-timeout-2.0.2
+++ b/metadata/md5-cache/dev-python/pytest-timeout-2.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=pytest plugin to abort hanging tests
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pytest-timeout/
 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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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-timeout/pytest-timeout-2.0.2.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=30679cf3504cf802f7af376f3f5ba327
+_md5_=735fb1272e29d8a07b52cd4b92bde7db
diff --git a/metadata/md5-cache/dev-python/python-socks-2.0.2 b/metadata/md5-cache/dev-python/python-socks-2.0.2
new file mode 100644
index 000000000000..f93860b84339
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-socks-2.0.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_python3_8? ( >=dev-python/anyio-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/trio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/anyio-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/trio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/anyio-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/trio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/async_timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/yarl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/async_timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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=SOCKS4, SOCKS5, HTTP tunneling functionality for Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/python-socks/ https://github.com/romis2012/python-socks/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/async_timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/romis2012/python-socks/archive/v2.0.2.tar.gz -> python-socks-2.0.2.gh.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=46ff1734924a12af3c2a3d505e3f9d3e
diff --git a/metadata/md5-cache/dev-python/quantities-0.13.0 b/metadata/md5-cache/dev-python/quantities-0.13.0
new file mode 100644
index 000000000000..533fa0a011d8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/quantities-0.13.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/numpy-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Support for physical quantities with units, based on numpy
+EAPI=8
+HOMEPAGE=https://github.com/python-quantities/python-quantities
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/numpy-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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-quantities/python-quantities/archive/v0.13.0.tar.gz -> python-quantities-0.13.0.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=026729cff1ee32367e169868a4af1403
diff --git a/metadata/md5-cache/dev-python/readme_renderer-31.0 b/metadata/md5-cache/dev-python/readme_renderer-31.0
deleted file mode 100644
index 8b8cfbfa4382..000000000000
--- a/metadata/md5-cache/dev-python/readme_renderer-31.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/bleach-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docutils-0.13.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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 library for rendering "readme" descriptions for Warehouse
-EAPI=8
-HOMEPAGE=https://github.com/pypa/readme_renderer https://pypi.org/project/readme-renderer/
-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 sparc x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/bleach-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docutils-0.13.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/readme_renderer/readme_renderer-31.0.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=7763775b81a76a074006d11fd4f4539e
diff --git a/metadata/md5-cache/dev-python/readme_renderer-32.0 b/metadata/md5-cache/dev-python/readme_renderer-32.0
index 9b33b9f49b11..75f4f3de3322 100644
--- a/metadata/md5-cache/dev-python/readme_renderer-32.0
+++ b/metadata/md5-cache/dev-python/readme_renderer-32.0
@@ -4,7 +4,7 @@ DESCRIPTION=a library for rendering "readme" descriptions for Warehouse
 EAPI=8
 HOMEPAGE=https://github.com/pypa/readme_renderer https://pypi.org/project/readme-renderer/
 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 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/bleach-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docutils-0.13.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/readme_renderer/readme_renderer-32.0.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=4809dbd457e4373e68c939bde0c441f2
+_md5_=7763775b81a76a074006d11fd4f4539e
diff --git a/metadata/md5-cache/dev-python/stack_data-0.1.3 b/metadata/md5-cache/dev-python/stack_data-0.1.3-r1
similarity index 51%
rename from metadata/md5-cache/dev-python/stack_data-0.1.3
rename to metadata/md5-cache/dev-python/stack_data-0.1.3-r1
index 87b537e430e9..b2cf242e732d 100644
--- a/metadata/md5-cache/dev-python/stack_data-0.1.3
+++ b/metadata/md5-cache/dev-python/stack_data-0.1.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/asttokens[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/executing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typeguard[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/littleutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pure_eval[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/typeguard[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/littleutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/asttokens[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/executing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pure_eval[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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=Extract data from Python tracebacks for informative displays
 EAPI=8
@@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/alexmojaki/stack_data
 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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+RDEPEND=dev-python/asttokens[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/executing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pure_eval[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stack_data/stack_data-0.1.3.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8b49f8756b87dfc0662a058230d83751
+_md5_=e09fef522800664bb616d2913e973a42
diff --git a/metadata/md5-cache/dev-python/tomli-2.0.0 b/metadata/md5-cache/dev-python/tomli-2.0.0
index b872ca5a851e..11e5cecfb4e5 100644
--- a/metadata/md5-cache/dev-python/tomli-2.0.0
+++ b/metadata/md5-cache/dev-python/tomli-2.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=A lil' TOML parser
 EAPI=7
 HOMEPAGE=https://pypi.org/project/tomli/ https://github.com/hukkin/tomli/
 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 ~riscv ~sparc ~x86 ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/hukkin/tomli/archive/2.0.0.tar.gz -> tomli-2.0.0.gh.tar.gz https://files.pythonhosted.org/packages/py3/t/tomli/tomli-2.0.0-py3-none-any.whl -> tomli-2.0.0-py3-none-any.whl.zip
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=3298c411a6968ebf15cc28fe401df5f8
+_md5_=08963277e4a81731f7bbeed0522e83df
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index c1b0dd2acc6b..551e855ca186 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.61.9 b/metadata/md5-cache/dev-ruby/dnsruby-1.61.9
new file mode 100644
index 000000000000..6a32b345f0c2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.61.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/simpleidn-0.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/simpleidn-0.1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/simpleidn-0.1:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/minitest-5.4:5[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? ( 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 pure Ruby DNS client library
+EAPI=8
+HOMEPAGE=https://github.com/alexdalitz/dnsruby
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/simpleidn-0.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/simpleidn-0.1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/simpleidn-0.1:0[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=0
+SRC_URI=https://rubygems.org/gems/dnsruby-1.61.9.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=9b6637f330f32ab7015a727868ebdc4b
diff --git a/metadata/md5-cache/dev-ruby/excon-0.73.0 b/metadata/md5-cache/dev-ruby/excon-0.73.0
deleted file mode 100644
index 3a631c8f3e74..000000000000
--- a/metadata/md5-cache/dev-ruby/excon-0.73.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] test? ( dev-ruby/activesupport[ruby_targets_ruby26(-)] >=dev-ruby/eventmachine-1.0.4[ruby_targets_ruby26(-)] >=dev-ruby/json-1.8.5[ruby_targets_ruby26(-)] dev-ruby/open4[ruby_targets_ruby26(-)] dev-ruby/rdoc[ruby_targets_ruby26(-)] dev-ruby/sinatra[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] test? ( dev-ruby/activesupport[ruby_targets_ruby27(-)] >=dev-ruby/eventmachine-1.0.4[ruby_targets_ruby27(-)] >=dev-ruby/json-1.8.5[ruby_targets_ruby27(-)] dev-ruby/open4[ruby_targets_ruby27(-)] dev-ruby/rdoc[ruby_targets_ruby27(-)] dev-ruby/sinatra[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/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[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=EXtended http(s) CONnections
-EAPI=7
-HOMEPAGE=https://github.com/excon/excon
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 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_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 )
-SLOT=0
-SRC_URI=https://github.com/excon/excon/archive/v0.73.0.tar.gz -> excon-0.73.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=40f49ef5358757e6ed566b357b0b6b64
diff --git a/metadata/md5-cache/dev-ruby/excon-0.87.0 b/metadata/md5-cache/dev-ruby/excon-0.90.0
similarity index 95%
rename from metadata/md5-cache/dev-ruby/excon-0.87.0
rename to metadata/md5-cache/dev-ruby/excon-0.90.0
index 75165345cb34..b3376a1278f6 100644
--- a/metadata/md5-cache/dev-ruby/excon-0.87.0
+++ b/metadata/md5-cache/dev-ruby/excon-0.90.0
@@ -11,6 +11,6 @@ RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
-SRC_URI=https://github.com/excon/excon/archive/v0.87.0.tar.gz -> excon-0.87.0.tar.gz
+SRC_URI=https://github.com/excon/excon/archive/v0.90.0.tar.gz -> excon-0.90.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1d5f701669eba0425ab537d405f6e593
+_md5_=310492d827dce957408d2c87d0854b39
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.15.5 b/metadata/md5-cache/dev-ruby/ffi-1.15.5
new file mode 100644
index 000000000000..d7f659c4ce53
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ffi-1.15.5
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rake[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=dev-libs/libffi:= 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=Ruby extension for programmatically loading dynamic libraries
+EAPI=8
+HOMEPAGE=https://wiki.github.com/ffi/ffi
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=dev-libs/libffi:= 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/ffi/ffi/archive/v1.15.5.tar.gz -> ffi-git-1.15.5.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=bfe9800236af7a5d1efd827a7ce66d9b
diff --git a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.5 b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.5
deleted file mode 100644
index 6f8a4ca86090..000000000000
--- a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby26? ( <dev-ruby/railties-6.1:*[ruby_targets_ruby26(-)] >=dev-ruby/railties-3.2:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( <dev-ruby/railties-6.1:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-3.2:*[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? ( 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(-)] ) )
-DESCRIPTION=Font-awesome for the asset pipeline
-EAPI=6
-HOMEPAGE=https://github.com/bokmann/font-awesome-rails https://rubygems.org/gems/font-awesome-rails
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=~amd64
-LICENSE=MIT OFL
-RDEPEND=ruby_targets_ruby26? ( <dev-ruby/railties-6.1:*[ruby_targets_ruby26(-)] >=dev-ruby/railties-3.2:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( <dev-ruby/railties-6.1:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-3.2:*[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 )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/font-awesome-rails-4.7.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=4a522019286af69eb5eb89dc7e6d936e
diff --git a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.6 b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.8
similarity index 84%
rename from metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.6
rename to metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.8
index bceb53862d6f..f86a5ab19942 100644
--- a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.6
+++ b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.8
@@ -1,16 +1,16 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( <dev-ruby/railties-6.2:*[ruby_targets_ruby26(-)] >=dev-ruby/railties-3.2:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( <dev-ruby/railties-6.2:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-3.2:*[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? ( 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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby26? ( <dev-ruby/railties-8.0:*[ruby_targets_ruby26(-)] >=dev-ruby/railties-3.2:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( <dev-ruby/railties-8.0:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-3.2:*[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? ( 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=Font-awesome for the asset pipeline
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/bokmann/font-awesome-rails https://rubygems.org/gems/font-awesome-rails
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test
 KEYWORDS=~amd64
 LICENSE=MIT OFL
-RDEPEND=ruby_targets_ruby26? ( <dev-ruby/railties-6.2:*[ruby_targets_ruby26(-)] >=dev-ruby/railties-3.2:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( <dev-ruby/railties-6.2:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-3.2:*[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(-)] )
+RDEPEND=ruby_targets_ruby26? ( <dev-ruby/railties-8.0:*[ruby_targets_ruby26(-)] >=dev-ruby/railties-3.2:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( <dev-ruby/railties-8.0:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-3.2:*[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 )
 SLOT=0
-SRC_URI=https://rubygems.org/gems/font-awesome-rails-4.7.0.6.gem
+SRC_URI=https://rubygems.org/gems/font-awesome-rails-4.7.0.8.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=6afecfd8af98fccc96d293c339cdcc98
+_md5_=fd7b955a3381b3940577dbe9899536ce
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.22.0 b/metadata/md5-cache/dev-ruby/octokit-4.22.0
new file mode 100644
index 000000000000..c328822e2fa3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/octokit-4.22.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/faraday-0.9:*[ruby_targets_ruby26(-)] =dev-ruby/sawyer-0.8*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/faraday-0.9:*[ruby_targets_ruby27(-)] =dev-ruby/sawyer-0.8*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/jwt[ruby_targets_ruby26(-)] dev-ruby/mime-types[ruby_targets_ruby26(-)] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby26(-)] >=dev-ruby/rbnacl-7.1.1:6[ruby_targets_ruby26(-)] dev-ruby/vcr:3[ruby_targets_ruby26(-),json] dev-ruby/webmock:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/jwt[ruby_targets_ruby27(-)] dev-ruby/mime-types[ruby_targets_ruby27(-)] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby27(-)] >=dev-ruby/rbnacl-7.1.1:6[ruby_targets_ruby27(-)] dev-ruby/vcr:3[ruby_targets_ruby27(-),json] dev-ruby/webmock:3[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/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[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=Ruby toolkit for the Github API
+EAPI=8
+HOMEPAGE=https://github.com/octokit/octokit.rb
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/faraday-0.9:*[ruby_targets_ruby26(-)] =dev-ruby/sawyer-0.8*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/faraday-0.9:*[ruby_targets_ruby27(-)] =dev-ruby/sawyer-0.8*[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=0
+SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.22.0.tar.gz -> octokit-4.22.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=e599b229908130177e8d93a5c2b5328a
diff --git a/metadata/md5-cache/dev-ruby/rainbow-3.1.1 b/metadata/md5-cache/dev-ruby/rainbow-3.1.1
new file mode 100644
index 000000000000..bd8b9883b45d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rainbow-3.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/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=Colorize printed text on ANSI terminals
+EAPI=8
+HOMEPAGE=https://github.com/sickill/rainbow
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~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=3
+SRC_URI=https://github.com/sickill/rainbow/archive/v3.1.1.tar.gz -> rainbow-git-3.1.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=caf93327b736aef1d9cd270f9d836ac2
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 61c4a2ac5633..94b6e100b7b3 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/bcc-0.22.0 b/metadata/md5-cache/dev-util/bcc-0.22.0
deleted file mode 100644
index 693086dab6af..000000000000
--- a/metadata/md5-cache/dev-util/bcc-0.22.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/cmake virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=|| ( ~dev-libs/libbpf-0.5.0 ~dev-libs/libbpf-9999 ) dev-libs/libbpf:=[static-libs(-)] >=sys-kernel/linux-headers-5.13 >=dev-libs/elfutils-0.166:= <=sys-devel/clang-13:= <=sys-devel/llvm-13:=[llvm_targets_BPF(+)] lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) test? ( || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/netperf net-misc/iperf:* ) !!sys-devel/llvm:0
-DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
-EAPI=7
-HOMEPAGE=https://iovisor.github.io/bcc/
-IUSE=+lua test +lua_single_target_luajit python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=|| ( ~dev-libs/libbpf-0.5.0 ~dev-libs/libbpf-9999 ) dev-libs/libbpf:=[static-libs(-)] >=sys-kernel/linux-headers-5.13 >=dev-libs/elfutils-0.166:= <=sys-devel/clang-13:= <=sys-devel/llvm-13:=[llvm_targets_BPF(+)] lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) lua? ( ^^ ( lua_single_target_luajit ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/iovisor/bcc/archive/v0.22.0.tar.gz -> bcc-0.22.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	linux-info	2f039741fe92bcea55c78806d16ac0f5	llvm	19c0cdeff39b0e08d1454df31b588316	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=09a96cba65008ace1a0dca1f4ae824fc
diff --git a/metadata/md5-cache/dev-util/bcc-0.22.0-r1 b/metadata/md5-cache/dev-util/bcc-0.22.0-r1
deleted file mode 100644
index e4649e3cb46a..000000000000
--- a/metadata/md5-cache/dev-util/bcc-0.22.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=dev-libs/elfutils-0.166:= >=dev-libs/libbpf-0.5.0:=[static-libs(-)] >=sys-kernel/linux-headers-5.13 <sys-devel/clang-14:= <sys-devel/llvm-14:=[llvm_targets_BPF(+)] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) test? ( || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/netperf net-misc/iperf:* ) !!sys-devel/llvm:0
-DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
-EAPI=7
-HOMEPAGE=https://iovisor.github.io/bcc/
-IUSE=+lua test +lua_single_target_luajit python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/elfutils-0.166:= >=dev-libs/libbpf-0.5.0:=[static-libs(-)] >=sys-kernel/linux-headers-5.13 <sys-devel/clang-14:= <sys-devel/llvm-14:=[llvm_targets_BPF(+)] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) lua? ( ^^ ( lua_single_target_luajit ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/iovisor/bcc/archive/v0.22.0.tar.gz -> bcc-0.22.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	linux-info	2f039741fe92bcea55c78806d16ac0f5	llvm	19c0cdeff39b0e08d1454df31b588316	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=22db5d81fc7a97c0cb75f00f0c55aecf
diff --git a/metadata/md5-cache/dev-util/bcc-0.23.0-r3 b/metadata/md5-cache/dev-util/bcc-0.23.0-r3
deleted file mode 100644
index abec725dee2e..000000000000
--- a/metadata/md5-cache/dev-util/bcc-0.23.0-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=dev-libs/elfutils-0.166:= >=dev-libs/libbpf-0.5.0:=[static-libs(-)] sys-kernel/linux-headers <sys-devel/clang-14:= <sys-devel/llvm-14:=[llvm_targets_BPF(+)] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) test? ( || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/netperf net-misc/iperf:* ) !!sys-devel/llvm:0
-DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
-EAPI=7
-HOMEPAGE=https://iovisor.github.io/bcc/
-IUSE=+lua test +lua_single_target_luajit python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/elfutils-0.166:= >=dev-libs/libbpf-0.5.0:=[static-libs(-)] sys-kernel/linux-headers <sys-devel/clang-14:= <sys-devel/llvm-14:=[llvm_targets_BPF(+)] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) lua? ( ^^ ( lua_single_target_luajit ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/iovisor/bcc/archive/v0.23.0.tar.gz -> bcc-0.23.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	linux-info	2f039741fe92bcea55c78806d16ac0f5	llvm	19c0cdeff39b0e08d1454df31b588316	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=33962af53c4bc4bf0b64f0f51612c774
diff --git a/metadata/md5-cache/dev-util/uncrustify-0.71.0 b/metadata/md5-cache/dev-util/uncrustify-0.71.0
index bb5e328f4032..682a08e3d99b 100644
--- a/metadata/md5-cache/dev-util/uncrustify-0.71.0
+++ b/metadata/md5-cache/dev-util/uncrustify-0.71.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=C/C++/C#/D/Java/Pawn code indenter and beautifier
 EAPI=7
@@ -10,4 +10,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uncrustify/uncrustify/archive/uncrustify-0.71.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=5b89e4efb3965f492f375ef90b7a7cb2
+_md5_=b676cdce698ddf539c0541288fbb062e
diff --git a/metadata/md5-cache/dev-util/weka-3.8.0 b/metadata/md5-cache/dev-util/weka-3.8.0
index 75aa473d0210..c6edd21bb9db 100644
--- a/metadata/md5-cache/dev-util/weka-3.8.0
+++ b/metadata/md5-cache/dev-util/weka-3.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=A Java data mining package
 EAPI=6
 HOMEPAGE=http://www.cs.waikato.ac.nz/ml/weka/
 IUSE=source
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/javacup-0.11a_beta20060608:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/weka/weka-3-8-0.zip
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c5158bbf71027224721724572d44c2fc
+_md5_=b62c66b4ca4dddb2c52a3b3eaea12fdd
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index cb42e7b30d85..d2292de6e5c9 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-41.3 b/metadata/md5-cache/gnome-base/gnome-desktop-41.3
new file mode 100644
index 000000000000..193843c5d2a7
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-41.3
@@ -0,0 +1,14 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen gtk-doc? ( >=dev-util/gtk-doc-1.14 ) dev-util/itstool >=sys-devel/gettext-0.19.8 x11-base/xorg-proto virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=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? ( virtual/libudev:= ) seccomp? ( sys-libs/libseccomp ) x11-libs/cairo:= introspection? ( >=dev-libs/gobject-introspection-1.54:= ) media-libs/fontconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+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 ~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? ( 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/41/gnome-desktop-41.3.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=ef92769698d848120aeb0bfc1dcef7b8
diff --git a/metadata/md5-cache/gnome-base/gnome-session-40.8 b/metadata/md5-cache/gnome-base/gnome-session-40.8
new file mode 100644
index 000000000000..b19012540276
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-session-40.8
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 x11-libs/xtrans virtual/pkgconfig doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 ) app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=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.46.0:2 >=x11-libs/gtk+-3.22.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl(+),gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-242:0= ) elogind? ( >=sys-auth/elogind-239.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Gnome session manager
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-session
+IUSE=doc elogind systemd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.22.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl(+),gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-242:0= ) elogind? ( >=sys-auth/elogind-239.4 ) >=gnome-base/gnome-settings-daemon-3.35.91 >=gnome-base/gsettings-desktop-schemas-0.1.7 sys-apps/dbus[X] x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-session/40/gnome-session-40.8.tar.xz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	239e7afa214b50012f83b8bb61de7555	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=605addf3aa39a9f55bf20f903dc36699
diff --git a/metadata/md5-cache/gnome-base/gnome-session-41.3 b/metadata/md5-cache/gnome-base/gnome-session-41.3
new file mode 100644
index 000000000000..c44c79e0d93f
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-session-41.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 x11-libs/xtrans virtual/pkgconfig doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 ) app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=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.46.0:2 >=x11-libs/gtk+-3.22.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl(+),gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-242:0= ) elogind? ( >=sys-auth/elogind-239.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Gnome session manager
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-session
+IUSE=doc elogind systemd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.22.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl(+),gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-242:0= ) elogind? ( >=sys-auth/elogind-239.4 ) >=gnome-base/gnome-settings-daemon-3.35.91 >=gnome-base/gsettings-desktop-schemas-0.1.7 sys-apps/dbus[X] x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-session/41/gnome-session-41.3.tar.xz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	239e7afa214b50012f83b8bb61de7555	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=605addf3aa39a9f55bf20f903dc36699
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-41.0 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-41.0
index 07058e6e48cf..1be3b73b1da3 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-41.0
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-41.0
@@ -1,16 +1,16 @@
 BDEPEND=sys-kernel/linux-headers dev-util/glib-utils dev-util/gdbus-codegen x11-base/xorg-proto || ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) test? ( || ( ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-dbusmock[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-dbusmock[python_targets_python3_8(-)] ) ) gnome-base/gnome-session ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=sci-geosciences/geocode-glib-3.10 >=dev-libs/glib-2.58:2 >=gnome-base/gnome-desktop-3.37.1:3= >=gnome-base/gsettings-desktop-schemas-40 >=x11-libs/gtk+-3.15.3:3[X,wayland?] >=dev-libs/libgweather-40:2= colord? ( >=x11-misc/colord-1.4.5:= >=media-libs/lcms-2.2:2 ) media-libs/libcanberra[gtk3] >=app-misc/geoclue-2.3.1:2.0 >=x11-libs/libnotify-0.7.3 >=media-sound/pulseaudio-12.99.3[glib] >=sys-auth/polkit-0.114 >=sys-power/upower-0.99.8:= x11-libs/libX11 >=x11-libs/libXfixes-6.0.0 udev? ( dev-libs/libgudev:= ) wayland? ( dev-libs/wayland ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20.0 x11-libs/gdk-pixbuf:2 ) smartcard? ( >=dev-libs/nss-3.11.2 ) cups? ( >=net-print/cups-1.4[dbus] ) modemmanager? ( >=app-crypt/gcr-3.7.5:= >=net-misc/modemmanager-1.0:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) media-libs/alsa-lib x11-libs/libXi x11-libs/libXext media-libs/fontconfig systemd? ( >=sys-apps/systemd-243 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=sci-geosciences/geocode-glib-3.10 >=dev-libs/glib-2.58:2 >=gnome-base/gnome-desktop-3.37.1:3= >=gnome-base/gsettings-desktop-schemas-40 >=x11-libs/gtk+-3.15.3:3[X,wayland?] >=dev-libs/libgweather-40:2= colord? ( >=x11-misc/colord-1.4.5:= >=media-libs/lcms-2.2:2 ) media-libs/libcanberra[gtk3] >=app-misc/geoclue-2.3.1:2.0 >=x11-libs/libnotify-0.7.3 >=media-sound/pulseaudio-12.99.3[glib] >=sys-auth/polkit-0.114 >=sys-power/upower-0.99.12:= x11-libs/libX11 >=x11-libs/libXfixes-6.0.0 udev? ( dev-libs/libgudev:= ) wayland? ( dev-libs/wayland ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20.0 x11-libs/gdk-pixbuf:2 ) smartcard? ( >=dev-libs/nss-3.11.2 ) cups? ( >=net-print/cups-1.4[dbus] ) modemmanager? ( >=app-crypt/gcr-3.7.5:= >=net-misc/modemmanager-1.0:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) media-libs/alsa-lib x11-libs/libXi x11-libs/libXext media-libs/fontconfig systemd? ( >=sys-apps/systemd-243 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Gnome Settings Daemon
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-settings-daemon
 IUSE=+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test +udev wayland test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=sci-geosciences/geocode-glib-3.10 >=dev-libs/glib-2.58:2 >=gnome-base/gnome-desktop-3.37.1:3= >=gnome-base/gsettings-desktop-schemas-40 >=x11-libs/gtk+-3.15.3:3[X,wayland?] >=dev-libs/libgweather-40:2= colord? ( >=x11-misc/colord-1.4.5:= >=media-libs/lcms-2.2:2 ) media-libs/libcanberra[gtk3] >=app-misc/geoclue-2.3.1:2.0 >=x11-libs/libnotify-0.7.3 >=media-sound/pulseaudio-12.99.3[glib] >=sys-auth/polkit-0.114 >=sys-power/upower-0.99.8:= x11-libs/libX11 >=x11-libs/libXfixes-6.0.0 udev? ( dev-libs/libgudev:= ) wayland? ( dev-libs/wayland ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20.0 x11-libs/gdk-pixbuf:2 ) smartcard? ( >=dev-libs/nss-3.11.2 ) cups? ( >=net-print/cups-1.4[dbus] ) modemmanager? ( >=app-crypt/gcr-3.7.5:= >=net-misc/modemmanager-1.0:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) media-libs/alsa-lib x11-libs/libXi x11-libs/libXext media-libs/fontconfig systemd? ( >=sys-apps/systemd-243 ) gnome-base/dconf elogind? ( sys-auth/elogind ) !<gnome-base/gnome-session-3.33.90 !<gnome-base/gdm-3.33.90 !<gnome-extra/gnome-shell-extensions-3.34.1 !<gnome-base/gnome-flashback-3.33.1
+RDEPEND=>=sci-geosciences/geocode-glib-3.10 >=dev-libs/glib-2.58:2 >=gnome-base/gnome-desktop-3.37.1:3= >=gnome-base/gsettings-desktop-schemas-40 >=x11-libs/gtk+-3.15.3:3[X,wayland?] >=dev-libs/libgweather-40:2= colord? ( >=x11-misc/colord-1.4.5:= >=media-libs/lcms-2.2:2 ) media-libs/libcanberra[gtk3] >=app-misc/geoclue-2.3.1:2.0 >=x11-libs/libnotify-0.7.3 >=media-sound/pulseaudio-12.99.3[glib] >=sys-auth/polkit-0.114 >=sys-power/upower-0.99.12:= x11-libs/libX11 >=x11-libs/libXfixes-6.0.0 udev? ( dev-libs/libgudev:= ) wayland? ( dev-libs/wayland ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20.0 x11-libs/gdk-pixbuf:2 ) smartcard? ( >=dev-libs/nss-3.11.2 ) cups? ( >=net-print/cups-1.4[dbus] ) modemmanager? ( >=app-crypt/gcr-3.7.5:= >=net-misc/modemmanager-1.0:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) media-libs/alsa-lib x11-libs/libXi x11-libs/libXext media-libs/fontconfig systemd? ( >=sys-apps/systemd-243 ) gnome-base/dconf elogind? ( sys-auth/elogind ) !<gnome-base/gnome-session-3.33.90 !<gnome-base/gdm-3.33.90 !<gnome-extra/gnome-shell-extensions-3.34.1 !<gnome-base/gnome-flashback-3.33.1
 REQUIRED_USE=^^ ( elogind systemd ) input_devices_wacom? ( udev ) wayland? ( udev )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/41/gnome-settings-daemon-41.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	239e7afa214b50012f83b8bb61de7555	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=6afd2e33d315440fe2d12cfac8d4c4fa
+_md5_=dd3e96b227dec3356843fbda91826aa0
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.50.7 b/metadata/md5-cache/gnome-base/librsvg-2.50.7
index 3e9ad7f85363..a63859e12851 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.50.7
+++ b/metadata/md5-cache/gnome-base/librsvg-2.50.7
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.50/librsvg-2.50.7.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	397207e07bdf58b07ce295d0bc1049fe	gnome2-utils	239e7afa214b50012f83b8bb61de7555	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	78150b86094c58851346877cbf691245	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	397207e07bdf58b07ce295d0bc1049fe	gnome2-utils	239e7afa214b50012f83b8bb61de7555	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	78150b86094c58851346877cbf691245	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
 _md5_=aed47742b68fefb30b67b841c1b384ec
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.52.5 b/metadata/md5-cache/gnome-base/librsvg-2.52.5
index 3fe946d5f995..a9d519921ad3 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.52.5
+++ b/metadata/md5-cache/gnome-base/librsvg-2.52.5
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.52/librsvg-2.52.5.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	397207e07bdf58b07ce295d0bc1049fe	gnome2-utils	239e7afa214b50012f83b8bb61de7555	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	78150b86094c58851346877cbf691245	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	397207e07bdf58b07ce295d0bc1049fe	gnome2-utils	239e7afa214b50012f83b8bb61de7555	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	78150b86094c58851346877cbf691245	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
 _md5_=a4a80935ceb580734f96cb8ac8bb1cdb
diff --git a/metadata/md5-cache/gnome-base/nautilus-41.2 b/metadata/md5-cache/gnome-base/nautilus-41.2
new file mode 100644
index 000000000000..ffef64be1c5d
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/nautilus-41.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/gdbus-codegen-2.51.2 >=dev-util/meson-0.57.2 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.10 app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.67.1:2 >=media-libs/gexiv2-0.10.0 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.3.0 >=gnome-base/gnome-desktop-3.0.0:3= >=x11-libs/gtk+-3.22.27:3[X,introspection?] >=gui-libs/libhandy-1.1.90:1 >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-3.0:3= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Default file manager for the GNOME desktop
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
+IUSE=gnome +gstreamer gtk-doc +introspection +previewer selinux sendto test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+ LGPL-2.1+
+PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk(+)]
+RDEPEND=>=dev-libs/glib-2.67.1:2 >=media-libs/gexiv2-0.10.0 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.3.0 >=gnome-base/gnome-desktop-3.0.0:3= >=x11-libs/gtk+-3.22.27:3[X,introspection?] >=gui-libs/libhandy-1.1.90:1 >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-3.0:3= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gstreamer? ( !<media-video/totem-3.31.91[nautilus] ) >=app-misc/tracker-miners-3.0:3=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/nautilus/41/nautilus-41.2.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	239e7afa214b50012f83b8bb61de7555	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=522c79d682b781b4d749e92fec785c9c
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index b693ab221fab..05e1bf9bdb4d 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-41.3 b/metadata/md5-cache/gnome-extra/gnome-boxes-41.3
new file mode 100644
index 000000000000..705500fd67ff
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-41.3
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/vala:0.54[vapigen(+)] dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] ) net-libs/gtk-vnc[vala] sys-libs/libosinfo[vala] app-crypt/libsecret[vala] net-libs/libsoup:2.4[vala] app-emulation/libvirt-glib[vala] net-misc/spice-gtk[vala] x11-libs/vte:2.91[vala] dev-libs/appstream-glib rdp? ( x11-libs/gtk+:3[introspection] ) dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] x11-libs/gtksourceview:4 >=sys-libs/libosinfo-1.7.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.26.0:4 >=gui-libs/libhandy-1.0.0:1= >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= rdp? ( >=net-misc/freerdp-2.0.0:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Simple GNOME application to access remote or virtual systems
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Boxes
+IUSE=rdp
+KEYWORDS=~amd64
+LICENSE=LGPL-2+ CC-BY-2.0
+RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] x11-libs/gtksourceview:4 >=sys-libs/libosinfo-1.7.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.26.0:4 >=gui-libs/libhandy-1.0.0:1= >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= rdp? ( >=net-misc/freerdp-2.0.0:= ) app-cdr/cdrtools app-misc/tracker-miners:3[iso] app-emulation/spice[smartcard] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] sys-fs/mtools sys-auth/polkit
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-boxes/41/gnome-boxes-41.3.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	239e7afa214b50012f83b8bb61de7555	linux-info	2f039741fe92bcea55c78806d16ac0f5	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	78150b86094c58851346877cbf691245	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=803a8b5bbba769d91a317d872c92fcce
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index b09db6633e23..5c9c0867851a 100644
Binary files a/metadata/md5-cache/gui-wm/Manifest.gz and b/metadata/md5-cache/gui-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-wm/hikari-2.3.3 b/metadata/md5-cache/gui-wm/hikari-2.3.3
new file mode 100644
index 000000000000..f3a8adb94f66
--- /dev/null
+++ b/metadata/md5-cache/gui-wm/hikari-2.3.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/wayland-scanner sys-devel/bmake virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/glib:2 dev-libs/libinput:= dev-libs/libucl dev-libs/wayland gui-libs/wlroots:0/15[X?] sys-libs/pam x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman dev-libs/wayland-protocols
+DESCRIPTION=Wayland compositor inspired by CWM
+EAPI=8
+HOMEPAGE=https://hikari.acmelabs.space/
+IUSE=X suid
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/glib:2 dev-libs/libinput:= dev-libs/libucl dev-libs/wayland gui-libs/wlroots:0/15[X?] sys-libs/pam x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman x11-misc/xkeyboard-config
+SLOT=0
+SRC_URI=https://hikari.acmelabs.space/releases/hikari-2.3.3.tar.gz
+_eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=e6e31ecbcc6ae90afca068521227420a
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index a5a1e0a30fe0..b19b1ba03db9 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/postfix-3.7_pre20220102 b/metadata/md5-cache/mail-mta/postfix-3.7_pre20220103
similarity index 98%
rename from metadata/md5-cache/mail-mta/postfix-3.7_pre20220102
rename to metadata/md5-cache/mail-mta/postfix-3.7_pre20220103
index b2eb9ffd3ecc..90fc8a281077 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.7_pre20220102
+++ b/metadata/md5-cache/mail-mta/postfix-3.7_pre20220103
@@ -10,6 +10,6 @@ LICENSE=|| ( IBM EPL-2.0 )
 RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix || ( dev-libs/libpcre2:0 dev-libs/libpcre ) dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.7-20220102.tar.gz
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.7-20220103.tar.gz
 _eclasses_=flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pam	e44a1dd98f13e1ad76de01e919bde1f1	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c19c1e933e4a81d11b5bcbecd2d16bc4
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index f97f6bf2ec79..13c6203977d4 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.37 b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.37
index bf9fe636cf9c..e59e3557f91e 100644
--- a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.37
+++ b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.37
@@ -5,10 +5,10 @@ DESCRIPTION=Collection of tools and libraries for many image formats
 EAPI=8
 HOMEPAGE=http://www.graphicsmagick.org/ http://hg.code.sf.net/p/graphicsmagick/code/
 IUSE=bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma openmp perl png postscript q16 q32 static-libs svg threads tiff truetype webp wmf X zlib
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib )
 SLOT=0/1.3
 SRC_URI=mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.37.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8392225742c3f9cec14aa5b821ace421
+_md5_=b940684769405b09b95f43014b701f0d
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.12.2 b/metadata/md5-cache/media-gfx/ristretto-0.12.2
new file mode 100644
index 000000000000..93ac89ea3f0f
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/ristretto-0.12.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig sys-devel/gettext
+DEFINED_PHASES=postinst postrm
+DEPEND=>=dev-libs/glib-2.44:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.16:0= >=xfce-base/libxfce4util-4.16:0= >=xfce-base/xfconf-4.12.1:0=
+DESCRIPTION=A fast and lightweight picture viewer for Xfce
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/apps/ristretto/start
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.44:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.16:0= >=xfce-base/libxfce4util-4.16:0= >=xfce-base/xfconf-4.12.1:0=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/ristretto/0.12/ristretto-0.12.2.tar.bz2
+_eclasses_=xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=740eba03fc0cb9fb7408cd3666a7f52c
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index a06291acca99..a53009d4b813 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/picard-2.7.2 b/metadata/md5-cache/media-sound/picard-2.7.3
similarity index 99%
rename from metadata/md5-cache/media-sound/picard-2.7.2
rename to metadata/md5-cache/media-sound/picard-2.7.3
index 51bc4fc873d3..7852428826c5 100644
--- a/metadata/md5-cache/media-sound/picard-2.7.2
+++ b/metadata/md5-cache/media-sound/picard-2.7.3
@@ -10,6 +10,6 @@ RDEPEND=python_single_target_python3_8? ( dev-python/fasteners[python_targets_py
 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://musicbrainz.osuosl.org/pub/musicbrainz/picard/picard-2.7.2.tar.gz
+SRC_URI=https://musicbrainz.osuosl.org/pub/musicbrainz/picard/picard-2.7.3.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	9783802d3840cbbd78c02b313df760cc	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
 _md5_=f217ce1eeb5f43abda231bc46aeba808
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index ff306b4cf2a6..1abccbfa5666 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/prosody-0.11.10 b/metadata/md5-cache/net-im/prosody-0.11.10
deleted file mode 100644
index 859a47f16a01..000000000000
--- a/metadata/md5-cache/net-im/prosody-0.11.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( lua_single_target_luajit? ( dev-lua/busted[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/busted[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/busted[lua_targets_lua5-3(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=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(+)] )
-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
-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://prosody.im/downloads/source/prosody-0.11.10.tar.gz
-_eclasses_=lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=f48a823ccd5bf83ee6d659234ea6bdfb
diff --git a/metadata/md5-cache/net-im/prosody-0.11.11 b/metadata/md5-cache/net-im/prosody-0.11.12
similarity index 97%
rename from metadata/md5-cache/net-im/prosody-0.11.11
rename to metadata/md5-cache/net-im/prosody-0.11.12
index e0ad52e242d8..2349170301ec 100644
--- a/metadata/md5-cache/net-im/prosody-0.11.11
+++ b/metadata/md5-cache/net-im/prosody-0.11.12
@@ -5,12 +5,12 @@ DESCRIPTION=Prosody is a modern XMPP communication server
 EAPI=8
 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 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://prosody.im/downloads/source/prosody-0.11.11.tar.gz
+SRC_URI=https://prosody.im/downloads/source/prosody-0.11.12.tar.gz
 _eclasses_=lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=59beeaadf268e3e035f8485791e1e95b
+_md5_=861974131a07acd4cbbfe3db8b89ce93
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 9af61dfcc720..3b68b78a418b 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/libmrss-0.19.2-r1 b/metadata/md5-cache/net-libs/libmrss-0.19.2-r1
index f4abaafe3caa..f1053b623c09 100644
--- a/metadata/md5-cache/net-libs/libmrss-0.19.2-r1
+++ b/metadata/md5-cache/net-libs/libmrss-0.19.2-r1
@@ -5,9 +5,9 @@ DESCRIPTION=A C-library for parsing and writing RSS 0.91/0.92/1.0/2.0 files or s
 EAPI=7
 HOMEPAGE=https://www.autistici.org/bakunin/libmrss/doc/
 IUSE=doc examples
-KEYWORDS=amd64 ~arm ~mips ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=net-libs/libnxml net-misc/curl
 SLOT=0
 SRC_URI=https://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz
-_md5_=1326f8a0ed583b6a3948e30f15298e92
+_md5_=f958e249979d8a653a99bbc49c990402
diff --git a/metadata/md5-cache/net-libs/libnxml-0.18.3-r1 b/metadata/md5-cache/net-libs/libnxml-0.18.3-r1
index b8627cdafde9..8cac7bcacaaa 100644
--- a/metadata/md5-cache/net-libs/libnxml-0.18.3-r1
+++ b/metadata/md5-cache/net-libs/libnxml-0.18.3-r1
@@ -5,9 +5,9 @@ DESCRIPTION=A C-library for parsing and writing XML 1.0/1.1 files or streams
 EAPI=7
 HOMEPAGE=https://www.autistici.org/bakunin/libnxml/doc/
 IUSE=doc examples
-KEYWORDS=amd64 ~arm ~mips ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=net-misc/curl
 SLOT=0
 SRC_URI=https://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz
-_md5_=8abfee1e7c5ec90cbd535d0818891aa2
+_md5_=39750a2b08931baa031f4d184aef6ad6
diff --git a/metadata/md5-cache/net-libs/quiche-0.10.0 b/metadata/md5-cache/net-libs/quiche-0.10.0
index 77c40b2ce59f..12deb9542c30 100644
--- a/metadata/md5-cache/net-libs/quiche-0.10.0
+++ b/metadata/md5-cache/net-libs/quiche-0.10.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) BSD-2 BSD ISC MIT || ( Unlicense MIT ) openssl
 SLOT=0/0
 SRC_URI=https://crates.io/api/v1/crates/anyhow/1.0.26/download -> anyhow-1.0.26.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/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/arrayvec/0.4.11/download -> arrayvec-0.4.11.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/backtrace/0.3.37/download -> backtrace-0.3.37.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/bindgen/0.57.0/download -> bindgen-0.57.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/boring-sys/1.1.1/download -> boring-sys-1.1.1.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/bumpalo/3.7.1/download -> bumpalo-3.7.1.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.crate https://crates.io/api/v1/crates/cc/1.0.70/download -> cc-1.0.70.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.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/clang-sys/1.2.2/download -> clang-sys-1.2.2.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cmake/0.1.45/download -> cmake-0.1.45.crate https://crates.io/api/v1/crates/criterion/0.3.1/download -> criterion-0.3.1.crate https://crates.io/api/v1/crates/criterion-plot/0.4.1/download -> criterion-plot-0.4.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.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/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/darling/0.13.0/download -> darling-0.13.0.crate https://crates.io/api/v1/crates/darling_core/0.13.0/download -> darling_core-0.13.0.crate https://crates.io/api/v1/crates/darling_macro/0.13.0/download -> darling_macro-0.13.0.crate https://crates.io/api/v1/crates/env_logger/0.8.4/download -> env_logger-0.8.4.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/js-sys/0.3.55/download -> js-sys-0.3.55.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.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.102/download -> libc-0.2.102.crate https://crates.io/api/v1/crates/libloading/0.7.0/download -> libloading-0.7.0.crate https://crates.io/api/v1/crates/libm/0.2.1/download -> libm-0.2.1.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.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.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memoffset/0.5.3/download -> memoffset-0.5.3.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.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/num_cpus/1.12.0/download -> num_cpus-1.12.0.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/oorandom/11.1.0/download -> oorandom-11.1.0.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/plotters/0.2.12/download -> plotters-0.2.12.crate https://crates.io/api/v1/crates/proc-macro2/1.0.29/download -> proc-macro2-1.0.29.crate https://crates.io/api/v1/crates/qlog/0.5.0/download -> qlog-0.5.0.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rayon/1.3.0/download -> rayon-1.3.0.crate https://crates.io/api/v1/crates/rayon-core/1.7.0/download -> rayon-core-1.7.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.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/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustversion/1.0.5/download -> rustversion-1.0.5.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.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/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.130/download -> serde-1.0.130.crate https://crates.io/api/v1/crates/serde_derive/1.0.130/download -> serde_derive-1.0.130.crate https://crates.io/api/v1/crates/serde_json/1.0.68/download -> serde_json-1.0.68.crate https://crates.io/api/v1/crates/serde_with/1.10.0/download -> serde_with-1.10.0.crate https://crates.io/api/v1/crates/serde_with_macros/1.5.0/download -> serde_with_macros-1.5.0.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/slab/0.4.4/download -> slab-0.4.4.crate https://crates.io/api/v1/crates/smallvec/1.4.0/download -> smallvec-1.4.0.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.76/download -> syn-1.0.76.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/tinytemplate/1.0.3/download -> tinytemplate-1.0.3.crate https://crates.io/api/v1/crates/tinyvec/1.4.0/download -> tinyvec-1.4.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.6/download -> unicode-bidi-0.3.6.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.78/download -> wasm-bindgen-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.78/download -> wasm-bindgen-backend-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.78/download -> wasm-bindgen-macro-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.78/download -> wasm-bindgen-macro-support-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.78/download -> wasm-bindgen-shared-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-webidl/0.2.74/download -> wasm-bindgen-webidl-0.2.74.crate https://crates.io/api/v1/crates/web-sys/0.3.55/download -> web-sys-0.3.55.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/quiche/0.10.0/download -> quiche-0.10.0.crate
-_eclasses_=cargo	7ea27a358c2ff39754bf66a96c06f3de	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_eclasses_=cargo	7ea27a358c2ff39754bf66a96c06f3de	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
 _md5_=052082d29e4d08c848d963c10bda77eb
diff --git a/metadata/md5-cache/net-libs/quiche-0.9.0-r1 b/metadata/md5-cache/net-libs/quiche-0.9.0-r1
index e3e8b786e763..f7b7dc388462 100644
--- a/metadata/md5-cache/net-libs/quiche-0.9.0-r1
+++ b/metadata/md5-cache/net-libs/quiche-0.9.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) BSD-2 BSD ISC MIT || ( Unlicense MIT ) openssl
 SLOT=0/0
 SRC_URI=https://crates.io/api/v1/crates/anyhow/1.0.26/download -> anyhow-1.0.26.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/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/arrayvec/0.4.11/download -> arrayvec-0.4.11.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/backtrace/0.3.37/download -> backtrace-0.3.37.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/bindgen/0.57.0/download -> bindgen-0.57.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/boring-sys/1.1.1/download -> boring-sys-1.1.1.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/bumpalo/3.7.0/download -> bumpalo-3.7.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.crate https://crates.io/api/v1/crates/cc/1.0.68/download -> cc-1.0.68.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.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/clang-sys/1.2.0/download -> clang-sys-1.2.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cmake/0.1.45/download -> cmake-0.1.45.crate https://crates.io/api/v1/crates/criterion/0.3.1/download -> criterion-0.3.1.crate https://crates.io/api/v1/crates/criterion-plot/0.4.1/download -> criterion-plot-0.4.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.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/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/darling/0.13.0/download -> darling-0.13.0.crate https://crates.io/api/v1/crates/darling_core/0.13.0/download -> darling_core-0.13.0.crate https://crates.io/api/v1/crates/darling_macro/0.13.0/download -> darling_macro-0.13.0.crate https://crates.io/api/v1/crates/env_logger/0.8.3/download -> env_logger-0.8.3.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/js-sys/0.3.51/download -> js-sys-0.3.51.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.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.95/download -> libc-0.2.95.crate https://crates.io/api/v1/crates/libloading/0.7.0/download -> libloading-0.7.0.crate https://crates.io/api/v1/crates/libm/0.2.1/download -> libm-0.2.1.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.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.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/memoffset/0.5.3/download -> memoffset-0.5.3.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.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/num_cpus/1.12.0/download -> num_cpus-1.12.0.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/indexmap/1.6.2/download -> indexmap-1.6.2.crate https://crates.io/api/v1/crates/once_cell/1.7.2/download -> once_cell-1.7.2.crate https://crates.io/api/v1/crates/oorandom/11.1.0/download -> oorandom-11.1.0.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/plotters/0.2.12/download -> plotters-0.2.12.crate https://crates.io/api/v1/crates/proc-macro2/1.0.27/download -> proc-macro2-1.0.27.crate https://crates.io/api/v1/crates/qlog/0.4.0/download -> qlog-0.4.0.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rayon/1.3.0/download -> rayon-1.3.0.crate https://crates.io/api/v1/crates/rayon-core/1.7.0/download -> rayon-core-1.7.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.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/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustversion/1.0.5/download -> rustversion-1.0.5.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.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/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.126/download -> serde-1.0.126.crate https://crates.io/api/v1/crates/serde_derive/1.0.126/download -> serde_derive-1.0.126.crate https://crates.io/api/v1/crates/serde_json/1.0.64/download -> serde_json-1.0.64.crate https://crates.io/api/v1/crates/serde_with/1.9.2/download -> serde_with-1.9.2.crate https://crates.io/api/v1/crates/serde_with_macros/1.4.2/download -> serde_with_macros-1.4.2.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/slab/0.4.3/download -> slab-0.4.3.crate https://crates.io/api/v1/crates/smallvec/1.4.0/download -> smallvec-1.4.0.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.72/download -> syn-1.0.72.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/tinytemplate/1.0.3/download -> tinytemplate-1.0.3.crate https://crates.io/api/v1/crates/tinyvec/1.2.0/download -> tinyvec-1.2.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.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.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.74/download -> wasm-bindgen-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.74/download -> wasm-bindgen-backend-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.74/download -> wasm-bindgen-macro-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.74/download -> wasm-bindgen-macro-support-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.74/download -> wasm-bindgen-shared-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-webidl/0.2.74/download -> wasm-bindgen-webidl-0.2.74.crate https://crates.io/api/v1/crates/web-sys/0.3.51/download -> web-sys-0.3.51.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/quiche/0.9.0/download -> quiche-0.9.0.crate
-_eclasses_=cargo	7ea27a358c2ff39754bf66a96c06f3de	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_eclasses_=cargo	7ea27a358c2ff39754bf66a96c06f3de	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
 _md5_=0be6fd581dc87237ced91a4c2fe4837f
diff --git a/metadata/md5-cache/net-libs/quiche-9999 b/metadata/md5-cache/net-libs/quiche-9999
index ca3a28914e4e..e96f15fd811e 100644
--- a/metadata/md5-cache/net-libs/quiche-9999
+++ b/metadata/md5-cache/net-libs/quiche-9999
@@ -7,5 +7,5 @@ IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_
 LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) BSD-2 BSD ISC MIT || ( Unlicense MIT ) openssl
 PROPERTIES=live
 SLOT=0/0
-_eclasses_=cargo	7ea27a358c2ff39754bf66a96c06f3de	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_eclasses_=cargo	7ea27a358c2ff39754bf66a96c06f3de	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
 _md5_=052082d29e4d08c848d963c10bda77eb
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index cddda2638805..01fd5642e649 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/clusterssh-4.03.03 b/metadata/md5-cache/net-misc/clusterssh-4.03.03
deleted file mode 100644
index 2720f8e161ea..000000000000
--- a/metadata/md5-cache/net-misc/clusterssh-4.03.03
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Exception-Class dev-perl/Readonly dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Trap dev-perl/Test-DistManifest dev-perl/Try-Tiny dev-perl/Tk dev-perl/Config-Simple dev-perl/X11-Protocol dev-perl/XML-Simple x11-apps/xlsfonts x11-terms/xterm dev-perl/File-Which dev-perl/Module-Build dev-perl/Test-Pod dev-perl/Test-Differences dev-lang/perl:=[-build(-)]
-DESCRIPTION=Concurrent Multi-Server Terminal Access
-EAPI=5
-HOMEPAGE=https://github.com/duncs/clusterssh
-IUSE=test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-perl/Exception-Class dev-perl/Readonly dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Trap dev-perl/Test-DistManifest dev-perl/Try-Tiny dev-perl/Tk dev-perl/Config-Simple dev-perl/X11-Protocol dev-perl/XML-Simple x11-apps/xlsfonts x11-terms/xterm dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.01_05.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bd2f858b35e5b4679a137b3870121cd0
diff --git a/metadata/md5-cache/net-misc/clusterssh-4.16 b/metadata/md5-cache/net-misc/clusterssh-4.16
index 9ba4a384dc0b..5278b8d0f85b 100644
--- a/metadata/md5-cache/net-misc/clusterssh-4.16
+++ b/metadata/md5-cache/net-misc/clusterssh-4.16
@@ -5,11 +5,11 @@ DESCRIPTION=Concurrent Multi-Server Terminal Access
 EAPI=8
 HOMEPAGE=https://github.com/duncs/clusterssh
 IUSE=test test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-perl/Config-Simple dev-perl/Exception-Class dev-perl/Readonly dev-perl/Sort-Naturally dev-perl/Test-DistManifest dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Trap dev-perl/Tk dev-perl/Try-Tiny dev-perl/X11-Protocol dev-perl/X11-Protocol-Other dev-perl/XML-Simple x11-apps/xlsfonts x11-terms/xterm dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.16.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1
-_md5_=65b683f224f9fac08bdce451d23b0f6f
+_md5_=83679d6f902e6b9f4650905493f2b325
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.10-r1 b/metadata/md5-cache/net-misc/networkmanager-1.32.10-r1
deleted file mode 100644
index 590bda36f966..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.32.10-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-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.0_p1-r1:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.54[vapigen(+)] dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] ) ) test? ( >=dev-libs/jansson-2.7 || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1: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.58.2-r1 >=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 psl lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi 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	2f039741fe92bcea55c78806d16ac0f5	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	vala	78150b86094c58851346877cbf691245	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=782ac99371f270a9db0b9aaa89a91f90
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.12 b/metadata/md5-cache/net-misc/networkmanager-1.32.12
deleted file mode 100644
index eefbd0caa346..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.32.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils gtk-doc? ( 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.0_p1-r1:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.54[vapigen(+)] dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] ) ) test? ( >=dev-libs/jansson-2.7 || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1: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.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-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 +gtk-doc +introspection iptables iwd psl lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi 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 ) ) gtk-doc? ( introspection ) 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.12.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	linux-info	2f039741fe92bcea55c78806d16ac0f5	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	vala	78150b86094c58851346877cbf691245	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b0df9273808d09528a9daa97613bfc8f
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.4-r1 b/metadata/md5-cache/net-misc/networkmanager-1.32.4-r1
deleted file mode 100644
index fe0a064d581d..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.32.4-r1
+++ /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.0_p1-r1:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.54[vapigen(+)] dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] ) ) test? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1: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 +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi 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.4.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	397207e07bdf58b07ce295d0bc1049fe	gnome2-utils	239e7afa214b50012f83b8bb61de7555	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	2f039741fe92bcea55c78806d16ac0f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	vala	78150b86094c58851346877cbf691245	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=403709dadcc3f04790e66a37fc7bce50
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.8-r1 b/metadata/md5-cache/net-misc/networkmanager-1.32.8-r1
deleted file mode 100644
index 7bfd2570d444..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.32.8-r1
+++ /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.0_p1-r1:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.54[vapigen(+)] dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] ) ) test? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1: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 +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi 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 ~riscv ~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.8.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	397207e07bdf58b07ce295d0bc1049fe	gnome2-utils	239e7afa214b50012f83b8bb61de7555	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	2f039741fe92bcea55c78806d16ac0f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	vala	78150b86094c58851346877cbf691245	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=588e1409cdf596a449e94d160509b3c0
diff --git a/metadata/md5-cache/net-misc/wget-1.21.2 b/metadata/md5-cache/net-misc/wget-1.21.2
index fd4cb05c9f10..127bce2d2f48 100644
--- a/metadata/md5-cache/net-misc/wget-1.21.2
+++ b/metadata/md5-cache/net-misc/wget-1.21.2
@@ -5,7 +5,7 @@ DESCRIPTION=Network utility to retrieve files from the WWW
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/wget/
 IUSE=cookie_check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib
-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=GPL-3
 RDEPEND=!static? ( cookie_check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:= ) metalink? ( media-libs/libmetalink ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
 REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.21.2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dc5a992d029ec5b1a40513f3525b7882
+_md5_=cd88673daae8ae229463568fe414fe70
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 7315bf1d940a..b1d43788bced 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/syncthing-1.18.5 b/metadata/md5-cache/net-p2p/syncthing-1.18.5
index b715d6d2a24d..102e700ac96f 100644
--- a/metadata/md5-cache/net-p2p/syncthing-1.18.5
+++ b/metadata/md5-cache/net-p2p/syncthing-1.18.5
@@ -4,11 +4,11 @@ DESCRIPTION=Open Source Continuous File Synchronization
 EAPI=8
 HOMEPAGE=https://syncthing.net
 IUSE=selinux tools
-KEYWORDS=amd64 arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense
 RDEPEND=acct-group/syncthing acct-user/syncthing tools? ( >=acct-user/stdiscosrv-1 >=acct-user/strelaysrv-1 ) selinux? ( sec-policy/selinux-syncthing )
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/syncthing/syncthing/archive/v1.18.5.tar.gz -> syncthing-1.18.5.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.31.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.31.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.37.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.37.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/app/changes/@v/v0.0.0-20180602232624-0a106ad413e3.mod -> dmitri.shuralyov.com%2Fapp%2Fchanges%2F@v%2Fv0.0.0-20180602232624-0a106ad413e3.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//dmitri.shuralyov.com/html/belt/@v/v0.0.0-20180602232347-f7d459c86be0.mod -> dmitri.shuralyov.com%2Fhtml%2Fbelt%2F@v%2Fv0.0.0-20180602232347-f7d459c86be0.mod mirror://goproxy//dmitri.shuralyov.com/service/change/@v/v0.0.0-20181023043359-a85b471d5412.mod -> dmitri.shuralyov.com%2Fservice%2Fchange%2F@v%2Fv0.0.0-20181023043359-a85b471d5412.mod mirror://goproxy//dmitri.shuralyov.com/state/@v/v0.0.0-20180228185332-28bcc343414c.mod -> dmitri.shuralyov.com%2Fstate%2F@v%2Fv0.0.0-20180228185332-28bcc343414c.mod mirror://goproxy//git.apache.org/thrift.git/@v/v0.0.0-20180902110319-2566ecd5d999.mod -> git.apache.org%2Fthrift.git%2F@v%2Fv0.0.0-20180902110319-2566ecd5d999.mod mirror://goproxy//github.com/!audrius!butkevicius/pfilter/@v/v0.0.10.zip -> github.com%2F!audrius!butkevicius%2Fpfilter%2F@v%2Fv0.0.10.zip mirror://goproxy//github.com/!audrius!butkevicius/pfilter/@v/v0.0.10.mod -> github.com%2F!audrius!butkevicius%2Fpfilter%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/!audrius!butkevicius/recli/@v/v0.0.6.zip -> github.com%2F!audrius!butkevicius%2Frecli%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/!audrius!butkevicius/recli/@v/v0.0.6.mod -> github.com%2F!audrius!butkevicius%2Frecli%2F@v%2Fv0.0.6.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.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/!stack!exchange/wmi/@v/v1.2.1.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v1.2.1.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.17.zip -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.17.zip mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.17.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.17.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/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.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/bkaradzic/go-lz4/@v/v0.0.0-20160924222819-7224d8d8f27e.zip -> github.com%2Fbkaradzic%2Fgo-lz4%2F@v%2Fv0.0.0-20160924222819-7224d8d8f27e.zip mirror://goproxy//github.com/bkaradzic/go-lz4/@v/v0.0.0-20160924222819-7224d8d8f27e.mod -> github.com%2Fbkaradzic%2Fgo-lz4%2F@v%2Fv0.0.0-20160924222819-7224d8d8f27e.mod mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.mod -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20181115193947-bf1c66bbce23.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20181115193947-bf1c66bbce23.mod mirror://goproxy//github.com/calmh/xdr/@v/v1.1.0.zip -> github.com%2Fcalmh%2Fxdr%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/calmh/xdr/@v/v1.1.0.mod -> github.com%2Fcalmh%2Fxdr%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/ccding/go-stun/@v/v0.1.3.zip -> github.com%2Fccding%2Fgo-stun%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/ccding/go-stun/@v/v0.1.3.mod -> github.com%2Fccding%2Fgo-stun%2F@v%2Fv0.1.3.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/certifi/gocertifi/@v/v0.0.0-20210507211836-431795d63e8d.zip -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20210507211836-431795d63e8d.zip mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20210507211836-431795d63e8d.mod -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20210507211836-431795d63e8d.mod 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/cespare/xxhash/v2/@v/v2.1.2.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.2.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.2.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.zip -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/chmduquesne/rollinghash/@v/v0.0.0-20180912150627-a60f8e7142b5.zip -> github.com%2Fchmduquesne%2Frollinghash%2F@v%2Fv0.0.0-20180912150627-a60f8e7142b5.zip mirror://goproxy//github.com/chmduquesne/rollinghash/@v/v0.0.0-20180912150627-a60f8e7142b5.mod -> github.com%2Fchmduquesne%2Frollinghash%2F@v%2Fv0.0.0-20180912150627-a60f8e7142b5.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/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-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.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.1.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.1.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/d4l3k/messagediff/@v/v1.2.1.zip -> github.com%2Fd4l3k%2Fmessagediff%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/d4l3k/messagediff/@v/v1.2.1.mod -> github.com%2Fd4l3k%2Fmessagediff%2F@v%2Fv1.2.1.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/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/flynn-archive/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.zip -> github.com%2Fflynn-archive%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip mirror://goproxy//github.com/flynn-archive/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn-archive%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.mod -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.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/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.5.1.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.5.1.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.zip -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.mod -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.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/gliderlabs/ssh/@v/v0.1.1.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod 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-asn1-ber/asn1-ber/@v/v1.5.3.zip -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.3.zip mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.3.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.3.mod 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/log/@v/v0.1.0.mod -> github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.4.1.zip -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.4.1.zip mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.4.1.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.4.1.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-ole/go-ole/@v/v1.2.5.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.6-0.20210915003542-8b1f7f90f6b1.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.6-0.20210915003542-8b1f7f90f6b1.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.6-0.20210915003542-8b1f7f90f6b1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.6-0.20210915003542-8b1f7f90f6b1.mod 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-task/slim-sprig/@v/v0.0.0-20210107165309-348f09dbbbc0.zip -> github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.zip mirror://goproxy//github.com/go-task/slim-sprig/@v/v0.0.0-20210107165309-348f09dbbbc0.mod -> github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.mod mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.zip -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.mod -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.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.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.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/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.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.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/mock/@v/v1.6.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.6.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.6.0.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.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.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.4.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.4.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.4.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.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.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/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/@v/v2.0.0+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.3.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.3.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/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/greatroar/blobloom/@v/v0.7.0.zip -> github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/greatroar/blobloom/@v/v0.7.0.mod -> github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.7.0.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/grpc-gateway/@v/v1.5.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.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/jackpal/gateway/@v/v1.0.7.zip -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.7.zip mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.7.mod -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.7.mod mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.zip -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.mod -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/jellevandenhooff/dkim/@v/v0.0.0-20150330215556-f50fe3d243e1.mod -> github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.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/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.zip -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.zip 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/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.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/cpuid/v2/@v/v2.0.4.mod -> github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/klauspost/cpuid/v2/@v/v2.0.9.zip -> github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.9.zip mirror://goproxy//github.com/klauspost/cpuid/v2/@v/v2.0.9.mod -> github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.9.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/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.3.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.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/lib/pq/@v/v1.10.3.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.10.3.zip mirror://goproxy//github.com/lib/pq/@v/v1.10.3.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.22.0.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.22.0.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.23.0.zip -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.23.0.zip mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.23.0.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.23.0.mod mirror://goproxy//github.com/lunixbochs/vtclean/@v/v1.0.0.mod -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/marten-seemann/qpack/@v/v0.2.1.mod -> github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.4.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.5.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-16/@v/v0.1.4.zip -> github.com%2Fmarten-seemann%2Fqtls-go1-16%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/marten-seemann/qtls-go1-16/@v/v0.1.4.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-16%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-17/@v/v0.1.0-rc.1.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-17%2F@v%2Fv0.1.0-rc.1.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-17/@v/v0.1.0.zip -> github.com%2Fmarten-seemann%2Fqtls-go1-17%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/marten-seemann/qtls-go1-17/@v/v0.1.0.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-17%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/maruel/panicparse/@v/v1.6.1.zip -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/maruel/panicparse/@v/v1.6.1.mod -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/maruel/panicparse/v2/@v/v2.1.1.mod -> github.com%2Fmaruel%2Fpanicparse%2Fv2%2F@v%2Fv2.1.1.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-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.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/maxbrunsfeld/counterfeiter/v6/@v/v6.3.0.zip -> github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.3.0.zip mirror://goproxy//github.com/maxbrunsfeld/counterfeiter/v6/@v/v6.3.0.mod -> github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.3.0.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20200706080929-d51e80ef957d.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.1.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v1.0.0.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v1.0.0.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/miscreant/miscreant.go/@v/v0.0.0-20200214223636-26d376326b75.zip -> github.com%2Fmiscreant%2Fmiscreant.go%2F@v%2Fv0.0.0-20200214223636-26d376326b75.zip mirror://goproxy//github.com/miscreant/miscreant.go/@v/v0.0.0-20200214223636-26d376326b75.mod -> github.com%2Fmiscreant%2Fmiscreant.go%2F@v%2Fv0.0.0-20200214223636-26d376326b75.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.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/neelance/astrewrite/@v/v0.0.0-20160511093645-99348263ae86.mod -> github.com%2Fneelance%2Fastrewrite%2F@v%2Fv0.0.0-20160511093645-99348263ae86.mod mirror://goproxy//github.com/neelance/sourcemap/@v/v0.0.0-20151028013722-8c68805598ab.mod -> github.com%2Fneelance%2Fsourcemap%2F@v%2Fv0.0.0-20151028013722-8c68805598ab.mod 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/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.8.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.8.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.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.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.2.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.2.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.4.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.4.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.4.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.4.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.13.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.13.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/oschwald/geoip2-golang/@v/v1.5.0.zip -> github.com%2Foschwald%2Fgeoip2-golang%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/oschwald/geoip2-golang/@v/v1.5.0.mod -> github.com%2Foschwald%2Fgeoip2-golang%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/oschwald/maxminddb-golang/@v/v1.8.0.zip -> github.com%2Foschwald%2Fmaxminddb-golang%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/oschwald/maxminddb-golang/@v/v1.8.0.mod -> github.com%2Foschwald%2Fmaxminddb-golang%2F@v%2Fv1.8.0.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/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.8.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.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.0.0-20180801064454-c7de2306084e.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.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.30.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.30.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.30.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.30.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180725123919-05ee40e3a273.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180725123919-05ee40e3a273.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.3.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.7.3.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.7.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.7.3.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20201227073835-cf1acfcdf475.zip -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20201227073835-cf1acfcdf475.zip mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20201227073835-cf1acfcdf475.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20201227073835-cf1acfcdf475.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/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/sasha-s/go-deadlock/@v/v0.3.1.zip -> github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/sasha-s/go-deadlock/@v/v0.3.1.mod -> github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/sclevine/spec/@v/v1.4.0.zip -> github.com%2Fsclevine%2Fspec%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/sclevine/spec/@v/v1.4.0.mod -> github.com%2Fsclevine%2Fspec%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.21.8.zip -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.21.8.zip mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.21.8.mod -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.21.8.mod mirror://goproxy//github.com/shurcoo!l/component/@v/v0.0.0-20170202220835-f88ec8f54cc4.mod -> github.com%2Fshurcoo!l%2Fcomponent%2F@v%2Fv0.0.0-20170202220835-f88ec8f54cc4.mod mirror://goproxy//github.com/shurcoo!l/events/@v/v0.0.0-20181021180414-410e4ca65f48.mod -> github.com%2Fshurcoo!l%2Fevents%2F@v%2Fv0.0.0-20181021180414-410e4ca65f48.mod mirror://goproxy//github.com/shurcoo!l/github_flavored_markdown/@v/v0.0.0-20181002035957-2122de532470.mod -> github.com%2Fshurcoo!l%2Fgithub_flavored_markdown%2F@v%2Fv0.0.0-20181002035957-2122de532470.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/gofontwoff/@v/v0.0.0-20180329035133-29b52fc0a18d.mod -> github.com%2Fshurcoo!l%2Fgofontwoff%2F@v%2Fv0.0.0-20180329035133-29b52fc0a18d.mod mirror://goproxy//github.com/shurcoo!l/gopherjslib/@v/v0.0.0-20160914041154-feb6d3990c2c.mod -> github.com%2Fshurcoo!l%2Fgopherjslib%2F@v%2Fv0.0.0-20160914041154-feb6d3990c2c.mod mirror://goproxy//github.com/shurcoo!l/highlight_diff/@v/v0.0.0-20170515013008-09bb4053de1b.mod -> github.com%2Fshurcoo!l%2Fhighlight_diff%2F@v%2Fv0.0.0-20170515013008-09bb4053de1b.mod mirror://goproxy//github.com/shurcoo!l/highlight_go/@v/v0.0.0-20181028180052-98c3abbbae20.mod -> github.com%2Fshurcoo!l%2Fhighlight_go%2F@v%2Fv0.0.0-20181028180052-98c3abbbae20.mod mirror://goproxy//github.com/shurcoo!l/home/@v/v0.0.0-20181020052607-80b7ffcb30f9.mod -> github.com%2Fshurcoo!l%2Fhome%2F@v%2Fv0.0.0-20181020052607-80b7ffcb30f9.mod mirror://goproxy//github.com/shurcoo!l/htmlg/@v/v0.0.0-20170918183704-d01228ac9e50.mod -> github.com%2Fshurcoo!l%2Fhtmlg%2F@v%2Fv0.0.0-20170918183704-d01228ac9e50.mod mirror://goproxy//github.com/shurcoo!l/httperror/@v/v0.0.0-20170206035902-86b7830d14cc.mod -> github.com%2Fshurcoo!l%2Fhttperror%2F@v%2Fv0.0.0-20170206035902-86b7830d14cc.mod mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20171119174359-809beceb2371.mod -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20171119174359-809beceb2371.mod mirror://goproxy//github.com/shurcoo!l/httpgzip/@v/v0.0.0-20180522190206-b1c53ac65af9.mod -> github.com%2Fshurcoo!l%2Fhttpgzip%2F@v%2Fv0.0.0-20180522190206-b1c53ac65af9.mod mirror://goproxy//github.com/shurcoo!l/issues/@v/v0.0.0-20181008053335-6292fdc1e191.mod -> github.com%2Fshurcoo!l%2Fissues%2F@v%2Fv0.0.0-20181008053335-6292fdc1e191.mod mirror://goproxy//github.com/shurcoo!l/issuesapp/@v/v0.0.0-20180602232740-048589ce2241.mod -> github.com%2Fshurcoo!l%2Fissuesapp%2F@v%2Fv0.0.0-20180602232740-048589ce2241.mod mirror://goproxy//github.com/shurcoo!l/notifications/@v/v0.0.0-20181007000457-627ab5aea122.mod -> github.com%2Fshurcoo!l%2Fnotifications%2F@v%2Fv0.0.0-20181007000457-627ab5aea122.mod mirror://goproxy//github.com/shurcoo!l/octicon/@v/v0.0.0-20181028054416-fa4f57f9efb2.mod -> github.com%2Fshurcoo!l%2Focticon%2F@v%2Fv0.0.0-20181028054416-fa4f57f9efb2.mod mirror://goproxy//github.com/shurcoo!l/reactions/@v/v0.0.0-20181006231557-f2e0b4ca5b82.mod -> github.com%2Fshurcoo!l%2Freactions%2F@v%2Fv0.0.0-20181006231557-f2e0b4ca5b82.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v0.0.0-20170918181015-86672fcb3f95.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv0.0.0-20170918181015-86672fcb3f95.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/shurcoo!l/users/@v/v0.0.0-20180125191416-49c67e49c537.mod -> github.com%2Fshurcoo!l%2Fusers%2F@v%2Fv0.0.0-20180125191416-49c67e49c537.mod mirror://goproxy//github.com/shurcoo!l/webdavfs/@v/v0.0.0-20170829043945-18c3829fa133.mod -> github.com%2Fshurcoo!l%2Fwebdavfs%2F@v%2Fv0.0.0-20170829043945-18c3829fa133.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/sourcegraph/annotate/@v/v0.0.0-20160123013949-f4cad6c6324d.mod -> github.com%2Fsourcegraph%2Fannotate%2F@v%2Fv0.0.0-20160123013949-f4cad6c6324d.mod mirror://goproxy//github.com/sourcegraph/syntaxhighlight/@v/v0.0.0-20170531221838-bd320f5d308e.mod -> github.com%2Fsourcegraph%2Fsyntaxhighlight%2F@v%2Fv0.0.0-20170531221838-bd320f5d308e.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.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/syncthing/notify/@v/v0.0.0-20210616190510-c6b7342338d2.zip -> github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20210616190510-c6b7342338d2.zip mirror://goproxy//github.com/syncthing/notify/@v/v0.0.0-20210616190510-c6b7342338d2.mod -> github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20210616190510-c6b7342338d2.mod mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.1-0.20200815071216-d9e9293bd0f7.zip -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20200815071216-d9e9293bd0f7.zip mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.1-0.20200815071216-d9e9293bd0f7.mod -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20200815071216-d9e9293bd0f7.mod mirror://goproxy//github.com/tarm/serial/@v/v0.0.0-20180830185346-98f6abe2eb07.mod -> github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod mirror://goproxy//github.com/thejerf/suture/v4/@v/v4.0.1.zip -> github.com%2Fthejerf%2Fsuture%2Fv4%2F@v%2Fv4.0.1.zip mirror://goproxy//github.com/thejerf/suture/v4/@v/v4.0.1.mod -> github.com%2Fthejerf%2Fsuture%2Fv4%2F@v%2Fv4.0.1.mod mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.9.mod -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.9.mod mirror://goproxy//github.com/tklauser/numcpus/@v/v0.3.0.mod -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.3.0.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.5.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.5.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.5.mod mirror://goproxy//github.com/viant/assertly/@v/v0.4.8.mod -> github.com%2Fviant%2Fassertly%2F@v%2Fv0.4.8.mod mirror://goproxy//github.com/viant/toolbox/@v/v0.24.0.mod -> github.com%2Fviant%2Ftoolbox%2F@v%2Fv0.24.0.mod mirror://goproxy//github.com/vitrun/qart/@v/v0.0.0-20160531060029-bf64b92db6b0.zip -> github.com%2Fvitrun%2Fqart%2F@v%2Fv0.0.0-20160531060029-bf64b92db6b0.zip mirror://goproxy//github.com/vitrun/qart/@v/v0.0.0-20160531060029-bf64b92db6b0.mod -> github.com%2Fvitrun%2Fqart%2F@v%2Fv0.0.0-20160531060029-bf64b92db6b0.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//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.5.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.4.0.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.4.0.mod mirror://goproxy//go.opencensus.io/@v/v0.18.0.mod -> go.opencensus.io%2F@v%2Fv0.18.0.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//go4.org/@v/v0.0.0-20180809161055-417644f6feb5.mod -> go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190111050920-041ab4dc3f9d.mod -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190111050920-041ab4dc3f9d.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-20181030102418-4d3f4d9ffa16.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181030102418-4d3f4d9ffa16.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-20190313024323-a1f597ede03a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.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-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-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-20210711020723-a769d52b0f97.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210711020723-a769d52b0f97.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210921155107-089bfa567519.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210921155107-089bfa567519.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210921155107-089bfa567519.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210921155107-089bfa567519.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-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/mod/@v/v0.4.2.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod mirror://goproxy//golang.org/x/mod/@v/v0.5.1.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.5.1.zip mirror://goproxy//golang.org/x/mod/@v/v0.5.1.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.5.1.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-20181029044818-c44066c5c816.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181029044818-c44066c5c816.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-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-20190313220215-9f648a60d977.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190313220215-9f648a60d977.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-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-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.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-20200813134508-3edf25e44fcc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200813134508-3edf25e44fcc.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-20201006153459-a7d1128ccaa0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201006153459-a7d1128ccaa0.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-20201026091529-146b70c837a4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201026091529-146b70c837a4.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-20210405180319-a5a99cb37ef4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210428140749-89ef3d95e781.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210428140749-89ef3d95e781.mod 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/net/@v/v0.0.0-20210716203947-853a461950ff.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210716203947-853a461950ff.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210805182204-aaa1db679c0d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210805182204-aaa1db679c0d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210924151903-3ad01bbaa167.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210924151903-3ad01bbaa167.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210924151903-3ad01bbaa167.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210924151903-3ad01bbaa167.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-20181017192945-9dcd33a902f4.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181017192945-9dcd33a902f4.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-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.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.mod mirror://goproxy//golang.org/x/perf/@v/v0.0.0-20180704124530-6e6d33e29852.mod -> golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.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-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-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod 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-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-20180926160741-c2ed4eda69e7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180926160741-c2ed4eda69e7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181029174526-d69651ed3497.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181029174526-d69651ed3497.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-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-20190316082340-a2f829d7f35f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190316082340-a2f829d7f35f.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-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.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-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-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20191224085550-c709ea063b76.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191224085550-c709ea063b76.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-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-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.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-20200724161237-0e2f3a69832c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200724161237-0e2f3a69832c.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-20200814200057-3d37ad5750ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200814200057-3d37ad5750ed.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-20210112080510-489259a85091.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210112080510-489259a85091.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-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.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-20210510120138-977fb7262007.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.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.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210809222454-d867a43fc93e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210809222454-d867a43fc93e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210816074244-15123e1e1f71.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210816074244-15123e1e1f71.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210925032602-92d5a993a665.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210925032602-92d5a993a665.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210925032602-92d5a993a665.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210925032602-92d5a993a665.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.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/text/@v/v0.3.7.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.7.zip mirror://goproxy//golang.org/x/text/@v/v0.3.7.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.7.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-20210723032227-1f47c861a9ac.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210723032227-1f47c861a9ac.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210723032227-1f47c861a9ac.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210723032227-1f47c861a9ac.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-20181030000716-a0a13e073c7b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030000716-a0a13e073c7b.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-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.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/tools/@v/v0.0.0-20201023174141-c8cfbd0f21e6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201023174141-c8cfbd0f21e6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201224043029-2b0845dc783e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201224043029-2b0845dc783e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.1.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.1.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.5.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.6.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.6.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.6.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-20180910000450-7ca32eb868bf.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180910000450-7ca32eb868bf.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20181030000543-1d582fd0359e.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181030000543-1d582fd0359e.mod mirror://goproxy//google.golang.org/api/@v/v0.1.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.1.0.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.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.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.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-20180831171423-11092d34479b.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180831171423-11092d34479b.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181029155118-b69ba1387ce2.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181029155118-b69ba1387ce2.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181202183823-bd91e49a0898.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181202183823-bd91e49a0898.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190306203927-b5d61aea6440.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190306203927-b5d61aea6440.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.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.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.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.27.1.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.27.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.27.1.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/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-20200902074654-038fdea0a05b.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.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/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.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/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//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//grpc.go4.org/@v/v0.0.0-20170609214715-11d0a25b4919.mod -> grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.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-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 mirror://goproxy//sourcegraph.com/sourcegraph/go-diff/@v/v0.5.0.mod -> sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v0.0.0-20180604144634-d3ebe8f20ae4.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	go-module	82631624a3653e595cf9c18164a8c500	multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=11f4c90c926ad47b2f4be03e3965fa73
+_md5_=da3536795c473ee19507d7ad9765811c
diff --git a/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1 b/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1
index 05706a066dae..807f3bd0dc22 100644
--- a/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1
+++ b/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ client for management of the Transmission BitTorrent client, ov
 EAPI=6
 HOMEPAGE=https://github.com/transmission-remote-gtk/transmission-remote-gtk
 IUSE=ayatana debug geoip libnotify libproxy rss
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.12.6 net-misc/curl >=x11-libs/gtk+-3.16:3 ayatana? ( dev-libs/libappindicator:3 ) geoip? ( dev-libs/geoip ) libnotify? ( >=x11-libs/libnotify-0.7 ) libproxy? ( net-libs/libproxy ) rss? ( >=net-libs/libmrss-0.18 )
 SLOT=0
 SRC_URI=https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/download/1.4.1/transmission-remote-gtk-1.4.1.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	397207e07bdf58b07ce295d0bc1049fe	gnome2-utils	239e7afa214b50012f83b8bb61de7555	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=97373601b7c0019990986af87491f195
+_md5_=85dc3a8be8c4ca61af8f772b760cdfd9
diff --git a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0-r1 b/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0-r1
index e71bb71afcbc..2912af4ae7a2 100644
--- a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0-r1
+++ b/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/numkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/pandas-0.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/numkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=dev-python/six[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/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/numkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/pandas-0.17[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/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/numkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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 unpack
 DESCRIPTION=Python framework for Gromacs
 EAPI=7
 HOMEPAGE=https://gromacswrapper.readthedocs.io
-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=GPL-3 LGPL-3
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/numkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/six[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/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/numkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/Becksteinlab/GromacsWrapper/archive/release-0.8.0.tar.gz -> GromacsWrapper-0.8.0.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=02ab15bd0be40f1104b82e10c946a29a
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=488ae7cbcc578e8701d473e8f3cc3bfe
diff --git a/metadata/md5-cache/sci-chemistry/MDAnalysis-1.0.0 b/metadata/md5-cache/sci-chemistry/MDAnalysis-1.0.0
index c6748008f0d9..6bbfcfda0580 100644
--- a/metadata/md5-cache/sci-chemistry/MDAnalysis-1.0.0
+++ b/metadata/md5-cache/sci-chemistry/MDAnalysis-1.0.0
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-python/numpy-1.13.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/scipy-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-biology/biopython-1.71[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/networkx-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/GridDataFormats-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/joblib-0.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/matplotlib-1.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netcdf4-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mmtf-python-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/gsd-1.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/duecredit[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tqdm-4.43.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/numpy-1.13.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/scipy-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-biology/biopython-1.71[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/networkx-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/GridDataFormats-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/joblib-0.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/matplotlib-1.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netcdf4-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mmtf-python-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/gsd-1.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/duecredit[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tqdm-4.43.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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=>=dev-python/numpy-1.13.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-biology/biopython-1.71[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/networkx-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/GridDataFormats-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/joblib-0.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-1.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/netcdf4-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mmtf-python-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/gsd-1.9.3[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/duecredit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tqdm-4.43.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/numpy-1.13.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-biology/biopython-1.71[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/networkx-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/GridDataFormats-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/joblib-0.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-1.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/netcdf4-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mmtf-python-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/gsd-1.9.3[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/duecredit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tqdm-4.43.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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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 library to analyze and manipulate molecular dynamics trajectories
 EAPI=7
 HOMEPAGE=https://www.mdanalysis.org
-IUSE=test test python_targets_python3_8 python_targets_python3_9
+IUSE=test 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/numpy-1.13.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/scipy-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-biology/biopython-1.71[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/networkx-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/GridDataFormats-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/joblib-0.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/matplotlib-1.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netcdf4-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mmtf-python-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/gsd-1.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/duecredit[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tqdm-4.43.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/numpy-1.13.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-biology/biopython-1.71[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/networkx-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/GridDataFormats-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/joblib-0.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-1.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/netcdf4-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mmtf-python-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/gsd-1.9.3[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/duecredit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tqdm-4.43.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/MDAnalysis/MDAnalysis-1.0.0.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=173924a2840018a8cf103252a07a1c8d
+_md5_=e07b9d991b0ebdc5253eec932ecf80ed
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index dc3923d918ac..beeac19b7ac3 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index e8b0607f536d..923f55be4936 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/numkit-1.1.2-r1 b/metadata/md5-cache/sci-libs/numkit-1.1.2-r1
index a0996324e7c5..8c32cb548a4e 100644
--- a/metadata/md5-cache/sci-libs/numkit-1.1.2-r1
+++ b/metadata/md5-cache/sci-libs/numkit-1.1.2-r1
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/scipy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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=Numerical first aid kit (with numpy/scipy)
 EAPI=7
 HOMEPAGE=https://numkit.readthedocs.io
-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=BSD
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/scipy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/Becksteinlab/numkit/archive/release-1.1.2.tar.gz -> numkit-1.1.2.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d1127befc0d2c6e733acd34d250d2956
+_md5_=0db59cb26b076eb736d12fe29c48e807
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 5f5753a2fbeb..25d60a52b539 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/why3-1.4.0-r1 b/metadata/md5-cache/sci-mathematics/why3-1.4.0-r2
similarity index 83%
rename from metadata/md5-cache/sci-mathematics/why3-1.4.0-r1
rename to metadata/md5-cache/sci-mathematics/why3-1.4.0-r2
index ecbb519a32c0..99b8a8f81ef3 100644
--- a/metadata/md5-cache/sci-mathematics/why3-1.4.0-r1
+++ b/metadata/md5-cache/sci-mathematics/why3-1.4.0-r2
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( dev-python/sphinx dev-python/sphinxcontrib-bibtex media-gfx/graphviz || ( dev-texlive/texlive-latex dev-tex/latexmk dev-tex/rubber ) ) 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
+BDEPEND=doc? ( dev-python/sphinx dev-python/sphinxcontrib-bibtex media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra ) 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=!sci-mathematics/why3-for-spark >=dev-lang/ocaml-4.05.0:=[ocamlopt?] >=dev-ml/menhir-20151112:= dev-ml/num:= coq? ( >=sci-mathematics/coq-8.6 ) emacs? ( app-editors/emacs:* ) gtk? ( dev-ml/lablgtk:=[sourceview,ocamlopt?] ) re? ( dev-ml/re:= dev-ml/seq:= ) sexp? ( dev-ml/ppx_deriving:=[ocamlopt?] dev-ml/ppx_sexp_conv:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt?] ) zarith? ( dev-ml/zarith:= ) zip? ( dev-ml/camlzip:= ) >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Platform for deductive program verification
@@ -11,4 +11,4 @@ RDEPEND=!sci-mathematics/why3-for-spark >=dev-lang/ocaml-4.05.0:=[ocamlopt?] >=d
 SLOT=0/1.4.0
 SRC_URI=https://why3.gitlabpages.inria.fr/releases/why3-1.4.0.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=35aacde1da0e63b4e24fdd40ad629df9
+_md5_=f28b5d8140ee0e0dfc7f6a062d81a0ae
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index c72884828312..b588674f5d17 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.7.2-r1 b/metadata/md5-cache/sys-apps/fwupd-1.7.2-r2
similarity index 60%
rename from metadata/md5-cache/sys-apps/fwupd-1.7.2-r1
rename to metadata/md5-cache/sys-apps/fwupd-1.7.2-r2
index afdcabf0d648..371537694e47 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.7.2-r1
+++ b/metadata/md5-cache/sys-apps/fwupd-1.7.2-r2
@@ -1,16 +1,16 @@
 BDEPEND=|| ( dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 ) virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) bash-completion? ( >=app-shells/bash-completion-2.0 ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( thunderbolt? ( dev-util/umockdev ) net-libs/gnutls[tools] ) >=dev-util/meson-0.58.2-r1 >=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.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/udev archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) x11-libs/pango[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_8? ( dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/udev archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) x11-libs/pango[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
 EAPI=7
 HOMEPAGE=https://fwupd.org
 IUSE=amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
-RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/udev archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) sys-apps/dbus
+RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_8? ( dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/udev archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) sys-apps/dbus
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) fastboot? ( gusb ) logitech? ( gusb ) minimal? ( !introspection ) spi? ( lzma ) synaptics? ( gnutls ) uefi? ( gnutls )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fwupd/fwupd/archive/1.7.2.tar.gz -> fwupd-1.7.2.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	2f039741fe92bcea55c78806d16ac0f5	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	9783802d3840cbbd78c02b313df760cc	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	78150b86094c58851346877cbf691245	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=a3f7128cae7fa39b4416ce38387e87e4
+_md5_=acdcf32f440658b0c5e0a0b58298bc0a
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.7.3 b/metadata/md5-cache/sys-apps/fwupd-1.7.3-r1
similarity index 59%
rename from metadata/md5-cache/sys-apps/fwupd-1.7.3
rename to metadata/md5-cache/sys-apps/fwupd-1.7.3-r1
index c3cc3c7eae62..803f4e77b856 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.7.3
+++ b/metadata/md5-cache/sys-apps/fwupd-1.7.3-r1
@@ -1,16 +1,16 @@
 BDEPEND=|| ( dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 ) virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) bash-completion? ( >=app-shells/bash-completion-2.0 ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( thunderbolt? ( dev-util/umockdev ) net-libs/gnutls[tools] ) >=dev-util/meson-0.58.2-r1 >=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.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.58:2 dev-libs/json-glib dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) x11-libs/pango[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.58:2 dev-libs/json-glib dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_8? ( dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) x11-libs/pango[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
 EAPI=7
 HOMEPAGE=https://fwupd.org
 IUSE=amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.58:2 dev-libs/json-glib dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) sys-apps/dbus
+RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.58:2 dev-libs/json-glib dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_8? ( dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) sys-apps/dbus
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) fastboot? ( gusb ) logitech? ( gusb ) minimal? ( !introspection ) spi? ( lzma ) synaptics? ( gnutls ) uefi? ( gnutls )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fwupd/fwupd/archive/1.7.3.tar.gz -> fwupd-1.7.3.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	2f039741fe92bcea55c78806d16ac0f5	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	9783802d3840cbbd78c02b313df760cc	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	78150b86094c58851346877cbf691245	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=a6686dc01db80256c88dc33691360927
+_md5_=bee0d6a1e67469a8331a9148c79ea012
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.7.4 b/metadata/md5-cache/sys-apps/fwupd-1.7.4
new file mode 100644
index 000000000000..ddb0100175e4
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fwupd-1.7.4
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 ) virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) bash-completion? ( >=app-shells/bash-completion-2.0 ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( thunderbolt? ( dev-util/umockdev ) net-libs/gnutls[tools] ) >=dev-util/meson-0.58.2-r1 >=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.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.58:2 dev-libs/json-glib dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_8? ( dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) x11-libs/pango[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
+EAPI=7
+HOMEPAGE=https://fwupd.org
+IUSE=amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.58:2 dev-libs/json-glib dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_8? ( dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) sys-apps/dbus
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) fastboot? ( gusb ) logitech? ( gusb ) minimal? ( !introspection ) spi? ( lzma ) synaptics? ( gnutls ) uefi? ( gnutls )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fwupd/fwupd/archive/1.7.4.tar.gz -> fwupd-1.7.4.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	2f039741fe92bcea55c78806d16ac0f5	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	9783802d3840cbbd78c02b313df760cc	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	78150b86094c58851346877cbf691245	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=a35a577af433e2722e740a3e62f45984
diff --git a/metadata/md5-cache/sys-apps/opal-utils-7.0 b/metadata/md5-cache/sys-apps/opal-utils-7.0
new file mode 100644
index 000000000000..d2f5bfe7bc38
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/opal-utils-7.0
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/recommonmark[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/recommonmark[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/recommonmark[python_targets_python3_10(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install setup test
+DESCRIPTION=OPAL firmware utilities
+EAPI=8
+HOMEPAGE=https://github.com/open-power/skiboot
+IUSE=doc python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~ppc64
+LICENSE=Apache-2.0 GPL-2+
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/open-power/skiboot/archive/v7.0.tar.gz -> opal-utils-7.0.tar.gz
+_eclasses_=linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	9783802d3840cbbd78c02b313df760cc	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=abc6c85a890e4b3deec9b188f36e079e
diff --git a/metadata/md5-cache/sys-apps/systemd-249.6-r1 b/metadata/md5-cache/sys-apps/systemd-249.6-r1
deleted file mode 100644
index 02e44dd57238..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-249.6-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( app-text/tree dev-lang/perl sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.30: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/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:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) 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.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.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(-)?] ) >=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-DESCRIPTION=System and service manager for Linux
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +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 split-usr
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.30: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/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:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) 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.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.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(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) pwquality? ( homed )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd-stable/archive/v249.6/systemd-stable-249.6.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	linux-info	2f039741fe92bcea55c78806d16ac0f5	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=77d2eca7c03b9992c676793ffa5f509a
diff --git a/metadata/md5-cache/sys-apps/systemd-249.7 b/metadata/md5-cache/sys-apps/systemd-249.7
deleted file mode 100644
index 47d3ed1ce5dc..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-249.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( app-text/tree dev-lang/perl sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.30: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/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:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) 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.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.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(-)?] ) >=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-DESCRIPTION=System and service manager for Linux
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +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 split-usr
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.30: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/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:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) 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.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.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(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) pwquality? ( homed )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd-stable/archive/v249.7/systemd-stable-249.7.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	linux-info	2f039741fe92bcea55c78806d16ac0f5	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=60f7ad100ccb8a809e8cb0c7a9f21427
diff --git a/metadata/md5-cache/sys-apps/systemd-249.7-r1 b/metadata/md5-cache/sys-apps/systemd-249.7-r1
deleted file mode 100644
index 05089abc7570..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-249.7-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( app-text/tree dev-lang/perl sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.30: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/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:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) 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.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.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(-)?] ) >=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-DESCRIPTION=System and service manager for Linux
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +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 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.30: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/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:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) 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.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.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(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) pwquality? ( homed )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd-stable/archive/v249.7/systemd-stable-249.7.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-249.7-CVE-2021-3997.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	linux-info	2f039741fe92bcea55c78806d16ac0f5	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=467490686ce5e6d1312785225d3e9db6
diff --git a/metadata/md5-cache/sys-apps/systemd-tmpfiles-249.5 b/metadata/md5-cache/sys-apps/systemd-tmpfiles-249.5
deleted file mode 100644
index 6f4102754a70..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-tmpfiles-249.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= ) virtual/libcrypt:= !sys-apps/opentmpfiles !sys-apps/systemd >=sys-kernel/linux-headers-3.11
-DESCRIPTION=Creates, deletes and cleans up volatile and temporary files and directories
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=selinux test
-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= ) virtual/libcrypt:= !sys-apps/opentmpfiles !sys-apps/systemd
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/systemd/systemd-stable/archive/v249.5.tar.gz -> systemd-stable-249.5.tar.gz elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-249.5-r1.tar.xz https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-249.5-r1.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f7eab202f69312bb41ada4efd5edbd5e
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index c8688c67310d..4577060addde 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/rust-std-1.51.0 b/metadata/md5-cache/sys-devel/rust-std-1.51.0
deleted file mode 100644
index 73c7e027148c..000000000000
--- a/metadata/md5-cache/sys-devel/rust-std-1.51.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ~dev-lang/rust-1.51.0:=
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=|| ( >=sys-devel/gcc-4.7:* >=sys-devel/clang-3.5:* )
-DESCRIPTION=Rust standard library, standalone (for crossdev)
-EAPI=7
-HOMEPAGE=https://www.rust-lang.org
-IUSE=debug 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=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-RDEPEND=|| ( >=sys-devel/gcc-4.7:* >=sys-devel/clang-3.5:* )
-RESTRICT=test
-SLOT=stable/1.51
-SRC_URI=https://static.rust-lang.org/dist/rustc-1.51.0-src.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1799fe718704a50bc6e2824a682d5f3b
diff --git a/metadata/md5-cache/sys-devel/rust-std-1.53.0 b/metadata/md5-cache/sys-devel/rust-std-1.53.0
index cbf5f874ff18..ab0f274a8ce1 100644
--- a/metadata/md5-cache/sys-devel/rust-std-1.53.0
+++ b/metadata/md5-cache/sys-devel/rust-std-1.53.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=sys-devel/gcc-4.7:* >=sys-devel/clang-3.5:* )
 RESTRICT=test
 SLOT=stable/1.53
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.53.0-src.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=53530058fcdd22792d90ff457d146dfc
diff --git a/metadata/md5-cache/sys-devel/rust-std-1.54.0 b/metadata/md5-cache/sys-devel/rust-std-1.54.0
index 4de4ad6fa044..219bec4c8d61 100644
--- a/metadata/md5-cache/sys-devel/rust-std-1.54.0
+++ b/metadata/md5-cache/sys-devel/rust-std-1.54.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=sys-devel/gcc-4.7:* >=sys-devel/clang-3.5:* )
 RESTRICT=test
 SLOT=stable/1.54
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.54.0-src.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=53530058fcdd22792d90ff457d146dfc
diff --git a/metadata/md5-cache/sys-devel/rust-std-1.55.0 b/metadata/md5-cache/sys-devel/rust-std-1.55.0
index dc8251ba597c..c2a86c25232e 100644
--- a/metadata/md5-cache/sys-devel/rust-std-1.55.0
+++ b/metadata/md5-cache/sys-devel/rust-std-1.55.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=sys-devel/gcc-4.7:* >=sys-devel/clang-3.5:* )
 RESTRICT=test
 SLOT=stable/1.55
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.55.0-src.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=53530058fcdd22792d90ff457d146dfc
diff --git a/metadata/md5-cache/sys-devel/rust-std-1.56.1 b/metadata/md5-cache/sys-devel/rust-std-1.56.1
index 8d9d0b466113..78683e4ec7df 100644
--- a/metadata/md5-cache/sys-devel/rust-std-1.56.1
+++ b/metadata/md5-cache/sys-devel/rust-std-1.56.1
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=sys-devel/gcc-4.7:* >=sys-devel/clang-3.5:* )
 RESTRICT=test
 SLOT=stable/1.56
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.56.1-src.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=53530058fcdd22792d90ff457d146dfc
diff --git a/metadata/md5-cache/sys-devel/rust-std-1.52.1 b/metadata/md5-cache/sys-devel/rust-std-1.58.0
similarity index 53%
rename from metadata/md5-cache/sys-devel/rust-std-1.52.1
rename to metadata/md5-cache/sys-devel/rust-std-1.58.0
index 5b3155c3a1f9..da42bb8b1d4e 100644
--- a/metadata/md5-cache/sys-devel/rust-std-1.52.1
+++ b/metadata/md5-cache/sys-devel/rust-std-1.58.0
@@ -1,14 +1,14 @@
-BDEPEND=|| ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ~dev-lang/rust-1.52.1:=
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ~dev-lang/rust-1.58.0:=
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=|| ( >=sys-devel/gcc-4.7:* >=sys-devel/clang-3.5:* )
 DESCRIPTION=Rust standard library, standalone (for crossdev)
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.rust-lang.org
 IUSE=debug 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=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
 RDEPEND=|| ( >=sys-devel/gcc-4.7:* >=sys-devel/clang-3.5:* )
 RESTRICT=test
-SLOT=stable/1.52
-SRC_URI=https://static.rust-lang.org/dist/rustc-1.52.1-src.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=53530058fcdd22792d90ff457d146dfc
+SLOT=stable/1.58
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.58.0-src.tar.xz
+_eclasses_=flag-o-matic	d5e1306543bc457213f68bb18f830d14	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	rust-toolchain	0b9ab12c2b622c265cd72d5d67a14f1f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=49641fb3185a450035d3246e57a0e402
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 84a4338429fb..8e892dec98fb 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/htop-3.1.2-r1 b/metadata/md5-cache/sys-process/htop-3.1.2-r1
index 437e10f87da2..ea028fb90c3e 100644
--- a/metadata/md5-cache/sys-process/htop-3.1.2-r1
+++ b/metadata/md5-cache/sys-process/htop-3.1.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=interactive process viewer
 EAPI=8
 HOMEPAGE=https://htop.dev/ https://github.com/htop-dev/htop
 IUSE=caps debug delayacct hwloc lm-sensors llvm-libunwind openvz unicode unwind vserver
-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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD GPL-2+
 RDEPEND=sys-libs/ncurses:=[unicode(+)?] hwloc? ( sys-apps/hwloc:= ) unwind? ( !llvm-libunwind? ( sys-libs/libunwind:= ) llvm-libunwind? ( sys-libs/llvm-libunwind:= ) ) kernel_linux? ( caps? ( sys-libs/libcap ) delayacct? ( dev-libs/libnl:3 ) lm-sensors? ( sys-apps/lm-sensors ) )
 SLOT=0
 SRC_URI=https://github.com/htop-dev/htop/archive/3.1.2.tar.gz -> htop-3.1.2.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=c130134bbb1b3c1609e7bbb3cf44e367
+_md5_=9be3c527e289918f10c48b024713303d
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 3b23b1e021e0..889aabb43a47 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/rust-1.58.0 b/metadata/md5-cache/virtual/rust-1.58.0
new file mode 100644
index 000000000000..7c3a7519e4d8
--- /dev/null
+++ b/metadata/md5-cache/virtual/rust-1.58.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Rust language compiler
+EAPI=8
+IUSE=rustfmt 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
+RDEPEND=|| ( ~dev-lang/rust-1.58.0[rustfmt?,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/rust-bin-1.58.0[rustfmt?,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
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=529d003eb99a95e7c90c8fd970c53b9b
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index bc0a594b52a5..db74dae97493 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/firefox-96.0.1 b/metadata/md5-cache/www-client/firefox-96.0.1
new file mode 100644
index 000000000000..9fa09e39ba8b
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-96.0.1
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.9-r1:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.12_p1-r1: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.53.0 || ( ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ( 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] ) ) ) ) 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.73 >=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/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/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-0.9.3:= >=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-70.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-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) 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 ) x11-libs/libICE x11-libs/libSM 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 hardened hwaccel jack lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png +system-webp wayland wifi geckodriver +gmp-autoupdate screencast l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.73 >=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/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/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-0.9.3:= >=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-70.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-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) 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 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus ) screencast? ( wayland )
+SLOT=0/96
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/96.0.1/source/firefox-96.0.1.source.tar.xz -> firefox-96.0.1.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-96-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-96-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-96-patches-01.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/af.xpi -> firefox-96.0.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ar.xpi -> firefox-96.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ast.xpi -> firefox-96.0.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/be.xpi -> firefox-96.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/bg.xpi -> firefox-96.0.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/br.xpi -> firefox-96.0.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ca.xpi -> firefox-96.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/cak.xpi -> firefox-96.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/cs.xpi -> firefox-96.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/cy.xpi -> firefox-96.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/da.xpi -> firefox-96.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/de.xpi -> firefox-96.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-96.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/el.xpi -> firefox-96.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-96.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-96.0.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-96.0.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-96.0.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/et.xpi -> firefox-96.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/eu.xpi -> firefox-96.0.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/fi.xpi -> firefox-96.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/fr.xpi -> firefox-96.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-96.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-96.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/gd.xpi -> firefox-96.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/gl.xpi -> firefox-96.0.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/he.xpi -> firefox-96.0.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/hr.xpi -> firefox-96.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-96.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/hu.xpi -> firefox-96.0.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/id.xpi -> firefox-96.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/is.xpi -> firefox-96.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/it.xpi -> firefox-96.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ja.xpi -> firefox-96.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ka.xpi -> firefox-96.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/kab.xpi -> firefox-96.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/kk.xpi -> firefox-96.0.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ko.xpi -> firefox-96.0.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/lt.xpi -> firefox-96.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/lv.xpi -> firefox-96.0.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ms.xpi -> firefox-96.0.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-96.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/nl.xpi -> firefox-96.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-96.0.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-96.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/pl.xpi -> firefox-96.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-96.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-96.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/rm.xpi -> firefox-96.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ro.xpi -> firefox-96.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ru.xpi -> firefox-96.0.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/sk.xpi -> firefox-96.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/sl.xpi -> firefox-96.0.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/sq.xpi -> firefox-96.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/sr.xpi -> firefox-96.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-96.0.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/th.xpi -> firefox-96.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/tr.xpi -> firefox-96.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/uk.xpi -> firefox-96.0.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/uz.xpi -> firefox-96.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/vi.xpi -> firefox-96.0.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-96.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-96.0.1-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ach.xpi -> firefox-96.0.1-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/an.xpi -> firefox-96.0.1-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/az.xpi -> firefox-96.0.1-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/bn.xpi -> firefox-96.0.1-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/bs.xpi -> firefox-96.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-96.0.1-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/eo.xpi -> firefox-96.0.1-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-96.0.1-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-96.0.1-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/fa.xpi -> firefox-96.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ff.xpi -> firefox-96.0.1-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/gn.xpi -> firefox-96.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-96.0.1-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-96.0.1-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-96.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ia.xpi -> firefox-96.0.1-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/km.xpi -> firefox-96.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/kn.xpi -> firefox-96.0.1-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/lij.xpi -> firefox-96.0.1-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/mk.xpi -> firefox-96.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/mr.xpi -> firefox-96.0.1-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/my.xpi -> firefox-96.0.1-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-96.0.1-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/oc.xpi -> firefox-96.0.1-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/sco.xpi -> firefox-96.0.1-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/si.xpi -> firefox-96.0.1-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/son.xpi -> firefox-96.0.1-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/szl.xpi -> firefox-96.0.1-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ta.xpi -> firefox-96.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/te.xpi -> firefox-96.0.1-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/tl.xpi -> firefox-96.0.1-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/trs.xpi -> firefox-96.0.1-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ur.xpi -> firefox-96.0.1-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/xh.xpi -> firefox-96.0.1-xh.xpi )
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	gnome2-utils	239e7afa214b50012f83b8bb61de7555	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	2f039741fe92bcea55c78806d16ac0f5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=645fa02aba56e1ecdf07a877e94005b8
diff --git a/metadata/md5-cache/www-client/firefox-bin-96.0 b/metadata/md5-cache/www-client/firefox-bin-96.0
deleted file mode 100644
index 054304e3133c..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-96.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_sco 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
-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/libxcb x11-libs/libX11 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/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip
-SLOT=0/96
-SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/en-US/firefox-96.0.tar.bz2 -> firefox-bin_x86_64-96.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/en-US/firefox-96.0.tar.bz2 -> firefox-bin_i686-96.0.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/ach.xpi -> firefox-96.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/af.xpi -> firefox-96.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/an.xpi -> firefox-96.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/ar.xpi -> firefox-96.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/ast.xpi -> firefox-96.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/az.xpi -> firefox-96.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/be.xpi -> firefox-96.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/bg.xpi -> firefox-96.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/bn.xpi -> firefox-96.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/br.xpi -> firefox-96.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/bs.xpi -> firefox-96.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-96.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/ca.xpi -> firefox-96.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/cak.xpi -> firefox-96.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/cs.xpi -> firefox-96.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/cy.xpi -> firefox-96.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/da.xpi -> firefox-96.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/de.xpi -> firefox-96.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/dsb.xpi -> firefox-96.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/el.xpi -> firefox-96.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/en-CA.xpi -> firefox-96.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/en-GB.xpi -> firefox-96.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/eo.xpi -> firefox-96.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/es-AR.xpi -> firefox-96.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/es-CL.xpi -> firefox-96.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/es-ES.xpi -> firefox-96.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/es-MX.xpi -> firefox-96.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/et.xpi -> firefox-96.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/eu.xpi -> firefox-96.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/fa.xpi -> firefox-96.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/ff.xpi -> firefox-96.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/fi.xpi -> firefox-96.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/fr.xpi -> firefox-96.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-96.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-96.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/gd.xpi -> firefox-96.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/gl.xpi -> firefox-96.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/gn.xpi -> firefox-96.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-96.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/he.xpi -> firefox-96.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-96.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/hr.xpi -> firefox-96.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/hsb.xpi -> firefox-96.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/hu.xpi -> firefox-96.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-96.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/ia.xpi -> firefox-96.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/id.xpi -> firefox-96.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/is.xpi -> firefox-96.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/it.xpi -> firefox-96.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/ja.xpi -> firefox-96.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/ka.xpi -> firefox-96.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/kab.xpi -> firefox-96.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/kk.xpi -> firefox-96.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/km.xpi -> firefox-96.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/kn.xpi -> firefox-96.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/ko.xpi -> firefox-96.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/lij.xpi -> firefox-96.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/lt.xpi -> firefox-96.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/lv.xpi -> firefox-96.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/mk.xpi -> firefox-96.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/mr.xpi -> firefox-96.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/ms.xpi -> firefox-96.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/my.xpi -> firefox-96.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-96.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-96.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/nl.xpi -> firefox-96.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-96.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/oc.xpi -> firefox-96.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-96.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/pl.xpi -> firefox-96.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-96.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-96.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/rm.xpi -> firefox-96.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/ro.xpi -> firefox-96.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/ru.xpi -> firefox-96.0-ru.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/sco.xpi -> firefox-96.0-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/si.xpi -> firefox-96.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/sk.xpi -> firefox-96.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/sl.xpi -> firefox-96.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/son.xpi -> firefox-96.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/sq.xpi -> firefox-96.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/sr.xpi -> firefox-96.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-96.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/ta.xpi -> firefox-96.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/te.xpi -> firefox-96.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/th.xpi -> firefox-96.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/tl.xpi -> firefox-96.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/tr.xpi -> firefox-96.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/trs.xpi -> firefox-96.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/uk.xpi -> firefox-96.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/ur.xpi -> firefox-96.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/uz.xpi -> firefox-96.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/vi.xpi -> firefox-96.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/xh.xpi -> firefox-96.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-96.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-96.0-zh-TW.xpi )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=b4a44bf3ecd8e403069049585f634b8d
diff --git a/metadata/md5-cache/www-client/firefox-bin-96.0.1 b/metadata/md5-cache/www-client/firefox-bin-96.0.1
new file mode 100644
index 000000000000..108536fb322e
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-96.0.1
@@ -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_sco 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
+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/libxcb x11-libs/libX11 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/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip
+SLOT=0/96
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/en-US/firefox-96.0.1.tar.bz2 -> firefox-bin_x86_64-96.0.1.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/en-US/firefox-96.0.1.tar.bz2 -> firefox-bin_i686-96.0.1.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ach.xpi -> firefox-96.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/af.xpi -> firefox-96.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/an.xpi -> firefox-96.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ar.xpi -> firefox-96.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ast.xpi -> firefox-96.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/az.xpi -> firefox-96.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/be.xpi -> firefox-96.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/bg.xpi -> firefox-96.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/bn.xpi -> firefox-96.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/br.xpi -> firefox-96.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/bs.xpi -> firefox-96.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-96.0.1-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ca.xpi -> firefox-96.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/cak.xpi -> firefox-96.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/cs.xpi -> firefox-96.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/cy.xpi -> firefox-96.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/da.xpi -> firefox-96.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/de.xpi -> firefox-96.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-96.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/el.xpi -> firefox-96.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-96.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-96.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/eo.xpi -> firefox-96.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-96.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-96.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-96.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-96.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/et.xpi -> firefox-96.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/eu.xpi -> firefox-96.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/fa.xpi -> firefox-96.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ff.xpi -> firefox-96.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/fi.xpi -> firefox-96.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/fr.xpi -> firefox-96.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-96.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-96.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/gd.xpi -> firefox-96.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/gl.xpi -> firefox-96.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/gn.xpi -> firefox-96.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-96.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/he.xpi -> firefox-96.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-96.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/hr.xpi -> firefox-96.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-96.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/hu.xpi -> firefox-96.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-96.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ia.xpi -> firefox-96.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/id.xpi -> firefox-96.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/is.xpi -> firefox-96.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/it.xpi -> firefox-96.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ja.xpi -> firefox-96.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ka.xpi -> firefox-96.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/kab.xpi -> firefox-96.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/kk.xpi -> firefox-96.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/km.xpi -> firefox-96.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/kn.xpi -> firefox-96.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ko.xpi -> firefox-96.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/lij.xpi -> firefox-96.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/lt.xpi -> firefox-96.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/lv.xpi -> firefox-96.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/mk.xpi -> firefox-96.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/mr.xpi -> firefox-96.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ms.xpi -> firefox-96.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/my.xpi -> firefox-96.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-96.0.1-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-96.0.1-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/nl.xpi -> firefox-96.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-96.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/oc.xpi -> firefox-96.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-96.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/pl.xpi -> firefox-96.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-96.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-96.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/rm.xpi -> firefox-96.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ro.xpi -> firefox-96.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ru.xpi -> firefox-96.0.1-ru.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/sco.xpi -> firefox-96.0.1-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/si.xpi -> firefox-96.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/sk.xpi -> firefox-96.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/sl.xpi -> firefox-96.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/son.xpi -> firefox-96.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/sq.xpi -> firefox-96.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/sr.xpi -> firefox-96.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-96.0.1-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ta.xpi -> firefox-96.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/te.xpi -> firefox-96.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/th.xpi -> firefox-96.0.1-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/tl.xpi -> firefox-96.0.1-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/tr.xpi -> firefox-96.0.1-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/trs.xpi -> firefox-96.0.1-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/uk.xpi -> firefox-96.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/ur.xpi -> firefox-96.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/uz.xpi -> firefox-96.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/vi.xpi -> firefox-96.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/xh.xpi -> firefox-96.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-96.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-96.0.1-zh-TW.xpi )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=b4a44bf3ecd8e403069049585f634b8d
diff --git a/metadata/md5-cache/www-client/vivaldi-5.0.2497.35 b/metadata/md5-cache/www-client/vivaldi-5.0.2497.35
index c57c19f9bfd5..02db522eccfe 100644
--- a/metadata/md5-cache/www-client/vivaldi-5.0.2497.35
+++ b/metadata/md5-cache/www-client/vivaldi-5.0.2497.35
@@ -3,11 +3,11 @@ DESCRIPTION=A browser for our friends
 EAPI=8
 HOMEPAGE=https://vivaldi.com/
 IUSE=proprietary-codecs widevine +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
+KEYWORDS=-* amd64 ~arm ~arm64
 LICENSE=Vivaldi
 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 media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg-chromium:96 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.0.2497.35-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.0.2497.35-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.0.2497.35-1_arm64.deb )
 _eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=af6906de33384f48df787fd62199763e
+_md5_=8ea5e64c7eeb95f16a5643a17d8d8fac
diff --git a/metadata/md5-cache/www-client/vivaldi-5.0.2497.32 b/metadata/md5-cache/www-client/vivaldi-5.0.2497.38
similarity index 87%
rename from metadata/md5-cache/www-client/vivaldi-5.0.2497.32
rename to metadata/md5-cache/www-client/vivaldi-5.0.2497.38
index ae5803e6e6f7..3fe6fb58ec6b 100644
--- a/metadata/md5-cache/www-client/vivaldi-5.0.2497.32
+++ b/metadata/md5-cache/www-client/vivaldi-5.0.2497.38
@@ -3,11 +3,11 @@ DESCRIPTION=A browser for our friends
 EAPI=8
 HOMEPAGE=https://vivaldi.com/
 IUSE=proprietary-codecs widevine +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
+KEYWORDS=-* ~amd64 ~arm ~arm64
 LICENSE=Vivaldi
 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 media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg-chromium:96 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.0.2497.32-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.0.2497.32-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.0.2497.32-1_arm64.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.0.2497.38-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.0.2497.38-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.0.2497.38-1_arm64.deb )
 _eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=05b3372c5c4b935570869b027a622ed8
+_md5_=af6906de33384f48df787fd62199763e
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 31ecd90367f7..a043b697ad94 100644
Binary files a/metadata/md5-cache/x11-plugins/Manifest.gz and b/metadata/md5-cache/x11-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-plugins/wmstickynotes-0.7 b/metadata/md5-cache/x11-plugins/wmstickynotes-0.7
new file mode 100644
index 000000000000..989ee4d071d5
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/wmstickynotes-0.7
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=x11-libs/gtk+:2
+DESCRIPTION=A dockapp for keeping small notes around on the desktop
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/wmstickynotes/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=x11-libs/gtk+:2
+SLOT=0
+SRC_URI=mirror://sourceforge/wmstickynotes/wmstickynotes-0.7.tar.gz
+_md5_=cf1b7f0482790b1ad5dedd299b9ec62e
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 65ea5ee0d914..4f9cd14e5d36 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/alacritty-0.10.0_rc3 b/metadata/md5-cache/x11-terms/alacritty-0.10.0_rc3
deleted file mode 100644
index 2abba33a14b0..000000000000
--- a/metadata/md5-cache/x11-terms/alacritty-0.10.0_rc3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/cmake >=virtual/rust-1.53.0 >=virtual/rust-1.53
-DEFINED_PHASES=compile configure install postinst setup test unpack
-DEPEND=media-libs/fontconfig:= media-libs/freetype:2 x11-libs/libxkbcommon X? ( x11-libs/libxcb:=[xkb] ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 )
-DESCRIPTION=GPU-accelerated terminal emulator
-EAPI=8
-HOMEPAGE=https://github.com/alacritty/alacritty
-IUSE=wayland +X debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB
-RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 x11-libs/libxkbcommon X? ( x11-libs/libxcb:=[xkb] ) media-libs/mesa[X?,wayland?] sys-libs/zlib sys-libs/ncurses:0 wayland? ( dev-libs/wayland ) X? ( x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr )
-REQUIRED_USE=|| ( wayland X )
-SLOT=0
-SRC_URI=https://github.com/alacritty/alacritty/archive/refs/tags/v0.10.0-rc3.tar.gz -> alacritty-0.10.0_rc3.tar.gz https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.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/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/bumpalo/3.8.0/download -> bumpalo-3.8.0.crate https://crates.io/api/v1/crates/calloop/0.9.3/download -> calloop-0.9.3.crate https://crates.io/api/v1/crates/cc/1.0.72/download -> cc-1.0.72.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/cgl/0.3.2/download -> cgl-0.3.2.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/clipboard-win/3.1.1/download -> clipboard-win-3.1.1.crate https://crates.io/api/v1/crates/cmake/0.1.46/download -> cmake-0.1.46.crate https://crates.io/api/v1/crates/cocoa/0.24.0/download -> cocoa-0.24.0.crate https://crates.io/api/v1/crates/cocoa-foundation/0.1.0/download -> cocoa-foundation-0.1.0.crate https://crates.io/api/v1/crates/copypasta/0.7.1/download -> copypasta-0.7.1.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.2/download -> core-foundation-0.9.2.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/core-graphics/0.19.2/download -> core-graphics-0.19.2.crate https://crates.io/api/v1/crates/core-graphics/0.22.3/download -> core-graphics-0.22.3.crate https://crates.io/api/v1/crates/core-graphics-types/0.1.1/download -> core-graphics-types-0.1.1.crate https://crates.io/api/v1/crates/core-text/19.2.0/download -> core-text-19.2.0.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.crate https://crates.io/api/v1/crates/crc32fast/1.3.0/download -> crc32fast-1.3.0.crate https://crates.io/api/v1/crates/crossfont/0.3.2/download -> crossfont-0.3.2.crate https://crates.io/api/v1/crates/cty/0.2.2/download -> cty-0.2.2.crate https://crates.io/api/v1/crates/darling/0.13.1/download -> darling-0.13.1.crate https://crates.io/api/v1/crates/darling_core/0.13.1/download -> darling_core-0.13.1.crate https://crates.io/api/v1/crates/darling_macro/0.13.1/download -> darling_macro-0.13.1.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dirs/3.0.2/download -> dirs-3.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.5.0/download -> dlib-0.5.0.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/dwrote/0.11.0/download -> dwrote-0.11.0.crate https://crates.io/api/v1/crates/embed-resource/1.6.5/download -> embed-resource-1.6.5.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/filetime/0.2.15/download -> filetime-0.2.15.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.1/download -> foreign-types-macros-0.2.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.3.0/download -> foreign-types-shared-0.3.0.crate https://crates.io/api/v1/crates/freetype-rs/0.26.0/download -> freetype-rs-0.26.0.crate https://crates.io/api/v1/crates/freetype-sys/0.13.1/download -> freetype-sys-0.13.1.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gl_generator/0.14.0/download -> gl_generator-0.14.0.crate https://crates.io/api/v1/crates/glutin/0.28.0/download -> glutin-0.28.0.crate https://crates.io/api/v1/crates/glutin_egl_sys/0.1.5/download -> glutin_egl_sys-0.1.5.crate https://crates.io/api/v1/crates/glutin_emscripten_sys/0.1.1/download -> glutin_emscripten_sys-0.1.1.crate https://crates.io/api/v1/crates/glutin_gles2_sys/0.1.5/download -> glutin_gles2_sys-0.1.5.crate https://crates.io/api/v1/crates/glutin_glx_sys/0.1.7/download -> glutin_glx_sys-0.1.7.crate https://crates.io/api/v1/crates/glutin_wgl_sys/0.1.5/download -> glutin_wgl_sys-0.1.5.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/inotify/0.7.1/download -> inotify-0.7.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/itoa/1.0.1/download -> itoa-1.0.1.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/js-sys/0.3.55/download -> js-sys-0.3.55.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/khronos_api/3.1.0/download -> khronos_api-3.1.0.crate https://crates.io/api/v1/crates/lazy-bytes-cast/5.0.1/download -> lazy-bytes-cast-5.0.1.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/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.109/download -> libc-0.2.109.crate https://crates.io/api/v1/crates/libloading/0.7.2/download -> libloading-0.7.2.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/lock_api/0.4.5/download -> lock_api-0.4.5.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memmap2/0.3.1/download -> memmap2-0.3.1.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/mio/0.8.0/download -> mio-0.8.0.crate https://crates.io/api/v1/crates/mio-anonymous-pipes/0.2.0/download -> mio-anonymous-pipes-0.2.0.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/mio-uds/0.6.8/download -> mio-uds-0.6.8.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/ndk/0.5.0/download -> ndk-0.5.0.crate https://crates.io/api/v1/crates/ndk-glue/0.5.0/download -> ndk-glue-0.5.0.crate https://crates.io/api/v1/crates/ndk-macro/0.3.0/download -> ndk-macro-0.3.0.crate https://crates.io/api/v1/crates/ndk-sys/0.2.2/download -> ndk-sys-0.2.2.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nix/0.22.2/download -> nix-0.22.2.crate https://crates.io/api/v1/crates/nom/7.1.0/download -> nom-7.1.0.crate https://crates.io/api/v1/crates/notify/4.0.17/download -> notify-4.0.17.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num_enum/0.5.4/download -> num_enum-0.5.4.crate https://crates.io/api/v1/crates/num_enum_derive/0.5.4/download -> num_enum_derive-0.5.4.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.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/pkg-config/0.3.24/download -> pkg-config-0.3.24.crate https://crates.io/api/v1/crates/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/proc-macro-crate/1.1.0/download -> proc-macro-crate-1.1.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.33/download -> proc-macro2-1.0.33.crate https://crates.io/api/v1/crates/quote/1.0.10/download -> quote-1.0.10.crate https://crates.io/api/v1/crates/raw-window-handle/0.4.2/download -> raw-window-handle-0.4.2.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/ryu/1.0.7/download -> ryu-1.0.7.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/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.133/download -> serde-1.0.133.crate https://crates.io/api/v1/crates/serde_derive/1.0.133/download -> serde_derive-1.0.133.crate https://crates.io/api/v1/crates/serde_json/1.0.74/download -> serde_json-1.0.74.crate https://crates.io/api/v1/crates/serde_yaml/0.8.23/download -> serde_yaml-0.8.23.crate https://crates.io/api/v1/crates/servo-fontconfig/0.5.1/download -> servo-fontconfig-0.5.1.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/5.1.0/download -> servo-fontconfig-sys-5.1.0.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/signal-hook/0.3.12/download -> signal-hook-0.3.12.crate https://crates.io/api/v1/crates/signal-hook-mio/0.2.1/download -> signal-hook-mio-0.2.1.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/slab/0.4.5/download -> slab-0.4.5.crate https://crates.io/api/v1/crates/smallvec/1.7.0/download -> smallvec-1.7.0.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.15.3/download -> smithay-client-toolkit-0.15.3.crate https://crates.io/api/v1/crates/smithay-clipboard/0.6.5/download -> smithay-clipboard-0.6.5.crate https://crates.io/api/v1/crates/spsc-buffer/0.1.1/download -> spsc-buffer-0.1.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/structopt/0.3.25/download -> structopt-0.3.25.crate https://crates.io/api/v1/crates/structopt-derive/0.4.18/download -> structopt-derive-0.4.18.crate https://crates.io/api/v1/crates/syn/1.0.82/download -> syn-1.0.82.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.30/download -> thiserror-1.0.30.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download -> thiserror-impl-1.0.30.crate https://crates.io/api/v1/crates/time/0.3.5/download -> time-0.3.5.crate https://crates.io/api/v1/crates/time-macros/0.2.3/download -> time-macros-0.2.3.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.0/download -> vswhom-sys-0.1.0.crate https://crates.io/api/v1/crates/vte/0.10.1/download -> vte-0.10.1.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.78/download -> wasm-bindgen-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.78/download -> wasm-bindgen-backend-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.78/download -> wasm-bindgen-macro-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.78/download -> wasm-bindgen-macro-support-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.78/download -> wasm-bindgen-shared-0.2.78.crate https://crates.io/api/v1/crates/wayland-client/0.29.4/download -> wayland-client-0.29.4.crate https://crates.io/api/v1/crates/wayland-commons/0.29.4/download -> wayland-commons-0.29.4.crate https://crates.io/api/v1/crates/wayland-cursor/0.29.4/download -> wayland-cursor-0.29.4.crate https://crates.io/api/v1/crates/wayland-egl/0.29.4/download -> wayland-egl-0.29.4.crate https://crates.io/api/v1/crates/wayland-protocols/0.29.4/download -> wayland-protocols-0.29.4.crate https://crates.io/api/v1/crates/wayland-scanner/0.29.4/download -> wayland-scanner-0.29.4.crate https://crates.io/api/v1/crates/wayland-sys/0.29.4/download -> wayland-sys-0.29.4.crate https://crates.io/api/v1/crates/web-sys/0.3.55/download -> web-sys-0.3.55.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winit/0.26.1/download -> winit-0.26.1.crate https://crates.io/api/v1/crates/winreg/0.10.1/download -> winreg-0.10.1.crate https://crates.io/api/v1/crates/wio/0.2.2/download -> wio-0.2.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.2/download -> x11-clipboard-0.5.2.crate https://crates.io/api/v1/crates/x11-dl/2.19.1/download -> x11-dl-2.19.1.crate https://crates.io/api/v1/crates/xcb/0.9.0/download -> xcb-0.9.0.crate https://crates.io/api/v1/crates/xcursor/0.3.4/download -> xcursor-0.3.4.crate https://crates.io/api/v1/crates/xdg/2.4.0/download -> xdg-2.4.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	7ea27a358c2ff39754bf66a96c06f3de	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=fbda75e393de95f1bb07f266ef99499a
diff --git a/metadata/md5-cache/x11-terms/alacritty-0.10.0_rc4 b/metadata/md5-cache/x11-terms/alacritty-0.10.0_rc4
new file mode 100644
index 000000000000..70d1f1002941
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/alacritty-0.10.0_rc4
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/cmake >=virtual/rust-1.53.0 >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install postinst setup test unpack
+DEPEND=media-libs/fontconfig:= media-libs/freetype:2 x11-libs/libxkbcommon X? ( x11-libs/libxcb:=[xkb] ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 )
+DESCRIPTION=GPU-accelerated terminal emulator
+EAPI=8
+HOMEPAGE=https://github.com/alacritty/alacritty
+IUSE=wayland +X debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB
+RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 x11-libs/libxkbcommon X? ( x11-libs/libxcb:=[xkb] ) media-libs/mesa[X?,wayland?] sys-libs/zlib sys-libs/ncurses:0 wayland? ( dev-libs/wayland ) X? ( x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr )
+REQUIRED_USE=|| ( wayland X )
+SLOT=0
+SRC_URI=https://github.com/alacritty/alacritty/archive/refs/tags/v0.10.0-rc4.tar.gz -> alacritty-0.10.0_rc4.tar.gz https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.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/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/bumpalo/3.9.1/download -> bumpalo-3.9.1.crate https://crates.io/api/v1/crates/calloop/0.9.3/download -> calloop-0.9.3.crate https://crates.io/api/v1/crates/cc/1.0.72/download -> cc-1.0.72.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/cgl/0.3.2/download -> cgl-0.3.2.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/clipboard-win/3.1.1/download -> clipboard-win-3.1.1.crate https://crates.io/api/v1/crates/cmake/0.1.48/download -> cmake-0.1.48.crate https://crates.io/api/v1/crates/cocoa/0.24.0/download -> cocoa-0.24.0.crate https://crates.io/api/v1/crates/cocoa-foundation/0.1.0/download -> cocoa-foundation-0.1.0.crate https://crates.io/api/v1/crates/copypasta/0.7.1/download -> copypasta-0.7.1.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.2/download -> core-foundation-0.9.2.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/core-graphics/0.19.2/download -> core-graphics-0.19.2.crate https://crates.io/api/v1/crates/core-graphics/0.22.3/download -> core-graphics-0.22.3.crate https://crates.io/api/v1/crates/core-graphics-types/0.1.1/download -> core-graphics-types-0.1.1.crate https://crates.io/api/v1/crates/core-text/19.2.0/download -> core-text-19.2.0.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.crate https://crates.io/api/v1/crates/crc32fast/1.3.0/download -> crc32fast-1.3.0.crate https://crates.io/api/v1/crates/crossfont/0.3.2/download -> crossfont-0.3.2.crate https://crates.io/api/v1/crates/cty/0.2.2/download -> cty-0.2.2.crate https://crates.io/api/v1/crates/darling/0.13.1/download -> darling-0.13.1.crate https://crates.io/api/v1/crates/darling_core/0.13.1/download -> darling_core-0.13.1.crate https://crates.io/api/v1/crates/darling_macro/0.13.1/download -> darling_macro-0.13.1.crate https://crates.io/api/v1/crates/dirs/3.0.2/download -> dirs-3.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.5.0/download -> dlib-0.5.0.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/dwrote/0.11.0/download -> dwrote-0.11.0.crate https://crates.io/api/v1/crates/embed-resource/1.6.5/download -> embed-resource-1.6.5.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/filetime/0.2.15/download -> filetime-0.2.15.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.1/download -> foreign-types-macros-0.2.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.3.0/download -> foreign-types-shared-0.3.0.crate https://crates.io/api/v1/crates/freetype-rs/0.26.0/download -> freetype-rs-0.26.0.crate https://crates.io/api/v1/crates/freetype-sys/0.13.1/download -> freetype-sys-0.13.1.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gl_generator/0.14.0/download -> gl_generator-0.14.0.crate https://crates.io/api/v1/crates/glutin/0.28.0/download -> glutin-0.28.0.crate https://crates.io/api/v1/crates/glutin_egl_sys/0.1.5/download -> glutin_egl_sys-0.1.5.crate https://crates.io/api/v1/crates/glutin_emscripten_sys/0.1.1/download -> glutin_emscripten_sys-0.1.1.crate https://crates.io/api/v1/crates/glutin_gles2_sys/0.1.5/download -> glutin_gles2_sys-0.1.5.crate https://crates.io/api/v1/crates/glutin_glx_sys/0.1.7/download -> glutin_glx_sys-0.1.7.crate https://crates.io/api/v1/crates/glutin_wgl_sys/0.1.5/download -> glutin_wgl_sys-0.1.5.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/indexmap/1.8.0/download -> indexmap-1.8.0.crate https://crates.io/api/v1/crates/inotify/0.7.1/download -> inotify-0.7.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/1.0.1/download -> itoa-1.0.1.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/js-sys/0.3.55/download -> js-sys-0.3.55.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/khronos_api/3.1.0/download -> khronos_api-3.1.0.crate https://crates.io/api/v1/crates/lazy-bytes-cast/5.0.1/download -> lazy-bytes-cast-5.0.1.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/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.112/download -> libc-0.2.112.crate https://crates.io/api/v1/crates/libloading/0.7.2/download -> libloading-0.7.2.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/lock_api/0.4.5/download -> lock_api-0.4.5.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memmap2/0.3.1/download -> memmap2-0.3.1.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/mio/0.8.0/download -> mio-0.8.0.crate https://crates.io/api/v1/crates/mio-anonymous-pipes/0.2.0/download -> mio-anonymous-pipes-0.2.0.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/mio-uds/0.6.8/download -> mio-uds-0.6.8.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/ndk/0.5.0/download -> ndk-0.5.0.crate https://crates.io/api/v1/crates/ndk-glue/0.5.0/download -> ndk-glue-0.5.0.crate https://crates.io/api/v1/crates/ndk-macro/0.3.0/download -> ndk-macro-0.3.0.crate https://crates.io/api/v1/crates/ndk-sys/0.2.2/download -> ndk-sys-0.2.2.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nix/0.22.2/download -> nix-0.22.2.crate https://crates.io/api/v1/crates/nom/7.1.0/download -> nom-7.1.0.crate https://crates.io/api/v1/crates/notify/4.0.17/download -> notify-4.0.17.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num_enum/0.5.6/download -> num_enum-0.5.6.crate https://crates.io/api/v1/crates/num_enum_derive/0.5.6/download -> num_enum_derive-0.5.6.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/once_cell/1.9.0/download -> once_cell-1.9.0.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.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/pkg-config/0.3.24/download -> pkg-config-0.3.24.crate https://crates.io/api/v1/crates/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/proc-macro-crate/1.1.0/download -> proc-macro-crate-1.1.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/quick-xml/0.22.0/download -> quick-xml-0.22.0.crate https://crates.io/api/v1/crates/quote/1.0.14/download -> quote-1.0.14.crate https://crates.io/api/v1/crates/raw-window-handle/0.4.2/download -> raw-window-handle-0.4.2.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/ryu/1.0.9/download -> ryu-1.0.9.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/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.133/download -> serde-1.0.133.crate https://crates.io/api/v1/crates/serde_derive/1.0.133/download -> serde_derive-1.0.133.crate https://crates.io/api/v1/crates/serde_json/1.0.74/download -> serde_json-1.0.74.crate https://crates.io/api/v1/crates/serde_yaml/0.8.23/download -> serde_yaml-0.8.23.crate https://crates.io/api/v1/crates/servo-fontconfig/0.5.1/download -> servo-fontconfig-0.5.1.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/5.1.0/download -> servo-fontconfig-sys-5.1.0.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/signal-hook/0.3.13/download -> signal-hook-0.3.13.crate https://crates.io/api/v1/crates/signal-hook-mio/0.2.1/download -> signal-hook-mio-0.2.1.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/slab/0.4.5/download -> slab-0.4.5.crate https://crates.io/api/v1/crates/smallvec/1.7.0/download -> smallvec-1.7.0.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.15.3/download -> smithay-client-toolkit-0.15.3.crate https://crates.io/api/v1/crates/smithay-clipboard/0.6.5/download -> smithay-clipboard-0.6.5.crate https://crates.io/api/v1/crates/spsc-buffer/0.1.1/download -> spsc-buffer-0.1.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/structopt/0.3.25/download -> structopt-0.3.25.crate https://crates.io/api/v1/crates/structopt-derive/0.4.18/download -> structopt-derive-0.4.18.crate https://crates.io/api/v1/crates/syn/1.0.85/download -> syn-1.0.85.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.30/download -> thiserror-1.0.30.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download -> thiserror-impl-1.0.30.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.0/download -> vswhom-sys-0.1.0.crate https://crates.io/api/v1/crates/vte/0.10.1/download -> vte-0.10.1.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.78/download -> wasm-bindgen-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.78/download -> wasm-bindgen-backend-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.78/download -> wasm-bindgen-macro-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.78/download -> wasm-bindgen-macro-support-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.78/download -> wasm-bindgen-shared-0.2.78.crate https://crates.io/api/v1/crates/wayland-client/0.29.4/download -> wayland-client-0.29.4.crate https://crates.io/api/v1/crates/wayland-commons/0.29.4/download -> wayland-commons-0.29.4.crate https://crates.io/api/v1/crates/wayland-cursor/0.29.4/download -> wayland-cursor-0.29.4.crate https://crates.io/api/v1/crates/wayland-egl/0.29.4/download -> wayland-egl-0.29.4.crate https://crates.io/api/v1/crates/wayland-protocols/0.29.4/download -> wayland-protocols-0.29.4.crate https://crates.io/api/v1/crates/wayland-scanner/0.29.4/download -> wayland-scanner-0.29.4.crate https://crates.io/api/v1/crates/wayland-sys/0.29.4/download -> wayland-sys-0.29.4.crate https://crates.io/api/v1/crates/web-sys/0.3.55/download -> web-sys-0.3.55.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winit/0.26.1/download -> winit-0.26.1.crate https://crates.io/api/v1/crates/winreg/0.10.1/download -> winreg-0.10.1.crate https://crates.io/api/v1/crates/wio/0.2.2/download -> wio-0.2.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.3/download -> x11-clipboard-0.5.3.crate https://crates.io/api/v1/crates/x11-dl/2.19.1/download -> x11-dl-2.19.1.crate https://crates.io/api/v1/crates/xcb/0.10.1/download -> xcb-0.10.1.crate https://crates.io/api/v1/crates/xcursor/0.3.4/download -> xcursor-0.3.4.crate https://crates.io/api/v1/crates/xdg/2.4.0/download -> xdg-2.4.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	7ea27a358c2ff39754bf66a96c06f3de	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	7ec9eb6bbbeccd424c0430368962d272	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=c0dae9146b7af421487fdc3b83946c65
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 6bf5c57e6aac..88808e6ac529 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 13 Jan 2022 13:39:19 +0000
+Fri, 14 Jan 2022 13:09:20 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index cc45fefa930b..9a49207c38f3 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -1827,7 +1827,7 @@
   </project>
   <project>
     <email>ml@gentoo.org</email>
-    <name>ML Project</name>
+    <name>ML</name>
     <url>https://wiki.gentoo.org/wiki/Project:ML</url>
     <description>The ML Project maintains packages related to the ML programming language family.</description>
     <member>
diff --git a/metadata/timestamp b/metadata/timestamp
index cae335e2b723..e0872fc1d394 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Jan 13 01:39:18 PM UTC 2022
+Fri Jan 14 01:09:20 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a001fc09f6e9..2d9651b47153 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 13 Jan 2022 14:00:01 +0000
+Fri, 14 Jan 2022 13:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 892d8f4c4de3..52b51594adf9 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ef9c4b88e7dd07a57e5d6dbca310a84bdc1574cd 1642079655 2022-01-13T13:14:15+00:00
+59392ba216311511cb07b1db528759ebceb6a10e 1642164749 2022-01-14T12:52:29+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c0dfba654ded..a57fe9ce9d2c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1642081201 Thu 13 Jan 2022 01:40:01 PM UTC
+1642165801 Fri 14 Jan 2022 01:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 6f1262817c99..88808e6ac529 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 13 Jan 2022 13:39:18 +0000
+Fri, 14 Jan 2022 13:09:20 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 54297b555c93..774fd9aa67b8 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 3a2882c40b55..33a949249744 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1,2 +1 @@
-DIST prosody-0.11.10.tar.gz 438888 BLAKE2B 590f97f4eb8a333701eca516de3c3bcee9cf093267d2000af03b48d32396a1be21a0cf2f8ff542e7fbcb8419138bab5cf411f71b17666593559004a8a9674367 SHA512 419d8f8465f1807015f0a52d8f35ee89892b0869084dae38b60fc833d63c3d70892d8e59ae00039cd15e0e25f46d042954896f51f8c0520650a877f5296707cb
-DIST prosody-0.11.11.tar.gz 439395 BLAKE2B d9662ff9e5a767aaee86c2b0762249c702e755191359ee276f37019ac98fab52d75a23590f0c3a14f3bfde356cc2bd9802e842e1f1a7ea5da8ec3d034fa028a0 SHA512 eb9851e1b279bef894d556ca6bc6210d1cd55e0c02a9d475f74e6e6b4a2dfef704fd3de77b71cff97909925c48c60940c34cfb541e6f3801e23e90ea21d119a9
+DIST prosody-0.11.12.tar.gz 439656 BLAKE2B 593bb24d7e84ed337e8d8a11b387ac50abd27ea62be0fd18e8c8441472c09565a6603ccb070250b620b3f50f4d1e33fad579f988e68250c083b8a9aa25a8e03b SHA512 cd03ee8b02ffaa478b5329d9942d833cfed2d8bf720bf580a2082d681e7d333bc34f45041cea7234bee75f1a0e7c07983a685fe2ac9b31d51a0dbb36e87ba5d2
diff --git a/net-im/prosody/prosody-0.11.10.ebuild b/net-im/prosody/prosody-0.11.10.ebuild
deleted file mode 100644
index a89c56614eb0..000000000000
--- a/net-im/prosody/prosody-0.11.10.ebuild
+++ /dev/null
@@ -1,102 +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 )
-LUA_REQ_USE="deprecated(+)"
-
-inherit lua-single systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="Prosody is a modern XMPP communication server"
-HOMEPAGE="https://prosody.im/"
-SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="icu +idn +libevent mysql postgres selinux +sqlite +ssl test +zlib"
-REQUIRED_USE="
-	^^ ( icu idn )
-	${LUA_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	$(lua_gen_cond_dep 'dev-lua/luaexpat[${LUA_USEDEP}]')
-	$(lua_gen_cond_dep 'dev-lua/luafilesystem[${LUA_USEDEP}]')
-	$(lua_gen_cond_dep 'dev-lua/luasocket[${LUA_USEDEP}]')
-	net-im/jabber-base
-	icu? ( dev-libs/icu:= )
-	idn? ( net-dns/libidn:= )
-	libevent? ( $(lua_gen_cond_dep 'dev-lua/luaevent[${LUA_USEDEP}]') )
-	dev-libs/openssl:0=
-	lua_single_target_lua5-1? ( $(lua_gen_cond_dep 'dev-lua/lua-bit32[lua_targets_lua5-1(-)]') )
-	mysql? ( $(lua_gen_cond_dep 'dev-lua/luadbi[mysql,${LUA_USEDEP}]') )
-	postgres? ( $(lua_gen_cond_dep 'dev-lua/luadbi[postgres,${LUA_USEDEP}]') )
-	sqlite? ( $(lua_gen_cond_dep 'dev-lua/luadbi[sqlite,${LUA_USEDEP}]') )
-	ssl? ( $(lua_gen_cond_dep 'dev-lua/luasec[${LUA_USEDEP}]') )
-	zlib? ( $(lua_gen_cond_dep 'dev-lua/lua-zlib[${LUA_USEDEP}]') )
-	${LUA_DEPS}
-"
-
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-jabber )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? ( $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.11.7-gentoo.patch" )
-
-src_prepare() {
-	default
-
-	# Set correct plugin path for optional net-im/prosody-modules package
-	sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--add-cflags="${CFLAGS}"
-		--add-ldflags="${LDFLAGS}"
-		--c-compiler="$(tc-getCC)"
-		--datadir="${EPREFIX}/var/spool/jabber"
-		--idn-library="$(usex idn 'idn' 'icu')"
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--linker="$(tc-getCC)"
-		--lua-version="$(usex lua_single_target_luajit '5.1' $(ver_cut 1-2 $(lua_get_version)))"
-		--no-example-certs
-		--ostype="linux"
-		--prefix="${EPREFIX}/usr"
-		--runwith="${ELUA}"
-		--sysconfdir="${EPREFIX}/etc/jabber"
-		--with-lua-include="${EPREFIX}/$(lua_get_include_dir)"
-		--with-lua-lib="${EPREFIX}/$(lua_get_cmod_dir)"
-	)
-
-	# Since the configure script is handcrafted,
-	# and yells at unknown options, do not use 'econf'.
-	./configure "${myeconfargs[@]}" || die
-
-	rm makefile || die
-	mv GNUmakefile Makefile || die
-}
-
-src_install() {
-	default
-
-	keepdir /var/spool/jabber
-
-	newinitd "${FILESDIR}"/prosody.initd-r5 prosody
-	systemd_newunit "${FILESDIR}"/prosody.service-r2 prosody.service
-
-	newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r1 prosody.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process prosody.conf
-}
diff --git a/net-im/prosody/prosody-0.11.11.ebuild b/net-im/prosody/prosody-0.11.12.ebuild
similarity index 97%
rename from net-im/prosody/prosody-0.11.11.ebuild
rename to net-im/prosody/prosody-0.11.12.ebuild
index c8a34767663f..1b9f77dd5703 100644
--- a/net-im/prosody/prosody-0.11.11.ebuild
+++ b/net-im/prosody/prosody-0.11.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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-libs/Manifest.gz b/net-libs/Manifest.gz
index 3aa2f356ea08..28130aefa4e1 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libmrss/libmrss-0.19.2-r1.ebuild b/net-libs/libmrss/libmrss-0.19.2-r1.ebuild
index 094466ef4985..05c56f50afa4 100644
--- a/net-libs/libmrss/libmrss-0.19.2-r1.ebuild
+++ b/net-libs/libmrss/libmrss-0.19.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/net-libs/libnxml/libnxml-0.18.3-r1.ebuild b/net-libs/libnxml/libnxml-0.18.3-r1.ebuild
index 9a1d82c9061e..1f4b284d7def 100644
--- a/net-libs/libnxml/libnxml-0.18.3-r1.ebuild
+++ b/net-libs/libnxml/libnxml-0.18.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 ~sparc x86"
 IUSE="doc examples"
 
 RDEPEND="net-misc/curl"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8ffa364f0246..6b5ba8222587 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/clusterssh/Manifest b/net-misc/clusterssh/Manifest
index 953add07cb81..1a8bd15ecf6d 100644
--- a/net-misc/clusterssh/Manifest
+++ b/net-misc/clusterssh/Manifest
@@ -1,2 +1 @@
-DIST App-ClusterSSH-4.01_05.tar.gz 71502 BLAKE2B f9e1f9de36173c766a382660e34adee3005a64550a90cafe59101fd3f4b66307990e254334fb270398c9e36a9d27657a27e7348b1223a7ccef04181f8c88809b SHA512 4b63b91684c981a28871e5264502c66435b531ae3c4bad2eab2571f8b237d43e5f45ed93d036e7497c713f2982a110d93a3055ae0004d4f33e7786df9aa56ff8
 DIST App-ClusterSSH-4.16.tar.gz 96151 BLAKE2B c0b4ee36f42cb26853c264686fa6084133e0a75f9dba6e7233e341a2dedbb3c41642dd255bf6fa01b7285c9c3edd43485d3014b6d41957d6476382dcd00866a2 SHA512 3d4fc2aa681ea815020375bb3bb0f9a070e1638c5a4e38b1b279c58f9644a568bb687e0e611919afa48a32b44ff4e25cd5661c7d1330978f851bc506282f020e
diff --git a/net-misc/clusterssh/clusterssh-4.03.03.ebuild b/net-misc/clusterssh/clusterssh-4.03.03.ebuild
deleted file mode 100644
index cb2f2702720f..000000000000
--- a/net-misc/clusterssh/clusterssh-4.03.03.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
-
-MY_PN="App-ClusterSSH"
-MODULE_AUTHOR="DUNCS"
-MODULE_VERSION="4.01_05"
-
-inherit perl-module
-
-DESCRIPTION="Concurrent Multi-Server Terminal Access"
-HOMEPAGE="https://github.com/duncs/clusterssh"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Exception-Class
-	dev-perl/Readonly
-	dev-perl/Test-Pod
-	dev-perl/Test-Pod-Coverage
-	dev-perl/Test-Trap
-	dev-perl/Test-DistManifest
-	dev-perl/Try-Tiny
-	dev-perl/Tk
-	dev-perl/Config-Simple
-	dev-perl/X11-Protocol
-	dev-perl/XML-Simple
-	x11-apps/xlsfonts
-	x11-terms/xterm"
-DEPEND="
-	${RDEPEND}
-	dev-perl/File-Which
-	dev-perl/Module-Build
-	dev-perl/Test-Pod
-	dev-perl/Test-Differences"
-
-#S="${WORKDIR}"/${MY_P}
-
-SRC_TEST="do parallel"
-
-src_prepare() {
-	# broken test, check again for new releases
-	sed \
-		-e '/boilerplate/d' \
-		-e '/manifest.t/d' \
-		-i MANIFEST || die
-	rm t/boilerplate.t t/manifest.t || die
-
-	perl-module_src_prepare
-}
diff --git a/net-misc/clusterssh/clusterssh-4.16.ebuild b/net-misc/clusterssh/clusterssh-4.16.ebuild
index 22c6617aa513..c98759fb454f 100644
--- a/net-misc/clusterssh/clusterssh-4.16.ebuild
+++ b/net-misc/clusterssh/clusterssh-4.16.ebuild
@@ -16,7 +16,7 @@ else
 	#DIST_VERSION="$(ver_cut 1-2)"
 	#die "|$(ver_cut 1-2)_$(ver_cut 3)|"
 
-	KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 fi
 
 inherit perl-module
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 7d6ceebeb8c7..f0e10adbc5cc 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,4 +1 @@
-DIST NetworkManager-1.32.10.tar.xz 5353296 BLAKE2B af176abd4dd8f725741cc8fde10245606d1b00cb6b11cde11b2e3bce74a33980fdf76fab5c6c769a4275c5168098cb2531a0a03909db8eef5fa502d464d59bd1 SHA512 c4eb9114869efba197c3ec1e99d7d5bc54222d9c7118cf699fe61130952a20376a760b86909290d6312a4a23016d51f9ff90ba8eadbbcda84ce811e441293d8d
 DIST NetworkManager-1.32.12.tar.xz 5373452 BLAKE2B 29ca1f1c2aea60e4ddc7e3d5464604b329c8b740a2a143266c0bc05ec6a16079cfdf67770fc75afe523664e2e4234189031a8ffa2f51c0f02d4760f3ab20e04a SHA512 b8dfa409302781fdab19790afeb7f4396875e282d6983e2c5775294c8c13d3c1036dee69a37bf6e4fb2a2e80504c8e792780b6a9c1262616e57860da5ebc0e61
-DIST NetworkManager-1.32.4.tar.xz 5250412 BLAKE2B 6c0931d50a8666f88865d4ca5281e1570dd230156e30bb27822c9ea3d93b3b3b24f336e154787794e7edd7c00296f9f7c5761136cac0c0eacf142a0371cbfe81 SHA512 95be90d4c8f8f9f58a3c7ad8d8c9b592d2b77f283df58b495fe1b673c4fadd4409f4fc00fc9766343e3ac240dd805583db4f05e6d1f0b367fe22b306227fc684
-DIST NetworkManager-1.32.8.tar.xz 5255076 BLAKE2B 5f1bc55e3b9e6864c05421c8506ac202162deaf5081450e5d50f52699abc2d9bfb6e89b6f48c9874cccdc11fe754a5063a63e830702e211cf178ce7df0d628fb SHA512 328733f3dce9e52e680e464b60112995439f94dfeaea3b6c2082b323e85418483db6c6dc9e43f52176ff7c1291b226db77fe5acab9935dad7735c4397f5e9b83
diff --git a/net-misc/networkmanager/networkmanager-1.32.10-r1.ebuild b/net-misc/networkmanager/networkmanager-1.32.10-r1.ebuild
deleted file mode 100644
index 5cad0e546759..000000000000
--- a/net-misc/networkmanager/networkmanager-1.32.10-r1.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2022 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 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.12.ebuild b/net-misc/networkmanager/networkmanager-1.32.12.ebuild
deleted file mode 100644
index 2d35db0f7ea1..000000000000
--- a/net-misc/networkmanager/networkmanager-1.32.12.ebuild
+++ /dev/null
@@ -1,392 +0,0 @@
-# Copyright 1999-2022 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 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
-
-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 +gtk-doc +introspection iptables iwd 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 ) )
-	gtk-doc? ( introspection )
-	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
-	gtk-doc? (
-		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
-
-	# bug 809695
-	if tc-is-clang && use lto; then
-		eerror "Clang does not support -flto-partition"
-		die "Please use gcc or turn off USE=lto flag when building with clang"
-	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_use_bool gtk-doc 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 -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die
-	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 || die
-		[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.4-r1.ebuild b/net-misc/networkmanager/networkmanager-1.32.4-r1.ebuild
deleted file mode 100644
index d378b6279029..000000000000
--- a/net-misc/networkmanager/networkmanager-1.32.4-r1.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2022 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 +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.8-r1.ebuild b/net-misc/networkmanager/networkmanager-1.32.8-r1.ebuild
deleted file mode 100644
index 1306142b49e8..000000000000
--- a/net-misc/networkmanager/networkmanager-1.32.8-r1.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2022 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 +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 ~riscv ~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/wget/wget-1.21.2.ebuild b/net-misc/wget/wget-1.21.2.ebuild
index e8a275e0341a..63faba88832d 100644
--- a/net-misc/wget/wget-1.21.2.ebuild
+++ b/net-misc/wget/wget-1.21.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 
 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"
+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="cookie_check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 RESTRICT="!test? ( test )"
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index eabc2c232ba0..f68e1a4899a9 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/syncthing/syncthing-1.18.5.ebuild b/net-p2p/syncthing/syncthing-1.18.5.ebuild
index cd3d65664324..3ef6bd639508 100644
--- a/net-p2p/syncthing/syncthing-1.18.5.ebuild
+++ b/net-p2p/syncthing/syncthing-1.18.5.ebuild
@@ -793,7 +793,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing
diff --git a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
index a3412eb41d05..75cb7a97c1a9 100644
--- a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
+++ b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="ayatana debug geoip libnotify libproxy rss"
 
 # RESTRICT="test"
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 36d3ca6867c1..9eb65fff793e 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/unifi/metadata.xml b/net-wireless/unifi/metadata.xml
index e8af626aaf48..d81a3fef9a30 100644
--- a/net-wireless/unifi/metadata.xml
+++ b/net-wireless/unifi/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>bkohler@gentoo.org</email>
-		<name>Ben Kohler</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index e3a6748886f6..9910979d80cc 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/default/linux/amd64/17.0/deprecated b/profiles/default/linux/amd64/17.0/deprecated
index 91595130b2d6..69a9c780854d 100644
--- a/profiles/default/linux/amd64/17.0/deprecated
+++ b/profiles/default/linux/amd64/17.0/deprecated
@@ -1,53 +1,73 @@
 default/linux/amd64/17.1
 
 The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
-multilib layout, and require an explicit migration.
-The migration is performed using the app-portage/unsymlink-lib tool.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 The following steps can be used to upgrade your system:
 
 1. Sync and upgrade your system to the newest package versions
    to reduce the risk of issues.
 
-2. Install the tool:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. Run 'unsymlink-lib --analyze' and check the output for obvious
    mistakes.  If you need to perform any changes to the system, remember
    to run 'unsymlink-lib --analyze' again afterwards.
 
 [past this point do not call emerge or modify /usr manually]
 
-4. This is a very good time to make a backup.
+5. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
    what is going to happen.
 
-6. Reboot your system.  Check if important programs work.
+7. Reboot your system.  Check if important programs work.
    In particular, verify that e.g. 'emerge --info' works (but do not
    install anything).  If you hit any serious problems, you can use
    'unsymlink-lib --rollback' to revert the changes and return to
    step 3.
 
-7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+8. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
    what is going to happen but note that you're going to see a very long
    list of files to remove.
 
-8. Switch the profile, e.g.:
+9. Switch the profile, e.g.:
      # eselect profile set default/linux/amd64/17.1/desktop
 
 [at this point you can start using emerge again. emerge will then 
  not display this message anymore, but the remaining steps are still 
  required!]
 
-9. Rebuild gcc:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. If you are using a multilib profile, rebuild all 32-bit packages.
     This can be done using:
       # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
 
-11. Once the last 32-bit package is rebuilt, your package manager
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. Once the last 32-bit package is rebuilt, your package manager
     should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
     does not happen, remove them manually:
       # rm /lib32 /usr/lib32
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/desktop/deprecated b/profiles/default/linux/amd64/17.0/desktop/deprecated
index b726cb19ea7a..90bb574cd748 100644
--- a/profiles/default/linux/amd64/17.0/desktop/deprecated
+++ b/profiles/default/linux/amd64/17.0/desktop/deprecated
@@ -1,53 +1,73 @@
 default/linux/amd64/17.1/desktop
 
 The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
-multilib layout, and require an explicit migration.
-The migration is performed using the app-portage/unsymlink-lib tool.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 The following steps can be used to upgrade your system:
 
 1. Sync and upgrade your system to the newest package versions
    to reduce the risk of issues.
 
-2. Install the tool:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. Run 'unsymlink-lib --analyze' and check the output for obvious
    mistakes.  If you need to perform any changes to the system, remember
    to run 'unsymlink-lib --analyze' again afterwards.
 
 [past this point do not call emerge or modify /usr manually]
 
-4. This is a very good time to make a backup.
+5. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
    what is going to happen.
 
-6. Reboot your system.  Check if important programs work.
+7. Reboot your system.  Check if important programs work.
    In particular, verify that e.g. 'emerge --info' works (but do not
    install anything).  If you hit any serious problems, you can use
    'unsymlink-lib --rollback' to revert the changes and return to
    step 3.
 
-7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+8. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
    what is going to happen but note that you're going to see a very long
    list of files to remove.
 
-8. Switch the profile, e.g.:
+9. Switch the profile, e.g.:
      # eselect profile set default/linux/amd64/17.1/desktop
 
 [at this point you can start using emerge again. emerge will then 
  not display this message anymore, but the remaining steps are still 
  required!]
 
-9. Rebuild gcc:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. If you are using a multilib profile, rebuild all 32-bit packages.
     This can be done using:
       # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
 
-11. Once the last 32-bit package is rebuilt, your package manager
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. Once the last 32-bit package is rebuilt, your package manager
     should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
     does not happen, remove them manually:
       # rm /lib32 /usr/lib32
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/desktop/gnome/deprecated b/profiles/default/linux/amd64/17.0/desktop/gnome/deprecated
index 995ec40fcfe2..56eae0878730 100644
--- a/profiles/default/linux/amd64/17.0/desktop/gnome/deprecated
+++ b/profiles/default/linux/amd64/17.0/desktop/gnome/deprecated
@@ -1,53 +1,73 @@
 default/linux/amd64/17.1/desktop/gnome
 
 The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
-multilib layout, and require an explicit migration.
-The migration is performed using the app-portage/unsymlink-lib tool.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 The following steps can be used to upgrade your system:
 
 1. Sync and upgrade your system to the newest package versions
    to reduce the risk of issues.
 
-2. Install the tool:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. Run 'unsymlink-lib --analyze' and check the output for obvious
    mistakes.  If you need to perform any changes to the system, remember
    to run 'unsymlink-lib --analyze' again afterwards.
 
 [past this point do not call emerge or modify /usr manually]
 
-4. This is a very good time to make a backup.
+5. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
    what is going to happen.
 
-6. Reboot your system.  Check if important programs work.
+7. Reboot your system.  Check if important programs work.
    In particular, verify that e.g. 'emerge --info' works (but do not
    install anything).  If you hit any serious problems, you can use
    'unsymlink-lib --rollback' to revert the changes and return to
    step 3.
 
-7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+8. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
    what is going to happen but note that you're going to see a very long
    list of files to remove.
 
-8. Switch the profile, e.g.:
+9. Switch the profile, e.g.:
      # eselect profile set default/linux/amd64/17.1/desktop
 
 [at this point you can start using emerge again. emerge will then 
  not display this message anymore, but the remaining steps are still 
  required!]
 
-9. Rebuild gcc:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. If you are using a multilib profile, rebuild all 32-bit packages.
     This can be done using:
       # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
 
-11. Once the last 32-bit package is rebuilt, your package manager
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. Once the last 32-bit package is rebuilt, your package manager
     should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
     does not happen, remove them manually:
       # rm /lib32 /usr/lib32
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/deprecated b/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/deprecated
index e64ddd762146..3a7b4563dacf 100644
--- a/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/deprecated
+++ b/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/deprecated
@@ -1,53 +1,73 @@
 default/linux/amd64/17.1/desktop/gnome/systemd
 
 The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
-multilib layout, and require an explicit migration.
-The migration is performed using the app-portage/unsymlink-lib tool.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 The following steps can be used to upgrade your system:
 
 1. Sync and upgrade your system to the newest package versions
    to reduce the risk of issues.
 
-2. Install the tool:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. Run 'unsymlink-lib --analyze' and check the output for obvious
    mistakes.  If you need to perform any changes to the system, remember
    to run 'unsymlink-lib --analyze' again afterwards.
 
 [past this point do not call emerge or modify /usr manually]
 
-4. This is a very good time to make a backup.
+5. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
    what is going to happen.
 
-6. Reboot your system.  Check if important programs work.
+7. Reboot your system.  Check if important programs work.
    In particular, verify that e.g. 'emerge --info' works (but do not
    install anything).  If you hit any serious problems, you can use
    'unsymlink-lib --rollback' to revert the changes and return to
    step 3.
 
-7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+8. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
    what is going to happen but note that you're going to see a very long
    list of files to remove.
 
-8. Switch the profile, e.g.:
+9. Switch the profile, e.g.:
      # eselect profile set default/linux/amd64/17.1/desktop
 
 [at this point you can start using emerge again. emerge will then 
  not display this message anymore, but the remaining steps are still 
  required!]
 
-9. Rebuild gcc:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. If you are using a multilib profile, rebuild all 32-bit packages.
     This can be done using:
       # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
 
-11. Once the last 32-bit package is rebuilt, your package manager
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. Once the last 32-bit package is rebuilt, your package manager
     should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
     does not happen, remove them manually:
       # rm /lib32 /usr/lib32
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/desktop/plasma/deprecated b/profiles/default/linux/amd64/17.0/desktop/plasma/deprecated
index 2eecded52231..45505ca188f5 100644
--- a/profiles/default/linux/amd64/17.0/desktop/plasma/deprecated
+++ b/profiles/default/linux/amd64/17.0/desktop/plasma/deprecated
@@ -1,53 +1,73 @@
-default/linux/amd64/17.1/desktop/plasma
+default/linux/amd64/17.1/desktop/plasma/systemd
 
 The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
-multilib layout, and require an explicit migration.
-The migration is performed using the app-portage/unsymlink-lib tool.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 The following steps can be used to upgrade your system:
 
 1. Sync and upgrade your system to the newest package versions
    to reduce the risk of issues.
 
-2. Install the tool:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. Run 'unsymlink-lib --analyze' and check the output for obvious
    mistakes.  If you need to perform any changes to the system, remember
    to run 'unsymlink-lib --analyze' again afterwards.
 
 [past this point do not call emerge or modify /usr manually]
 
-4. This is a very good time to make a backup.
+5. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
    what is going to happen.
 
-6. Reboot your system.  Check if important programs work.
+7. Reboot your system.  Check if important programs work.
    In particular, verify that e.g. 'emerge --info' works (but do not
    install anything).  If you hit any serious problems, you can use
    'unsymlink-lib --rollback' to revert the changes and return to
    step 3.
 
-7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+8. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
    what is going to happen but note that you're going to see a very long
    list of files to remove.
 
-8. Switch the profile, e.g.:
+9. Switch the profile, e.g.:
      # eselect profile set default/linux/amd64/17.1/desktop
 
 [at this point you can start using emerge again. emerge will then 
  not display this message anymore, but the remaining steps are still 
  required!]
 
-9. Rebuild gcc:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. If you are using a multilib profile, rebuild all 32-bit packages.
     This can be done using:
       # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
 
-11. Once the last 32-bit package is rebuilt, your package manager
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. Once the last 32-bit package is rebuilt, your package manager
     should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
     does not happen, remove them manually:
       # rm /lib32 /usr/lib32
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/deprecated b/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/deprecated
index 83189d77ef50..2c476214c5de 100644
--- a/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/deprecated
+++ b/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/deprecated
@@ -1,53 +1,73 @@
-default/linux/amd64/17.1/desktop/plasma/systemd
+default/linux/amd64/17.1/systemd
 
 The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
-multilib layout, and require an explicit migration.
-The migration is performed using the app-portage/unsymlink-lib tool.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 The following steps can be used to upgrade your system:
 
 1. Sync and upgrade your system to the newest package versions
    to reduce the risk of issues.
 
-2. Install the tool:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. Run 'unsymlink-lib --analyze' and check the output for obvious
    mistakes.  If you need to perform any changes to the system, remember
    to run 'unsymlink-lib --analyze' again afterwards.
 
 [past this point do not call emerge or modify /usr manually]
 
-4. This is a very good time to make a backup.
+5. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
    what is going to happen.
 
-6. Reboot your system.  Check if important programs work.
+7. Reboot your system.  Check if important programs work.
    In particular, verify that e.g. 'emerge --info' works (but do not
    install anything).  If you hit any serious problems, you can use
    'unsymlink-lib --rollback' to revert the changes and return to
    step 3.
 
-7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+8. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
    what is going to happen but note that you're going to see a very long
    list of files to remove.
 
-8. Switch the profile, e.g.:
+9. Switch the profile, e.g.:
      # eselect profile set default/linux/amd64/17.1/desktop
 
 [at this point you can start using emerge again. emerge will then 
  not display this message anymore, but the remaining steps are still 
  required!]
 
-9. Rebuild gcc:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. If you are using a multilib profile, rebuild all 32-bit packages.
     This can be done using:
       # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
 
-11. Once the last 32-bit package is rebuilt, your package manager
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. Once the last 32-bit package is rebuilt, your package manager
     should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
     does not happen, remove them manually:
       # rm /lib32 /usr/lib32
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/developer/deprecated b/profiles/default/linux/amd64/17.0/developer/deprecated
index f3fe9f7f95bd..4fb55d9fd75f 100644
--- a/profiles/default/linux/amd64/17.0/developer/deprecated
+++ b/profiles/default/linux/amd64/17.0/developer/deprecated
@@ -1,53 +1,73 @@
 default/linux/amd64/17.1/developer
 
 The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
-multilib layout, and require an explicit migration.
-The migration is performed using the app-portage/unsymlink-lib tool.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 The following steps can be used to upgrade your system:
 
 1. Sync and upgrade your system to the newest package versions
    to reduce the risk of issues.
 
-2. Install the tool:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. Run 'unsymlink-lib --analyze' and check the output for obvious
    mistakes.  If you need to perform any changes to the system, remember
    to run 'unsymlink-lib --analyze' again afterwards.
 
 [past this point do not call emerge or modify /usr manually]
 
-4. This is a very good time to make a backup.
+5. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
    what is going to happen.
 
-6. Reboot your system.  Check if important programs work.
+7. Reboot your system.  Check if important programs work.
    In particular, verify that e.g. 'emerge --info' works (but do not
    install anything).  If you hit any serious problems, you can use
    'unsymlink-lib --rollback' to revert the changes and return to
    step 3.
 
-7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+8. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
    what is going to happen but note that you're going to see a very long
    list of files to remove.
 
-8. Switch the profile, e.g.:
+9. Switch the profile, e.g.:
      # eselect profile set default/linux/amd64/17.1/desktop
 
 [at this point you can start using emerge again. emerge will then 
  not display this message anymore, but the remaining steps are still 
  required!]
 
-9. Rebuild gcc:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. If you are using a multilib profile, rebuild all 32-bit packages.
     This can be done using:
       # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
 
-11. Once the last 32-bit package is rebuilt, your package manager
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. Once the last 32-bit package is rebuilt, your package manager
     should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
     does not happen, remove them manually:
       # rm /lib32 /usr/lib32
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/hardened/deprecated b/profiles/default/linux/amd64/17.0/hardened/deprecated
index 04b24997b203..4b041c6e3b60 100644
--- a/profiles/default/linux/amd64/17.0/hardened/deprecated
+++ b/profiles/default/linux/amd64/17.0/hardened/deprecated
@@ -1,53 +1,73 @@
 default/linux/amd64/17.1/hardened
 
 The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
-multilib layout, and require an explicit migration.
-The migration is performed using the app-portage/unsymlink-lib tool.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 The following steps can be used to upgrade your system:
 
 1. Sync and upgrade your system to the newest package versions
    to reduce the risk of issues.
 
-2. Install the tool:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. Run 'unsymlink-lib --analyze' and check the output for obvious
    mistakes.  If you need to perform any changes to the system, remember
    to run 'unsymlink-lib --analyze' again afterwards.
 
 [past this point do not call emerge or modify /usr manually]
 
-4. This is a very good time to make a backup.
+5. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
    what is going to happen.
 
-6. Reboot your system.  Check if important programs work.
+7. Reboot your system.  Check if important programs work.
    In particular, verify that e.g. 'emerge --info' works (but do not
    install anything).  If you hit any serious problems, you can use
    'unsymlink-lib --rollback' to revert the changes and return to
    step 3.
 
-7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+8. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
    what is going to happen but note that you're going to see a very long
    list of files to remove.
 
-8. Switch the profile, e.g.:
+9. Switch the profile, e.g.:
      # eselect profile set default/linux/amd64/17.1/desktop
 
 [at this point you can start using emerge again. emerge will then 
  not display this message anymore, but the remaining steps are still 
  required!]
 
-9. Rebuild gcc:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. If you are using a multilib profile, rebuild all 32-bit packages.
     This can be done using:
       # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
 
-11. Once the last 32-bit package is rebuilt, your package manager
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. Once the last 32-bit package is rebuilt, your package manager
     should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
     does not happen, remove them manually:
       # rm /lib32 /usr/lib32
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/hardened/selinux/deprecated b/profiles/default/linux/amd64/17.0/hardened/selinux/deprecated
index 255b567bbbf6..ab2397503e8c 100644
--- a/profiles/default/linux/amd64/17.0/hardened/selinux/deprecated
+++ b/profiles/default/linux/amd64/17.0/hardened/selinux/deprecated
@@ -1,53 +1,73 @@
 default/linux/amd64/17.1/hardened/selinux
 
 The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
-multilib layout, and require an explicit migration.
-The migration is performed using the app-portage/unsymlink-lib tool.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 The following steps can be used to upgrade your system:
 
 1. Sync and upgrade your system to the newest package versions
    to reduce the risk of issues.
 
-2. Install the tool:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. Run 'unsymlink-lib --analyze' and check the output for obvious
    mistakes.  If you need to perform any changes to the system, remember
    to run 'unsymlink-lib --analyze' again afterwards.
 
 [past this point do not call emerge or modify /usr manually]
 
-4. This is a very good time to make a backup.
+5. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
    what is going to happen.
 
-6. Reboot your system.  Check if important programs work.
+7. Reboot your system.  Check if important programs work.
    In particular, verify that e.g. 'emerge --info' works (but do not
    install anything).  If you hit any serious problems, you can use
    'unsymlink-lib --rollback' to revert the changes and return to
    step 3.
 
-7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+8. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
    what is going to happen but note that you're going to see a very long
    list of files to remove.
 
-8. Switch the profile, e.g.:
+9. Switch the profile, e.g.:
      # eselect profile set default/linux/amd64/17.1/desktop
 
 [at this point you can start using emerge again. emerge will then 
  not display this message anymore, but the remaining steps are still 
  required!]
 
-9. Rebuild gcc:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. If you are using a multilib profile, rebuild all 32-bit packages.
     This can be done using:
       # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
 
-11. Once the last 32-bit package is rebuilt, your package manager
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. Once the last 32-bit package is rebuilt, your package manager
     should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
     does not happen, remove them manually:
       # rm /lib32 /usr/lib32
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/deprecated b/profiles/default/linux/amd64/17.0/no-multilib/deprecated
index b031cc932e9e..b68f569db99d 100644
--- a/profiles/default/linux/amd64/17.0/no-multilib/deprecated
+++ b/profiles/default/linux/amd64/17.0/no-multilib/deprecated
@@ -1,53 +1,73 @@
 default/linux/amd64/17.1/no-multilib
 
 The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
-multilib layout, and require an explicit migration.
-The migration is performed using the app-portage/unsymlink-lib tool.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 The following steps can be used to upgrade your system:
 
 1. Sync and upgrade your system to the newest package versions
    to reduce the risk of issues.
 
-2. Install the tool:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. Run 'unsymlink-lib --analyze' and check the output for obvious
    mistakes.  If you need to perform any changes to the system, remember
    to run 'unsymlink-lib --analyze' again afterwards.
 
 [past this point do not call emerge or modify /usr manually]
 
-4. This is a very good time to make a backup.
+5. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
    what is going to happen.
 
-6. Reboot your system.  Check if important programs work.
+7. Reboot your system.  Check if important programs work.
    In particular, verify that e.g. 'emerge --info' works (but do not
    install anything).  If you hit any serious problems, you can use
    'unsymlink-lib --rollback' to revert the changes and return to
    step 3.
 
-7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+8. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
    what is going to happen but note that you're going to see a very long
    list of files to remove.
 
-8. Switch the profile, e.g.:
+9. Switch the profile, e.g.:
      # eselect profile set default/linux/amd64/17.1/desktop
 
 [at this point you can start using emerge again. emerge will then 
  not display this message anymore, but the remaining steps are still 
  required!]
 
-9. Rebuild gcc:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. If you are using a multilib profile, rebuild all 32-bit packages.
     This can be done using:
       # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
 
-11. Once the last 32-bit package is rebuilt, your package manager
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. Once the last 32-bit package is rebuilt, your package manager
     should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
     does not happen, remove them manually:
       # rm /lib32 /usr/lib32
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/hardened/deprecated b/profiles/default/linux/amd64/17.0/no-multilib/hardened/deprecated
index bd30b21ce48e..5a17c34f27a6 100644
--- a/profiles/default/linux/amd64/17.0/no-multilib/hardened/deprecated
+++ b/profiles/default/linux/amd64/17.0/no-multilib/hardened/deprecated
@@ -1,53 +1,73 @@
-default/linux/amd64/17.1/no-multilib/hardened
+default/linux/amd64/17.1/no-multilib/hardened/selinux
 
 The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
-multilib layout, and require an explicit migration.
-The migration is performed using the app-portage/unsymlink-lib tool.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 The following steps can be used to upgrade your system:
 
 1. Sync and upgrade your system to the newest package versions
    to reduce the risk of issues.
 
-2. Install the tool:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. Run 'unsymlink-lib --analyze' and check the output for obvious
    mistakes.  If you need to perform any changes to the system, remember
    to run 'unsymlink-lib --analyze' again afterwards.
 
 [past this point do not call emerge or modify /usr manually]
 
-4. This is a very good time to make a backup.
+5. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
    what is going to happen.
 
-6. Reboot your system.  Check if important programs work.
+7. Reboot your system.  Check if important programs work.
    In particular, verify that e.g. 'emerge --info' works (but do not
    install anything).  If you hit any serious problems, you can use
    'unsymlink-lib --rollback' to revert the changes and return to
    step 3.
 
-7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+8. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
    what is going to happen but note that you're going to see a very long
    list of files to remove.
 
-8. Switch the profile, e.g.:
+9. Switch the profile, e.g.:
      # eselect profile set default/linux/amd64/17.1/desktop
 
 [at this point you can start using emerge again. emerge will then 
  not display this message anymore, but the remaining steps are still 
  required!]
 
-9. Rebuild gcc:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. If you are using a multilib profile, rebuild all 32-bit packages.
     This can be done using:
       # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
 
-11. Once the last 32-bit package is rebuilt, your package manager
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. Once the last 32-bit package is rebuilt, your package manager
     should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
     does not happen, remove them manually:
       # rm /lib32 /usr/lib32
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/deprecated b/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/deprecated
index 46ee10d2470c..2c476214c5de 100644
--- a/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/deprecated
+++ b/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/deprecated
@@ -1,53 +1,73 @@
-default/linux/amd64/17.1/no-multilib/hardened/selinux
+default/linux/amd64/17.1/systemd
 
 The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
-multilib layout, and require an explicit migration.
-The migration is performed using the app-portage/unsymlink-lib tool.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 The following steps can be used to upgrade your system:
 
 1. Sync and upgrade your system to the newest package versions
    to reduce the risk of issues.
 
-2. Install the tool:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. Run 'unsymlink-lib --analyze' and check the output for obvious
    mistakes.  If you need to perform any changes to the system, remember
    to run 'unsymlink-lib --analyze' again afterwards.
 
 [past this point do not call emerge or modify /usr manually]
 
-4. This is a very good time to make a backup.
+5. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
    what is going to happen.
 
-6. Reboot your system.  Check if important programs work.
+7. Reboot your system.  Check if important programs work.
    In particular, verify that e.g. 'emerge --info' works (but do not
    install anything).  If you hit any serious problems, you can use
    'unsymlink-lib --rollback' to revert the changes and return to
    step 3.
 
-7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+8. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
    what is going to happen but note that you're going to see a very long
    list of files to remove.
 
-8. Switch the profile, e.g.:
+9. Switch the profile, e.g.:
      # eselect profile set default/linux/amd64/17.1/desktop
 
 [at this point you can start using emerge again. emerge will then 
  not display this message anymore, but the remaining steps are still 
  required!]
 
-9. Rebuild gcc:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. If you are using a multilib profile, rebuild all 32-bit packages.
     This can be done using:
       # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
 
-11. Once the last 32-bit package is rebuilt, your package manager
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. Once the last 32-bit package is rebuilt, your package manager
     should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
     does not happen, remove them manually:
       # rm /lib32 /usr/lib32
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/selinux/deprecated b/profiles/default/linux/amd64/17.0/selinux/deprecated
index 2e4dfe1314c0..1a7153ad0957 100644
--- a/profiles/default/linux/amd64/17.0/selinux/deprecated
+++ b/profiles/default/linux/amd64/17.0/selinux/deprecated
@@ -1,53 +1,73 @@
 default/linux/amd64/17.1/selinux
 
 The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
-multilib layout, and require an explicit migration.
-The migration is performed using the app-portage/unsymlink-lib tool.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 The following steps can be used to upgrade your system:
 
 1. Sync and upgrade your system to the newest package versions
    to reduce the risk of issues.
 
-2. Install the tool:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. Run 'unsymlink-lib --analyze' and check the output for obvious
    mistakes.  If you need to perform any changes to the system, remember
    to run 'unsymlink-lib --analyze' again afterwards.
 
 [past this point do not call emerge or modify /usr manually]
 
-4. This is a very good time to make a backup.
+5. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
    what is going to happen.
 
-6. Reboot your system.  Check if important programs work.
+7. Reboot your system.  Check if important programs work.
    In particular, verify that e.g. 'emerge --info' works (but do not
    install anything).  If you hit any serious problems, you can use
    'unsymlink-lib --rollback' to revert the changes and return to
    step 3.
 
-7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+8. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
    what is going to happen but note that you're going to see a very long
    list of files to remove.
 
-8. Switch the profile, e.g.:
+9. Switch the profile, e.g.:
      # eselect profile set default/linux/amd64/17.1/desktop
 
 [at this point you can start using emerge again. emerge will then 
  not display this message anymore, but the remaining steps are still 
  required!]
 
-9. Rebuild gcc:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. If you are using a multilib profile, rebuild all 32-bit packages.
     This can be done using:
       # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
 
-11. Once the last 32-bit package is rebuilt, your package manager
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. Once the last 32-bit package is rebuilt, your package manager
     should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
     does not happen, remove them manually:
       # rm /lib32 /usr/lib32
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/systemd/deprecated b/profiles/default/linux/amd64/17.0/systemd/deprecated
index cb52626392cd..2c476214c5de 100644
--- a/profiles/default/linux/amd64/17.0/systemd/deprecated
+++ b/profiles/default/linux/amd64/17.0/systemd/deprecated
@@ -1,53 +1,73 @@
 default/linux/amd64/17.1/systemd
 
 The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
-multilib layout, and require an explicit migration.
-The migration is performed using the app-portage/unsymlink-lib tool.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 The following steps can be used to upgrade your system:
 
 1. Sync and upgrade your system to the newest package versions
    to reduce the risk of issues.
 
-2. Install the tool:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. Run 'unsymlink-lib --analyze' and check the output for obvious
    mistakes.  If you need to perform any changes to the system, remember
    to run 'unsymlink-lib --analyze' again afterwards.
 
 [past this point do not call emerge or modify /usr manually]
 
-4. This is a very good time to make a backup.
+5. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
    what is going to happen.
 
-6. Reboot your system.  Check if important programs work.
+7. Reboot your system.  Check if important programs work.
    In particular, verify that e.g. 'emerge --info' works (but do not
    install anything).  If you hit any serious problems, you can use
    'unsymlink-lib --rollback' to revert the changes and return to
    step 3.
 
-7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+8. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
    what is going to happen but note that you're going to see a very long
    list of files to remove.
 
-8. Switch the profile, e.g.:
+9. Switch the profile, e.g.:
      # eselect profile set default/linux/amd64/17.1/desktop
 
 [at this point you can start using emerge again. emerge will then 
  not display this message anymore, but the remaining steps are still 
  required!]
 
-9. Rebuild gcc:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. If you are using a multilib profile, rebuild all 32-bit packages.
     This can be done using:
       # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
 
-11. Once the last 32-bit package is rebuilt, your package manager
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. Once the last 32-bit package is rebuilt, your package manager
     should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
     does not happen, remove them manually:
       # rm /lib32 /usr/lib32
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/package.mask b/profiles/package.mask
index f00bd364c9ad..da377510de98 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,16 @@
 
 #--- END OF EXAMPLES ---
 
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-01-13)
+# java-package without consumers. Bug #831107. Removal in 30 days.
+dev-java/dnsjava
+
+# Michał Górny <mgorny@gentoo.org> (2022-01-13)
+# A temporary hack used by flit to workaround a problem with pip.
+# No longer used by modern flit versions.
+# Removal on 2022-02-12.  Bug #831156.
+dev-python/intreehooks
+
 # Jakov Smolić <jsmolic@gentoo.org> (2022-01-13)
 # Dead upstream, uses EAPI 5, multiple open bugs, no revdeps,
 # no other distro is packaging this.
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index f60317bf41ad..7573dc09b588 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -156,7 +156,7 @@ mips		default/linux/mips/17.0/mipsel/multilib/o32	exp
 mips		default/linux/mips/17.0/mipsel/multilib/n32	exp
 mips		default/linux/mips/17.0/mipsel/multilib/n64	exp
 
-# PPC32 Profiles
+# Deprecated PPC32 Profiles
 # @MAINTAINER: ppc@gentoo.org
 ppc		default/linux/powerpc/ppc32/17.0			exp
 ppc		default/linux/powerpc/ppc32/17.0/desktop		exp
@@ -164,7 +164,7 @@ ppc		default/linux/powerpc/ppc32/17.0/desktop/gnome		exp
 ppc		default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd	exp
 ppc		default/linux/powerpc/ppc32/17.0/developer		exp
 
-# PPC64 Profiles
+# Deprecated PPC64 Profiles
 # @MAINTAINER: ppc64@gentoo.org
 ppc		default/linux/powerpc/ppc64/17.0/32bit-userland				stable
 ppc		default/linux/powerpc/ppc64/17.0/32bit-userland/desktop			stable
@@ -177,8 +177,8 @@ ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome		exp
 ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd	exp
 ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/developer		exp
 
-# PPC/PPC64 flat Profiles
-# @MAINTAINER: gyakovlev@gentoo.org, ppc64@gentoo.org, musl@gentoo.org
+# PPC profiles
+# @MAINTAINER: gyakovlev@gentoo.org, ppc@gentoo.org, musl@gentoo.org
 ppc		default/linux/ppc/17.0					stable
 ppc		default/linux/ppc/17.0/desktop				stable
 ppc		default/linux/ppc/17.0/desktop/gnome			stable
@@ -187,6 +187,9 @@ ppc		default/linux/ppc/17.0/systemd				stable
 ppc		default/linux/ppc/17.0/developer			exp
 ppc		default/linux/ppc/17.0/musl				exp
 ppc		default/linux/ppc/17.0/musl/hardened			exp
+
+# PPC64 profiles
+# @MAINTAINER: gyakovlev@gentoo.org, ppc64@gentoo.org, musl@gentoo.org
 ppc64		default/linux/ppc64/17.0				stable
 ppc64		default/linux/ppc64/17.0/desktop			stable
 ppc64		default/linux/ppc64/17.0/desktop/gnome			stable
@@ -195,6 +198,9 @@ ppc64		default/linux/ppc64/17.0/systemd			stable
 ppc64		default/linux/ppc64/17.0/developer			exp
 ppc64		default/linux/ppc64/17.0/musl				exp
 ppc64		default/linux/ppc64/17.0/musl/hardened			exp
+
+# PPC64LE profiles
+# @MAINTAINER: gyakovlev@gentoo.org, ppc64@gentoo.org, musl@gentoo.org
 ppc64		default/linux/ppc64le/17.0				stable
 ppc64		default/linux/ppc64le/17.0/desktop			stable
 ppc64		default/linux/ppc64le/17.0/desktop/gnome		stable
diff --git a/sci-chemistry/GromacsWrapper/GromacsWrapper-0.8.0-r1.ebuild b/sci-chemistry/GromacsWrapper/GromacsWrapper-0.8.0-r1.ebuild
index 8f747a7a5acd..e6354fb05f92 100644
--- a/sci-chemistry/GromacsWrapper/GromacsWrapper-0.8.0-r1.ebuild
+++ b/sci-chemistry/GromacsWrapper/GromacsWrapper-0.8.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 if [[ ${PV} = *9999* ]]; then
 	scm_eclass=git-r3
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-inherit eutils distutils-r1 ${scm_eclass}
+inherit distutils-r1 ${scm_eclass}
 
 DESCRIPTION="Python framework for Gromacs"
 HOMEPAGE="https://gromacswrapper.readthedocs.io"
diff --git a/sci-chemistry/MDAnalysis/MDAnalysis-1.0.0.ebuild b/sci-chemistry/MDAnalysis/MDAnalysis-1.0.0.ebuild
index 0b58e90489e4..1f9c2ac3aa5e 100644
--- a/sci-chemistry/MDAnalysis/MDAnalysis-1.0.0.ebuild
+++ b/sci-chemistry/MDAnalysis/MDAnalysis-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 6d5e2daf6e7f..79457e260392 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index f9e579b6e5f4..0cb03426493f 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/numkit/numkit-1.1.2-r1.ebuild b/sci-libs/numkit/numkit-1.1.2-r1.ebuild
index 80b313603db7..a47312e24d4f 100644
--- a/sci-libs/numkit/numkit-1.1.2-r1.ebuild
+++ b/sci-libs/numkit/numkit-1.1.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Numerical first aid kit (with numpy/scipy)"
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index f4bdff708f66..16e67aad794b 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/why3/why3-1.4.0-r1.ebuild b/sci-mathematics/why3/why3-1.4.0-r2.ebuild
similarity index 95%
rename from sci-mathematics/why3/why3-1.4.0-r1.ebuild
rename to sci-mathematics/why3/why3-1.4.0-r2.ebuild
index badf49628e94..cb84e64b2802 100644
--- a/sci-mathematics/why3/why3-1.4.0-r1.ebuild
+++ b/sci-mathematics/why3/why3-1.4.0-r2.ebuild
@@ -37,7 +37,9 @@ BDEPEND="
 		dev-python/sphinx
 		dev-python/sphinxcontrib-bibtex
 		media-gfx/graphviz
-		|| ( dev-texlive/texlive-latex dev-tex/latexmk dev-tex/rubber )
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
 	)
 "
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 6cf5d7b32da7..575c4998e126 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 564325110d87..3221c0ad798b 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,2 +1,3 @@
 DIST fwupd-1.7.2.tar.gz 3922633 BLAKE2B aec40de0bbadba9a8688617bf2f1a79b8952b8a30ac011b3656a3dee312295250e370a09b4ea2fbf35992f0124a7aa78b6e17200dc57c768d75d9ce3a94f6f18 SHA512 9cf47d13e31eaf11e2ffddfd26a0fb23a18049bcd7a54a1cb4e96003db8134cf01bbe83e507b90d429df78e478cb3c97bdd3d2c0e194f02994ef4c5a15347521
 DIST fwupd-1.7.3.tar.gz 3964542 BLAKE2B ab098023663c6b33e02270e169d1f29f5e2d8531e6b7924ae98b2bc2cb36bd86958c301f99bbc6754f5b30737ae1ee9ec64eec67a8661960837497527e2e5995 SHA512 6192574b0b4cb839c724bca91c9ed3d6ee934140038873a8e596d852b272b38b31e690f94e83eb9e21c45eb71515ff50720511c721a58b28f8f434a2ccd58bc8
+DIST fwupd-1.7.4.tar.gz 4002584 BLAKE2B 6d01ee3993cc2a55164fd6ae468c00430fdc63b737abbad3dd279ef061625de4e2540d76b7069757753a9e94c1afc3635b565a25758c9d616e0d467212fd4751 SHA512 fa7195e2873a55fe544636c639597b4b2bac0855b10df4fac075ce377b87ae2aa2ccd86fb173379d39ebff542acca33e97234fd6c946e12b212dcf88b5f378a1
diff --git a/sys-apps/fwupd/fwupd-1.7.2-r1.ebuild b/sys-apps/fwupd/fwupd-1.7.2-r2.ebuild
similarity index 97%
rename from sys-apps/fwupd/fwupd-1.7.2-r1.ebuild
rename to sys-apps/fwupd/fwupd-1.7.2-r2.ebuild
index 5aef904b6ca8..03e200fc2781 100644
--- a/sys-apps/fwupd/fwupd-1.7.2-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.7.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,6 +50,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/libgudev:=
 	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
 	>=dev-libs/libxmlb-0.1.13:=[introspection?]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
 	net-misc/curl
 	virtual/udev
diff --git a/sys-apps/fwupd/fwupd-1.7.3.ebuild b/sys-apps/fwupd/fwupd-1.7.3-r1.ebuild
similarity index 98%
rename from sys-apps/fwupd/fwupd-1.7.3.ebuild
rename to sys-apps/fwupd/fwupd-1.7.3-r1.ebuild
index 701fe15adf53..164e0e06e4f1 100644
--- a/sys-apps/fwupd/fwupd-1.7.3.ebuild
+++ b/sys-apps/fwupd/fwupd-1.7.3-r1.ebuild
@@ -49,6 +49,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/libgudev:=
 	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
 	>=dev-libs/libxmlb-0.1.13:=[introspection?]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
 	net-misc/curl
 	archive? ( app-arch/libarchive:= )
diff --git a/sys-apps/fwupd/fwupd-1.7.4.ebuild b/sys-apps/fwupd/fwupd-1.7.4.ebuild
new file mode 100644
index 000000000000..282861f294ad
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.7.4.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 linux-info meson python-single-r1 vala xdg
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( elogind minimal systemd )
+	dell? ( uefi )
+	fastboot? ( gusb )
+	logitech? ( gusb )
+	minimal? ( !introspection )
+	spi? ( lzma )
+	synaptics? ( gnutls )
+	uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	introspection? ( dev-libs/gobject-introspection )
+	man? (
+		app-text/docbook-sgml-utils
+		sys-apps/help2man
+	)
+	test? (
+		thunderbolt? ( dev-util/umockdev )
+		net-libs/gnutls[tools]
+	)
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-arch/gcab-1.0
+	app-arch/xz-utils
+	>=dev-libs/glib-2.58:2
+	dev-libs/json-glib
+	dev-libs/libgudev:=
+	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
+	>=dev-libs/libxmlb-0.1.13:=[introspection?]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
+	>=net-libs/libsoup-2.51.92:2.4[introspection?]
+	net-misc/curl
+	archive? ( app-arch/libarchive:= )
+	dell? ( >=sys-libs/libsmbios-2.4.0 )
+	elogind? ( >=sys-auth/elogind-211 )
+	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+	gnutls? ( net-libs/gnutls )
+	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
+	logitech? ( dev-libs/protobuf-c:= )
+	lzma? ( app-arch/xz-utils )
+	modemmanager? ( net-misc/modemmanager[qmi] )
+	policykit? ( >=sys-auth/polkit-0.103 )
+	sqlite? ( dev-db/sqlite )
+	systemd? ( >=sys-apps/systemd-211 )
+	tpm? ( app-crypt/tpm2-tss )
+	uefi? (
+		sys-apps/fwupd-efi
+		sys-boot/efibootmgr
+		sys-fs/udisks
+		sys-libs/efivar
+	)
+"
+# Block sci-chemistry/chemical-mime-data for bug #701900
+RDEPEND="
+	!<sci-chemistry/chemical-mime-data-0.1.94-r4
+	${COMMON_DEPEND}
+	sys-apps/dbus
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/pango[introspection]
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use nvme ; then
+		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+	fi
+}
+
+src_prepare() {
+	default
+	# c.f. https://github.com/fwupd/fwupd/issues/1414
+	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+		-i plugins/thunderbolt/meson.build || die
+
+	sed -e '/platform-integrity/d' \
+		-i plugins/meson.build || die #753521
+
+	sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
+		-i data/builder/meson.build || die
+
+	vala_src_prepare
+}
+
+src_configure() {
+	local plugins=(
+		$(meson_use amt plugin_amt)
+		$(meson_use dell plugin_dell)
+		$(meson_use fastboot plugin_fastboot)
+		$(meson_use flashrom plugin_flashrom)
+		$(meson_use gusb plugin_uf2)
+		$(meson_use logitech plugin_logitech_bulkcontroller)
+		$(meson_use modemmanager plugin_modem_manager)
+		$(meson_use nvme plugin_nvme)
+		$(meson_use sqlite)
+		$(meson_use spi plugin_intel_spi)
+		$(meson_use synaptics plugin_synaptics_mst)
+		$(meson_use synaptics plugin_synaptics_rmi)
+		$(meson_use thunderbolt plugin_thunderbolt)
+		$(meson_use tpm plugin_tpm)
+		$(meson_use uefi plugin_uefi_capsule)
+		$(meson_use uefi plugin_uefi_capsule_splash)
+		$(meson_use uefi plugin_uefi_pk)
+	)
+	use ppc64 && plugins+=( -Dplugin_msr="false" )
+	use riscv && plugins+=( -Dplugin_msr="false" )
+
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dbuild="$(usex minimal standalone all)"
+		-Dconsolekit="false"
+		-Dcurl="true"
+		-Ddocs="$(usex gtk-doc gtkdoc none)"
+		-Defi_binary="false"
+		-Dsupported_build="true"
+		$(meson_use archive libarchive)
+		$(meson_use bash-completion bash_completion)
+		$(meson_use bluetooth bluez)
+		$(meson_use elogind)
+		$(meson_use gnutls)
+		$(meson_use gusb)
+		$(meson_use lzma)
+		$(meson_use man)
+		$(meson_use introspection)
+		$(meson_use policykit polkit)
+		$(meson_use systemd)
+		$(meson_use test tests)
+
+		${plugins[@]}
+	)
+	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+	export CACHE_DIRECTORY="${T}"
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use minimal ; then
+		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
+
+		if ! use systemd ; then
+			# Don't timeout when fwupd is running (#673140)
+			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+				-i "${ED}"/etc/${PN}/daemon.conf || die
+		fi
+	fi
+}
diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest
index e789980f23a7..72dec2bddbcc 100644
--- a/sys-apps/opal-utils/Manifest
+++ b/sys-apps/opal-utils/Manifest
@@ -1 +1,2 @@
 DIST opal-utils-6.8.tar.gz 5321377 BLAKE2B 3be812618dcbd3d877576e1dec0b6a74ad9091b59760bd8f1f67ba9a8efbce79cba4130464dcb6f2b8e61dedca3a1a60103f36d04fcd234b5a4c577c6e07635b SHA512 a799112c14abdcdb37e1a4c63e48e12bb7a67b6c90476d4e60597f06fd6050a58ffd25859cf6bb12c393522e4b4771ce3aa25a1277bac35855d599e9eb357814
+DIST opal-utils-7.0.tar.gz 5418069 BLAKE2B 86ad4c1a3000753b0bd48f0cf50e9a91eeff8c2a420a6339e4359a5ce6a35954120d7fe7caff64def83bb06e96c602d099fb1fc8e5b580adb67c48a09fb9d7a8 SHA512 72198f0d1bb0d09cb74fe4656421a73ec1a604ec6fa0965bd82e56819a2d41a1a6588f8a8cc7eb507d73ef401f8557901a5305c844fbfc9f27534c7b2e2e9db3
diff --git a/sys-apps/opal-utils/opal-utils-7.0.ebuild b/sys-apps/opal-utils/opal-utils-7.0.ebuild
new file mode 100644
index 000000000000..c0dc400c7312
--- /dev/null
+++ b/sys-apps/opal-utils/opal-utils-7.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit linux-info python-single-r1 systemd toolchain-funcs
+
+DESCRIPTION="OPAL firmware utilities"
+HOMEPAGE="https://github.com/open-power/skiboot"
+SRC_URI="https://github.com/open-power/skiboot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2+"
+SLOT="0"
+KEYWORDS="~ppc64"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${DEPEND} ${PYTHON_DEPS}"
+
+BDEPEND="doc? ( $(python_gen_cond_dep '
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/recommonmark[${PYTHON_USEDEP}]')
+)"
+
+CONFIG_CHECK="~MTD_POWERNV_FLASH ~OPAL_PRD ~PPC_DT_CPU_FTRS ~SCOM_DEBUGFS"
+ERROR_MTD_POWERND_FLASH="CONFIG_MTD_POWERND_FLASH is required to use pflash and opal-gard"
+ERROR_OPAL_PRD="CONFIG_OPAL_PRD is required to run opal-prd daemon"
+ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils"
+
+S="${WORKDIR}/skiboot-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/flags.patch"
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	tc-export CC LD
+	export OPAL_PRD_VERSION="${PV}"
+	export GARD_VERSION="${PV}"
+	export PFLASH_VERSION="${PV}"
+	export XSCOM_VERSION="${PV}"
+	export FFSPART_VERSION="${PV}"
+}
+
+src_compile() {
+	emake V=1 -C external/opal-prd
+	emake V=1 -C external/gard
+	emake V=1 -C external/pflash
+	emake V=1 -C external/xscom-utils
+	emake V=1 -C external/ffspart
+
+	use doc && emake V=1 -C doc html
+}
+
+src_install() {
+	emake -C external/opal-prd DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+	emake -C external/gard DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+	emake -C external/pflash DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+	emake -C external/xscom-utils DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+	dosbin external/ffspart/ffspart
+
+	python_domodule external/pci-scripts/ppc.py
+	python_doscript external/pci-scripts/phberr.py
+
+	newinitd "${FILESDIR}"/opal-prd.initd opal-prd
+	newconfd "${FILESDIR}"/opal-prd.confd opal-prd
+
+	systemd_dounit external/opal-prd/opal-prd.service
+
+	if use doc; then
+		rm -r doc/_build/html/_sources || die
+		local HTML_DOCS=( doc/_build/html/. )
+	fi
+	einstalldocs
+}
+
+src_test() {
+	emake V=1 -C external/opal-prd test
+	emake V=1 -C external/gard check
+
+	# 2 test are fragile and fails because of filename path
+	rm -v external/pflash/test/tests/01-info || die
+	rm -v external/pflash/test/tests/06-miscprint || die
+	emake V=1 -C external/pflash check
+	emake V=1 -C external/ffspart check
+}
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index 70031c2ea400..f06572e8f2be 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -1,5 +1,4 @@
 DIST systemd-249.7-CVE-2021-3997.tar.gz 8431 BLAKE2B 167ae8bfb3b653fa4a7a62eee164f2a7edf2f0fb312db8ed955634030c95dfdbd747821b4652620cd34a7af38fe0b77e48ed61096b5d076c3eb2f56371e191c8 SHA512 b17a60a0862743faee0153218792a77b5d06a44876e0c53c264e98d62786442c165f47136d7bc2857edcedc24e667c220a2e7d065e77f9a957804131acb26598
 DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b
-DIST systemd-stable-249.5.tar.gz 10597897 BLAKE2B 5c573322ef9bcd9d019776d6e2d8625a741c1535c0d06661b5666c2438a70cfc4dc182919bb419829de27a4d93c16717ce24e668faf9bd6b09e57f8bd88be725 SHA512 d6f1a5a6f03f0ed05b111aee75da509c5868c523af6209f33e630724dd0c7e0d0abf16920795d587e6c31a5915d247ebc613cf26d4aecf39f82ebb0690fab75f
 DIST systemd-stable-249.7.tar.gz 10608252 BLAKE2B a5597c4973b24c962779622cae47dbf8351af49f8cd898d9c16a967c6f3600c6feb293e9b03eab0423b860eef5b04b287185fb9827cb323429d0ab9fc6d809b2 SHA512 4daf8570621fdcda5c94d982908c64eddfeef989005f4fd79a10f199dbc6f366354177bb59dff34bcb14764fb4423a870ffabac1163849ec53592e29760105fc
 DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.5.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.5.ebuild
deleted file mode 100644
index d4b97e07bdd5..000000000000
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.5.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *.* ]]; then
-	MY_PN=systemd-stable
-else
-	 MY_PN=systemd
-fi
-
-MINKV="3.11"
-MUSL_PATCHSET="${PV}-r1"
-PYTHON_COMPAT=( python3_{8..10} )
-inherit flag-o-matic meson python-any-r1
-
-DESCRIPTION="Creates, deletes and cleans up volatile and temporary files and directories"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz
-	elibc_musl? (
-		https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
-		https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
-	)"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="selinux test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-apps/acl:0=
-	>=sys-apps/util-linux-2.30:0=
-	sys-libs/libcap:0=
-	selinux? ( sys-libs/libselinux:0= )
-	virtual/libcrypt:=
-	!sys-apps/opentmpfiles
-	!sys-apps/systemd
-"
-
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if [[ -n ${EPREFIX} ]]; then
-		ewarn "systemd-tmpfiles uses un-prefixed paths at runtime.".
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# musl patchset from:
-	# http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd
-	# check SRC_URI_MUSL in systemd_${PV}.bb file for exact list of musl patches
-	# we share patch tarball with sys-fs/udev
-	if use elibc_musl; then
-		einfo "applying musl patches and workarounds"
-		eapply "${WORKDIR}/musl-patches"
-
-		# avoids re-definition of struct ethhdr, also 0006-Include-netinet-if_ether.h.patch
-		append-cppflags '-D__UAPI_DEF_ETHHDR=0'
-
-		# src/basic/rlimit-util.c:46:19: error: format ‘%lu’ expects argument of type ‘long unsigned int’,
-		# but argument 9 has type ‘rlim_t’ {aka ‘long long unsigned int’}
-		# not a nice workaround, but it comes from debug messages and we don't really use this component.
-		append-cflags '-Wno-error=format'
-	fi
-
-	default
-
-	# https://bugs.gentoo.org/767403
-	python_fix_shebang src/test/*.py
-	python_fix_shebang test/*.py
-	python_fix_shebang tools/*.py
-}
-
-src_configure() {
-	# disable everything until configure says "enabled features: ACL, tmpfiles, standalone-binaries, static-libsystemd(true)"
-	# and optionally selinux feature can be enabled to make tmpfiles secontext-aware
-	local systemd_disable_options=(
-		adm-group
-		analyze
-		apparmor
-		audit
-		backlight
-		binfmt
-		blkid
-		bzip2
-		coredump
-		dbus
-		efi
-		elfutils
-		environment-d
-		fdisk
-		gcrypt
-		glib
-		gshadow
-		gnutls
-		hibernate
-		hostnamed
-		hwdb
-		idn
-		ima
-		initrd
-		firstboot
-		kernel-install
-		kmod
-		ldconfig
-		libcryptsetup
-		libcurl
-		libfido2
-		libidn
-		libidn2
-		libiptc
-		link-networkd-shared
-		link-systemctl-shared
-		link-timesyncd-shared
-		link-udev-shared
-		localed
-		logind
-		lz4
-		machined
-		microhttpd
-		networkd
-		nscd
-		nss-myhostname
-		nss-resolve
-		nss-systemd
-		oomd
-		openssl
-		p11kit
-		pam
-		pcre2
-		polkit
-		portabled
-		pstore
-		pwquality
-		randomseed
-		resolve
-		rfkill
-		seccomp
-		smack
-		sysext
-		sysusers
-		timedated
-		timesyncd
-		tpm
-		qrencode
-		quotacheck
-		userdb
-		utmp
-		vconsole
-		wheel-group
-		xdg-autostart
-		xkbcommon
-		xz
-		zlib
-		zstd
-	)
-
-	# prepend -D and append =false, e.g. zstd becomes -Dzstd=false
-	systemd_disable_options=( ${systemd_disable_options[@]/#/-D} )
-	systemd_disable_options=( ${systemd_disable_options[@]/%/=false} )
-
-	local emesonargs=(
-		-Drootprefix="${EPREFIX:-/}"
-		-Dacl=true
-		-Dtmpfiles=true
-		-Dstandalone-binaries=true # this and below option does the magic
-		-Dstatic-libsystemd=true
-		-Dsysvinit-path=''
-		${systemd_disable_options[@]}
-		$(meson_use selinux)
-	)
-	meson_src_configure
-}
-
-src_compile() {
-	# tmpfiles and sysusers can be built as standalone and link systemd-shared in statically.
-	# https://github.com/systemd/systemd/pull/16061 original implementation
-	# we just need to pass -Dstandalone-binaries=true and
-	# use <name>.standalone target below.
-	# check meson.build for if have_standalone_binaries condition per target.
-	local mytargets=(
-		systemd-tmpfiles.standalone
-		man/tmpfiles.d.5
-		man/systemd-tmpfiles.8
-	)
-	meson_src_compile "${mytargets[@]}"
-}
-
-src_install() {
-	# lean and mean installation, single binary and man-pages
-	pushd "${BUILD_DIR}" > /dev/null || die
-	into /
-	newbin systemd-tmpfiles.standalone systemd-tmpfiles
-
-	doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
-
-	popd > /dev/null || die
-
-	# service files adapter from opentmpfiles
-	newinitd "${FILESDIR}"/stmpfiles-dev.initd stmpfiles-dev
-	newinitd "${FILESDIR}"/stmpfiles-setup.initd stmpfiles-setup
-
-	# same content, but install as different file
-	newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-dev
-	newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-setup
-}
-
-src_test() {
-	# 'meson test' will compile full systemd, but we can still outsmart it
-	"${EPYTHON}" test/test-systemd-tmpfiles.py \
-		"${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed"
-}
-
-# stolen from opentmpfiles ebuild
-add_service() {
-	local initd=$1
-	local runlevel=$2
-
-	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-	mkdir -p "${EROOT}/etc/runlevels/${runlevel}"
-	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
-}
-
-pkg_postinst() {
-	if [[ -z $REPLACING_VERSIONS ]]; then
-		add_service stmpfiles-dev sysinit
-		add_service stmpfiles-setup boot
-	fi
-}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 32362230c5be..8d3466ae249a 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,5 +1,2 @@
-DIST systemd-249.7-CVE-2021-3997.tar.gz 8431 BLAKE2B 167ae8bfb3b653fa4a7a62eee164f2a7edf2f0fb312db8ed955634030c95dfdbd747821b4652620cd34a7af38fe0b77e48ed61096b5d076c3eb2f56371e191c8 SHA512 b17a60a0862743faee0153218792a77b5d06a44876e0c53c264e98d62786442c165f47136d7bc2857edcedc24e667c220a2e7d065e77f9a957804131acb26598
-DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6df5191e6c632e2eac9f71f9ff9817564d9b3fc177d2aec0c0daea8ac33bbdc2066ad68a8967cf8857f4af3668b9a3e7d3bf SHA512 7a7791dfe4923c00987b924adcb1cd08c4d17af2b17b4c6c6c701856c6810cfda61f06821c39787339fc05293853c0ea61b9973fcf4495c7bf4f8054ecfae66f
-DIST systemd-stable-249.7.tar.gz 10608252 BLAKE2B a5597c4973b24c962779622cae47dbf8351af49f8cd898d9c16a967c6f3600c6feb293e9b03eab0423b860eef5b04b287185fb9827cb323429d0ab9fc6d809b2 SHA512 4daf8570621fdcda5c94d982908c64eddfeef989005f4fd79a10f199dbc6f366354177bb59dff34bcb14764fb4423a870ffabac1163849ec53592e29760105fc
 DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164
 DIST systemd-stable-250.2.tar.gz 11121031 BLAKE2B ddbb33648dbf0442e4258bf23ace04eac6d5ab6a2434537395b900b7bd4113a86199d6d559f8d76dcbede88484240a6593439acdcc7b1801857d13840c389c6c SHA512 2f734c1d1ea98ee3f1beb00689a0d56603cd981aa938bee1655445ddd4af3b2bb6472249fa158741edcb2259ee302b625e124c38b7d2ec00c53760d6b362d5bb
diff --git a/sys-apps/systemd/files/250-fix-openssl.patch b/sys-apps/systemd/files/250-fix-openssl.patch
deleted file mode 100644
index 520ba0b66427..000000000000
--- a/sys-apps/systemd/files/250-fix-openssl.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 9bcf483b117b23ae25bf4a5d39ddc3eade8659a6 Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Fri, 24 Dec 2021 10:06:13 +0900
-Subject: [PATCH] meson: fix build with -Dcryptolib=openssl
- -Ddns-over-tls=false
-
-Previously, when -Ddns-over-tls=false, libopenssl was missing in the
-dependency of resolved.
-Also, this drops libgpg_error when it is not necessary.
-
-Replaces #21878.
----
- meson.build             | 3 +--
- src/resolve/meson.build | 9 +--------
- 2 files changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index c0cbadecb123..0b7c1918ad4c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1474,7 +1474,7 @@ conf.set10('PREFER_OPENSSL',
-            opt == 'openssl' or (opt == 'auto' and conf.get('HAVE_OPENSSL') == 1 and conf.get('HAVE_GCRYPT') == 0))
- conf.set10('HAVE_OPENSSL_OR_GCRYPT',
-            conf.get('HAVE_OPENSSL') == 1 or conf.get('HAVE_GCRYPT') == 1)
--lib_openssl_or_gcrypt = conf.get('PREFER_OPENSSL') == 1 ? libopenssl : libgcrypt
-+lib_openssl_or_gcrypt = conf.get('PREFER_OPENSSL') == 1 ? [libopenssl] : [libgcrypt, libgpg_error]
- 
- dns_over_tls = get_option('dns-over-tls')
- if dns_over_tls != 'false'
-@@ -2200,7 +2200,6 @@ if conf.get('ENABLE_RESOLVE') == 1
-                              libsystemd_resolve_core],
-                 dependencies : [threads,
-                                 lib_openssl_or_gcrypt,
--                                libgpg_error,
-                                 libm,
-                                 libidn],
-                 install_rpath : rootlibexecdir,
-diff --git a/src/resolve/meson.build b/src/resolve/meson.build
-index 0580fbeec625..2cdf24b1cbef 100644
---- a/src/resolve/meson.build
-+++ b/src/resolve/meson.build
-@@ -135,7 +135,7 @@ systemd_resolved_sources += custom_target(
-         output : 'resolved-dnssd-gperf.c',
-         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
- 
--systemd_resolved_dependencies = [threads, libgpg_error, libm]
-+systemd_resolved_dependencies = [threads, libm] + [lib_openssl_or_gcrypt]
- if conf.get('ENABLE_DNS_OVER_TLS') == 1
-         if conf.get('DNS_OVER_TLS_USE_GNUTLS') == 1
-                 systemd_resolved_sources += files(
-@@ -178,14 +178,12 @@ tests += [
-          [libsystemd_resolve_core,
-           libshared],
-          [lib_openssl_or_gcrypt,
--          libgpg_error,
-           libm]],
- 
-         [['src/resolve/test-dns-packet.c'],
-          [libsystemd_resolve_core,
-           libshared],
-          [lib_openssl_or_gcrypt,
--          libgpg_error,
-           libm]],
- 
-         [['src/resolve/test-resolved-etc-hosts.c',
-@@ -194,21 +192,18 @@ tests += [
-          [libsystemd_resolve_core,
-           libshared],
-          [lib_openssl_or_gcrypt,
--          libgpg_error,
-           libm]],
- 
-         [['src/resolve/test-resolved-packet.c'],
-          [libsystemd_resolve_core,
-           libshared],
-          [lib_openssl_or_gcrypt,
--          libgpg_error,
-           libm]],
- 
-         [['src/resolve/test-dnssec.c'],
-          [libsystemd_resolve_core,
-           libshared],
-          [lib_openssl_or_gcrypt,
--          libgpg_error,
-           libm],
-          [], 'HAVE_OPENSSL_OR_GCRYPT'],
- 
-@@ -216,7 +211,6 @@ tests += [
-          [libsystemd_resolve_core,
-           libshared],
-          [lib_openssl_or_gcrypt,
--          libgpg_error,
-           libm],
-          [], '', 'manual'],
- ]
-@@ -226,6 +220,5 @@ fuzzers += [
-          [libsystemd_resolve_core,
-           libshared],
-          [lib_openssl_or_gcrypt,
--          libgpg_error,
-           libm]],
- ]
diff --git a/sys-apps/systemd/systemd-249.6-r1.ebuild b/sys-apps/systemd/systemd-249.6-r1.ebuild
deleted file mode 100644
index 0e72de6fff3e..000000000000
--- a/sys-apps/systemd/systemd-249.6-r1.ebuild
+++ /dev/null
@@ -1,505 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-# Avoid QA warnings
-TMPFILES_OPTIONAL=1
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-fi
-
-inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
-
-REQUIRED_USE="
-	homed? ( cryptsetup pam )
-	importd? ( curl gcrypt lzma )
-	pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-	curl? ( net-misc/curl:0= )
-	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	fido2? ( dev-libs/libfido2:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	homed? ( ${OPENSSL_DEP} )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
-		>=net-libs/gnutls-3.1.4:0=
-	)
-	idn? ( net-dns/libidn2:= )
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( app-crypt/p11-kit:0= )
-	pcre? ( dev-libs/libpcre2 )
-	pwquality? ( dev-libs/libpwquality:0= )
-	qrcode? ( media-gfx/qrencode:0= )
-	repart? ( ${OPENSSL_DEP} )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	tpm? ( app-crypt/tpm2-tss:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
-"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=acct-group/adm-0-r1
-	>=acct-group/wheel-0-r1
-	>=acct-group/kmem-0-r1
-	>=acct-group/tty-0-r1
-	>=acct-group/utmp-0-r1
-	>=acct-group/audio-0-r1
-	>=acct-group/cdrom-0-r1
-	>=acct-group/dialout-0-r1
-	>=acct-group/disk-0-r1
-	>=acct-group/input-0-r1
-	>=acct-group/kvm-0-r1
-	>=acct-group/lp-0-r1
-	>=acct-group/render-0-r1
-	acct-group/sgx
-	>=acct-group/tape-0-r1
-	acct-group/users
-	>=acct-group/video-0-r1
-	>=acct-group/systemd-journal-0-r1
-	>=acct-user/root-0-r1
-	acct-user/nobody
-	>=acct-user/systemd-journal-remote-0-r1
-	>=acct-user/systemd-coredump-0-r1
-	>=acct-user/systemd-network-0-r1
-	acct-user/systemd-oom
-	>=acct-user/systemd-resolve-0-r1
-	>=acct-user/systemd-timesync-0-r1
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? (
-		!sys-apps/openrc[sysv-utils(-)]
-		!sys-apps/sysvinit
-	)
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-apps/hwids[udev]
-	!sys-auth/nss-myhostname
-	!sys-fs/eudev
-	!sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-fs/udev-init-scripts-34
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		app-text/tree
-		dev-lang/perl
-		sys-apps/dbus
-	)
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if kernel_is -lt 5 10 20; then
-			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
-		else
-			CONFIG_CHECK+=" ~KCMP"
-		fi
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-generator-path-r2.patch"
-			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
-			"${FILESDIR}/gentoo-journald-audit.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsupport-url="https://gentoo.org/support/"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		$(meson_use split-usr)
-		-Dsplit-bin=true
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Dima=true
-		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
-		# Optional components/dependencies
-		$(meson_native_use_bool acl)
-		$(meson_native_use_bool apparmor)
-		$(meson_native_use_bool audit)
-		$(meson_native_use_bool cryptsetup libcryptsetup)
-		$(meson_native_use_bool curl libcurl)
-		$(meson_native_use_bool dns-over-tls dns-over-tls)
-		$(meson_native_use_bool elfutils)
-		$(meson_native_use_bool fido2 libfido2)
-		$(meson_use gcrypt)
-		$(meson_native_use_bool gnuefi gnu-efi)
-		-Defi-includedir="${ESYSROOT}/usr/include/efi"
-		-Defi-ld="$(tc-getLD)"
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		$(meson_native_use_bool homed)
-		$(meson_native_use_bool http microhttpd)
-		$(meson_native_use_bool idn)
-		$(meson_native_use_bool importd)
-		$(meson_native_use_bool importd bzip2)
-		$(meson_native_use_bool importd zlib)
-		$(meson_native_use_bool kmod)
-		$(meson_use lz4)
-		$(meson_use lzma xz)
-		$(meson_use zstd)
-		$(meson_native_use_bool nat libiptc)
-		$(meson_use pam)
-		$(meson_native_use_bool pkcs11 p11kit)
-		$(meson_native_use_bool pcre pcre2)
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool pwquality)
-		$(meson_native_use_bool qrcode qrencode)
-		$(meson_native_use_bool repart)
-		$(meson_native_use_bool seccomp)
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool tpm tpm2)
-		$(meson_native_use_bool test dbus)
-		$(meson_native_use_bool xkb xkbcommon)
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-		-Dcreate-log-dirs=false
-
-		# multilib options
-		$(meson_native_true backlight)
-		$(meson_native_true binfmt)
-		$(meson_native_true coredump)
-		$(meson_native_true environment-d)
-		$(meson_native_true firstboot)
-		$(meson_native_true hibernate)
-		$(meson_native_true hostnamed)
-		$(meson_native_true ldconfig)
-		$(meson_native_true localed)
-		$(meson_native_true man)
-		$(meson_native_true networkd)
-		$(meson_native_true quotacheck)
-		$(meson_native_true randomseed)
-		$(meson_native_true rfkill)
-		$(meson_native_true sysusers)
-		$(meson_native_true timedated)
-		$(meson_native_true timesyncd)
-		$(meson_native_true tmpfiles)
-		$(meson_native_true vconsole)
-	)
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	meson_src_test
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	rm "${ED}"/etc/init.d/README || die
-	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# https://bugs.gentoo.org/761763
-	rm -r "${ED}"/usr/lib/sysusers.d || die
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/kernel/install.d
-	keepdir /etc/systemd/{network,system,user}
-	keepdir /etc/udev/rules.d
-
-	keepdir /etc/udev/hwdb.d
-
-	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
-	if use pam; then
-		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
-	fi
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-
-	gen_usr_ldscript -a systemd udev
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_preinst() {
-	if ! use split-usr; then
-		local dir
-		for dir in bin sbin lib; do
-			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
-				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
-				eerror "One of them should be a symbolic link to the other one."
-				FAIL=1
-			fi
-		done
-		if [[ ${FAIL} ]]; then
-			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
-			die "System layout with split directories still used"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required.
-	systemd-hwdb --root="${ROOT}" update
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respected, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-249.7-r1.ebuild b/sys-apps/systemd/systemd-249.7-r1.ebuild
deleted file mode 100644
index 84bdcb174f3d..000000000000
--- a/sys-apps/systemd/systemd-249.7-r1.ebuild
+++ /dev/null
@@ -1,507 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-# Avoid QA warnings
-TMPFILES_OPTIONAL=1
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	SRC_URI+=" https://dev.gentoo.org/~floppym/dist/systemd-249.7-CVE-2021-3997.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
-
-REQUIRED_USE="
-	homed? ( cryptsetup pam )
-	importd? ( curl gcrypt lzma )
-	pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-	curl? ( net-misc/curl:0= )
-	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	fido2? ( dev-libs/libfido2:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	homed? ( ${OPENSSL_DEP} )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
-		>=net-libs/gnutls-3.1.4:0=
-	)
-	idn? ( net-dns/libidn2:= )
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( app-crypt/p11-kit:0= )
-	pcre? ( dev-libs/libpcre2 )
-	pwquality? ( dev-libs/libpwquality:0= )
-	qrcode? ( media-gfx/qrencode:0= )
-	repart? ( ${OPENSSL_DEP} )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	tpm? ( app-crypt/tpm2-tss:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
-"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=acct-group/adm-0-r1
-	>=acct-group/wheel-0-r1
-	>=acct-group/kmem-0-r1
-	>=acct-group/tty-0-r1
-	>=acct-group/utmp-0-r1
-	>=acct-group/audio-0-r1
-	>=acct-group/cdrom-0-r1
-	>=acct-group/dialout-0-r1
-	>=acct-group/disk-0-r1
-	>=acct-group/input-0-r1
-	>=acct-group/kvm-0-r1
-	>=acct-group/lp-0-r1
-	>=acct-group/render-0-r1
-	acct-group/sgx
-	>=acct-group/tape-0-r1
-	acct-group/users
-	>=acct-group/video-0-r1
-	>=acct-group/systemd-journal-0-r1
-	>=acct-user/root-0-r1
-	acct-user/nobody
-	>=acct-user/systemd-journal-remote-0-r1
-	>=acct-user/systemd-coredump-0-r1
-	>=acct-user/systemd-network-0-r1
-	acct-user/systemd-oom
-	>=acct-user/systemd-resolve-0-r1
-	>=acct-user/systemd-timesync-0-r1
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? (
-		!sys-apps/openrc[sysv-utils(-)]
-		!sys-apps/sysvinit
-	)
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-apps/hwids[udev]
-	!sys-auth/nss-myhostname
-	!sys-fs/eudev
-	!sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-fs/udev-init-scripts-34
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		app-text/tree
-		dev-lang/perl
-		sys-apps/dbus
-	)
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if kernel_is -lt 5 10 20; then
-			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
-		else
-			CONFIG_CHECK+=" ~KCMP"
-		fi
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-		"${WORKDIR}/systemd-249.7-CVE-2021-3997"
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-generator-path-r2.patch"
-			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
-			"${FILESDIR}/gentoo-journald-audit.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsupport-url="https://gentoo.org/support/"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		$(meson_use split-usr)
-		-Dsplit-bin=true
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Dima=true
-		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
-		# Optional components/dependencies
-		$(meson_native_use_bool acl)
-		$(meson_native_use_bool apparmor)
-		$(meson_native_use_bool audit)
-		$(meson_native_use_bool cryptsetup libcryptsetup)
-		$(meson_native_use_bool curl libcurl)
-		$(meson_native_use_bool dns-over-tls dns-over-tls)
-		$(meson_native_use_bool elfutils)
-		$(meson_native_use_bool fido2 libfido2)
-		$(meson_use gcrypt)
-		$(meson_native_use_bool gnuefi gnu-efi)
-		-Defi-includedir="${ESYSROOT}/usr/include/efi"
-		-Defi-ld="$(tc-getLD)"
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		$(meson_native_use_bool homed)
-		$(meson_native_use_bool http microhttpd)
-		$(meson_native_use_bool idn)
-		$(meson_native_use_bool importd)
-		$(meson_native_use_bool importd bzip2)
-		$(meson_native_use_bool importd zlib)
-		$(meson_native_use_bool kmod)
-		$(meson_use lz4)
-		$(meson_use lzma xz)
-		$(meson_use zstd)
-		$(meson_native_use_bool nat libiptc)
-		$(meson_use pam)
-		$(meson_native_use_bool pkcs11 p11kit)
-		$(meson_native_use_bool pcre pcre2)
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool pwquality)
-		$(meson_native_use_bool qrcode qrencode)
-		$(meson_native_use_bool repart)
-		$(meson_native_use_bool seccomp)
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool tpm tpm2)
-		$(meson_native_use_bool test dbus)
-		$(meson_native_use_bool xkb xkbcommon)
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-		-Dcreate-log-dirs=false
-
-		# multilib options
-		$(meson_native_true backlight)
-		$(meson_native_true binfmt)
-		$(meson_native_true coredump)
-		$(meson_native_true environment-d)
-		$(meson_native_true firstboot)
-		$(meson_native_true hibernate)
-		$(meson_native_true hostnamed)
-		$(meson_native_true ldconfig)
-		$(meson_native_true localed)
-		$(meson_native_true man)
-		$(meson_native_true networkd)
-		$(meson_native_true quotacheck)
-		$(meson_native_true randomseed)
-		$(meson_native_true rfkill)
-		$(meson_native_true sysusers)
-		$(meson_native_true timedated)
-		$(meson_native_true timesyncd)
-		$(meson_native_true tmpfiles)
-		$(meson_native_true vconsole)
-	)
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	meson_src_test
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	rm "${ED}"/etc/init.d/README || die
-	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# https://bugs.gentoo.org/761763
-	rm -r "${ED}"/usr/lib/sysusers.d || die
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/kernel/install.d
-	keepdir /etc/systemd/{network,system,user}
-	keepdir /etc/udev/rules.d
-
-	keepdir /etc/udev/hwdb.d
-
-	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
-	if use pam; then
-		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
-	fi
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-
-	gen_usr_ldscript -a systemd udev
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_preinst() {
-	if ! use split-usr; then
-		local dir
-		for dir in bin sbin lib; do
-			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
-				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
-				eerror "One of them should be a symbolic link to the other one."
-				FAIL=1
-			fi
-		done
-		if [[ ${FAIL} ]]; then
-			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
-			die "System layout with split directories still used"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required.
-	systemd-hwdb --root="${ROOT}" update
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respected, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-249.7.ebuild b/sys-apps/systemd/systemd-249.7.ebuild
deleted file mode 100644
index 0d9a1792bad8..000000000000
--- a/sys-apps/systemd/systemd-249.7.ebuild
+++ /dev/null
@@ -1,505 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-# Avoid QA warnings
-TMPFILES_OPTIONAL=1
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-
-inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
-
-REQUIRED_USE="
-	homed? ( cryptsetup pam )
-	importd? ( curl gcrypt lzma )
-	pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-	curl? ( net-misc/curl:0= )
-	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	fido2? ( dev-libs/libfido2:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	homed? ( ${OPENSSL_DEP} )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
-		>=net-libs/gnutls-3.1.4:0=
-	)
-	idn? ( net-dns/libidn2:= )
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( app-crypt/p11-kit:0= )
-	pcre? ( dev-libs/libpcre2 )
-	pwquality? ( dev-libs/libpwquality:0= )
-	qrcode? ( media-gfx/qrencode:0= )
-	repart? ( ${OPENSSL_DEP} )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	tpm? ( app-crypt/tpm2-tss:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
-"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=acct-group/adm-0-r1
-	>=acct-group/wheel-0-r1
-	>=acct-group/kmem-0-r1
-	>=acct-group/tty-0-r1
-	>=acct-group/utmp-0-r1
-	>=acct-group/audio-0-r1
-	>=acct-group/cdrom-0-r1
-	>=acct-group/dialout-0-r1
-	>=acct-group/disk-0-r1
-	>=acct-group/input-0-r1
-	>=acct-group/kvm-0-r1
-	>=acct-group/lp-0-r1
-	>=acct-group/render-0-r1
-	acct-group/sgx
-	>=acct-group/tape-0-r1
-	acct-group/users
-	>=acct-group/video-0-r1
-	>=acct-group/systemd-journal-0-r1
-	>=acct-user/root-0-r1
-	acct-user/nobody
-	>=acct-user/systemd-journal-remote-0-r1
-	>=acct-user/systemd-coredump-0-r1
-	>=acct-user/systemd-network-0-r1
-	acct-user/systemd-oom
-	>=acct-user/systemd-resolve-0-r1
-	>=acct-user/systemd-timesync-0-r1
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? (
-		!sys-apps/openrc[sysv-utils(-)]
-		!sys-apps/sysvinit
-	)
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-apps/hwids[udev]
-	!sys-auth/nss-myhostname
-	!sys-fs/eudev
-	!sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-fs/udev-init-scripts-34
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		app-text/tree
-		dev-lang/perl
-		sys-apps/dbus
-	)
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if kernel_is -lt 5 10 20; then
-			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
-		else
-			CONFIG_CHECK+=" ~KCMP"
-		fi
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-generator-path-r2.patch"
-			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
-			"${FILESDIR}/gentoo-journald-audit.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsupport-url="https://gentoo.org/support/"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		$(meson_use split-usr)
-		-Dsplit-bin=true
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Dima=true
-		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
-		# Optional components/dependencies
-		$(meson_native_use_bool acl)
-		$(meson_native_use_bool apparmor)
-		$(meson_native_use_bool audit)
-		$(meson_native_use_bool cryptsetup libcryptsetup)
-		$(meson_native_use_bool curl libcurl)
-		$(meson_native_use_bool dns-over-tls dns-over-tls)
-		$(meson_native_use_bool elfutils)
-		$(meson_native_use_bool fido2 libfido2)
-		$(meson_use gcrypt)
-		$(meson_native_use_bool gnuefi gnu-efi)
-		-Defi-includedir="${ESYSROOT}/usr/include/efi"
-		-Defi-ld="$(tc-getLD)"
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		$(meson_native_use_bool homed)
-		$(meson_native_use_bool http microhttpd)
-		$(meson_native_use_bool idn)
-		$(meson_native_use_bool importd)
-		$(meson_native_use_bool importd bzip2)
-		$(meson_native_use_bool importd zlib)
-		$(meson_native_use_bool kmod)
-		$(meson_use lz4)
-		$(meson_use lzma xz)
-		$(meson_use zstd)
-		$(meson_native_use_bool nat libiptc)
-		$(meson_use pam)
-		$(meson_native_use_bool pkcs11 p11kit)
-		$(meson_native_use_bool pcre pcre2)
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool pwquality)
-		$(meson_native_use_bool qrcode qrencode)
-		$(meson_native_use_bool repart)
-		$(meson_native_use_bool seccomp)
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool tpm tpm2)
-		$(meson_native_use_bool test dbus)
-		$(meson_native_use_bool xkb xkbcommon)
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-		-Dcreate-log-dirs=false
-
-		# multilib options
-		$(meson_native_true backlight)
-		$(meson_native_true binfmt)
-		$(meson_native_true coredump)
-		$(meson_native_true environment-d)
-		$(meson_native_true firstboot)
-		$(meson_native_true hibernate)
-		$(meson_native_true hostnamed)
-		$(meson_native_true ldconfig)
-		$(meson_native_true localed)
-		$(meson_native_true man)
-		$(meson_native_true networkd)
-		$(meson_native_true quotacheck)
-		$(meson_native_true randomseed)
-		$(meson_native_true rfkill)
-		$(meson_native_true sysusers)
-		$(meson_native_true timedated)
-		$(meson_native_true timesyncd)
-		$(meson_native_true tmpfiles)
-		$(meson_native_true vconsole)
-	)
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	meson_src_test
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	rm "${ED}"/etc/init.d/README || die
-	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# https://bugs.gentoo.org/761763
-	rm -r "${ED}"/usr/lib/sysusers.d || die
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/kernel/install.d
-	keepdir /etc/systemd/{network,system,user}
-	keepdir /etc/udev/rules.d
-
-	keepdir /etc/udev/hwdb.d
-
-	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
-	if use pam; then
-		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
-	fi
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-
-	gen_usr_ldscript -a systemd udev
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_preinst() {
-	if ! use split-usr; then
-		local dir
-		for dir in bin sbin lib; do
-			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
-				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
-				eerror "One of them should be a symbolic link to the other one."
-				FAIL=1
-			fi
-		done
-		if [[ ${FAIL} ]]; then
-			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
-			die "System layout with split directories still used"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required.
-	systemd-hwdb --root="${ROOT}" update
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respected, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 7dbc12491164..170f30868e80 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/rust-std/Manifest b/sys-devel/rust-std/Manifest
index 68535d7586d3..408325747f02 100644
--- a/sys-devel/rust-std/Manifest
+++ b/sys-devel/rust-std/Manifest
@@ -1,6 +1,5 @@
-DIST rustc-1.51.0-src.tar.xz 109596164 BLAKE2B c1ac89655adfe7db8005476d42c748cf1896f52888141229fd6dda43855dbb08c21c8e1f11398d2f1f9dd5f8d508d9158a3bda4f1b282d1b184ea4c701100837 SHA512 ded91468ddf3e6627f00e7ec3d44452aa24eb727a183c0de9d90264f593119a54300d56b09251a88260db480b48554181ae195c538996a32d68d48b6587ac0df
-DIST rustc-1.52.1-src.tar.xz 115109508 BLAKE2B c5d73f5884037d287d88ba9fdaf63a36678b692e1b510920045797ab29f1660f05cda901e19411ff83ec3084c4130034c269976b1056220f3e629cff116d07f0 SHA512 55f5053ce40d4eba4663052817aef6a6275139ca229c89cd1ec44711458b412720203301d8c7975aac5720a91fcaf21847f8184f641cbb0004f722520283c73c
 DIST rustc-1.53.0-src.tar.xz 115686332 BLAKE2B fa068f89d42f927fdc79ee31aad1386eaf2aa596a060e059c5a1a73fe48c48d008fc952cd6c7912b743e41d77a94b205639eed0f728b2539b62f18a772cabfe3 SHA512 70485cf7a0f7fc36ee31644e546374079dc387a85b44e5e793707fd0a4d7ca05d311291e78b86db955485d8f21c47ff9e1908acc4da68ba04929287213a40c24
 DIST rustc-1.54.0-src.tar.xz 116286856 BLAKE2B 5ac47822646a0b6205f09282168b4d4ddcace9f6bc8f242c890327ca4074626f129514f8bcae5c5556015745f718990cce490658076f5cd3526623439540416b SHA512 5162f85b43ca2c5af93fdbfb2597d75df8a838f7fcc025a5298499ce1043db50f1ea2fbba753e47ce5daad3d80d4b612acf6527ef902c34117763e687fdbbcfa
 DIST rustc-1.55.0-src.tar.xz 117197580 BLAKE2B 8d9739ce7571146aee0e07c6287de9a8c4f1a914606cd47819eb1ef118b15772ecf22d0d43d7732f03c234a013fa54a4a7f0578a3f136af518f71bf64a03305d SHA512 7522f2fa95d5af92472404ecc97d7d9e745e88c933196a83fa373ce1efff6db3c295e0e2afdbfa1ff00644554efa0c3c7f6c11f9119ecf9010cb440b3f27c2da
 DIST rustc-1.56.1-src.tar.xz 121798264 BLAKE2B 09677b0332022f28a0d80949a6735929dbf64276f7eb57195d8c33e6c80f13c903432ff77d8834093ab551677618fb1d385f2300e2b1b4c064f9c245c696be32 SHA512 193468e211cde9ebc5f6e30b8e3733b79bd8710fe6dd45c7ed8d4392f91010d30466787afd4d0b2041cd7dd994924fee8ad111048824e248bd994959e55bf15f
+DIST rustc-1.58.0-src.tar.xz 124348768 BLAKE2B e5a0d919a1ca1202e218cec3da93fc69cba163069b1f2b4051778a49184715579c14cd6b03baa0225b10a8f1adf758aca427c910d95dfa2e647bbf8b7d133785 SHA512 70104f4d3b474dcb9935200ef0503f29cb15f10d38ba8630e1dadbb384924dd9137fced647794699efe83ac88083e4ae5f45712f0e1c8bc0a6f8c23eecdb0aeb
diff --git a/sys-devel/rust-std/rust-std-1.51.0.ebuild b/sys-devel/rust-std/rust-std-1.51.0.ebuild
deleted file mode 100644
index 935388d41a01..000000000000
--- a/sys-devel/rust-std/rust-std-1.51.0.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit flag-o-matic multiprocessing python-any-r1 rust-toolchain toolchain-funcs
-
-DESCRIPTION="Rust standard library, standalone (for crossdev)"
-HOMEPAGE="https://www.rust-lang.org"
-SRC_URI="https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="stable/$(ver_cut 1-2)"
-# please do not keyword
-#KEYWORDS="" #nowarn
-IUSE="debug"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/rust-${PV}:=
-"
-
-DEPEND="||
-	(
-		>="${CATEGORY}"/gcc-4.7:*
-		>="${CATEGORY}"/clang-3.5:*
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-# need full compiler to run tests
-RESTRICT="test"
-
-QA_FLAGS_IGNORED="usr/lib/rust/${PV}/rustlib/.*/lib/lib.*.so"
-
-S="${WORKDIR}/${P/-std/c}-src"
-
-PATCHES=( "${FILESDIR}"/1.51.0-bootstrap-panic.patch )
-
-#
-# The cross magic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-is_cross() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-toml_usex() {
-	usex "$1" true false
-}
-
-pkg_pretend() {
-	is_cross || die "${PN} should only be used for cross"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	# do the great cleanup
-	strip-flags
-	filter-flags '-mcpu=*' '-march=*' '-mtune=*' '-m32' '-m64'
-	strip-unsupported-flags
-
-	local rust_root x
-	rust_root="$(rustc --print sysroot)"
-	rtarget="$(rust_abi ${CTARGET})"
-	rtarget="${ERUST_STD_RTARGET:-${rtarget}}" # some targets need to be custom.
-	rbuild="$(rust_abi ${CBUILD})"
-	rhost="$(rust_abi ${CHOST})"
-
-	echo
-	for x in CATEGORY rust_root rbuild rhost rtarget RUSTFLAGS CFLAGS CXXFLAGS LDFLAGS; do
-		einfo "$(printf '%10s' ${x^^}:) ${!x}"
-	done
-
-	cat <<- EOF > "${S}"/config.toml
-		[build]
-		build = "${rbuild}"
-		host = ["${rhost}"]
-		target = ["${rtarget}"]
-		cargo = "${rust_root}/bin/cargo"
-		rustc = "${rust_root}/bin/rustc"
-		submodules = false
-		python = "${EPYTHON}"
-		locked-deps = true
-		vendor = true
-		extended = true
-		verbose = 2
-		cargo-native-static = false
-		[install]
-		prefix = "${EPREFIX}/usr/lib/${PN}/${PV}"
-		sysconfdir = "etc"
-		docdir = "share/doc/rust"
-		bindir = "bin"
-		libdir = "lib"
-		mandir = "share/man"
-		[rust]
-		# https://github.com/rust-lang/rust/issues/54872
-		codegen-units-std = 1
-		optimize = true
-		debug = $(toml_usex debug)
-		debug-assertions = $(toml_usex debug)
-		debuginfo-level-rustc = 0
-		backtrace = true
-		incremental = false
-		default-linker = "$(tc-getCC)"
-		rpath = false
-		dist-src = false
-		remap-debuginfo = true
-		jemalloc = false
-		[dist]
-		src-tarball = false
-		[target.${rtarget}]
-		cc = "$(tc-getCC ${CTARGET})"
-		cxx = "$(tc-getCXX ${CTARGET})"
-		linker = "$(tc-getCC ${CTARGET})"
-		ar = "$(tc-getAR ${CTARGET})"
-		$(usex elibc_musl 'crt-static = false' '')
-	EOF
-
-	einfo "${PN^} configured with the following settings:"
-	cat "${S}"/config.toml || die
-}
-
-src_compile() {
-	env RUST_BACKTRACE=1 \
-		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \
-		library/std --stage 0 || die
-}
-
-src_test() {
-	ewarn "${PN} can't run tests"
-}
-
-src_install() {
-	local rustlib="lib/rust/${PV}/lib/rustlib"
-	dodir "/usr/${rustlib}"
-	pushd "build/${rhost}/stage0-sysroot/lib/rustlib" > /dev/null || die
-	cp -pPRv "${rtarget}" "${ED}/usr/${rustlib}" || die
-	popd > /dev/null || die
-}
diff --git a/sys-devel/rust-std/rust-std-1.52.1.ebuild b/sys-devel/rust-std/rust-std-1.58.0.ebuild
similarity index 95%
rename from sys-devel/rust-std/rust-std-1.52.1.ebuild
rename to sys-devel/rust-std/rust-std-1.58.0.ebuild
index 7ca481644a6a..b3528f3325e7 100644
--- a/sys-devel/rust-std/rust-std-1.52.1.ebuild
+++ b/sys-devel/rust-std/rust-std-1.58.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit flag-o-matic multiprocessing python-any-r1 rust-toolchain toolchain-funcs
 
@@ -124,11 +124,12 @@ src_configure() {
 		[dist]
 		src-tarball = false
 		[target.${rtarget}]
+		ar = "$(tc-getAR ${CTARGET})"
 		cc = "$(tc-getCC ${CTARGET})"
 		cxx = "$(tc-getCXX ${CTARGET})"
 		linker = "$(tc-getCC ${CTARGET})"
-		ar = "$(tc-getAR ${CTARGET})"
-		$(usex elibc_musl 'crt-static = false' '')
+		ranlib = "$(tc-getRANLIB ${CTARGET})"
+		$(usev elibc_musl 'crt-static = false')
 	EOF
 
 	einfo "${PN^} configured with the following settings:"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 90ee0668708b..5f51aa851924 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/htop/htop-3.1.2-r1.ebuild b/sys-process/htop/htop-3.1.2-r1.ebuild
index 8b750067a145..296878083679 100644
--- a/sys-process/htop/htop-3.1.2-r1.ebuild
+++ b/sys-process/htop/htop-3.1.2-r1.ebuild
@@ -10,7 +10,7 @@ inherit autotools linux-info python-any-r1 xdg-utils
 DESCRIPTION="interactive process viewer"
 HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
 SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index d59e544017f2..65869801e6da 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/rust/rust-1.58.0.ebuild b/virtual/rust/rust-1.58.0.ebuild
new file mode 100644
index 000000000000..8de903f38293
--- /dev/null
+++ b/virtual/rust/rust-1.58.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for Rust language compiler"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="rustfmt"
+
+BDEPEND=""
+RDEPEND="|| (
+	~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+	~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+)"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index d7e08d135c07..9616c2bc1dde 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index a14cef8a148b..8afd172163ce 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -93,103 +93,103 @@ DIST firefox-91.5.0esr-vi.xpi 573483 BLAKE2B 7b62675934fc36036e34df3f688ac47f1fe
 DIST firefox-91.5.0esr-xh.xpi 428173 BLAKE2B 19495b818bbb365b85a74e0e869831b4a036062e8a0c15cef4e5598f156b5c9e842e70531256e471ca5f38e50c992ae1ab75272cf0d0960a958d9b83eab83bbe SHA512 248f7d3f8915988f2a5c4c9d934b3bf6e3f7878bba83c74df25f119b671a9b8c08915b8d25ba0cab9f5f68f3c1e7edbebcf84a441a230597158549712a4cdb2d
 DIST firefox-91.5.0esr-zh-CN.xpi 575372 BLAKE2B 4d36fbf718303541f7b7fa33c959f216486b3306d212e11f47d286dfd64e1e289c9c636b9d338a49df445ef12067bd194d9699a4bf312ef9223dcffbf81ef765 SHA512 e77f85970ce112fe5037affb3a3cf47fb6863574738716d405e946ecacd6d4c2156cb763c8a475236c80013925073d9de71d147cc690ead0ddad39908942c39b
 DIST firefox-91.5.0esr-zh-TW.xpi 576219 BLAKE2B f41e203e52e2bc1ca0b8e81229c435ca70bee102b84308b7913e90622656be15106b9b5100939157b4af45ca8afa32645818023b3a7c8153f12fcdc1115ebec7 SHA512 9f9838d4e063ae6255d0e89ab5822e13fbdde081014cda45e22457add5c4759dad11f88b2812e7cbeac5f8e0ae3745f2ac15d08e116be344f9c3b83a20174944
-DIST firefox-96.0-ach.xpi 451187 BLAKE2B d02df5f9a6496702c8e093c3418499460c5f47c2a21ef8b31d6ecb36d01fd928651289c840ac2267c4425cefa1dd60f12733d0c327bead619471b112eb69f197 SHA512 f1d57a4826ff686663e869cda64b24bb024864ed293e2c05026dc6ed04b9bbfeaea7250f5f31acb51113bae38c817ee487f7a70e5b776eba462ba1a847df05fe
-DIST firefox-96.0-af.xpi 420335 BLAKE2B 4fb84f96e6919da8d9dd567ba6acacb61a7f7b8cedfb4326e83c6dd95c50137667d6fe8eaf0292a9b77da6a0737b59d156fe6b75f6da3b67496c46290cba2c6a SHA512 905e0ea7d8407355467893c1fddcaa24641f5d360a4f170a89bbc8fced3bf01fd5fadfa1061b76cc16ec9e19719014ea05f851b5eba233ae087e5074c70b5479
-DIST firefox-96.0-an.xpi 499444 BLAKE2B f30fa5fe1e8f277511d44b925a24c595ce90fd4a5d1d9457d4bda875ecd22c08c7309b31a725d6076899a43590784570e04c6c999b928d34d741a379e413dd26 SHA512 ca1260c450d7c70d1196928f288294d5a754a9263171f1482602b938baa372d719a1fc4d0539c3389a41fb95e6182934ba6cfe5f09f4ceeadf75cb82476f59e5
-DIST firefox-96.0-ar.xpi 559642 BLAKE2B 8d83d4d8ef207de690aac92c06857ee675ee901eac23088d33b9b97d6a97487249e69d59a7393d1bf91bab9d4034e694f36b7061544c1d21c248ad31d45c65bc SHA512 57845376a402ff4fd0449df3dbaef68a4cef956f7777c1a3e42b6182da239a61925e5d7f0e31523a3ac028463972110c184a1e73492bec4f53989a8ac1085f07
-DIST firefox-96.0-ast.xpi 496735 BLAKE2B 56ee7c86a5f8acd9110882e921ac94c7226f78aed13cae57a91a7529b3c5991ec3812d5d3768710bad9583bce77cdf7f6387640499e1f7a46f4168c362a97a61 SHA512 fc4d6af7f21d8f1f8a373cdb5d087414460066b1bf5086dd3ad521d29e889d9efd9f04f382cb222aa4ae3ac5b46cae68a75f2dab61760362bfad6d9f330ff9c0
-DIST firefox-96.0-az.xpi 487140 BLAKE2B 2ecc433464cf4b76fcaac8ed453929a2d9e0e960a52e252d48d2cc52ad3c51683f200e09ae8ccd87780a4b05f0d1afa09516fdd3c4dbe8afaae3cc45020982b4 SHA512 e21566bac36b219c3e81eacb8fb16a4445d18f653a64dac1532c41fd945e8fb3f23550dc8e477753f683619a7e517a5e5226099fd596a75ba601693205c83ed7
-DIST firefox-96.0-be.xpi 620916 BLAKE2B 398c138efce30cb85e037b364a68749ac2d642ffc4aaeab3137652b3074f80b0998bd220a12f4ee7d5b503d8620845788d2decf8b2ad59fee1f2b755a86cb7c0 SHA512 653e4c2351bde281fc8fc2ae47720edb7eae8bb51afaf3b707434351ad5629acae61942c43640072bffd1a99ba987c6af91ffd12de4b0de2912510cfe582a128
-DIST firefox-96.0-bg.xpi 566683 BLAKE2B 2e634c7daca2c45fb0e9c1e77a1b7e8d057021a73c002c40cd420ce5313b818a94171a5cae30618ed1f4f952c2c8165d78066623713867befd3382da52e6ae3d SHA512 dd8ad3b5c5498930d782e48965da6583da008f6c4d31850c5263523dcfdb3ca3ff12004f7d154e41d20292dc0540d0b0359f78da4ec9979851ab72c08734f87b
-DIST firefox-96.0-bn.xpi 556024 BLAKE2B 1f0c2bdc649b08dffff400013946915fbf2e51779c4eba296e38ae386582f416aea7cd2ad9fd1a8d3e57bb7cb19f1ab8700245e7aa11d5c8a2d3ae661459c252 SHA512 c875b7baecd463148ec84d6dafad2fa846d3e6c2b776cda7928cf87c73bf81b523f6f5b7e2db9ba978e3cc265009336d66815e9b9afe81709be59cae78feeaac
-DIST firefox-96.0-br.xpi 526874 BLAKE2B 50c71f9eadab08c45c453d78859262c5de7894f898dbffe696a1be5bf568249643179a78bc96c4749995619c1fc4fe6b71c2db7bdcc7cc8981bb746dd6fec8b6 SHA512 818ab36a42ff70e77bfdf76c39c0e27fd012b60efcf9380e1a1424fd473955fc17b2d11719577e5c289b7a6555fbfe3e7ac6d86542db14a3accb2a0c1cc690d5
-DIST firefox-96.0-bs.xpi 462230 BLAKE2B 03ee69f4b7a3713bf62c35fade1ee80bfea1bc9ea627fe1f4625eb3e982e21a06e36a3645763c9c0b53c713b144881f44e6f3fbc87e71144619683e8a55d4da8 SHA512 6d9aad647815e3f37e0bafc181c7e207e88416778588786aed3ab684e6e0268889616e955fb9ef69ebc2851f94dba79847a45f36e1678e1401c1454f0c675399
-DIST firefox-96.0-ca-valencia.xpi 538646 BLAKE2B fd9b5cb59aa80c4014affeb765c764e32433a4e2ee0ea2442cdae6280c2dc72dcac263274bf1def5286341c13445425521344cf84d29589cfa1eff6bf22c24bf SHA512 00a05ff52b638c995dd535a5506f86bd437e759ffb6e989aa45e6a4da78837fa481ec1c36fff1808391a981ea3401e27476e6b53b441640ba8d687727d795857
-DIST firefox-96.0-ca.xpi 531294 BLAKE2B 2d3b5cb54b92a59a64a0fe37769895ce8a7abe014a790d86283c8ec822aacd2ed5ef29bfe3b51b365c2925ad5b4ec888995a05ac9f9222e246a30de114f12c97 SHA512 b8013f6953d6dc0d41059b4ebbffd972c017f747ddcae5ffd1c46ad4d3ac24c336a9026814e8f2bb6a87acfa2adc0212beb62f640892d6b80d774c9d839df83e
-DIST firefox-96.0-cak.xpi 553134 BLAKE2B 2979fc95106749114e15f8163634eab5f0336d0b9bf0865114a483cf7ba0f9b8f02c4b4a6c9b9a9d93f4f7bf7f1dd5ff6ab561a33d0183fcb1ca49ecae25a73b SHA512 048cd81cb26e9a59e8b619ec6369f9e81ec9c2cb65ca041537b595012d935032c55150ae85c6062860da35da6375ef26f1f5af935446cde35e38f5d00029ed23
-DIST firefox-96.0-cs.xpi 563574 BLAKE2B e3f7f22c04887240874bc0c53e756f9d561dee9dff83d12d8e4780247b81329f0a80a88346a6d33b5aa1199b714ece8e97f56881c08bc00ec88a38d846b9f920 SHA512 61d82c7c55b7fcd30c30846cb802a2b6391b07414e9ee09ebd431f10eb7fd3d53a08661479279116e8bde5e643c49e8f7725b08c2f7452351fcab0719174d47a
-DIST firefox-96.0-cy.xpi 542924 BLAKE2B ef957c6ca68e82c971f7926c10d0efe18143b7010effcb924db998a37d98964cf3e1d744cb3d3887f00be1839556da43388c3b3261af7061ef93834b398cd20d SHA512 f1ea7b89d246b6cd8c6466dbf036d105dfa6704e9de06a9cbb7113535c732f8be73eadc4cfeb41006a836a47285d61ada44e630f2a7363bf5d06c10c6d339bee
-DIST firefox-96.0-da.xpi 533841 BLAKE2B 54a2998bccf0cd7a20e3b3b14c9d94468bb6d6ec71cf237e7300c6f8cea594a5b27f1260a1bef9f1cb4e4efea1895567503a88436057bf521022d4665bb8bc77 SHA512 eeccf33b508b8d3d96420d32326626d6da509464b03dce43757cbbaf132a6520211e8e6dfe7a1ec796b949029310766636aaeeb67dca16b2d189ab5dd3ebfb19
-DIST firefox-96.0-de.xpi 554163 BLAKE2B 6a138275096dd0fa0f145db9b56a7f90368492bcc91b5471fcc0be0445ceabdfd8a9f40525c2c664c88a45fb10bcb2d16d3857ee6b63e656ef7a14464f40a067 SHA512 267f3f10f522543c59b91479d7d478071d14ee84f88954e2f19aa01ef5e05d9ce226bc64369115bd1c44bc321d2f3933d4f876ac33b57c00e8a09bcff3a67f1d
-DIST firefox-96.0-dsb.xpi 567018 BLAKE2B 9eea903f14678f35d18f94a9decf1a6b200845e8922dd31adc2baaf969d5efa5bec4b532caac9ef581578ec242ecac0eba3035d631b5373097a93f1fc82790d4 SHA512 475a5c26adee314e641929dfabc0fa567dae73a3dac7bca4e6b3fc09288c52ba9ffb38bde323df945897f68d5843dd87b3b3ec8c797ce46f6c8669a621d0fd92
-DIST firefox-96.0-el.xpi 638274 BLAKE2B ba93a85a09257fbf07c5b1c4d66ca3928f162a214ec9a082fc153fc92102836843b84a875bd90856627dac3814e65472036618600d1442105a2c408a3bbb9086 SHA512 b0386a3c535e9d9d7c4dacaecf02e64110668ab336660a8fd1cdb277dfa8a5d05e5074e5df0b978a61aa8e5d70ebcc3c71181812423eb758e18d15d171bc00e9
-DIST firefox-96.0-en-CA.xpi 510545 BLAKE2B 68596c6468cd67120faf5c8c1851ac205b3fabcc7aa9b977d03c06618a9e334a8836870c45eb730df786e69c5f00b8f01e418dc3ef92c4db3aa0336b859ee254 SHA512 46ee5754d7449fed45994d5d3f247cf872bebcca2e97ed51b8f558f9dd88b11a42a64203d8c57eed6444b4710225564c653c046ff6166e5b4f9b6f7931f2dca7
-DIST firefox-96.0-en-GB.xpi 511260 BLAKE2B 3dd0595ce2a89d137613f682504fd318b5a8d9138b98ad6a08aecd6bba99610e5b452f92c63bf9943bcaefda5cf58c895912bc118ba8b0397d1bb8134e60b72a SHA512 32d3e4ac17eda509077065f4c989732a90054566769d27c66f877e3abcb79e127ae8983cc5a663a4be45433057746b6b8c3f02f1a8b9c2fa88d1469d069617f9
-DIST firefox-96.0-eo.xpi 535221 BLAKE2B 11da0d9f114408cf8b8bd9826ae891442a4cd86fe43d9d45d1d4770dfaadaf18b25f12d48b0e73d6bae5a6664a54a6db105b15d31dd2455aedecae98b7c95135 SHA512 215aa51bf7112c8cecaf965f522f0fece66d15b8419cd615c726349694097f36f11c5a67bd52a12923d27950545dc85ca197f27f38178ba5150cff4d671a0dbb
-DIST firefox-96.0-es-AR.xpi 547490 BLAKE2B ec80d4b45c8dec0ea7b95dbcf1d0683a1abb25fdc974d3909d2304776771750a82e03d8e07af2079372593047abeef7673c8955afb36067fb573104d3914815e SHA512 8f63c5fafc3b401a5784ef688bd7ea9bf7291052d3e8e94f7c3ac081c94c754eceeae15a1fbbfab60932d06c35b227606f74b324afb79a223d1c4487ff8412a4
-DIST firefox-96.0-es-CL.xpi 546861 BLAKE2B 28c62827129840db1f169ba9e8e3ce62d51e6e275e3c916242c7fa8f25ce9994c21753e248abc9f6b60e98e66ddb9489dcec399240c084b87dc09b26ab9b73aa SHA512 37fc4dde65ae3556137fd6a8b23867b463c0560f33e63bc48c3145ade6f81b478346337b6570ff7185a386f9dc18bd269da209a71746bdb668de285c2e34e643
-DIST firefox-96.0-es-ES.xpi 537721 BLAKE2B 7bc3923e48cd65f82a9f8b8bb8acb6bbc5472cd66b93042fa9ba8ec69a8731ca8bbe11ffad396834b6e98ac94154b59807f2d43ed16d52576f9831f513d2a549 SHA512 fb5f80e16286a601f7fb0439ec9adefdaac0cf0b3664b333081577574d5659414ce4c48a1cf7722abd7dcc6116700022e378e6c719844e5bb01fea41c4cbd49b
-DIST firefox-96.0-es-MX.xpi 550720 BLAKE2B e1a5b4c24c72c2abd1fad021779d9cb8e5fe3fca6f2fbe1a5a3040269d0c8d51a82260a5b805e9dfa7f8507eb9f83186299ce7e49a5174d893095681af55caf1 SHA512 d05479f6d1c749593760c5713ca7d9b0fe3ec7608112860a40e5a7c74db7d85fcaccabfc5f7faa2fca201fa8628e99991fc48c1727eae2f627ded6116fc8c16c
-DIST firefox-96.0-et.xpi 528807 BLAKE2B 67bf5993ff9faab99268816420017a2652228486c11d43db2067137d0135b1bb493a08dd7f4e374cddd48066c597c021ef443b8029b6e92279d52dc2d213f2fd SHA512 2e7ab5ca36a11a5f4da89e5303223dd40c4b40be7dab41418b08de505a76ee51072c9b02b4b68dd2b9cb29fc00cbb4672d783c0e630a322ac6ae06fe7eb0a20b
-DIST firefox-96.0-eu.xpi 536789 BLAKE2B 02a83843d4cb2ec047794caf1931b4ac022c504de158f3bded6a35425e2f7a931bd2f535e0d26e16b7547c2127e1b2d20d508b4a75b937a11084875cb095f83c SHA512 280faf7c5cf67389812700679749412a62db6065a772bf77a3775768449da94bfe78215007897bddaeb0f47afd0e049af2787dee88afc6ab38c4bdd6d47aa561
-DIST firefox-96.0-fa.xpi 563689 BLAKE2B 46749169a6de5d0dd5c21b7fff8f7bb618eda55a65f2c80a268a514829ca087da0dc212f3f3cac9f10be7753daa283dcb434594494c008903e1f9f140264778b SHA512 8b7c536894ae0d8dc042545f4f211cb3c58666c8968ef35bcbad6944bda5644df11c8b6f4880c312eaa7f5895148a46f0d9c0ea3c8169c76200b7caf7efddd76
-DIST firefox-96.0-ff.xpi 470390 BLAKE2B 6d7c8abbd006a85f74cc451a06203e22ffc42a21aee975a9ae27c858562eff6cac8ddb846bdd75d7693bf08ad24e044d735f598038be2a4ceebccb86cda0a9c7 SHA512 b579059e806ec8b43fe1b50c7eba07179faff007aaf256b2b9f00d2f019c95f6f57fc4f2a8f184172e46fb2b62ed0f1cebafaf01e3d108887a47272afd603b2b
-DIST firefox-96.0-fi.xpi 532846 BLAKE2B fbcb0569106fc1c04f0d38ed58ef08712d9e0333663d0d469c7cb22ce7d26473a010ab0c659279a059ec4d32710b753228c8ae461b6b76c9b7cfe8f7cd0cbc6c SHA512 2c24ee1872384200ed87d0994e79d00b84bb9273102c8dbf315f1c4bafd5423eb9e0ae68991a77724fc0bf0e8f959ca7f306385e480446f4b7567258db1400dc
-DIST firefox-96.0-fr.xpi 558442 BLAKE2B e155e87987e40340a44d68a3774a0a010cc7f47cb356d6dbf2e76eb41c7a4983eee79e5c54554919ee8cbad7d7310766fb0c09c5ab6bf4fb47a3fbf540881435 SHA512 419ba4d06bd8bc7a4239c4363f54baf7e8ca1592a07e75287126bab90e39a15a4e97e8e7d48a52293e4b6bc35822696d2bc910029c8ffc99c7999718fa88549a
-DIST firefox-96.0-fy-NL.xpi 543697 BLAKE2B c4d4fd20079df6b64b3406b2c61349d4a84c0464a2112a6687c9d9e83c26093d4004dfe030c62d2da0fee664bfbd81235fbdf99cb758e78e6d0eea27b275f8d0 SHA512 cf78800b4260e0a4d09949998b889ec5a679ccbfb926779cc43930e622864cebd1e10c19c3477add6477f07419520e7ce532695fb4dab0d73abd2ffed23b5d31
-DIST firefox-96.0-ga-IE.xpi 457647 BLAKE2B ef8e700c5248675fdf32ba91f2e211d8abfb86be56040683e41342ef5f53447c7d1c3d2937b10c7e3120acdb6f85001e5bf33501f05522c0b494391112a17779 SHA512 b41f1715513298a5293f64ca9d94abc14a9b5efc5b025806307553dc72b97cd10396c383b294017c2333696306696a56b2c25a16e20ea00ee41deb9069ac4baa
-DIST firefox-96.0-gd.xpi 530888 BLAKE2B d39b6f16f008c2ffd9755d03a93e29f15493cf3521d8a5c31d60ed92b10483e0058c8630c4f77d027d07a5e676433eda30276016ae919e4aeabf78555e4aa8ca SHA512 c57b46697d3ec0e197e502ea0d99e72f3af1f7ea39c2cdfc76570bb24079918866f3b8a0b6b463eb452a07fd968bc783d258df747f692abbb0cca48e9a56dfd4
-DIST firefox-96.0-gl.xpi 542035 BLAKE2B 18e7fb43c226492a0ac136920ae50e4c0b2442441e00062b532c39aba38b29772c9df115420db4fd143d9da067307165b734afa3a9a200aaba4765043d4fbedd SHA512 cd0b0cf06108a1367ce0668150a93435d9f4bd91534ed2c9ab6234dc8af406121e1154703e775a40b503a3e272ac3639e826f97d2320d800f3292645011fb800
-DIST firefox-96.0-gn.xpi 558954 BLAKE2B b0b4baae851a39141e708f28ebd431be63cb82e631be2414aa9f0eae0971ee5eee37ade5f6edf633d7b20903afc144c6dab2a88e66602c2d58a45d4103fbcb02 SHA512 4fabf58eba7aa550851ff5b97f5ce92c922fea037221b5f3cfe5bfcc88aa8d5acc04b224157591d942c61ae71c1e2475ad8309a655d16ee7dbfcb385448d74f3
-DIST firefox-96.0-gu-IN.xpi 527662 BLAKE2B 740a9bae021cd7db821bf91cc5673120c5e033fdac9d8b1b128d1690368dbf662f53f87698cad0c1ab8eaea07f8cde3c3f754a292d42a01ed435b65b7a4ce680 SHA512 5457cc647f95156e4ebe23abe7894e5170eb80def4a898889696ea5a80037c792dea2764086fa857c475c2e2668467fb64ae5dad48d2823d87e120bd941ac3d9
-DIST firefox-96.0-he.xpi 557089 BLAKE2B 16de6f2ead2d669782b6fe56f9a93d0c808afa9743283665d0d1064dae2d5f96d8f54d519211fcbcb33d74be83986bf31282464e6ef2a5c0e6320dd4a4fbb52c SHA512 dde3618cd33f8aaf22aa2d88f063160783d54085ed54d214631b75dfc7189a07fc2f86a83c1ffc994d7424a1b25831c9a61cb101db23c5e0defc6d7e2b364e31
-DIST firefox-96.0-hi-IN.xpi 558753 BLAKE2B aa337556d9ccb35bc82587cfe6c23bb69610e2adb8beeadc121281b7387c9c07888ebc1be10e8b5b99ebf537ac288b38070fc538a2e54c71aad6095ccff02e7e SHA512 222e23acf2044444512d6b243ac7c77eea367ab17ac95a88f23108e1554b7d4437255b8327eabc0cbc3d0a5ac6324718c4e6f717c00698fe0597ba9f2d8133fb
-DIST firefox-96.0-hr.xpi 531744 BLAKE2B ae9a90100017a339b1ccb9584f9831185fbe0ecb70b69ea9dd3d1cf25682b4b63ab58c705f98034244cf3010a20241eab71163eb4f47632a3d36d385c833f91b SHA512 f77bdf213e23105cef495d7ae78a9509f1259c9eef16ee27f4e0513ae99879e46ce2587342e08081bfaf3701fc337f9dfc94b7f5598d253d8495309060cde66f
-DIST firefox-96.0-hsb.xpi 563124 BLAKE2B 94245baeabac6eae37ee4905e95b42aa1b2078eee7bd2ae0232ff0eea4731ef3e12bf87087ff4574af8f7ee7adc75f5586eeb737935b79e35d771779d6bc4b95 SHA512 2fbab74ce8c34f696d3cab7fd07d5242c6cdeb92286101bedc996ab0cd6b27370832905e5a911092fc69c99c16003b9d08b250aa825f3a39b790509f4a565564
-DIST firefox-96.0-hu.xpi 566420 BLAKE2B 521fe70a905c4e0a7d0ebc8681b26e36f17d5cfb9f3fb8fd5d25cde8de0434219023c1c002adfdd10dc34a48a1c37b80bd4c6f7b8ee6bfb111fbc33300721a56 SHA512 25006728eb94b5a1f71967a58119ab113fc2d38b3bb4ffc6ea04aadc43864dda4ef381cb9ab77db1500a729d220741c3f27d16302f13322a1955d19f2c2a5c88
-DIST firefox-96.0-hy-AM.xpi 580461 BLAKE2B 6c5492326e0808b8dc008a95df1169742a55289c125a6cbd4361ef2c3580e1a67781bfd4b361d365d29c27fa6a01c6cfc9932d7df0f0ef155dd78323973e5391 SHA512 2815a0524d15439923cabdd4dce33776f828b481c08c1f552df931e5f3d9671294b4d83f273af32f949ae02d029aa91da1a18cd60865c036cee49325e3f20844
-DIST firefox-96.0-ia.xpi 533074 BLAKE2B 81ba6fc03188c6863c949d8a51ce734385de08bc308090b2bc007ae126e2729940ea8367996e488d3b075a74ba941dc85e80c361ec47c8c79d65eb9e88c6f363 SHA512 b0f611716939421c60db212c7c0c37005f90e5c32e77e84b7051784740705525a396ec6c42c65133d856b9389d24c8409575962875d4466866d43cd26576bd2d
-DIST firefox-96.0-id.xpi 521708 BLAKE2B d1730be9d85affbf4e70a8149a2adc41de833229a791cfdfc6a5bcd060b384b7a1440aa481b989fcd5d4fe06a810e1dd4f09b9202e001ef9c0165f1133c4f420 SHA512 c0cc7baf60b247a905a460e68dc2179b5cd4b73da4bcbc486a044d865283fa10d71e492cb4a068127b03082d790635202eb3283c55d2f415b75d2f4381e7c55a
-DIST firefox-96.0-is.xpi 500006 BLAKE2B fd4db8317add04dcdce51fc2d80f3bfabe7097488684ecd9b3bef574042075eac68d06441636206764308cfd3b466558c70190dec6f8ab7c84a1807e1706711c SHA512 9854d9fc160f63b15e5a6cd42b7447b64f84a458b1b4974fa5e059c7c919c37236b72062656fcf073000888ccff54d76bc937663a44db84f54fb636b9c465c56
-DIST firefox-96.0-it.xpi 460938 BLAKE2B 417e5964e75afa6c0e3d0818a2a07f50d7b3ab665ab70c892c6c958e2c0a7761b1ff046492f87bd1185a0da535bcf5fe1ae77a262bbb919ffed2b80d77c07dd1 SHA512 2e1cd754cb2c56469aa20d94257eb462fd2afc5402abe9f43e0a2dc7e3d0702c3f61d9e2f0f057891719a14a15e9540e8c13e3b5de54978e5cf48db3397c19f2
-DIST firefox-96.0-ja.xpi 586105 BLAKE2B bb4f946f296bcb76f43d9fea3c352e5346c661361a24f1b09ea8e90472c06db629b75e50f5b4c08fb81793b20e9b533e539e0089b9c73c728abdf44292492018 SHA512 b5fc5608cde9f10004a35eb43e7684f854d963bdfc04bd0bc2cd5b329dca6fe4f9945a579513197811641968fd5d57e6aa03aed36994d0c4eca0058304573d51
-DIST firefox-96.0-ka.xpi 590825 BLAKE2B 076958c251faee47f9d1e709f3b01015e76cd8f43a19e352193959a02a3e3ad7fa5de0acb7e75519d9aa6c030b0664697098ee7cf3897799b5b1f605dccf8a4a SHA512 963c5ea4ef1048681303b4591370ad98a2ecc275f6e2a5a2d012e51ec8e7076a28d871fb79660fc8f6d5033ef57276008e82e664c42d10651d5256086ef01a48
-DIST firefox-96.0-kab.xpi 546185 BLAKE2B ec3528154e6e5eaebde777d368c636e7949438d3316df99fdf618bbca99dc88dc2f416b900471ff02caed3b1722e87ebc0688e0f5dc35fe94b7dd81db61cf7d2 SHA512 9570d4a77ba41a61b7cb7e49a5b31269d9cc30304769fe2239b203e0523d690cb0c4d75fdf8b6b4450cc95e759733b2312a2d07acd70bb76e7eb4af7358ee67f
-DIST firefox-96.0-kk.xpi 613165 BLAKE2B d503b0b7e1916cab280b1c575e42558110e6da371e60c55e23c55bcc1cb14b18f1c32df61babb68a91a3868d4ee57e8564cf1a40ef2c495b5387bd809ad429f4 SHA512 eceb7f1a8e30e96813e2d210916083d4d89bb818b8979f07d438aa47c3831ca4171231438455937aa460f1905285ac53b356c2116f9807fc80398c94bc2b15d0
-DIST firefox-96.0-km.xpi 529622 BLAKE2B c40141db744b6328fa1abd0b121a85faaa0ecade8802e9c853f941a1df1bb2bc84d5f8ad34c7b78322b8a6c163968075673f8349d38314132c5b65b97f8ae230 SHA512 4b8e8b481d0fac32c92d68ed3714acdb410b589d8eae969405344af33b553d9116e5ecae78af0858b5a51838c963ab9d23ec19be0b4a1ad4ba5a7e01be3f2e71
-DIST firefox-96.0-kn.xpi 495316 BLAKE2B 2f424f6763bf4ad5c776ea071a9a21e100fb6f25854fb70f6d7b0071dd497c836695649f328aa9156e80f598b1633bdd47efbc8d6039eb2ed63bced342683f86 SHA512 f27a41c3bc919d1dc5f3a5040589df16e8f3aaf53e7097f26be25c470d0585eea7b3df548881d2c64095daa047a92b8e6bbea7d48aa2f8afd47b8dfc7dab65c5
-DIST firefox-96.0-ko.xpi 579616 BLAKE2B 5bc6b0ab64525d030668260dc5852a870420874b015ac3aa599d5c71e83bfb4b103e1a8b34cdaa5a1d4b8f0eaef89f4ffa5c999f07a8b22ea0ffb5189737bde1 SHA512 cea3dddc07d06dbfecb86b198e171c71ceb328da9fdf253bbcf4f683688558e7e15957d8d706f3e5c0fd14142cd7359d840daad86fc828daaec97e5069601a21
-DIST firefox-96.0-lij.xpi 469145 BLAKE2B c6ebd5daba31330b3f97d9cda550a99d5658261fe75fe7b484153ae0beba11a9890736a5fca6871da39a5ca665ea7ff21cdb19ef40b533ae4ef5868fd1912604 SHA512 5ac65472099a66b2109407e57d0b5eaaf92ff511a6c26b9f6f24cfac1c567863716eeee9fe13476a8e364247d65024e00972609b43ef4c2395bf6df69d87b8d4
-DIST firefox-96.0-lt.xpi 559296 BLAKE2B 27218f653726e95d554ebf273b94cf00618ef45ab33643dac415320547d7337218595c6179e31543b86b7ffe7bf26626c15bb9c52c1e4ed0031102465a4a135b SHA512 b2c7534aa8d49a6ee38a96f14fb0aeaf6a4b7ee8f1eb8093d517544b912dc12c438d4c25ea4e2ca2ca63b71ff2e4fa283b8cd8c770007e6974e2e7533efabd7c
-DIST firefox-96.0-lv.xpi 461297 BLAKE2B 9c27489c7dba27d2277af6c6f08fa8cf064a1755c156bb3d48a1acaf836db1f3161a51718d0122ccdbf4650e1d1adf262236c561fe3c751ffc7d71ea36dc482b SHA512 56b34a8e5cc1447dda605c57b9cc70f41acb93037d3509e09f9e408b0966b31bb810fcfa498277387055273e74eb6a13612075f72352fd412b32d90123281dd9
-DIST firefox-96.0-mk.xpi 463328 BLAKE2B f6648aad3c8935205d42e45739741e36bbfdc5c3cf5ba614922f8eff9193c1b0eeed94bc34cb427dc4f17ffbd5076daa491d2b45426a09bdf664202b43e3d090 SHA512 bd1c9639de77aaa54d3fb790d4a1d4515ac0faf6ab7b766531978056d8c85784aa7e0654780858a9aea1f9b590d6e26a7b58fe2541e368f75c8ad9861b616e48
-DIST firefox-96.0-mr.xpi 530513 BLAKE2B e30a4362ceaa6db1ed1463cc641264672d1722d939a28996dc18324374f13a254ba45c38ad5d659cab56ddabfb52136b255a37a8957b57093adc062d20099725 SHA512 f770de18a0920dc8c57faba9d2f891e2c8f3237d9f058ba5a84371a0fa00666544b681076ddf48182a070c4d4cc758faaadc060f72d7f527fde3549c6e8bfb4e
-DIST firefox-96.0-ms.xpi 446399 BLAKE2B 94f95a903ce87e5acc72f3594f9709bb52724fe8c4c7eb775bce63ecc2cc7c818d8174cc60372cc74e2f66f3233b7488866855fde5535401b01d91a51826efdb SHA512 f6fb91019c1d08a0275d3260095af4429d152b4cfca06395698d88acaf9fe5d0f6d7558b52a86f5e4c87e97dd9af3a5566ab7fce748673a13868978e7f64f526
-DIST firefox-96.0-my.xpi 511708 BLAKE2B 3d6b74ef5f5073005dcec8ecd09593f5af9bfaccddb37ce324df9ee94f2d187ba9003e6766d333050ce121df3a2e75bd333f53bc187f30084728a775d866a076 SHA512 9096b96c5098ed415cf254feb9ceb6e1a361df83d18fa3abdbfcd241184712f260d6eae0192ea16613e5727a8cc0b593a0ac00124f8d8d61051bd6f50320d31e
-DIST firefox-96.0-nb-NO.xpi 529011 BLAKE2B bd6eee383cb7695c802c239dc1a50277c597f4e5dcd3742ca768cba4f2e6faa5ad0a4900e25fab86101d8bce1def707471500a0d2d1b6a6d86475088e1958aee SHA512 cd3b94ce6b81ee807aaa93e22b2e662cb18c7a615e2f1c884298c0691ef4fd023efc129dd9439fd5c764d140224d7e644b9a4ca71343823b461b2ce64a20b88d
-DIST firefox-96.0-ne-NP.xpi 482345 BLAKE2B 52165c67010938f50ef1fbc94da6f88e0bbc0378a96d489537984ca9135242ddeb790f86a4f44cde88f14f95aa44274ff7a260137cde4b518a6bf6f9df8eecbe SHA512 a8076672b8eb27d6de823ea30f33e984106393f6a565b0e79942cbb626b4a11507d82c513f6eafa646555e17912be3c3713921970c28ddacef033d5b211bf7e3
-DIST firefox-96.0-nl.xpi 538019 BLAKE2B a984d4b76281d7ba1e4086889c2c0a799fa53d151961a0fbece962026badf890c6d17dabc9aaeb10ccb5cbea4fa60a87c71b6372e59b2dca043a355e119a44a5 SHA512 99e0a29e552d02b5feccb46614eaa20f5cd61154c8880b07eebaaba0526605883d3ccf06097c23d30bf425aa05a43902ca20967dc8c22eab5bc9aeeb9729e8a5
-DIST firefox-96.0-nn-NO.xpi 531116 BLAKE2B 5c758b992fc8c3077b54be0cffffc802a384f021da104f74e4665c2e3a1ee5d567e0e22a7d664a54c62611e0a6b96ea916579e6b748deac726c115e784c4cbda SHA512 2aec82304ab8542268c0a83cc2ad45bbb84f81d394eee1fa774f2cbb92e68ddb91de9d99942ce18f118aadc9abdbe8605f61be0cd9bc1eb0e7cb31c7178651cf
-DIST firefox-96.0-oc.xpi 553576 BLAKE2B 3536b2bd2dbe6ff6a6f65c24de970547025af616a88bfee5847566cf496ab13c31df05ec759e55341f3d9b2c901cbef15dfcd13c72666aac479acdeb7651c31e SHA512 17f1aa36eb27b640da574308a2eb1a6b616b5789995eeb4e9199ffe7fa46bfb68ed59592f7cea9612fb44ed2034ab119ce59a695df33dd1727f79cbd1506e759
-DIST firefox-96.0-pa-IN.xpi 593686 BLAKE2B 2b1790bdc63483bd0e4c7ac1230cdd309fde0c88efc2061c437dd5b6f1126cc2c49f16559b1d709bd530861fba858aa7322ef915cf5b60a638e52b2ffb4747d5 SHA512 5d56af3b701da67f2f1592d0c1e793c6e251c1ee66e7fa45cacf1a16605234ccb4d1f2283f9fb44944e5a2cde1b2730398dbd41c538b3b69abfb31e7ecbc5cae
-DIST firefox-96.0-pl.xpi 556872 BLAKE2B 77512f683b19e84458ac52e70499bb037920be10962d0bfd2e0f49d4ddea865f816a22977ae9ac3b8110b9450fab424abcf7943bf03d7b13d068a1ea1b986f4c SHA512 5439450f180a8e47550247b1172fe0000a752af51dca10cf54524576c204212bed0265873d778dbc0021da519c8b17fe15352dab57ad9d25017e8d3552061795
-DIST firefox-96.0-pt-BR.xpi 543359 BLAKE2B 807a07b699d90e0b8fae7682e1db60af68b20d6913c08d25e4d9d4b4fbd0872d07b115374e0926d3cb0d95f8bcbef38b0dd1e3a7cd7d420a7724dd7832680253 SHA512 92f90efd558addc226d0344b79d8ddd100a9ba7ea613e88eb5bef1e96953896f7e9b912387fdae4c5ffcc8c556067baa013cc290974e6664ea1e15c40e21ffe2
-DIST firefox-96.0-pt-PT.xpi 545098 BLAKE2B 8beec8bc18fdc9a08e15ce3a4dde82bf6a62f984b4126ff5d7410994bdc8fc76f27c5b92685781b9ed3873a7c2798f698c622cb623a3a7e64be8c4740aa8905a SHA512 9b06ac16e29b9573aa365a1a0d639068ebbb6579354f3d03653d8f858f9dae60b114b7a85418eefbaa4adbdafe2b2ef9cb353249640a15c6c7868e6364988667
-DIST firefox-96.0-rm.xpi 536759 BLAKE2B 114666d3eb20bc889f45aa22ee89e970f7f84b67ad7da7bdcc040442b79f2dea60ddfb9297a626dfdf16b76dd0fbcdec501b5c91976f25a67253c80ce253eecc SHA512 c32c2393000a76882c0ceddb458869e5e04d3a1868282bf125430990b4d43f11795ac4a77c2c96fb8e3aafc9bee9fcd1c8df40fdf6406fa94969f3801f9f68ac
-DIST firefox-96.0-ro.xpi 529764 BLAKE2B a8a26ca4082159d1e79a9b408dc7cd14990d61e2a914de924a47ca5156581abb70062d7fcba7680e08eec8b96c08d771f990c8fa65cfa7a5b865437106a534de SHA512 e86f49f93c61b3a73633ce8d6a3ec1f8e699f6fb94edd8358b9e56066e3c9d56a40a31c2adde1cef4871eb45e858ef4cf9f360a78e9573ea38455f397f674fa0
-DIST firefox-96.0-ru.xpi 627602 BLAKE2B 559a7ca48058cc88cb95dab144b55b0d9b4ee76e97cfaf15a4af6328cb69040482f7e5849943ad0ad72cb67c7e7b34b9de99b82490568daf591ecd3b4e427baf SHA512 41bafdb582242647c5a8962c22a4828b6b219f1038b809fd7731281802f3bfc97e8557686ac20532709b8dff405ed61fb9e474e09db9d51aa7f75e55df70a8b2
-DIST firefox-96.0-sco.xpi 503461 BLAKE2B 227105a5721a382f3338119a0828e6d00590d9f21772ea8b9fa0e6396f98048214bf2e6395554ce38433f7384c7091e0eb62ed0451e3c9e5d86b52ed6f172f5e SHA512 dfad860ea018f3900c52a0f1d3d57a37c4145ec899a3eafdae7d4a3a2e88df33d7f8a10dbb6dcf02e563a069d7518e18199fb44636d1e969c9b828be377a8d8c
-DIST firefox-96.0-si.xpi 484749 BLAKE2B 4323a5c9b22fc330cbeb014a330f929d2e0e12afb3025724e49993e9a4d06e820a40ba73c345251742001b8cbee66884ef72d0def85cb3782cfc6964a9ce5a4b SHA512 a55ebe4ef2c4264ae1568285d885164eeda8e292dc47a09cfb46fa14653efcff1a504c7a0a5e967aa371cda339e31b7f07b362d644f8c4613320aaa383cc65c8
-DIST firefox-96.0-sk.xpi 567146 BLAKE2B 65b055532b0e2c97726b223c0113e80ecc17daf1e3a6b8a26e9a7c1c0cb5816677d1ad9612fc8642cdb262ba70dbbb8d99c6b19f71293a19aae47a13fa57854e SHA512 64c58d50223840f1c3cd822c60fc97dc5bae3cf4e6b63fead6f66125c4d361ac57719c9802a4b381e6a7ffaac8ae074a9026a76f773356abd7da0b22bc18fc48
-DIST firefox-96.0-sl.xpi 537521 BLAKE2B 69f1c3ecd8e48726caa38453def6c2eb92245ca4a9b429ac423ad94e880200ddf2388b3ec41984f8ee9f0e5ef498a9d6c03d40727f8af01640f3de2ba0c0cd13 SHA512 d83b281e3613e780391c7613d312de26a35c9af09091580b9c7ed0b9372ece7394f8e09c96ee907beb0d2aff338d8d10a97c9714f2e9e871278202637570f64b
-DIST firefox-96.0-son.xpi 420865 BLAKE2B f31bb3db5a079fd7c1b47c832ad50925edd8057ed7243ce29906c681d7d5e682dae125b4b3b666e6c38b643b7ea88176f8ade9201ac3e13d4b902ec47adffb61 SHA512 b1983cd3f695a609decc58a00a81aba1395d1763f9a0a07bb9f237908e7b0ce5ef4ec19aaa696f4da377e02b39fc6c5fa6c54f38c01f2c8dd9dc3e28b954354b
-DIST firefox-96.0-sq.xpi 555352 BLAKE2B 2595066eb78035caa8ad6da37dc3266916c6ba545bad95caa9fcd93cdb39022ec15a43f51d5bc6600b8d1173a08965b3a5add023ee5e3d553b9518d4dc04cc1a SHA512 83c36347d67abfbf50f9cb242986b524c6456964024c0564e0464881181eb7630146480df6804bf2caa198f18306ffcc5922189f083c3f9222cc5e71e96fc14d
-DIST firefox-96.0-sr.xpi 585962 BLAKE2B cbff0a131c59d2e9b87249c5c500c52d910f81b58b6ff8b9012b2d5fdec0028e5cff0dbaea306e60dd460e678897f97835b8f4ca9ff51fab311b16f2d1da9c8a SHA512 88540a0ac11d9beeaf958586000012a963022ebe2627607a1824a5891ddfe6ea04ed36481cd9500271c7b0341b49c15fc4888917fad7ee9b94e0d8005eb6a480
-DIST firefox-96.0-sv-SE.xpi 540645 BLAKE2B 649fe836fa34fc97a615975bff087a1ceefa1ddc8c78530ffddd8604c30438786d10b67daadb2ea09bb0a550ef347b516874f75e2224d0927b6de0e40e324bc0 SHA512 1dd36ed016325227827efc3f051cf380fb85e4c5ea147acddcd7d2fe00604e88942440410e99776a4a6cd8035c122956f8860c41148b23fd56fcf7c1a72c42e5
-DIST firefox-96.0-ta.xpi 510848 BLAKE2B b6bdda3488b31909de67583845fe18a205dec0256b4111460aae496bd3e9917ddd5da40d56c6a30792fae95763e0185a2740fef8b4d3bd67fd236374cac84295 SHA512 51ea7858f130deb50ba48b0ca46289badeca238b019788a7d97b112e694054b36e38738c94ce3d711a6bb89e5fb062106ef913c57b320e5184ab6c55be5b1236
-DIST firefox-96.0-te.xpi 549262 BLAKE2B ed92cf1b24bea1d6c30a8419ae7e24e75350de166838ea1448504e62b679a97e8e81de22d1eafc778cc07aba76d44f8387e591e94b0289b5160818c4003767c2 SHA512 47a45b4f6d125182e698d60242d11a65b4cb0be3fd828970e62942d7397366ee5178268e118a7c414503d00aa325115e8bf80da1dafc5ebe95a9d1b4102d4f7c
-DIST firefox-96.0-th.xpi 605805 BLAKE2B 844f3d8beb152b3b0d4a40ed25591b26514815fbb17a8b9a9ba8f2eeb6f799739ad3c2584a140a82f25561a78248731e60986844d80ffa994a600445246c4ae3 SHA512 771e7a0910b5d7e0f59e52682341f3fa104bbc54c8dd2db243389aac4eec6442bca34494e44901d42709aed0d3a8a6372365eb9575298990574706b00dd437e1
-DIST firefox-96.0-tl.xpi 519510 BLAKE2B 84748cb850aff2851d682485c505e59ede291b6c923f86344169febe39f79ca87496638835aa20e0a413dc6febd0c3fb8473366b61eb012117deef055dca7157 SHA512 1cc6212d3e58fbad81db0f6741ce0d4a7764dbdc71e157afff7e58733efcd2ee7c0c167eee330aca59e1bb090844f3f088bbc5049b07ea354cdfb3d2dd9c5d44
-DIST firefox-96.0-tr.xpi 553351 BLAKE2B cbb75ea274c3327f80d584ef057a792e4c64b0db6a1357edf90b3908d9fd374e8c81bc86aa1d96f8d82d59ad2f935ba7757677793685e4f37c0dc38ff3e164d2 SHA512 1df45a8a6a7a3dfbdf4083c87e50fd171ccf5f2985a6062efe62460d8d2f674d574948b98de3036707dbe9e100633c57cc67d93a97e42707c1845d5e121f3db5
-DIST firefox-96.0-trs.xpi 490081 BLAKE2B c723fc566e2cff78c7b09874b0fa654fc2e202a848d43acd409c4b62f89c9bd354a45c81ac05dfb7cd63a6ad78895443ee9ab476da955f70c0a0b438d4759fb2 SHA512 8cb73cbde0d228c5271dc4e0bcab6cd5d987f0587ac1bdd436cedff60830f03d7f73eab7ff8a29dfc6796ff49ebf29516e42fb8e70aeb3a3d61dfe13d2455168
-DIST firefox-96.0-uk.xpi 621210 BLAKE2B cefa4d0ba023caca862a97e534e3199ea5738af824a4b5b57dc10f38dc86c28f84391aad9d5962b0ffaa036af7c57fa3086ca671ac86bd828705412252997bf8 SHA512 5e1191d645461b33ac2b71a2fc693b78b4c068fbd9716de9c19569305b3bdb369d467c48f6a522a6da882b30ff4371b9a718a2b54c209e35a5f8414f64f43a99
-DIST firefox-96.0-ur.xpi 556310 BLAKE2B 15b14a7a9aff165b3b467d26c072211b36960df62a4c6c5701b731e0ddfcaccf1766b281af8ecf70e21df85b8f52b06139a172378d688cb9017818a6ee43d0ed SHA512 e78b000c7fe7ece729b91003414b2a17b4281520c94bbd56d5563c116a9d9d5397a28ed8655483b2a3a14ea3c9fcc1f2ebee37c54a0966e679214dd59c0037b0
-DIST firefox-96.0-uz.xpi 464800 BLAKE2B ebe537d8af3fa09e51fe8a22f911203d72eaedff1e0308c2449ddeba16748b2ae10458515d7ab9ca248b9845e14cff11c2e4136f90abe2b9e2e2cb2372dcfeed SHA512 8a799a7fab890d57a6be8c8bb884ae9ebb399db9d2ac3c6c1eb90691df895536d24c29f4058c426e5173d321ee9be217b4fca5f656b3baaf39463515555ecbfe
-DIST firefox-96.0-vi.xpi 572934 BLAKE2B cd4e9dd0222cd02d0f2a11994aa6f113cb2545e429c9ad16a7505af61d20cfb8664ab0fb38a6ca3628cc9e2011201cc8fe9a1e936abe96f3f856cb42e34de334 SHA512 8838a439cd8b8b5aca214484dc47daa38c74d0a0e563be7ddfc39c59cad724132ddfc1c166bd1d5dab98d7770869516bd2f58973b8b683b50aef2fdf4be0101c
-DIST firefox-96.0-xh.xpi 423438 BLAKE2B 9359768c03fce8fe1131f3263fdec7df40ad08b38a51c053d49daff715e80ba4c9e9ab04d16283d453c198cf962d2c4452192fd597f96a1a8916a9b20af701a1 SHA512 0e2e8caffd68133f67fe38aac1575c86cd2c08012b8a62c22d7706dc3970af8b0e1fb65818e777829c10b2227d2effe76d9413cb70504f3cd369bc6decda802b
-DIST firefox-96.0-zh-CN.xpi 575685 BLAKE2B 2eef7b7396901340cb4a207052168cb537081ea0a4a88011720ce5560bc2b26a25680dead37e26279a877982c323fc4f58eed83ee83ade894a640cabab344364 SHA512 c7e3c00ec26d3114e4ddae2b50adab0e64cf8b8d1fccb99909c53da0a2ee1b36aa6f1fa6fe04119e9f80e6dbb944cbcd34f5e291d3d910dd9a7e46c524648719
-DIST firefox-96.0-zh-TW.xpi 576803 BLAKE2B d664c86e6760cb5b782986765b738a0136548b9b13837dc7f0ecf647e2a3202d4af96f6d21a8b96493aea5236c2237d771000993f724f8a1437f2dca2937c17d SHA512 746e3fa4c218f88c749729b9c826b02f79259ebc90d1b52b9f6ce87aa7368fea407da0dd93fe7d0e38eeaa41fc634e03c4ec4081c9ebd26c4e23599e99a203e4
+DIST firefox-96.0.1-ach.xpi 451197 BLAKE2B e4c58d71757ae4cd079ea3f6ec25eb4988d019235748b5bfe864d49bbfc70f801243ab274de7aa763286f09badbfbfee2d738ff991fd3ec7dafb670825302d4e SHA512 5d3b696292926c622469c11b395f09ee4978314fc9f34623c697c7877666efea1f9547f77794fa54a3801b2835ba82178f66da0253906cff7ed7f6c39e63cac3
+DIST firefox-96.0.1-af.xpi 420330 BLAKE2B a2fe5e56aadb8ea082a8b525e57f135cda658240c5e47de559a2a7c5318d2a9d9c1f590def2d20953e9ccc2cc4dc8752f45d8ddcb2e70012d88abb839adcc0bb SHA512 012e4ebf71d7d0d795441377583428b7a9f8cf9c1ca19b7b8ff91daec0807223d1fb1285faaa24dbf478f164f01422a3a1452cbb26db5947cbb64f267ac30b4f
+DIST firefox-96.0.1-an.xpi 499443 BLAKE2B 3005e13c52694bacaf8907d7e52abf4155b6f2d62508d703011023e9c9dd3f6b44da1cc2428afa2e9d20489d22dc7de253018734a824e1c2b9e05e7e8243bdf2 SHA512 9c7af56541499b499486cc9dc373ec6334924d9fc9c5e3acc867560e948b9d5061cc05012a012c4785f083139dc330e32d661cfe10de4da15fda5e5d414b7f5d
+DIST firefox-96.0.1-ar.xpi 559647 BLAKE2B cbe5cabb0597bac7b18175124fd4b58723fd8523fbe9ddef9e3e4253e3ca503832eddadd3ef671a9a979e955000e053f387702a235d0d744c193425b1818e159 SHA512 9db981a5a2194dc736b92b5e73be07927b236630241e112dd724a44853f59c6df0482365c00ff8da650e302de19369dbd87fa8d51a8f0253b5d74098f18cdb6e
+DIST firefox-96.0.1-ast.xpi 496733 BLAKE2B 995541c7ca22f2cdacbeb5fc572c6835471fbbba82d75cd1c21b62b6778864f4c8cc9c02ace310cef50bfdf23af3625c9c08ffe93e573de606991d46cdf39291 SHA512 39f4bbe76750fb78a6d52c306845023f638d5b2fea03dff620ec61a5bcb40107b68d2bf5212d62c1b955a0b4da711ce000f342880a21adcc42285237d4bf8dd9
+DIST firefox-96.0.1-az.xpi 487143 BLAKE2B 4dc0ccf2939b7ce448536bc0a314219a3c0670f4a749989799a2c08edde6d77a0944afecd5b2f2e4767bed5b6b83214cd59d6e4a1202e55b963f56034f843980 SHA512 335f1c8b2888253b56071ec6644893d88c9f897a4a8fa99d5c27eec95c6d69f0c72c97fbd93fc0e48a8e3aac835d6bf7e03b97657853b7ce17774b75f1740a1d
+DIST firefox-96.0.1-be.xpi 620930 BLAKE2B 89116f256b3f6d2e4f75b656f425a5ba7336a21ac447368d885bb788538d58efa73da569cc7752cd46da209a7321d7d16d2fc11aef0df1c0737ae80d90102c90 SHA512 20f4d47ae2544b8ebf4cae46e46d71d10261887d005eb434e280de2b8b5ca95046cb569f4523f9386076a2d4262d760592b54b258b76d3d4145b3733b815b8a7
+DIST firefox-96.0.1-bg.xpi 566682 BLAKE2B b8800edb4384784e3c79b6c207cebe1f6d3e696591930e988183b9bad96ff7a0790615f56e0e239786a2a85e20059ec612abfa5f3224c94550c5c1a0973aea87 SHA512 127a63a82c35afc9bfc5d97e557bf84f0a7e7c7a36d9228e6a1d6896913607e9fb8aed71b42a171745e376de61f1f2f9c1c10885fb789cd7f66def31b2b05b7d
+DIST firefox-96.0.1-bn.xpi 556035 BLAKE2B 62e59fc02a4259caa9aacf5cfb4e8462f2e06376bc67b56ec95df4e841c16cee794466e45d18a742c1d52bb2b0d6e6beb00aaa548b8d0c9a5c300eb7a976fd3d SHA512 815052732219c95684fb76d5c9e152c1e9c7c9770dab2168610095754aabb1ebb31ab9955568fac20783419d0fceaa887df68c1b2df48a96f1b301586a2ab27e
+DIST firefox-96.0.1-br.xpi 526875 BLAKE2B 7bf78b74f4e95fbda2d2127baedc2b23b13ae2aed66c2c08dd394bbdf1606f4b0dbabf5d048b8002a416112e0f4f339143f1bf76d8a14774276441961fc39b6a SHA512 4ff8f428b01b2dc7ddb8f9bc63e57ce6f5d4238a76425267e604cc79a38969ab88b7dfaaaa04ff5e309b98d691c0487d7bac5b4a34daca3d221eade21439b6d1
+DIST firefox-96.0.1-bs.xpi 462235 BLAKE2B 39941ac7d94eae383da9a9ec54f0fb80eaa7baa184c042740ae0e701ea094cb54730551bfc3df9afc3389e15f1912e2ed5b9e6495653a26ce059fcc88fa9ef50 SHA512 cb0f5ca353132049ad67a160479a338c52f079af0e93c3d8d62ad6dae5e577436f30fe899c16c6ff56323994f09e2cb218262cdd87a61e967e87bded78956491
+DIST firefox-96.0.1-ca-valencia.xpi 538642 BLAKE2B e1f6207e00bf3449e1417a8b7c277954f32f69d250df550770da006e5033c142893fb66ec06faa1e16c9b0814385c80feb671561fd489ea749e6f0ad642c179f SHA512 80d98086ba7a26d6dd9a77b81dbed0e989a42bb03a3662fd86c704f81b98d956447c9cf8bd1153cf87d20bc3a8366d210418d443cbf4ee6e8957ed8dba9c5fe2
+DIST firefox-96.0.1-ca.xpi 531298 BLAKE2B 8b3b86d8c518f7718209d59afa7798b35a6897cb570c7fd305236a460fb0f7377a0614537deada850a1d6f30284f5cdcb9d9cf17cf6d47b656dd23b4867d59ad SHA512 570f2813a145d2e0a709bd0aa84f1076b9fe3098bb8caf5e7c8f216f19690a5c0c9ccc80771a00588e914576238b75309d377941499beec7a9fc5bc9843a1e5d
+DIST firefox-96.0.1-cak.xpi 553140 BLAKE2B efb04cb8cc61083b8f2f38dddfc2c5c4915f2e677e3f867bb3b4e8bc7af7cc0bc7e7d5d1ec0bfc2d1fa67b04410f0cdcc052f380bf93b3cb73203e8c58b50550 SHA512 ac69007109cddfe1ef34adb7f4c3e9665c03ba74b18b68d58df2239b551ed3111961f3ad6e18a5a67407797c5936e2c7b0682c9d260c687ffd6c0813dbfd7e23
+DIST firefox-96.0.1-cs.xpi 563586 BLAKE2B 86d3cb7053a577054aa54a1fbcbf83c2a1f766a8b37faeabc28148deeca5a0bec5ffb26b15ff660757e77fff7609dcd7c2a8f1ff2471adbed6d50a8d51697564 SHA512 988ee1d1b8a20b9cdd2b7398d28e70e1315fab07895436ccdb75ab11cb4eca1408dfec61519233e9a04e91fe5179251048bd52177b934a08a33b666a14bff7ad
+DIST firefox-96.0.1-cy.xpi 542940 BLAKE2B 7956a48922abd05e6e3c0b69865d0be421f688b77fdda7bfb9239af09ba68479d9463f5bef39b5d8f73ed420c21d761dd595988487fc898b9347a03545407a5f SHA512 1538295185cb9e211d319906d41c3000c1aff570f82100f04d4985ff69659b3fb0f4dbf20bb092a6f79360b3bc5c20c63a0aef67807d913995f6fe505421b421
+DIST firefox-96.0.1-da.xpi 533847 BLAKE2B b610c0a7c77284a9ce0ca94e575e024350b0f599afed54d09c1c8899c5becab65cd9ff3218963afceca893a147e2de6312384fd3c804638fe4e8d0329ab57ebb SHA512 bb1772ca2e1e99ab4afca1c095827e77258efbee057b8bfcd598012e77e9630684b44a74a48bf9b94c70252bf34edc5359739fe78ff4e9955e5de472c32e5abb
+DIST firefox-96.0.1-de.xpi 554169 BLAKE2B 90ace87e55d9111d441f86775110d6000376a4d357e0d34a9066596a84317901f062dc0822c3ca2dbf9be549c08506b4b15674cc5bc4209002b2e9eb4f69132e SHA512 3bf4b405e8e8c34850080c39e19d1d76c7fc14d5bf00b794aa205528a32d54b8fb3882f4a289c7f0606bbe591fc5b7d787bcca78dd28bf1d421d146604499849
+DIST firefox-96.0.1-dsb.xpi 567031 BLAKE2B ac8fff3abc314444b3d3eb5e284a5c3296c9d8c7bcf2a7c438a626066e115b64ef55fd38dc7064abcd7ac8228a68b3b6cb6aa0e6bebc02a91fd62cd3e1b8e68e SHA512 ad5f8dc45f14ee9b6db17aa87cf4fb92599969877347eba7e1d729f6dd34646be5783d2be33e830d6c47a445fca9eae9cbabe7a9667e7c0afab17b470d4c08b8
+DIST firefox-96.0.1-el.xpi 638284 BLAKE2B 80d687952102d1027c49fa18db64b1b2f99f90fadb3c1a9603ac696680706aa1ae3469a7748c3a0b465f3eda4c70e37d45a6c4fce68f8d343658a1e3a03b40b9 SHA512 80dbe950e8e81fc152466c9618199049cd42a5448d0ec75e415e266218512676cff72e8e4db0a02d1bf3e9d0a91af14446f7abb5ab87b21329c6ae2c59d79187
+DIST firefox-96.0.1-en-CA.xpi 510547 BLAKE2B 5ed8b66f60272d654a3899e8dd052471e706c682ab8e85ba4e5096c5c355e66b6183e65f830e2858998a0754c047ef73b04e94f6c353211e1550e4d89898dfdc SHA512 2b0843842337f7e594ca764c047b0e1dcbad617538629d0dffe1e939ab4a9f2f1a67f36e4138fbbbb75e2ecbdfbe0085619ab9fbd4530c2045f18ea0b025e910
+DIST firefox-96.0.1-en-GB.xpi 511268 BLAKE2B 9df615537107132db98d52df8a426f717a9f2f361fd3e122d8e7a8334c766ec7254facf292ce2ce2b15a0553a07ecfd2148d13bd1320b5b9f556493a866aed6c SHA512 3cedfb9ebb9fc65f532f5ed8120bfbcc94644504c3423e165c1f69a4199d799c2fb629907424f7a55f0f461702f6bf4ba6380bd84c3f3b38b925452b4a726b0f
+DIST firefox-96.0.1-eo.xpi 535226 BLAKE2B 9a646ae991d9adefdaf1c74d4896f24300903fad50378b5bd749bfd790d25cc11e8c482feb2eacece4cd778effc006db4c50482e4a6186733c19b09fb8d2e5f9 SHA512 e38ebbcabe786574b5b23eb1f99556b27db10fa6af0c67c7035dd8d0358bcc4d8202534a2a7a2cfbb746148bd3ec9d3ff245c964d949f7a71609390d5d46cde3
+DIST firefox-96.0.1-es-AR.xpi 547502 BLAKE2B edf96ec35d8e2a656fd331e405099e5377b314eccd4c18a7343e1ccd64a1131165d3311debd1831db75b2c3a5b403fc02c086444ec18a18cf9c62ca6d44aa535 SHA512 6007746216a1451e7b26495108a96a760d37bcccd80235794c24b74bad320aedf8bf1e82b31d42c55693c405fe2da15ab72b1b3b53b8603b28dfbb04a46f9826
+DIST firefox-96.0.1-es-CL.xpi 546864 BLAKE2B 6a45d2dbaf40b750bc3e16cee291200306bb44cfff8814d255c5d69feac65c8061206103ce02b591763b57e0ba655f81cae05617ea4fe163767095a7506d927d SHA512 e6c209ca1c4d5a42810322c6a836645212182010baadb86af09386c362327ba5aa2cd40da40b674f2832a47be82e2cba2a7c3333769cbfb05cd9d043a51a3066
+DIST firefox-96.0.1-es-ES.xpi 537731 BLAKE2B 2e2e00255aee4d35cf4b1a0753bf3fdd4d9d8e314b0613000eac38c846d04f0168f47ff323b6d0696db042c3ff4a6b70b8866f4005f771042c13947b8db93644 SHA512 e02755215d24be5075be02d9e4a7b138b94165ab36d931ef8dafa589b68e5a0a2f80cf4cfbf0dc4e200de6cf611220645fff75b1f1af1e0b9ddee03b6c67f064
+DIST firefox-96.0.1-es-MX.xpi 550725 BLAKE2B ddb2d05a353ef75aec258c35e71568cd7c6305da3492ba68e7e22cf07c351871dd30230995fe978ddd444fa143a48b9595db83361e14e7eb951708c24f4dfd11 SHA512 7aadf07c2400e01df50c3e6ebb7387a75304d06c4dda59ed4130ec173f739f3bb2ede904023b56fb8e201f077e637d7bb2dcc91f60623c832d5e336eaf5b61ae
+DIST firefox-96.0.1-et.xpi 528808 BLAKE2B 74ea2ca690d453591652ade9322a95bebd5fed9bb58095d44775f254bdcc8cb9ca13167d4a74166f2b27e4838a06280f2100add01a7d13e1ae9fceb4985a7470 SHA512 9bad910cf24684536ab98dc5aa96d185a26d1230f249ad661bf44aedb610ffd3074e4454a50ab365ba48d7e095721f71ae681860ed814e944b72b616a8972529
+DIST firefox-96.0.1-eu.xpi 536791 BLAKE2B bd6519af62304b72435cb0af200e7facef62a6a30583883acdf2d57a6c76ce2b5389c6f1a7f6aaba107428a13670c9d6255e33d3c4e1d95c61a3b77fd0f41695 SHA512 e7af2a1e53918d48209134ba6d2fa020db88e201dbb33f4c53839f24fca1308b213a76abad6476eb1b663d8625e78ab3c0f34fe5fd47020ba55dcf2995dd73e5
+DIST firefox-96.0.1-fa.xpi 563690 BLAKE2B e4a81d671ec30c081e39451be9799bbb5225881ed71c21f38ed79c9695cbcd8631ad2116eb6f7c4b3158e193849fdf7d56f8f441bb9ac05b5a2fe87745f669e3 SHA512 1765d16bfc037006799e45afb2f7d829edd17a98c0ba276084d6cdc337a535762d8c56a08321b827193fc3a83e5affe7b6b5fb805273d529dbc30d3a60c3a4e4
+DIST firefox-96.0.1-ff.xpi 470382 BLAKE2B 966777b935755cb5e8469fe93a2f1ae91fcec664c887a202f0a274177ad8adfde23f0fd52b9ac9867aba8188b3685026f28a7f9767fba11f2a6e64d7bbfb6113 SHA512 1adad2000e28957fadb57da437bdbd8ccfdaab87c0144ed5ca879396808e46a2467be789dfbb9523a5ab88a1eabc17dd0a70d912547762720a6572e04f919e5f
+DIST firefox-96.0.1-fi.xpi 532838 BLAKE2B e7efb4af8ce56e6543efe4c7ed444f4b93c3c5f2c8675d9de0bdf57c08921c59e9e87b580bcfef9f551e00a61ee7efe19a057709af2ec5eebdb85d4692c37f52 SHA512 1004f1826554fc1e32006c916f87cbd25fa29df7aa716df991b56b9b7cf0d792d55fa6f62d9f7b7b84ab28b44cf182fea0a2564eb508eff39cadfa10a0068fdf
+DIST firefox-96.0.1-fr.xpi 558448 BLAKE2B a52a9f7b556b6e3e76e2a00d6a588ca4a0e83d121cba26dcf8e1eaf85aba801ec1649ba0df84a30e203abba9c0b5f05215fec88e073eaeb030374e2527f9427e SHA512 99932da86c62f7abc343509f049c6416ea9c7e973e5d3627872b6a4164afe8ea12dd4ef7002f7e9b4fa02959423fcd9a4ff14eb911eb12400e5de3ef3fe76c80
+DIST firefox-96.0.1-fy-NL.xpi 543702 BLAKE2B 0f3fe1a52bd88819b4cae1cecc3936f26b6eacae281f9779de0d1b920b7e72925674e8c816cc54f7629cc6e356ee9fe161b2416cc0b506f1d877c60aac617383 SHA512 dc34d16e42afde231afd716e49fee681e19c6febee17300237ff94872a4a543300e0630a71d8cfdb8d16f38ce0a4f4ed14f00b27b7c5525cc422cca807c315e8
+DIST firefox-96.0.1-ga-IE.xpi 457641 BLAKE2B 99cd27ae70720c1e00f9ea52a0cd21c3ab8fff9b19b4a8ea4ccc9ecc8b560cc580b3cc35e1f46953d89749747bc429b86f2d63f45608569c081ee5dbd3f270ab SHA512 fe1fb33c1a676445674b50f4808851ddc415db433441583e024a179ae9a269d452f7fb9a5b3457e3043659517d5cce59e0d10530d9c5b41e559fcc79260bf86b
+DIST firefox-96.0.1-gd.xpi 530891 BLAKE2B 57541b5779dd8102cd7d1c9bef284fda737bf0f34589ef7cd06a12dd756b3e9ac46c86d570e5412544ad35cba1ceedb81642592c96d111664c6f46d9766644f4 SHA512 71fb2ed19fc9da69dd79daefe5f8c75da846ea1afe587589402427f3ad2ddac7927ffe05b74dd94734bac0361af8239b689d2f1cdc8d9eeaf047112f0e09230d
+DIST firefox-96.0.1-gl.xpi 542038 BLAKE2B 56535ad1d682faecf9a67dc2ff9705b107d5325b190f748f24c1a72ec1e22a41a06385bb75c1344bd33e62ea3226fd5f89d8eea877576fd8fe1eec8f1ed97c99 SHA512 37974446b6cae2211c7a230364c5f6ead83416726d2e40d7affd2e2a4d4c7ad616301ff86a963c955887ee06ed3534a45de7a507c8a1267d6ab78fb949e1c800
+DIST firefox-96.0.1-gn.xpi 558957 BLAKE2B 79aaf04b42417fa13e98c1ae862de22187b24bf8bc68fbd97909d45271ca4b9f1465f8639a3849bd82ec8a457e65c970354e2514e20d0e55730a3314b586bbce SHA512 b4862324bb6d0f1904c29ecf1acc9d8a34b30cc2e82b0daba8f433266ac6501be0538af4c8ceae4f3c90b8672f662851010cf8321172914804a8762b7fc1d9fc
+DIST firefox-96.0.1-gu-IN.xpi 527658 BLAKE2B 62dd6848c8d2d8f558e4b8561de3450d7e0f994a3a9f7b77cea818883852cbfa3fae6ce56e4714183f4c70b09b159a12ed716cd49ba9d18e4de235a52e973d0f SHA512 da9abfdbc1ce468a9f34ec2df6bc45b09bffc180fa852d4573d15244a3d5af6bbf581107a157c3659de1f5f7807113598390bc8765b33edd6eb6eac4fcd24888
+DIST firefox-96.0.1-he.xpi 557086 BLAKE2B a45f947072f43637c32fba4fca399866cd5b3f538b2cee1c2bc29e04c1ee3f6b583ffce98ab217b7acd43eb45d60de1c7628cd9742d0b1d3dd26cef0da87533d SHA512 62862e43da7c1ef3fd9ff7410ccae2abfe329533f3250218d9934bd8efede1bf30fa2d2c08c3336993ac982687ba96add922fa794fd91f93da3ef0ccd4170d94
+DIST firefox-96.0.1-hi-IN.xpi 558759 BLAKE2B 4a12372f9b36ec03f2b159948d3665bef4bb039ba2abaa052453166aa611736a0dc8b5a50b55be2d8c8666a50800923882807af51a20052814bccb5a7956385e SHA512 2d7c05aa3b30da03a98370743e8681f9c291c1b51ed026e0ef3cd5b20eddeaa03aba7cd5c0b158474c9805f6231c400bee024624deec9adb480f5d5ab3d09a83
+DIST firefox-96.0.1-hr.xpi 531750 BLAKE2B f4ef460b39385a2c62910c7860b6f2ff277320f69b7b3af5ff5e428ef18254e875b337da3f5dbb040b8ed4269f202e3ca087077285b651fbe826fcdeb4dcbe35 SHA512 31ed9766589911fc54958c04fd3527eadc7a8184879f455487e550b8c3680525a2e6b2ceac7085a84e8a5550b1bca833ff12b29d20296375925008d7be961ac0
+DIST firefox-96.0.1-hsb.xpi 563136 BLAKE2B 4f469e180c529409365ebc61d686e18d11490c64450d1d20af1199cce0a93efd36992db70bd603040079de66ca37b4eca4529f95d5e02cdfdf469de9362fe22d SHA512 3c24b3378e64b4275237f0212764fd785334576a962f1b0cdc012cc9fc384b1b2fb9d620494f8d12a2bee08203a7bcd32a3a9fc14eaa4536b3cc00b846d28880
+DIST firefox-96.0.1-hu.xpi 566428 BLAKE2B 64aa88fc06529d7706cb28c219aac6eed72ca264146c6156b959b2553c3418958d44b74048671d40f3fc13c6b1adce96525e5f6441a29ec225abcf8e93293dff SHA512 b559c67a2c5487c18d786ce91687b056810cfc833915404dfd6b052aff107c15d1764577ceac25b43319a32e1108e91409b48576b4d2bc0f1164254596178817
+DIST firefox-96.0.1-hy-AM.xpi 580462 BLAKE2B 4c966c30caa067c11dbab219a70ea77d071e71bd62202e5872997d2a79daec1e2022b928dbd254cef0bd66cfe3299c2ed24b9501749d757561be86bb37542f69 SHA512 927c56c5cff8cf69606a1a190149c6cda153373f9ccd39b6e9b06d72c334eba73086038399a81fab17f5b3b4c883dbf4ba793c1f064b6bd915aeb63d932b9a66
+DIST firefox-96.0.1-ia.xpi 533078 BLAKE2B d3a86d48a7ee45f7fd4cfee738b05928b43a95682297717aec76c064ab677455470830d0dd8f7b22677dc48b28ae61bf0ee15aff98e9ef76b3b60dfacc22db0c SHA512 5edb9cadae88e60ed92248e881a268c6015b90039e38fa747f6d64e422b5d3324ea2b8704080df602f33d409b819c0db7a5da5366c687fd38b591ca87665cb8f
+DIST firefox-96.0.1-id.xpi 521710 BLAKE2B 47b98650740b630290ec467fd78c8e745ad4df48bc19646690643c330cdc63203c71ef48b33aab05534921d714937c89d540515f348e756c7e386b794319b545 SHA512 2b5e822d37e737d24c822400beb55c5e85d33d3cc7615fe185b726db7ffdf0c59e060efc006a553ae5e0a3e8f602731b043dcea63eadf39c2294783c835fb170
+DIST firefox-96.0.1-is.xpi 500012 BLAKE2B 5157818f45ca5450a47dea27a5e1baadf301d8dd1fad5eeac91d6e0fef61d6d5d308ec79a42025712405d130572a8e78926d2614d1eb9f3fe1b29ddceb3ab21a SHA512 d73d5b7e2e9a724423213d0924c91d13fe4162cbd1380ec0c283008a7811dfee0cd8445d5755e0a466d8d446374fa040838e59dfa54396282e6ba62e89ca8092
+DIST firefox-96.0.1-it.xpi 460938 BLAKE2B a3cd1c2312f3cf4dfebda98b0dcd4b8cc2de310b077659a4de856a9be5898fbdf35d90d59826b511bb6bf3d69f791eb4e7152e562ac55b406001eaff54837302 SHA512 5b8f99a09c6e2465627e118899f946d093743dca384ef3908a7f898c8d8d6101fef46a508700798e71775a76d0de85114ca389d600b5e91726291f86d7705148
+DIST firefox-96.0.1-ja.xpi 586096 BLAKE2B 70b9ec22b2c0cb03bc65f93ff11b81b3d7e408afd3bc385eef73551367956d501fc87f7f4bc2bb3f6b7e75eaad2a5249a58410e31ba4ad37eff25abdb00dbdef SHA512 90181d9aea119d98447683fa99a4036b87dcf06f2105f84d74ed8c388bdb735990c08983fa795028fe31ee370603d3ffe902c9d6d679a0d5f76905c0fc7260ef
+DIST firefox-96.0.1-ka.xpi 590834 BLAKE2B 316f8dbc4546da219d488a8d692f738c03e18e2fa4a0e440efc5d0af388ec8230aa2201fe8ffd7b926a1c70fc7b8833205b668fc3a2f6d4339a0492a4b69a380 SHA512 32990300fcbe81a67f966d526f7f23aa9c7328bb53d2e5f07b11e5a1548b55bc208c933be5dd4a6b4ada533110bf890b1b354a9eca7266394b5c2f42be2f1208
+DIST firefox-96.0.1-kab.xpi 546186 BLAKE2B f44edf8d513cc60d9be72e561587c12c3c61339e6f7d1a577ce726efdbaaeda2cd0940e68b7a4aa6935da46a7d100168e441cca858d89c3609cf99ae3bb27518 SHA512 7a1a885a69128ed0da8914e067e56aec4d25f01605c63fdb1c8035d3b7fdde2fb820cfe09d82af03966ee7e728786ab1c0742cb4ec9e099a26686568cad65b55
+DIST firefox-96.0.1-kk.xpi 613166 BLAKE2B 847e2a170c3c231fcaf60c5fcb6638ddf83b5cedb37794daa2caebe3dae1ac7e0625012b43e875c569a1bc7bcd07ea33803d737ce02813f5a8b5eed0dfbc41af SHA512 5637b84e81a9be93b737dc1416e009e28d1880ccec6b0bdf9fced11164673f1d29346d7ee706c523f7be46061fcd395db0ee93db182e2d458f3a96175b064e0a
+DIST firefox-96.0.1-km.xpi 529625 BLAKE2B 0d06952bcd2782d65afd4a376376bd7f9cc5afd005776cabb4d22303b53898cdd3794d94401ee0bd71c987fd827c93eea996512c336d8fb2ba331081bcb5e2f6 SHA512 6f319157f5a74c5be61213cadae4adcb25b64a0a6a1eb2927ae4cb0e79bc31bd345196192985c81162864d5498c6e6ec8e2b567181889bfecec7d1314b2070ed
+DIST firefox-96.0.1-kn.xpi 495323 BLAKE2B 08a1b130f1081ade9a4ff908d7a7b5ffe3e5d19009b81648c0fcd9cba9320aeb22729550c90ea0e757a39707e085d65474abb1bc091a080d3fb5268b60649188 SHA512 807f53304a466f7b51c325cad9bc67efffd8234fffa957473ff90316303744d7020b184bf7be3035f2102a808d3d7d3d7cf8c9e9539c829bc0827b13cdf6e9cd
+DIST firefox-96.0.1-ko.xpi 579628 BLAKE2B 1c3f7c7544ba348cf2afc1b6bd69ee61612b45fb5f428abb2c629a858ed6f5e7ea537691da5698a6c57134123e6f6a590eb22329ca6b30b2537f6f527b04e46e SHA512 e411b12a19b5fd12b31f98f5b16b0220aaf1856ea403ec18192a12ae242d947bd6bedaa8a46a528569389fc64aea9aebce42c49144ebaf94b4c6957c823e05dc
+DIST firefox-96.0.1-lij.xpi 469160 BLAKE2B 70b8d675b22f4a42b877ce83f1b7f8703f18c42c746fa2e9f6df25b6359bd718f2e73248c81da1df04d84b10906f5b2642ef6e367bb183b7885eae54be90bd5e SHA512 2527ca0e6b2f59e789a4ad6ca953e7af05d36d8a7f752e0466c91cdcae09d800bf40c8c82b1e2b6ddfc43529d613172678ad2c5ce6fe20eb56677c64114f830a
+DIST firefox-96.0.1-lt.xpi 559294 BLAKE2B 67557159b420cd7bd9e428ed3787d14849503ffef1aca7883594d72571a638b117bbc5b6257f1323bc489f46d251ee03f6b194548a816c823be971abaf0322e8 SHA512 6cb3a63337991992709901efb611213e7a27d456e9fc6de8af402ef3a5dd24c416c320f7801721dbb13ae0de9f1a141df4673227efea09f561ecdbbf27fa05f5
+DIST firefox-96.0.1-lv.xpi 461303 BLAKE2B 036db72fe68e99b707e74b0f72baf3494027dceaf26ef596806e0ef7f8cc3b9ca9b3ecedcecc06eda07573359ca215176269d29315effd964d5b8812b228bd32 SHA512 b2144e6f69a3f42652c197eba411e99d13c8b9e87a336443b92ec0c68037c99476ba111ee8f7bcadd324476286911d85971148c53b2f2b4d462557fa67383070
+DIST firefox-96.0.1-mk.xpi 463319 BLAKE2B b9de6129b0283457d007f92dd263c66e222dbf02923a1fe99c4301b856b7cbf95f78851c8535f19d76affbb20dd9d817a625a9b837c676a089009f2947527b27 SHA512 2cb3e5cf8fc739776efbac92bfd947070ed2cc8c8c987f8575712662d419a7711ef79d603e53116c10df588a4d974405d7dd78037f8da5781bc649055426395e
+DIST firefox-96.0.1-mr.xpi 530519 BLAKE2B 43f644246422070877ee801b6f6891bf71b45662126bf6e06c6d989db00dc0bdaefbc893eb641aaccaddcff22ef2abc9dacc9272da9598f38ff4bf0ddf6565c6 SHA512 2e323181b3395ca9e19c530a054c1bf3e315d07d1ea39b7ab66c1812e95d3015c2a9fd853ba407b2576bdc774d9c3f8dca22108adcc8d5805163dd75537a5724
+DIST firefox-96.0.1-ms.xpi 446397 BLAKE2B 0d72d584bb6dcdb0ad024bd093f2fff78b08377619c1952ecec76d11add29474ed31ea3a6f749aafe0ecdba351bc812a88d22bad91afb1cae639a4aa2e64bdbb SHA512 856a2bcbfeb6f7aab34269e27b5af4e00c18b98495f4d5b4ae6b70c7a81f59b8fab316d35b8518478a9afbf92c2a7bb8adbd32ee71c9be10b680155700fe71f0
+DIST firefox-96.0.1-my.xpi 511713 BLAKE2B 02efee61f3857e53a5fe6545f8fa9166e199cf9e768a81f9080b14aabb61ad1dc519b651a36005d0c50089cd532a55a2e2f28ec343a9021ea0d9088a1ef0cdac SHA512 35422be98937b16f9f3e04417ae4a911761910eae090c89600cca6ba9b3517ed87f07672e832df051bb2df62eb52651d805e377d39e4b74ad189696f4e0584d1
+DIST firefox-96.0.1-nb-NO.xpi 529013 BLAKE2B 7fd9b1032af670b69bf30725f5ec0f6988b92148ab8b8235d000d62804395960aa91d07c1989f42b96b3b9afdac570da787c79a31cc09f37c30ede7b90651e55 SHA512 574160a26c522bb335a25a382331c5457bc4319af84c88ce016871bd57c4fc2264ca08290fb7a495acfd52eaa773a132bc8e5121ba14e26d362cd88a8cfe3ec7
+DIST firefox-96.0.1-ne-NP.xpi 482350 BLAKE2B f327f48aae0a6562e67a887c0e6394dcbf9f2ae129ed08a7c7a2e221eed6cd1d29195dce874f0700199b1b8eaf04e3fc6f4d1f727332b02f8e4aac52abad6264 SHA512 14fe5e1180723e29563038bf2394270c1007eab23e9d7fa39cfe9ee26728c1fb91e298931ead1ca646acf2627409ffdb9f42da0a9275f4d8474a533b00dbed71
+DIST firefox-96.0.1-nl.xpi 538035 BLAKE2B 62deef37f8b6d8835d643526e85aff0e358d5a96b0e6ecd818b13211443a1694296df3e0e28cd7f19e256c6972030c6998fb6989f131e77bd52cac45e90ca8b6 SHA512 45a4d2badfafd3c3c9114e8c90e68801afab38530559c469b9e2cd411de627cb0e19843807e1156ead2c3429e13f7bc84cd5d76eef7647a471912458259a89e9
+DIST firefox-96.0.1-nn-NO.xpi 531127 BLAKE2B 4445cf503478ae2eec547f97fe874c28181f44ce7e519513cc8ea17a2d7cc11c0cadc621890ac79bc617527eb989de17b49f15ab62ab597924032b0c9abe43e7 SHA512 2a00c7833f406f847256d478c861eaa56790a4c37818e664d32aeb7a637fe465d0f39a6f16a8e79aabcbc78723da64c0139da5bb5826e5c4b856991cc14f625e
+DIST firefox-96.0.1-oc.xpi 553584 BLAKE2B 354925f0905c9ac3c95da60bea537cfbee4578650306a832667a1305cf1cc3215587762bbce388b155b31bac65e6299eb7c05bbea43db0aea4195f64f842baf9 SHA512 b4829d6995faedecad5f3fb18e56e010db3861f0048dc0a1d932c687e82bcaa4e329a55154433206d6ff6f35edb4d262669519df712066d26af13e530baad371
+DIST firefox-96.0.1-pa-IN.xpi 593694 BLAKE2B f59d91b3ed736b70b295675bf141aed448fbe99c8506c19c67ee52787ac278805e1d635f5ac96c8728e113aaf42b9f5e9d0b039902faa3e2bb5315407cd2b200 SHA512 eeecd6e8593c56efb2604e2f73c028cf04796cff6d93856f2255cbf0d0ab456ef7c5f852d29bad1970eb8c60d03b2ecb03cce0017cfb791024bfae01fbe6a784
+DIST firefox-96.0.1-pl.xpi 556867 BLAKE2B e37533d7dd6970d821184e57c57af51f4fe456b5b002e124e951df500531eb298d45b9d7fb55b31e6d7d504e28e45f871103ba253d7498c4746656cc0b68f43d SHA512 8944b8d032c330ca7a6d707e3afb95973cbf79ca99a32a812b723a16aeaa7066e1c56a97ac5441c657953eac22d65a095aef493ab91ba8b6dcb9637679c11a8c
+DIST firefox-96.0.1-pt-BR.xpi 543367 BLAKE2B 270dfaae448c0b75bc63c61542653f963225e4e39a8a944642d3334f5fbd8d5092d9740045116aa614e2e3b604cc6070cbf1870b843014d9eba2430a17690d2d SHA512 046279b286bdc62cc1800c73216cb82e0e95e5b356e9e2f8ec66c7925516bd3f145c03411f3009b72f7744777eaa8052087cf7db50757316ad6240afcee6aca0
+DIST firefox-96.0.1-pt-PT.xpi 545098 BLAKE2B e011b0537568650a6cfe5e433888bb8d4b461dd0a09c851010ebe358eabc7692de226024976ff4333190c451de47a3d1a4d7279a93db811d3e1c5fa2216d46cb SHA512 5821da117faaec2728c4c9176255526769903891120ce9db2069c2f209db32c7a17b67e163d82d0437512eeb1d724cf3078ecdfbc2da837a2da0ed79608497f0
+DIST firefox-96.0.1-rm.xpi 536761 BLAKE2B 246113e8272d1f2eec689f90a40b5e4248b25da08a797371886f2fa17e6dfa013200725fa2d8a5bf120ec911ab242b3860f4d950f840f8e7781bb2354d4d2897 SHA512 11b663179d6ac354e90e39df28c7f5b77d5bd230ffbba5ca426617e67398a432e5d65abe0e16c55e7a6c66c0b520a2b5c7e27d11a953609caa5026255c6caaec
+DIST firefox-96.0.1-ro.xpi 529765 BLAKE2B 454c326b12f6cd269b890c25b8ba5831b00311393b5b769a0f5e560c970d87e05d4bca8c3225de18582734468495f24780ac693548ab7904ecc929e55f8f0015 SHA512 9e1d90a3cf504ff4dc9d95e4cb2b8699939cc80092ea2ddad48dabb80735eae50e85a8a68b8599fb9af8065befb000df80a207cc388b3975733258872c4f08a1
+DIST firefox-96.0.1-ru.xpi 627602 BLAKE2B 776fb5f9c1e0ef2fc1e8e4a83da13906d63dbfa870ed37fa92ae5188b5bab1208bd9ea6046d3b7471dd9822468f2dba8e833f48f5e0b04b514d352bba68e0203 SHA512 56b1b858d86f6b777872ec7b59aca7cfec14ff3573c3547852f7769ed455c30a981beb48cb663e23c18f1fa03c2f86a8c86627b60590c97477aeccc7a60a99c0
+DIST firefox-96.0.1-sco.xpi 503473 BLAKE2B f1d30aeee6fd436c0ae43fe0532e25f34c0ef75124b765e34b526323f8fb4b4331e96b833b16d7a01f9ebe4ecae44cf6384a1847434e334860c6cf3b2079cd39 SHA512 f62741e4a6f297eec880c2a34403d3106ff3650c96c536d08bc289bca0ff3dfce7e562bc2e680bde9e9b1905a9b00c0c4cc1b927576fdd80f62049c0909be029
+DIST firefox-96.0.1-si.xpi 484742 BLAKE2B c442012bf7ef7834cfb226c145087c29d14ecb8eaa0f7588f63d43b5baa0afd6298e278284339a44673ca68fe86ce7be44f008a00cf5e3c513af6243af37742b SHA512 626636b1d1a85aba09c3af480360d60c2dc6395fec01f907a0e5172a3a7db32190096f2b2b90e9e546afdf032f94588eee6c64e0696efa8261807a67081b5315
+DIST firefox-96.0.1-sk.xpi 567148 BLAKE2B ddcc70b496ceb90a4f7a07faa4083d0b07d990a24d78983f820d7be49ff7ff8715ff0a8d1351d0e57ac2118b8e60a6c0c933a065a635860729ddc3ce1bc7df9b SHA512 b0875dddae0de47b210f9e838f94ce5f9b762a281ac8c108a563b297bc09233e67cbbc4962ea4c707d8cec480f638b9d977e1a0da1ae47da9b655caa48ea952a
+DIST firefox-96.0.1-sl.xpi 537514 BLAKE2B aa72957d3ffb251e1f9802ce1944067b97e3cc116d8df5aa7ae2395fb5b30d5756d47340f5fa2302cf3b5c0c2c219c6c20fc3d5ebbd59e4f756463900afefb92 SHA512 685d054420b3fa85db7cb91b82a8e797301d1fbd7485b116aecc3b775727bd86328d027b07ee088fce4ad6378e8b3c2395c7fa6d564310a57d32dec6a4012602
+DIST firefox-96.0.1-son.xpi 420866 BLAKE2B 9e512f7df838ff97ca2b47f51b5ae916a0a02b88575eaceffa6c76e580658ce816fd446abb2ee12b2e71e235c9c351a1820220b4b71e3cdb2743183c6217887d SHA512 7a4efbef7253aad8c5a315f09d0a3f1451dbd395500ee847417ca1daf695d2d831b65a56f2be9112bb68763bdb932bdcb739b1feba880ce9fc7d62a27ecef7f2
+DIST firefox-96.0.1-sq.xpi 555343 BLAKE2B 257b3b6d46a6f9f43ff549da5d71ef9f821d62a8361374bf5ebfb1e725c90ee915c65d98a09dea26e3973189c36176444737b7499d7ab9207e3fafe3202ce83b SHA512 78135b7c97ce554f94f2939cd2232f5d6567d2b658f936a404ef284fec8a47888d5223cd01bff8470a3bcda2cbb8d38e83af1dbd5f4a49491a32ce61ceb5fb18
+DIST firefox-96.0.1-sr.xpi 585967 BLAKE2B 2301f69eb7a169f796bbf10bd4e6787d19ba46c25df317a48ea89aed452ae355d5ca0ff9547b6c0545ee90c004265813fab75d5abe89043ccb1e6422f511e91e SHA512 a453760663b7d6e083a93d19faecd32e1a8af73526ea57b1d54b16b6d83146d4711e9f9ddc5fdaf1e79e5671de2420f78f7ecb2d4adb7d882af6e81350b1f18d
+DIST firefox-96.0.1-sv-SE.xpi 540642 BLAKE2B 5c97a710c15dfdca61c44d3f25b46c7ebf5c309f4257c4c4de72eaf1c53be3183f344db6591a58ee05ce226fef7d3d77c19c4a027e04461c45f9574244acf7ec SHA512 9d75916be75c06bd4df7ba9012fb777f9389932bc4ea2cd496979b70f66cef668fa871b68ab279ed2bde444dbc18207f52919b678bd5ab3297c353c0e4c336dd
+DIST firefox-96.0.1-ta.xpi 510852 BLAKE2B a311dee86bf2be5679f7a36b20a4238e7a3a46841b608c73163fc1b030e59c88438ea66fb2deb9864137378c5f8ee2bbe9c161d8d8661cf4e812af330376018b SHA512 9a4e917d4ec0254f76a54f362929cdc1e27012318fc0a98a3abd9abdb184e49fc1e2d9e4b4787cea38d0cf9027955a05be8f414048fa5110c3404ee174ce3790
+DIST firefox-96.0.1-te.xpi 549261 BLAKE2B e613a52eeb17ff4261ba03ae63b93cb1b8e14ebd6d620361b67b71e5e7b74872d530a0002f09fc4a1f798ea94f748b25d869b28daa9de752ebcf8731877970bc SHA512 44687f8f2344040e73c327a05c3091b6ecb5522e8e046b6d2f115b17a8a586b16534226201a1aeb42cc1fe3d12caa6ef1eb056477edda713ea3c6929b5e0b120
+DIST firefox-96.0.1-th.xpi 605804 BLAKE2B d3b48d8c6a3b8b535f1631925a1d012f2fc4210f938ff1191cc57a7e2c15720d9d3d635431ead83cb89de0aedc851ca9a0f0056b0a98266ef6c4c2e06f0d30f8 SHA512 57ec6648e82022ac253b540f7bcdfe7d1d7957b6f25a0a616e20ac64b93ecac560ca7ec503af7912f0e72c871b73ab1e9a99eea7c0090ad435d5690d1d817bb3
+DIST firefox-96.0.1-tl.xpi 519527 BLAKE2B 2561bd8f9b91ed86bc22a35654afc6a464cae60d4be586d6009c0730070aff83e3653fbaa51bd87a9adaeb58208ab9df7f94ab64bc241b661378e5743e7bf695 SHA512 04021dd2773b61d2bc0020ba71ea8d20df32b4d3b3942c557d61e6699e5edd0d44cdab352747ed7ce42c3dd6909458567e400cd135ca53406f7602e1a45584f6
+DIST firefox-96.0.1-tr.xpi 553354 BLAKE2B 9007d3099133e7f4ebbba4715d2ca475822e76ab7aacd41aaea94ebce78ea6b896b5c71d3fd61892c2ab1c951b9e98a562457a2ec084b95775ac530591b01bd8 SHA512 d679873b616842f9c7651006a3e583ac05a56be343d050fe60ccca646ec4e1e269e1bc987b859851af99cdd1a64964b3e142e7346fcba9d3c5e12a455f72f95d
+DIST firefox-96.0.1-trs.xpi 490082 BLAKE2B 8c5182902848dd33d2b8d387da421468e35c274c8f304190de11e1220e19b6d6032b7b93393a0dea6d20a9d7111abc46788a27bdd5c24b359c48f79a862260d6 SHA512 8623c6a2981125d9ffe03151b35c5c51767ee4ba306a170e883f3bf9472e1007ee4426cc8abee55394f0f2a490ce2c73e24ea02b704779b819f299031d763b15
+DIST firefox-96.0.1-uk.xpi 621215 BLAKE2B 994c06e3b3afa0c077a2702f3e194c73bac31ed00d68742a548f296ccdab6c06114a0f41cc36d4a177a56c41e9b86655f3fb22ba7b1ebca94244e2df537ec275 SHA512 f620ebb7cd23d77491d98100308df695c53e33e0ed4130f4368415b30c17092a8c02af87c3867736ecdae86602f2ffdc5f72af26fd50438817f510a051fe495f
+DIST firefox-96.0.1-ur.xpi 556324 BLAKE2B ab26cf6197911ec559a62f1299b7cf829887eb2c1b69aa20b08380b1e2cd94b3794081b2e06c2e475e437b4c65cbde7486467b904e743813727d289db15bf933 SHA512 70c60f9c6886a14d73a9c4a77cd96c1781be3d52abe73258d2c84a12113bb4eb73d756ec6827e4bc218ea40f520e2f03656df4731e20c81f65a734d440794a95
+DIST firefox-96.0.1-uz.xpi 464793 BLAKE2B 60819fae06fa0d53bf08f1154531a23f601ed89141680f267be3bf7f4e55f1d150a977ddc2b25051eac14b4e20b409dd5202c943cefc76227553d374cd7d85e0 SHA512 f171093f6757229ce06ad238663cf27ad7f740209974704a1b3f2737207ef65dc0d89950ef65754db4a9a88d72d4a5d4dbeafcc3ea58be0543a705b0366ffbaa
+DIST firefox-96.0.1-vi.xpi 572937 BLAKE2B 3c75b32ad572ba49b73e9f5a561b53c37ecc997bac5f7aae7f71a349078edad9aed392f3ab714aa755128b560e95bc56fbbd09ea13fde8744064ce4204095807 SHA512 b920fbbfd906bd66614aecbf682583af6416bd5d6c703795acb5796cebe5f6fd7e4634867c21c49443bcab795e403342d7bf9b1bd7f193565fe255494bd58774
+DIST firefox-96.0.1-xh.xpi 423453 BLAKE2B 2a7dbad9532525fb8480b5b2cd065349b83e1e6ff5bfd951b7909c40e02b5c8730fcceed341211f48dd940443c3d30cc888adf11106111953151b6b0cacf3770 SHA512 86ca2e135ca14577bdd64474b673a315134628a8ba2ec8fab60c529c95dbfa612f12ada804eacecbb2545544e35ccbb683ae7dd0c4edefef17193027ad52cfe9
+DIST firefox-96.0.1-zh-CN.xpi 575689 BLAKE2B f6d89a03d706ef9562e573640e47b4f3f7febdeed8b76769cbfbcd63a126bdf212595b7a9dce77bfede370393e63f9796c73cd692e72c1ad6559dcdb72e45cbd SHA512 2f44be124ea4a92b7ce4203bfb107eeb3f269f4e9bbfef446fcb15be7353952981736ed2308cd7f1781272d5ee3c314dceb85f4d79b96b5e3c9d7433ad6bcfb1
+DIST firefox-96.0.1-zh-TW.xpi 576799 BLAKE2B 5d42e49e8c8f96bb858bffb4fb7ed9996d990235edd6e700f736ec31e89a06457871d008f362e5241dd193e0972e3b8525150e4aacfa176cf9e22e7eb90f4650 SHA512 8b7ed347c69d35c2135da15b77bcc83fb0f0a929e263c166fce9b69ec379bcf61fa18f85c6f1bb1320842e94fc5f61a7cf26bd4998b6978ffd35c89ab3d9b4e6
 DIST firefox-bin_i686-91.5.0.tar.bz2 78955584 BLAKE2B 5e3216963bb2d67a897c1f83d28975170b6b6a0014dc53034c75274215e059e3377e5d4a3be911c3dc903fbffafc5e23e824f6283535be699f9797dec60d4c8d SHA512 725ef23b015d4ad410e3e843add1ee68e212e1a01905b4407a9aff80497486c46f98633ce18d64750967f2f80f4852aa15287fa9d84c68a23cb12a3a9c6d03a3
-DIST firefox-bin_i686-96.0.tar.bz2 80278360 BLAKE2B 2cf3542a19625e010ec20f069ec3c6b44814a5edc78faf60818c5c7788c56fd1d791eb7470be390e5970db571b6f3edb84a972a74f1ab498f8cf6f628d7b9c33 SHA512 63ff3316248d99aeaea024d02c2d760e947eb9978c8eb4e01ad7670557832f31cfd5e07e55cb6b06be5cfc82238ab43b3e44f42c29cf5d84db72aad48edcb8b5
+DIST firefox-bin_i686-96.0.1.tar.bz2 80206991 BLAKE2B 05014d64c042450121a774cfd040f085c5096795a9dcec601ec08c8cc066bf90a79dedf3a5ea27df7db672d9101c431b92fe5e28855a6b2032ba2e90ca61c849 SHA512 91ca1e22bc4b358e823eb94be0520ae279cabcc0f11a8ae732bbd492d218ea400582ab8c4818aed3a4371200373957235e6e75a0598d389f80c6abb6de1ee0ec
 DIST firefox-bin_x86_64-91.5.0.tar.bz2 76271098 BLAKE2B 5814997fadf094e9cd2327d2e5438f5e7d931979b6098a7b43288397d6fe84b73a802756a121ac2dc96b0598d44ac376b123a754dc133aa8a941dcdf9f297f59 SHA512 d2cfa4b689cb85b4a088ca8e86de18a12e989730aa35fe3ac2ace28f97f15416bcedb36520d9320be3b79bc1078b40364c0e6f7fdfcb28e23e958ed0e01260b9
-DIST firefox-bin_x86_64-96.0.tar.bz2 76301800 BLAKE2B 2e573f80eb004e703d3cf4e7cce8b5cd780c8d54ce5d3f6c6324a6a49ede97dc8d52efd4b335e127b50bfe4a55c02a19253fa0a84eeff831f8e42c4d91779732 SHA512 62edbcb22918f1a5db1fad973dd68b122e0f8bc8ebc0516cc3aa87dc762f8f33a9002b6cafa98ac2100f2511b198bd714a1ff26efd2ae8bc7413eff404b92ffe
+DIST firefox-bin_x86_64-96.0.1.tar.bz2 76242021 BLAKE2B ebfb7b4c8cd79149f92d1312f7ca1105dc4aef44d2fd8d5cca2670a23fb911828d8083641d007407fba266d0e7feeb8cc20a1ec86599ed4bd482ebf6861a9035 SHA512 c7fd7df1b3c4d7b98c1821a4b4fc402f875c3f5828c2f5be12765780798fdb704b1c2b6b2c07a0bd28253542543268559c5af15a6952502d23178070c5764d56
diff --git a/www-client/firefox-bin/firefox-bin-96.0.ebuild b/www-client/firefox-bin/firefox-bin-96.0.1.ebuild
similarity index 100%
rename from www-client/firefox-bin/firefox-bin-96.0.ebuild
rename to www-client/firefox-bin/firefox-bin-96.0.1.ebuild
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 0613bcbd5cee..df3d2c1578d6 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -195,4 +195,102 @@ DIST firefox-96.0-vi.xpi 572934 BLAKE2B cd4e9dd0222cd02d0f2a11994aa6f113cb2545e4
 DIST firefox-96.0-xh.xpi 423438 BLAKE2B 9359768c03fce8fe1131f3263fdec7df40ad08b38a51c053d49daff715e80ba4c9e9ab04d16283d453c198cf962d2c4452192fd597f96a1a8916a9b20af701a1 SHA512 0e2e8caffd68133f67fe38aac1575c86cd2c08012b8a62c22d7706dc3970af8b0e1fb65818e777829c10b2227d2effe76d9413cb70504f3cd369bc6decda802b
 DIST firefox-96.0-zh-CN.xpi 575685 BLAKE2B 2eef7b7396901340cb4a207052168cb537081ea0a4a88011720ce5560bc2b26a25680dead37e26279a877982c323fc4f58eed83ee83ade894a640cabab344364 SHA512 c7e3c00ec26d3114e4ddae2b50adab0e64cf8b8d1fccb99909c53da0a2ee1b36aa6f1fa6fe04119e9f80e6dbb944cbcd34f5e291d3d910dd9a7e46c524648719
 DIST firefox-96.0-zh-TW.xpi 576803 BLAKE2B d664c86e6760cb5b782986765b738a0136548b9b13837dc7f0ecf647e2a3202d4af96f6d21a8b96493aea5236c2237d771000993f724f8a1437f2dca2937c17d SHA512 746e3fa4c218f88c749729b9c826b02f79259ebc90d1b52b9f6ce87aa7368fea407da0dd93fe7d0e38eeaa41fc634e03c4ec4081c9ebd26c4e23599e99a203e4
+DIST firefox-96.0.1-ach.xpi 451197 BLAKE2B e4c58d71757ae4cd079ea3f6ec25eb4988d019235748b5bfe864d49bbfc70f801243ab274de7aa763286f09badbfbfee2d738ff991fd3ec7dafb670825302d4e SHA512 5d3b696292926c622469c11b395f09ee4978314fc9f34623c697c7877666efea1f9547f77794fa54a3801b2835ba82178f66da0253906cff7ed7f6c39e63cac3
+DIST firefox-96.0.1-af.xpi 420330 BLAKE2B a2fe5e56aadb8ea082a8b525e57f135cda658240c5e47de559a2a7c5318d2a9d9c1f590def2d20953e9ccc2cc4dc8752f45d8ddcb2e70012d88abb839adcc0bb SHA512 012e4ebf71d7d0d795441377583428b7a9f8cf9c1ca19b7b8ff91daec0807223d1fb1285faaa24dbf478f164f01422a3a1452cbb26db5947cbb64f267ac30b4f
+DIST firefox-96.0.1-an.xpi 499443 BLAKE2B 3005e13c52694bacaf8907d7e52abf4155b6f2d62508d703011023e9c9dd3f6b44da1cc2428afa2e9d20489d22dc7de253018734a824e1c2b9e05e7e8243bdf2 SHA512 9c7af56541499b499486cc9dc373ec6334924d9fc9c5e3acc867560e948b9d5061cc05012a012c4785f083139dc330e32d661cfe10de4da15fda5e5d414b7f5d
+DIST firefox-96.0.1-ar.xpi 559647 BLAKE2B cbe5cabb0597bac7b18175124fd4b58723fd8523fbe9ddef9e3e4253e3ca503832eddadd3ef671a9a979e955000e053f387702a235d0d744c193425b1818e159 SHA512 9db981a5a2194dc736b92b5e73be07927b236630241e112dd724a44853f59c6df0482365c00ff8da650e302de19369dbd87fa8d51a8f0253b5d74098f18cdb6e
+DIST firefox-96.0.1-ast.xpi 496733 BLAKE2B 995541c7ca22f2cdacbeb5fc572c6835471fbbba82d75cd1c21b62b6778864f4c8cc9c02ace310cef50bfdf23af3625c9c08ffe93e573de606991d46cdf39291 SHA512 39f4bbe76750fb78a6d52c306845023f638d5b2fea03dff620ec61a5bcb40107b68d2bf5212d62c1b955a0b4da711ce000f342880a21adcc42285237d4bf8dd9
+DIST firefox-96.0.1-az.xpi 487143 BLAKE2B 4dc0ccf2939b7ce448536bc0a314219a3c0670f4a749989799a2c08edde6d77a0944afecd5b2f2e4767bed5b6b83214cd59d6e4a1202e55b963f56034f843980 SHA512 335f1c8b2888253b56071ec6644893d88c9f897a4a8fa99d5c27eec95c6d69f0c72c97fbd93fc0e48a8e3aac835d6bf7e03b97657853b7ce17774b75f1740a1d
+DIST firefox-96.0.1-be.xpi 620930 BLAKE2B 89116f256b3f6d2e4f75b656f425a5ba7336a21ac447368d885bb788538d58efa73da569cc7752cd46da209a7321d7d16d2fc11aef0df1c0737ae80d90102c90 SHA512 20f4d47ae2544b8ebf4cae46e46d71d10261887d005eb434e280de2b8b5ca95046cb569f4523f9386076a2d4262d760592b54b258b76d3d4145b3733b815b8a7
+DIST firefox-96.0.1-bg.xpi 566682 BLAKE2B b8800edb4384784e3c79b6c207cebe1f6d3e696591930e988183b9bad96ff7a0790615f56e0e239786a2a85e20059ec612abfa5f3224c94550c5c1a0973aea87 SHA512 127a63a82c35afc9bfc5d97e557bf84f0a7e7c7a36d9228e6a1d6896913607e9fb8aed71b42a171745e376de61f1f2f9c1c10885fb789cd7f66def31b2b05b7d
+DIST firefox-96.0.1-bn.xpi 556035 BLAKE2B 62e59fc02a4259caa9aacf5cfb4e8462f2e06376bc67b56ec95df4e841c16cee794466e45d18a742c1d52bb2b0d6e6beb00aaa548b8d0c9a5c300eb7a976fd3d SHA512 815052732219c95684fb76d5c9e152c1e9c7c9770dab2168610095754aabb1ebb31ab9955568fac20783419d0fceaa887df68c1b2df48a96f1b301586a2ab27e
+DIST firefox-96.0.1-br.xpi 526875 BLAKE2B 7bf78b74f4e95fbda2d2127baedc2b23b13ae2aed66c2c08dd394bbdf1606f4b0dbabf5d048b8002a416112e0f4f339143f1bf76d8a14774276441961fc39b6a SHA512 4ff8f428b01b2dc7ddb8f9bc63e57ce6f5d4238a76425267e604cc79a38969ab88b7dfaaaa04ff5e309b98d691c0487d7bac5b4a34daca3d221eade21439b6d1
+DIST firefox-96.0.1-bs.xpi 462235 BLAKE2B 39941ac7d94eae383da9a9ec54f0fb80eaa7baa184c042740ae0e701ea094cb54730551bfc3df9afc3389e15f1912e2ed5b9e6495653a26ce059fcc88fa9ef50 SHA512 cb0f5ca353132049ad67a160479a338c52f079af0e93c3d8d62ad6dae5e577436f30fe899c16c6ff56323994f09e2cb218262cdd87a61e967e87bded78956491
+DIST firefox-96.0.1-ca-valencia.xpi 538642 BLAKE2B e1f6207e00bf3449e1417a8b7c277954f32f69d250df550770da006e5033c142893fb66ec06faa1e16c9b0814385c80feb671561fd489ea749e6f0ad642c179f SHA512 80d98086ba7a26d6dd9a77b81dbed0e989a42bb03a3662fd86c704f81b98d956447c9cf8bd1153cf87d20bc3a8366d210418d443cbf4ee6e8957ed8dba9c5fe2
+DIST firefox-96.0.1-ca.xpi 531298 BLAKE2B 8b3b86d8c518f7718209d59afa7798b35a6897cb570c7fd305236a460fb0f7377a0614537deada850a1d6f30284f5cdcb9d9cf17cf6d47b656dd23b4867d59ad SHA512 570f2813a145d2e0a709bd0aa84f1076b9fe3098bb8caf5e7c8f216f19690a5c0c9ccc80771a00588e914576238b75309d377941499beec7a9fc5bc9843a1e5d
+DIST firefox-96.0.1-cak.xpi 553140 BLAKE2B efb04cb8cc61083b8f2f38dddfc2c5c4915f2e677e3f867bb3b4e8bc7af7cc0bc7e7d5d1ec0bfc2d1fa67b04410f0cdcc052f380bf93b3cb73203e8c58b50550 SHA512 ac69007109cddfe1ef34adb7f4c3e9665c03ba74b18b68d58df2239b551ed3111961f3ad6e18a5a67407797c5936e2c7b0682c9d260c687ffd6c0813dbfd7e23
+DIST firefox-96.0.1-cs.xpi 563586 BLAKE2B 86d3cb7053a577054aa54a1fbcbf83c2a1f766a8b37faeabc28148deeca5a0bec5ffb26b15ff660757e77fff7609dcd7c2a8f1ff2471adbed6d50a8d51697564 SHA512 988ee1d1b8a20b9cdd2b7398d28e70e1315fab07895436ccdb75ab11cb4eca1408dfec61519233e9a04e91fe5179251048bd52177b934a08a33b666a14bff7ad
+DIST firefox-96.0.1-cy.xpi 542940 BLAKE2B 7956a48922abd05e6e3c0b69865d0be421f688b77fdda7bfb9239af09ba68479d9463f5bef39b5d8f73ed420c21d761dd595988487fc898b9347a03545407a5f SHA512 1538295185cb9e211d319906d41c3000c1aff570f82100f04d4985ff69659b3fb0f4dbf20bb092a6f79360b3bc5c20c63a0aef67807d913995f6fe505421b421
+DIST firefox-96.0.1-da.xpi 533847 BLAKE2B b610c0a7c77284a9ce0ca94e575e024350b0f599afed54d09c1c8899c5becab65cd9ff3218963afceca893a147e2de6312384fd3c804638fe4e8d0329ab57ebb SHA512 bb1772ca2e1e99ab4afca1c095827e77258efbee057b8bfcd598012e77e9630684b44a74a48bf9b94c70252bf34edc5359739fe78ff4e9955e5de472c32e5abb
+DIST firefox-96.0.1-de.xpi 554169 BLAKE2B 90ace87e55d9111d441f86775110d6000376a4d357e0d34a9066596a84317901f062dc0822c3ca2dbf9be549c08506b4b15674cc5bc4209002b2e9eb4f69132e SHA512 3bf4b405e8e8c34850080c39e19d1d76c7fc14d5bf00b794aa205528a32d54b8fb3882f4a289c7f0606bbe591fc5b7d787bcca78dd28bf1d421d146604499849
+DIST firefox-96.0.1-dsb.xpi 567031 BLAKE2B ac8fff3abc314444b3d3eb5e284a5c3296c9d8c7bcf2a7c438a626066e115b64ef55fd38dc7064abcd7ac8228a68b3b6cb6aa0e6bebc02a91fd62cd3e1b8e68e SHA512 ad5f8dc45f14ee9b6db17aa87cf4fb92599969877347eba7e1d729f6dd34646be5783d2be33e830d6c47a445fca9eae9cbabe7a9667e7c0afab17b470d4c08b8
+DIST firefox-96.0.1-el.xpi 638284 BLAKE2B 80d687952102d1027c49fa18db64b1b2f99f90fadb3c1a9603ac696680706aa1ae3469a7748c3a0b465f3eda4c70e37d45a6c4fce68f8d343658a1e3a03b40b9 SHA512 80dbe950e8e81fc152466c9618199049cd42a5448d0ec75e415e266218512676cff72e8e4db0a02d1bf3e9d0a91af14446f7abb5ab87b21329c6ae2c59d79187
+DIST firefox-96.0.1-en-CA.xpi 510547 BLAKE2B 5ed8b66f60272d654a3899e8dd052471e706c682ab8e85ba4e5096c5c355e66b6183e65f830e2858998a0754c047ef73b04e94f6c353211e1550e4d89898dfdc SHA512 2b0843842337f7e594ca764c047b0e1dcbad617538629d0dffe1e939ab4a9f2f1a67f36e4138fbbbb75e2ecbdfbe0085619ab9fbd4530c2045f18ea0b025e910
+DIST firefox-96.0.1-en-GB.xpi 511268 BLAKE2B 9df615537107132db98d52df8a426f717a9f2f361fd3e122d8e7a8334c766ec7254facf292ce2ce2b15a0553a07ecfd2148d13bd1320b5b9f556493a866aed6c SHA512 3cedfb9ebb9fc65f532f5ed8120bfbcc94644504c3423e165c1f69a4199d799c2fb629907424f7a55f0f461702f6bf4ba6380bd84c3f3b38b925452b4a726b0f
+DIST firefox-96.0.1-eo.xpi 535226 BLAKE2B 9a646ae991d9adefdaf1c74d4896f24300903fad50378b5bd749bfd790d25cc11e8c482feb2eacece4cd778effc006db4c50482e4a6186733c19b09fb8d2e5f9 SHA512 e38ebbcabe786574b5b23eb1f99556b27db10fa6af0c67c7035dd8d0358bcc4d8202534a2a7a2cfbb746148bd3ec9d3ff245c964d949f7a71609390d5d46cde3
+DIST firefox-96.0.1-es-AR.xpi 547502 BLAKE2B edf96ec35d8e2a656fd331e405099e5377b314eccd4c18a7343e1ccd64a1131165d3311debd1831db75b2c3a5b403fc02c086444ec18a18cf9c62ca6d44aa535 SHA512 6007746216a1451e7b26495108a96a760d37bcccd80235794c24b74bad320aedf8bf1e82b31d42c55693c405fe2da15ab72b1b3b53b8603b28dfbb04a46f9826
+DIST firefox-96.0.1-es-CL.xpi 546864 BLAKE2B 6a45d2dbaf40b750bc3e16cee291200306bb44cfff8814d255c5d69feac65c8061206103ce02b591763b57e0ba655f81cae05617ea4fe163767095a7506d927d SHA512 e6c209ca1c4d5a42810322c6a836645212182010baadb86af09386c362327ba5aa2cd40da40b674f2832a47be82e2cba2a7c3333769cbfb05cd9d043a51a3066
+DIST firefox-96.0.1-es-ES.xpi 537731 BLAKE2B 2e2e00255aee4d35cf4b1a0753bf3fdd4d9d8e314b0613000eac38c846d04f0168f47ff323b6d0696db042c3ff4a6b70b8866f4005f771042c13947b8db93644 SHA512 e02755215d24be5075be02d9e4a7b138b94165ab36d931ef8dafa589b68e5a0a2f80cf4cfbf0dc4e200de6cf611220645fff75b1f1af1e0b9ddee03b6c67f064
+DIST firefox-96.0.1-es-MX.xpi 550725 BLAKE2B ddb2d05a353ef75aec258c35e71568cd7c6305da3492ba68e7e22cf07c351871dd30230995fe978ddd444fa143a48b9595db83361e14e7eb951708c24f4dfd11 SHA512 7aadf07c2400e01df50c3e6ebb7387a75304d06c4dda59ed4130ec173f739f3bb2ede904023b56fb8e201f077e637d7bb2dcc91f60623c832d5e336eaf5b61ae
+DIST firefox-96.0.1-et.xpi 528808 BLAKE2B 74ea2ca690d453591652ade9322a95bebd5fed9bb58095d44775f254bdcc8cb9ca13167d4a74166f2b27e4838a06280f2100add01a7d13e1ae9fceb4985a7470 SHA512 9bad910cf24684536ab98dc5aa96d185a26d1230f249ad661bf44aedb610ffd3074e4454a50ab365ba48d7e095721f71ae681860ed814e944b72b616a8972529
+DIST firefox-96.0.1-eu.xpi 536791 BLAKE2B bd6519af62304b72435cb0af200e7facef62a6a30583883acdf2d57a6c76ce2b5389c6f1a7f6aaba107428a13670c9d6255e33d3c4e1d95c61a3b77fd0f41695 SHA512 e7af2a1e53918d48209134ba6d2fa020db88e201dbb33f4c53839f24fca1308b213a76abad6476eb1b663d8625e78ab3c0f34fe5fd47020ba55dcf2995dd73e5
+DIST firefox-96.0.1-fa.xpi 563690 BLAKE2B e4a81d671ec30c081e39451be9799bbb5225881ed71c21f38ed79c9695cbcd8631ad2116eb6f7c4b3158e193849fdf7d56f8f441bb9ac05b5a2fe87745f669e3 SHA512 1765d16bfc037006799e45afb2f7d829edd17a98c0ba276084d6cdc337a535762d8c56a08321b827193fc3a83e5affe7b6b5fb805273d529dbc30d3a60c3a4e4
+DIST firefox-96.0.1-ff.xpi 470382 BLAKE2B 966777b935755cb5e8469fe93a2f1ae91fcec664c887a202f0a274177ad8adfde23f0fd52b9ac9867aba8188b3685026f28a7f9767fba11f2a6e64d7bbfb6113 SHA512 1adad2000e28957fadb57da437bdbd8ccfdaab87c0144ed5ca879396808e46a2467be789dfbb9523a5ab88a1eabc17dd0a70d912547762720a6572e04f919e5f
+DIST firefox-96.0.1-fi.xpi 532838 BLAKE2B e7efb4af8ce56e6543efe4c7ed444f4b93c3c5f2c8675d9de0bdf57c08921c59e9e87b580bcfef9f551e00a61ee7efe19a057709af2ec5eebdb85d4692c37f52 SHA512 1004f1826554fc1e32006c916f87cbd25fa29df7aa716df991b56b9b7cf0d792d55fa6f62d9f7b7b84ab28b44cf182fea0a2564eb508eff39cadfa10a0068fdf
+DIST firefox-96.0.1-fr.xpi 558448 BLAKE2B a52a9f7b556b6e3e76e2a00d6a588ca4a0e83d121cba26dcf8e1eaf85aba801ec1649ba0df84a30e203abba9c0b5f05215fec88e073eaeb030374e2527f9427e SHA512 99932da86c62f7abc343509f049c6416ea9c7e973e5d3627872b6a4164afe8ea12dd4ef7002f7e9b4fa02959423fcd9a4ff14eb911eb12400e5de3ef3fe76c80
+DIST firefox-96.0.1-fy-NL.xpi 543702 BLAKE2B 0f3fe1a52bd88819b4cae1cecc3936f26b6eacae281f9779de0d1b920b7e72925674e8c816cc54f7629cc6e356ee9fe161b2416cc0b506f1d877c60aac617383 SHA512 dc34d16e42afde231afd716e49fee681e19c6febee17300237ff94872a4a543300e0630a71d8cfdb8d16f38ce0a4f4ed14f00b27b7c5525cc422cca807c315e8
+DIST firefox-96.0.1-ga-IE.xpi 457641 BLAKE2B 99cd27ae70720c1e00f9ea52a0cd21c3ab8fff9b19b4a8ea4ccc9ecc8b560cc580b3cc35e1f46953d89749747bc429b86f2d63f45608569c081ee5dbd3f270ab SHA512 fe1fb33c1a676445674b50f4808851ddc415db433441583e024a179ae9a269d452f7fb9a5b3457e3043659517d5cce59e0d10530d9c5b41e559fcc79260bf86b
+DIST firefox-96.0.1-gd.xpi 530891 BLAKE2B 57541b5779dd8102cd7d1c9bef284fda737bf0f34589ef7cd06a12dd756b3e9ac46c86d570e5412544ad35cba1ceedb81642592c96d111664c6f46d9766644f4 SHA512 71fb2ed19fc9da69dd79daefe5f8c75da846ea1afe587589402427f3ad2ddac7927ffe05b74dd94734bac0361af8239b689d2f1cdc8d9eeaf047112f0e09230d
+DIST firefox-96.0.1-gl.xpi 542038 BLAKE2B 56535ad1d682faecf9a67dc2ff9705b107d5325b190f748f24c1a72ec1e22a41a06385bb75c1344bd33e62ea3226fd5f89d8eea877576fd8fe1eec8f1ed97c99 SHA512 37974446b6cae2211c7a230364c5f6ead83416726d2e40d7affd2e2a4d4c7ad616301ff86a963c955887ee06ed3534a45de7a507c8a1267d6ab78fb949e1c800
+DIST firefox-96.0.1-gn.xpi 558957 BLAKE2B 79aaf04b42417fa13e98c1ae862de22187b24bf8bc68fbd97909d45271ca4b9f1465f8639a3849bd82ec8a457e65c970354e2514e20d0e55730a3314b586bbce SHA512 b4862324bb6d0f1904c29ecf1acc9d8a34b30cc2e82b0daba8f433266ac6501be0538af4c8ceae4f3c90b8672f662851010cf8321172914804a8762b7fc1d9fc
+DIST firefox-96.0.1-gu-IN.xpi 527658 BLAKE2B 62dd6848c8d2d8f558e4b8561de3450d7e0f994a3a9f7b77cea818883852cbfa3fae6ce56e4714183f4c70b09b159a12ed716cd49ba9d18e4de235a52e973d0f SHA512 da9abfdbc1ce468a9f34ec2df6bc45b09bffc180fa852d4573d15244a3d5af6bbf581107a157c3659de1f5f7807113598390bc8765b33edd6eb6eac4fcd24888
+DIST firefox-96.0.1-he.xpi 557086 BLAKE2B a45f947072f43637c32fba4fca399866cd5b3f538b2cee1c2bc29e04c1ee3f6b583ffce98ab217b7acd43eb45d60de1c7628cd9742d0b1d3dd26cef0da87533d SHA512 62862e43da7c1ef3fd9ff7410ccae2abfe329533f3250218d9934bd8efede1bf30fa2d2c08c3336993ac982687ba96add922fa794fd91f93da3ef0ccd4170d94
+DIST firefox-96.0.1-hi-IN.xpi 558759 BLAKE2B 4a12372f9b36ec03f2b159948d3665bef4bb039ba2abaa052453166aa611736a0dc8b5a50b55be2d8c8666a50800923882807af51a20052814bccb5a7956385e SHA512 2d7c05aa3b30da03a98370743e8681f9c291c1b51ed026e0ef3cd5b20eddeaa03aba7cd5c0b158474c9805f6231c400bee024624deec9adb480f5d5ab3d09a83
+DIST firefox-96.0.1-hr.xpi 531750 BLAKE2B f4ef460b39385a2c62910c7860b6f2ff277320f69b7b3af5ff5e428ef18254e875b337da3f5dbb040b8ed4269f202e3ca087077285b651fbe826fcdeb4dcbe35 SHA512 31ed9766589911fc54958c04fd3527eadc7a8184879f455487e550b8c3680525a2e6b2ceac7085a84e8a5550b1bca833ff12b29d20296375925008d7be961ac0
+DIST firefox-96.0.1-hsb.xpi 563136 BLAKE2B 4f469e180c529409365ebc61d686e18d11490c64450d1d20af1199cce0a93efd36992db70bd603040079de66ca37b4eca4529f95d5e02cdfdf469de9362fe22d SHA512 3c24b3378e64b4275237f0212764fd785334576a962f1b0cdc012cc9fc384b1b2fb9d620494f8d12a2bee08203a7bcd32a3a9fc14eaa4536b3cc00b846d28880
+DIST firefox-96.0.1-hu.xpi 566428 BLAKE2B 64aa88fc06529d7706cb28c219aac6eed72ca264146c6156b959b2553c3418958d44b74048671d40f3fc13c6b1adce96525e5f6441a29ec225abcf8e93293dff SHA512 b559c67a2c5487c18d786ce91687b056810cfc833915404dfd6b052aff107c15d1764577ceac25b43319a32e1108e91409b48576b4d2bc0f1164254596178817
+DIST firefox-96.0.1-hy-AM.xpi 580462 BLAKE2B 4c966c30caa067c11dbab219a70ea77d071e71bd62202e5872997d2a79daec1e2022b928dbd254cef0bd66cfe3299c2ed24b9501749d757561be86bb37542f69 SHA512 927c56c5cff8cf69606a1a190149c6cda153373f9ccd39b6e9b06d72c334eba73086038399a81fab17f5b3b4c883dbf4ba793c1f064b6bd915aeb63d932b9a66
+DIST firefox-96.0.1-ia.xpi 533078 BLAKE2B d3a86d48a7ee45f7fd4cfee738b05928b43a95682297717aec76c064ab677455470830d0dd8f7b22677dc48b28ae61bf0ee15aff98e9ef76b3b60dfacc22db0c SHA512 5edb9cadae88e60ed92248e881a268c6015b90039e38fa747f6d64e422b5d3324ea2b8704080df602f33d409b819c0db7a5da5366c687fd38b591ca87665cb8f
+DIST firefox-96.0.1-id.xpi 521710 BLAKE2B 47b98650740b630290ec467fd78c8e745ad4df48bc19646690643c330cdc63203c71ef48b33aab05534921d714937c89d540515f348e756c7e386b794319b545 SHA512 2b5e822d37e737d24c822400beb55c5e85d33d3cc7615fe185b726db7ffdf0c59e060efc006a553ae5e0a3e8f602731b043dcea63eadf39c2294783c835fb170
+DIST firefox-96.0.1-is.xpi 500012 BLAKE2B 5157818f45ca5450a47dea27a5e1baadf301d8dd1fad5eeac91d6e0fef61d6d5d308ec79a42025712405d130572a8e78926d2614d1eb9f3fe1b29ddceb3ab21a SHA512 d73d5b7e2e9a724423213d0924c91d13fe4162cbd1380ec0c283008a7811dfee0cd8445d5755e0a466d8d446374fa040838e59dfa54396282e6ba62e89ca8092
+DIST firefox-96.0.1-it.xpi 460938 BLAKE2B a3cd1c2312f3cf4dfebda98b0dcd4b8cc2de310b077659a4de856a9be5898fbdf35d90d59826b511bb6bf3d69f791eb4e7152e562ac55b406001eaff54837302 SHA512 5b8f99a09c6e2465627e118899f946d093743dca384ef3908a7f898c8d8d6101fef46a508700798e71775a76d0de85114ca389d600b5e91726291f86d7705148
+DIST firefox-96.0.1-ja.xpi 586096 BLAKE2B 70b9ec22b2c0cb03bc65f93ff11b81b3d7e408afd3bc385eef73551367956d501fc87f7f4bc2bb3f6b7e75eaad2a5249a58410e31ba4ad37eff25abdb00dbdef SHA512 90181d9aea119d98447683fa99a4036b87dcf06f2105f84d74ed8c388bdb735990c08983fa795028fe31ee370603d3ffe902c9d6d679a0d5f76905c0fc7260ef
+DIST firefox-96.0.1-ka.xpi 590834 BLAKE2B 316f8dbc4546da219d488a8d692f738c03e18e2fa4a0e440efc5d0af388ec8230aa2201fe8ffd7b926a1c70fc7b8833205b668fc3a2f6d4339a0492a4b69a380 SHA512 32990300fcbe81a67f966d526f7f23aa9c7328bb53d2e5f07b11e5a1548b55bc208c933be5dd4a6b4ada533110bf890b1b354a9eca7266394b5c2f42be2f1208
+DIST firefox-96.0.1-kab.xpi 546186 BLAKE2B f44edf8d513cc60d9be72e561587c12c3c61339e6f7d1a577ce726efdbaaeda2cd0940e68b7a4aa6935da46a7d100168e441cca858d89c3609cf99ae3bb27518 SHA512 7a1a885a69128ed0da8914e067e56aec4d25f01605c63fdb1c8035d3b7fdde2fb820cfe09d82af03966ee7e728786ab1c0742cb4ec9e099a26686568cad65b55
+DIST firefox-96.0.1-kk.xpi 613166 BLAKE2B 847e2a170c3c231fcaf60c5fcb6638ddf83b5cedb37794daa2caebe3dae1ac7e0625012b43e875c569a1bc7bcd07ea33803d737ce02813f5a8b5eed0dfbc41af SHA512 5637b84e81a9be93b737dc1416e009e28d1880ccec6b0bdf9fced11164673f1d29346d7ee706c523f7be46061fcd395db0ee93db182e2d458f3a96175b064e0a
+DIST firefox-96.0.1-km.xpi 529625 BLAKE2B 0d06952bcd2782d65afd4a376376bd7f9cc5afd005776cabb4d22303b53898cdd3794d94401ee0bd71c987fd827c93eea996512c336d8fb2ba331081bcb5e2f6 SHA512 6f319157f5a74c5be61213cadae4adcb25b64a0a6a1eb2927ae4cb0e79bc31bd345196192985c81162864d5498c6e6ec8e2b567181889bfecec7d1314b2070ed
+DIST firefox-96.0.1-kn.xpi 495323 BLAKE2B 08a1b130f1081ade9a4ff908d7a7b5ffe3e5d19009b81648c0fcd9cba9320aeb22729550c90ea0e757a39707e085d65474abb1bc091a080d3fb5268b60649188 SHA512 807f53304a466f7b51c325cad9bc67efffd8234fffa957473ff90316303744d7020b184bf7be3035f2102a808d3d7d3d7cf8c9e9539c829bc0827b13cdf6e9cd
+DIST firefox-96.0.1-ko.xpi 579628 BLAKE2B 1c3f7c7544ba348cf2afc1b6bd69ee61612b45fb5f428abb2c629a858ed6f5e7ea537691da5698a6c57134123e6f6a590eb22329ca6b30b2537f6f527b04e46e SHA512 e411b12a19b5fd12b31f98f5b16b0220aaf1856ea403ec18192a12ae242d947bd6bedaa8a46a528569389fc64aea9aebce42c49144ebaf94b4c6957c823e05dc
+DIST firefox-96.0.1-lij.xpi 469160 BLAKE2B 70b8d675b22f4a42b877ce83f1b7f8703f18c42c746fa2e9f6df25b6359bd718f2e73248c81da1df04d84b10906f5b2642ef6e367bb183b7885eae54be90bd5e SHA512 2527ca0e6b2f59e789a4ad6ca953e7af05d36d8a7f752e0466c91cdcae09d800bf40c8c82b1e2b6ddfc43529d613172678ad2c5ce6fe20eb56677c64114f830a
+DIST firefox-96.0.1-lt.xpi 559294 BLAKE2B 67557159b420cd7bd9e428ed3787d14849503ffef1aca7883594d72571a638b117bbc5b6257f1323bc489f46d251ee03f6b194548a816c823be971abaf0322e8 SHA512 6cb3a63337991992709901efb611213e7a27d456e9fc6de8af402ef3a5dd24c416c320f7801721dbb13ae0de9f1a141df4673227efea09f561ecdbbf27fa05f5
+DIST firefox-96.0.1-lv.xpi 461303 BLAKE2B 036db72fe68e99b707e74b0f72baf3494027dceaf26ef596806e0ef7f8cc3b9ca9b3ecedcecc06eda07573359ca215176269d29315effd964d5b8812b228bd32 SHA512 b2144e6f69a3f42652c197eba411e99d13c8b9e87a336443b92ec0c68037c99476ba111ee8f7bcadd324476286911d85971148c53b2f2b4d462557fa67383070
+DIST firefox-96.0.1-mk.xpi 463319 BLAKE2B b9de6129b0283457d007f92dd263c66e222dbf02923a1fe99c4301b856b7cbf95f78851c8535f19d76affbb20dd9d817a625a9b837c676a089009f2947527b27 SHA512 2cb3e5cf8fc739776efbac92bfd947070ed2cc8c8c987f8575712662d419a7711ef79d603e53116c10df588a4d974405d7dd78037f8da5781bc649055426395e
+DIST firefox-96.0.1-mr.xpi 530519 BLAKE2B 43f644246422070877ee801b6f6891bf71b45662126bf6e06c6d989db00dc0bdaefbc893eb641aaccaddcff22ef2abc9dacc9272da9598f38ff4bf0ddf6565c6 SHA512 2e323181b3395ca9e19c530a054c1bf3e315d07d1ea39b7ab66c1812e95d3015c2a9fd853ba407b2576bdc774d9c3f8dca22108adcc8d5805163dd75537a5724
+DIST firefox-96.0.1-ms.xpi 446397 BLAKE2B 0d72d584bb6dcdb0ad024bd093f2fff78b08377619c1952ecec76d11add29474ed31ea3a6f749aafe0ecdba351bc812a88d22bad91afb1cae639a4aa2e64bdbb SHA512 856a2bcbfeb6f7aab34269e27b5af4e00c18b98495f4d5b4ae6b70c7a81f59b8fab316d35b8518478a9afbf92c2a7bb8adbd32ee71c9be10b680155700fe71f0
+DIST firefox-96.0.1-my.xpi 511713 BLAKE2B 02efee61f3857e53a5fe6545f8fa9166e199cf9e768a81f9080b14aabb61ad1dc519b651a36005d0c50089cd532a55a2e2f28ec343a9021ea0d9088a1ef0cdac SHA512 35422be98937b16f9f3e04417ae4a911761910eae090c89600cca6ba9b3517ed87f07672e832df051bb2df62eb52651d805e377d39e4b74ad189696f4e0584d1
+DIST firefox-96.0.1-nb-NO.xpi 529013 BLAKE2B 7fd9b1032af670b69bf30725f5ec0f6988b92148ab8b8235d000d62804395960aa91d07c1989f42b96b3b9afdac570da787c79a31cc09f37c30ede7b90651e55 SHA512 574160a26c522bb335a25a382331c5457bc4319af84c88ce016871bd57c4fc2264ca08290fb7a495acfd52eaa773a132bc8e5121ba14e26d362cd88a8cfe3ec7
+DIST firefox-96.0.1-ne-NP.xpi 482350 BLAKE2B f327f48aae0a6562e67a887c0e6394dcbf9f2ae129ed08a7c7a2e221eed6cd1d29195dce874f0700199b1b8eaf04e3fc6f4d1f727332b02f8e4aac52abad6264 SHA512 14fe5e1180723e29563038bf2394270c1007eab23e9d7fa39cfe9ee26728c1fb91e298931ead1ca646acf2627409ffdb9f42da0a9275f4d8474a533b00dbed71
+DIST firefox-96.0.1-nl.xpi 538035 BLAKE2B 62deef37f8b6d8835d643526e85aff0e358d5a96b0e6ecd818b13211443a1694296df3e0e28cd7f19e256c6972030c6998fb6989f131e77bd52cac45e90ca8b6 SHA512 45a4d2badfafd3c3c9114e8c90e68801afab38530559c469b9e2cd411de627cb0e19843807e1156ead2c3429e13f7bc84cd5d76eef7647a471912458259a89e9
+DIST firefox-96.0.1-nn-NO.xpi 531127 BLAKE2B 4445cf503478ae2eec547f97fe874c28181f44ce7e519513cc8ea17a2d7cc11c0cadc621890ac79bc617527eb989de17b49f15ab62ab597924032b0c9abe43e7 SHA512 2a00c7833f406f847256d478c861eaa56790a4c37818e664d32aeb7a637fe465d0f39a6f16a8e79aabcbc78723da64c0139da5bb5826e5c4b856991cc14f625e
+DIST firefox-96.0.1-oc.xpi 553584 BLAKE2B 354925f0905c9ac3c95da60bea537cfbee4578650306a832667a1305cf1cc3215587762bbce388b155b31bac65e6299eb7c05bbea43db0aea4195f64f842baf9 SHA512 b4829d6995faedecad5f3fb18e56e010db3861f0048dc0a1d932c687e82bcaa4e329a55154433206d6ff6f35edb4d262669519df712066d26af13e530baad371
+DIST firefox-96.0.1-pa-IN.xpi 593694 BLAKE2B f59d91b3ed736b70b295675bf141aed448fbe99c8506c19c67ee52787ac278805e1d635f5ac96c8728e113aaf42b9f5e9d0b039902faa3e2bb5315407cd2b200 SHA512 eeecd6e8593c56efb2604e2f73c028cf04796cff6d93856f2255cbf0d0ab456ef7c5f852d29bad1970eb8c60d03b2ecb03cce0017cfb791024bfae01fbe6a784
+DIST firefox-96.0.1-pl.xpi 556867 BLAKE2B e37533d7dd6970d821184e57c57af51f4fe456b5b002e124e951df500531eb298d45b9d7fb55b31e6d7d504e28e45f871103ba253d7498c4746656cc0b68f43d SHA512 8944b8d032c330ca7a6d707e3afb95973cbf79ca99a32a812b723a16aeaa7066e1c56a97ac5441c657953eac22d65a095aef493ab91ba8b6dcb9637679c11a8c
+DIST firefox-96.0.1-pt-BR.xpi 543367 BLAKE2B 270dfaae448c0b75bc63c61542653f963225e4e39a8a944642d3334f5fbd8d5092d9740045116aa614e2e3b604cc6070cbf1870b843014d9eba2430a17690d2d SHA512 046279b286bdc62cc1800c73216cb82e0e95e5b356e9e2f8ec66c7925516bd3f145c03411f3009b72f7744777eaa8052087cf7db50757316ad6240afcee6aca0
+DIST firefox-96.0.1-pt-PT.xpi 545098 BLAKE2B e011b0537568650a6cfe5e433888bb8d4b461dd0a09c851010ebe358eabc7692de226024976ff4333190c451de47a3d1a4d7279a93db811d3e1c5fa2216d46cb SHA512 5821da117faaec2728c4c9176255526769903891120ce9db2069c2f209db32c7a17b67e163d82d0437512eeb1d724cf3078ecdfbc2da837a2da0ed79608497f0
+DIST firefox-96.0.1-rm.xpi 536761 BLAKE2B 246113e8272d1f2eec689f90a40b5e4248b25da08a797371886f2fa17e6dfa013200725fa2d8a5bf120ec911ab242b3860f4d950f840f8e7781bb2354d4d2897 SHA512 11b663179d6ac354e90e39df28c7f5b77d5bd230ffbba5ca426617e67398a432e5d65abe0e16c55e7a6c66c0b520a2b5c7e27d11a953609caa5026255c6caaec
+DIST firefox-96.0.1-ro.xpi 529765 BLAKE2B 454c326b12f6cd269b890c25b8ba5831b00311393b5b769a0f5e560c970d87e05d4bca8c3225de18582734468495f24780ac693548ab7904ecc929e55f8f0015 SHA512 9e1d90a3cf504ff4dc9d95e4cb2b8699939cc80092ea2ddad48dabb80735eae50e85a8a68b8599fb9af8065befb000df80a207cc388b3975733258872c4f08a1
+DIST firefox-96.0.1-ru.xpi 627602 BLAKE2B 776fb5f9c1e0ef2fc1e8e4a83da13906d63dbfa870ed37fa92ae5188b5bab1208bd9ea6046d3b7471dd9822468f2dba8e833f48f5e0b04b514d352bba68e0203 SHA512 56b1b858d86f6b777872ec7b59aca7cfec14ff3573c3547852f7769ed455c30a981beb48cb663e23c18f1fa03c2f86a8c86627b60590c97477aeccc7a60a99c0
+DIST firefox-96.0.1-sco.xpi 503473 BLAKE2B f1d30aeee6fd436c0ae43fe0532e25f34c0ef75124b765e34b526323f8fb4b4331e96b833b16d7a01f9ebe4ecae44cf6384a1847434e334860c6cf3b2079cd39 SHA512 f62741e4a6f297eec880c2a34403d3106ff3650c96c536d08bc289bca0ff3dfce7e562bc2e680bde9e9b1905a9b00c0c4cc1b927576fdd80f62049c0909be029
+DIST firefox-96.0.1-si.xpi 484742 BLAKE2B c442012bf7ef7834cfb226c145087c29d14ecb8eaa0f7588f63d43b5baa0afd6298e278284339a44673ca68fe86ce7be44f008a00cf5e3c513af6243af37742b SHA512 626636b1d1a85aba09c3af480360d60c2dc6395fec01f907a0e5172a3a7db32190096f2b2b90e9e546afdf032f94588eee6c64e0696efa8261807a67081b5315
+DIST firefox-96.0.1-sk.xpi 567148 BLAKE2B ddcc70b496ceb90a4f7a07faa4083d0b07d990a24d78983f820d7be49ff7ff8715ff0a8d1351d0e57ac2118b8e60a6c0c933a065a635860729ddc3ce1bc7df9b SHA512 b0875dddae0de47b210f9e838f94ce5f9b762a281ac8c108a563b297bc09233e67cbbc4962ea4c707d8cec480f638b9d977e1a0da1ae47da9b655caa48ea952a
+DIST firefox-96.0.1-sl.xpi 537514 BLAKE2B aa72957d3ffb251e1f9802ce1944067b97e3cc116d8df5aa7ae2395fb5b30d5756d47340f5fa2302cf3b5c0c2c219c6c20fc3d5ebbd59e4f756463900afefb92 SHA512 685d054420b3fa85db7cb91b82a8e797301d1fbd7485b116aecc3b775727bd86328d027b07ee088fce4ad6378e8b3c2395c7fa6d564310a57d32dec6a4012602
+DIST firefox-96.0.1-son.xpi 420866 BLAKE2B 9e512f7df838ff97ca2b47f51b5ae916a0a02b88575eaceffa6c76e580658ce816fd446abb2ee12b2e71e235c9c351a1820220b4b71e3cdb2743183c6217887d SHA512 7a4efbef7253aad8c5a315f09d0a3f1451dbd395500ee847417ca1daf695d2d831b65a56f2be9112bb68763bdb932bdcb739b1feba880ce9fc7d62a27ecef7f2
+DIST firefox-96.0.1-sq.xpi 555343 BLAKE2B 257b3b6d46a6f9f43ff549da5d71ef9f821d62a8361374bf5ebfb1e725c90ee915c65d98a09dea26e3973189c36176444737b7499d7ab9207e3fafe3202ce83b SHA512 78135b7c97ce554f94f2939cd2232f5d6567d2b658f936a404ef284fec8a47888d5223cd01bff8470a3bcda2cbb8d38e83af1dbd5f4a49491a32ce61ceb5fb18
+DIST firefox-96.0.1-sr.xpi 585967 BLAKE2B 2301f69eb7a169f796bbf10bd4e6787d19ba46c25df317a48ea89aed452ae355d5ca0ff9547b6c0545ee90c004265813fab75d5abe89043ccb1e6422f511e91e SHA512 a453760663b7d6e083a93d19faecd32e1a8af73526ea57b1d54b16b6d83146d4711e9f9ddc5fdaf1e79e5671de2420f78f7ecb2d4adb7d882af6e81350b1f18d
+DIST firefox-96.0.1-sv-SE.xpi 540642 BLAKE2B 5c97a710c15dfdca61c44d3f25b46c7ebf5c309f4257c4c4de72eaf1c53be3183f344db6591a58ee05ce226fef7d3d77c19c4a027e04461c45f9574244acf7ec SHA512 9d75916be75c06bd4df7ba9012fb777f9389932bc4ea2cd496979b70f66cef668fa871b68ab279ed2bde444dbc18207f52919b678bd5ab3297c353c0e4c336dd
+DIST firefox-96.0.1-szl.xpi 507896 BLAKE2B d5ef2dc13c62b025a0aa4d6466cf9c00f7fe8c8b690a3898e69511e3a65c74dd1ad891e0dd74945c3b64a6c315274638688d4fae99bf08872d7ce4a906db62c1 SHA512 742d6b9f8872ae4af8517531453eacd75a282799577ba4e5ecd98a1849ace9cd8c08b0caaced41f32ec49782dc1abc082f571f14b05dabf1c4638d35ac6f4c7c
+DIST firefox-96.0.1-ta.xpi 510852 BLAKE2B a311dee86bf2be5679f7a36b20a4238e7a3a46841b608c73163fc1b030e59c88438ea66fb2deb9864137378c5f8ee2bbe9c161d8d8661cf4e812af330376018b SHA512 9a4e917d4ec0254f76a54f362929cdc1e27012318fc0a98a3abd9abdb184e49fc1e2d9e4b4787cea38d0cf9027955a05be8f414048fa5110c3404ee174ce3790
+DIST firefox-96.0.1-te.xpi 549261 BLAKE2B e613a52eeb17ff4261ba03ae63b93cb1b8e14ebd6d620361b67b71e5e7b74872d530a0002f09fc4a1f798ea94f748b25d869b28daa9de752ebcf8731877970bc SHA512 44687f8f2344040e73c327a05c3091b6ecb5522e8e046b6d2f115b17a8a586b16534226201a1aeb42cc1fe3d12caa6ef1eb056477edda713ea3c6929b5e0b120
+DIST firefox-96.0.1-th.xpi 605804 BLAKE2B d3b48d8c6a3b8b535f1631925a1d012f2fc4210f938ff1191cc57a7e2c15720d9d3d635431ead83cb89de0aedc851ca9a0f0056b0a98266ef6c4c2e06f0d30f8 SHA512 57ec6648e82022ac253b540f7bcdfe7d1d7957b6f25a0a616e20ac64b93ecac560ca7ec503af7912f0e72c871b73ab1e9a99eea7c0090ad435d5690d1d817bb3
+DIST firefox-96.0.1-tl.xpi 519527 BLAKE2B 2561bd8f9b91ed86bc22a35654afc6a464cae60d4be586d6009c0730070aff83e3653fbaa51bd87a9adaeb58208ab9df7f94ab64bc241b661378e5743e7bf695 SHA512 04021dd2773b61d2bc0020ba71ea8d20df32b4d3b3942c557d61e6699e5edd0d44cdab352747ed7ce42c3dd6909458567e400cd135ca53406f7602e1a45584f6
+DIST firefox-96.0.1-tr.xpi 553354 BLAKE2B 9007d3099133e7f4ebbba4715d2ca475822e76ab7aacd41aaea94ebce78ea6b896b5c71d3fd61892c2ab1c951b9e98a562457a2ec084b95775ac530591b01bd8 SHA512 d679873b616842f9c7651006a3e583ac05a56be343d050fe60ccca646ec4e1e269e1bc987b859851af99cdd1a64964b3e142e7346fcba9d3c5e12a455f72f95d
+DIST firefox-96.0.1-trs.xpi 490082 BLAKE2B 8c5182902848dd33d2b8d387da421468e35c274c8f304190de11e1220e19b6d6032b7b93393a0dea6d20a9d7111abc46788a27bdd5c24b359c48f79a862260d6 SHA512 8623c6a2981125d9ffe03151b35c5c51767ee4ba306a170e883f3bf9472e1007ee4426cc8abee55394f0f2a490ce2c73e24ea02b704779b819f299031d763b15
+DIST firefox-96.0.1-uk.xpi 621215 BLAKE2B 994c06e3b3afa0c077a2702f3e194c73bac31ed00d68742a548f296ccdab6c06114a0f41cc36d4a177a56c41e9b86655f3fb22ba7b1ebca94244e2df537ec275 SHA512 f620ebb7cd23d77491d98100308df695c53e33e0ed4130f4368415b30c17092a8c02af87c3867736ecdae86602f2ffdc5f72af26fd50438817f510a051fe495f
+DIST firefox-96.0.1-ur.xpi 556324 BLAKE2B ab26cf6197911ec559a62f1299b7cf829887eb2c1b69aa20b08380b1e2cd94b3794081b2e06c2e475e437b4c65cbde7486467b904e743813727d289db15bf933 SHA512 70c60f9c6886a14d73a9c4a77cd96c1781be3d52abe73258d2c84a12113bb4eb73d756ec6827e4bc218ea40f520e2f03656df4731e20c81f65a734d440794a95
+DIST firefox-96.0.1-uz.xpi 464793 BLAKE2B 60819fae06fa0d53bf08f1154531a23f601ed89141680f267be3bf7f4e55f1d150a977ddc2b25051eac14b4e20b409dd5202c943cefc76227553d374cd7d85e0 SHA512 f171093f6757229ce06ad238663cf27ad7f740209974704a1b3f2737207ef65dc0d89950ef65754db4a9a88d72d4a5d4dbeafcc3ea58be0543a705b0366ffbaa
+DIST firefox-96.0.1-vi.xpi 572937 BLAKE2B 3c75b32ad572ba49b73e9f5a561b53c37ecc997bac5f7aae7f71a349078edad9aed392f3ab714aa755128b560e95bc56fbbd09ea13fde8744064ce4204095807 SHA512 b920fbbfd906bd66614aecbf682583af6416bd5d6c703795acb5796cebe5f6fd7e4634867c21c49443bcab795e403342d7bf9b1bd7f193565fe255494bd58774
+DIST firefox-96.0.1-xh.xpi 423453 BLAKE2B 2a7dbad9532525fb8480b5b2cd065349b83e1e6ff5bfd951b7909c40e02b5c8730fcceed341211f48dd940443c3d30cc888adf11106111953151b6b0cacf3770 SHA512 86ca2e135ca14577bdd64474b673a315134628a8ba2ec8fab60c529c95dbfa612f12ada804eacecbb2545544e35ccbb683ae7dd0c4edefef17193027ad52cfe9
+DIST firefox-96.0.1-zh-CN.xpi 575689 BLAKE2B f6d89a03d706ef9562e573640e47b4f3f7febdeed8b76769cbfbcd63a126bdf212595b7a9dce77bfede370393e63f9796c73cd692e72c1ad6559dcdb72e45cbd SHA512 2f44be124ea4a92b7ce4203bfb107eeb3f269f4e9bbfef446fcb15be7353952981736ed2308cd7f1781272d5ee3c314dceb85f4d79b96b5e3c9d7433ad6bcfb1
+DIST firefox-96.0.1-zh-TW.xpi 576799 BLAKE2B 5d42e49e8c8f96bb858bffb4fb7ed9996d990235edd6e700f736ec31e89a06457871d008f362e5241dd193e0972e3b8525150e4aacfa176cf9e22e7eb90f4650 SHA512 8b7ed347c69d35c2135da15b77bcc83fb0f0a929e263c166fce9b69ec379bcf61fa18f85c6f1bb1320842e94fc5f61a7cf26bd4998b6978ffd35c89ab3d9b4e6
+DIST firefox-96.0.1.source.tar.xz 410542376 BLAKE2B b9b8229db62f3a4f6b79a26e79da6d003edb50f2b9df9594ab49c14221ea3b4999e6bb2ae92d129e7e13476d6ebcf031e3b18b9cb768e5885759e384f3a9c6ff SHA512 c0d2ccf9ca930def63dcb9dc269e47f60fd4bbbdcbc01463df0c30e11109a543e310fb36f2334d17b90cb9c96b8dcdd97d0e2d6c589a779de5e4f197c052f9a5
 DIST firefox-96.0.source.tar.xz 410165944 BLAKE2B 2105caab3f89cf2400fe58e90c280d45d99012aac244e8d3d1c48f69f4976fbd9bdd4467675a4e5f818f3ae2c28662321762495f9de485180e4aa63b6d89cdd6 SHA512 39f553474537eb4e521f4182e38f0ddff039fa6b40b939d461937d2cef27f7182097b478f08f90d64fdcbe9c063e78f14f6863a8a82a16207ec7a1d3fdfda4ff
diff --git a/www-client/firefox/firefox-96.0.1.ebuild b/www-client/firefox/firefox-96.0.1.ebuild
new file mode 100644
index 000000000000..5f77dec81f98
--- /dev/null
+++ b/www-client/firefox/firefox-96.0.1.ebuild
@@ -0,0 +1,1239 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-96-patches-01.tar.xz"
+
+LLVM_MAX_SLOT=13
+
+PYTHON_COMPAT=( python3_{8..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/~{juippis,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 hardened hwaccel"
+IUSE+=" jack lto +openh264 pgo pulseaudio sndio selinux"
+IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png +system-webp"
+IUSE+=" wayland wifi"
+
+# Firefox-only IUSE
+IUSE+=" geckodriver"
+IUSE+=" +gmp-autoupdate"
+IUSE+=" screencast"
+
+REQUIRED_USE="debug? ( !system-av1 )
+	pgo? ( lto )
+	wayland? ( dbus )
+	wifi? ( dbus )"
+
+# Firefox-only REQUIRED_USE flags
+REQUIRED_USE+=" 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.53.0
+	|| (
+		(
+			sys-devel/clang:13
+			sys-devel/llvm:13
+			clang? (
+				=sys-devel/lld-13*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
+			)
+		)
+		(
+			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] )
+			)
+		)
+	)
+	amd64? ( >=dev-lang/nasm-2.13 )
+	x86? ( >=dev-lang/nasm-2.13 )"
+
+CDEPEND="
+	>=dev-libs/nss-3.73
+	>=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/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/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libxcb
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	screencast? ( media-video/pipewire:= )
+	system-av1? (
+		>=media-libs/dav1d-0.9.3:=
+		>=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-70.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-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
+	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}
+	x11-libs/libICE
+	x11-libs/libSM
+	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=(
+	af ar ast be bg br ca cak cs cy da de dsb
+	el en-CA en-GB en-US es-AR es-ES et eu
+	fi fr fy-NL ga-IE gd gl he hr hsb hu
+	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
+	pa-IN pl pt-BR pt-PT rm ro ru
+	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+# Firefox-only LANGS
+MOZ_LANGS+=( ach )
+MOZ_LANGS+=( an )
+MOZ_LANGS+=( az )
+MOZ_LANGS+=( bn )
+MOZ_LANGS+=( bs )
+MOZ_LANGS+=( ca-valencia )
+MOZ_LANGS+=( eo )
+MOZ_LANGS+=( es-CL )
+MOZ_LANGS+=( es-MX )
+MOZ_LANGS+=( fa )
+MOZ_LANGS+=( ff )
+MOZ_LANGS+=( gn )
+MOZ_LANGS+=( gu-IN )
+MOZ_LANGS+=( hi-IN )
+MOZ_LANGS+=( hy-AM )
+MOZ_LANGS+=( ia )
+MOZ_LANGS+=( km )
+MOZ_LANGS+=( kn )
+MOZ_LANGS+=( lij )
+MOZ_LANGS+=( mk )
+MOZ_LANGS+=( mr )
+MOZ_LANGS+=( my )
+MOZ_LANGS+=( ne-NP )
+MOZ_LANGS+=( oc )
+MOZ_LANGS+=( sco )
+MOZ_LANGS+=( si )
+MOZ_LANGS+=( son )
+MOZ_LANGS+=( szl )
+MOZ_LANGS+=( ta )
+MOZ_LANGS+=( te )
+MOZ_LANGS+=( tl )
+MOZ_LANGS+=( trs )
+MOZ_LANGS+=( ur )
+MOZ_LANGS+=( xh )
+
+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 use pgo ; then
+			# Allow access to GPU during PGO run
+			local ati_cards mesa_cards nvidia_cards render_cards
+			shopt -s nullglob
+
+			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+			if [[ -n "${ati_cards}" ]] ; then
+				addpredict "${ati_cards}"
+			fi
+
+			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+			if [[ -n "${mesa_cards}" ]] ; then
+				addpredict "${mesa_cards}"
+			fi
+
+			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+			if [[ -n "${nvidia_cards}" ]] ; then
+				addpredict "${nvidia_cards}"
+			fi
+
+			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+			if [[ -n "${render_cards}" ]] ; then
+				addpredict "${render_cards}"
+			fi
+
+			shopt -u nullglob
+		fi
+
+		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 state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
+	# 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 \
+		--without-wasm-sandboxed-libraries \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--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-png
+	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
+			# ld.gold is known to fail:
+			# /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.1/../../../../x86_64-pc-linux-gnu/bin/ld.gold: internal error in set_xindex, at /var/tmp/portage/sys-devel/binutils-2.37_p1-r1/work/binutils-2.37/gold/object.h:1050
+
+			# ThinLTO is currently broken, see bmo#1644409
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		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
+	export MACH_SYSTEM_ASSERTED_COMPATIBLE_WITH_MACH_SITE=1
+	export PIP_NO_CACHE_DIR=off
+
+	# 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 gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.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}-r3.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
+	local show_normandy_information
+	local 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 ${PN}-91.0 we no longer install multiple shortcuts for"
+		elog "each supported display protocol.  Instead we will only install"
+		elog "one generic Mozilla ${PN^} shortcut."
+		elog "If you still want to be able to select between running Mozilla ${PN^}"
+		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
+	fi
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 48d13f54990e..6b31fcf80a32 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,6 +1,6 @@
-DIST vivaldi-stable_5.0.2497.32-1_amd64.deb 86965852 BLAKE2B e0fb6b6c972e8cc8dc9b8dc8dc33f7a105c7de0f30df3ea2f2c0c7c0c9de16b7999818418076e34515332176b41a2f1991b0957fc89546b6e3215f7369ff3158 SHA512 d021e5f16e4bb1bc8ff11bc395352c6bef1af46dcd092e1d344ea471203a6a01a452c5027b0501a220459f250da70c15257f123d3e647d1032f9a573ad2b1b3e
-DIST vivaldi-stable_5.0.2497.32-1_arm64.deb 81576300 BLAKE2B a27b363e5cbf00964dc2e76407e20edfb9edddf5e710274efb00acdd1d8b63f764d668251c79b8e0163f90b9d8e7f0005a94b352e46bda0073af548be6d3dc47 SHA512 176099420748d76be3d7e6ac99b37f5715c081638da89c43344bc91a935552bded078039022feb12d23155531075296be1d328044151bdd915f18ec072ccc9c3
-DIST vivaldi-stable_5.0.2497.32-1_armhf.deb 77941764 BLAKE2B 1018304591bd9d465a706a5175949f5c06abf26de8aacb97a9b42c9cbafd3c1015b7a173de308deb66c472f3460527d503ea96fd3fd6f28c60f2e0ee0333188e SHA512 9926d6c15e2295cd6ecb801a2b232de7a774dc07c8864458c5a290dc7b607bd0e5211f9678334728e4a9617a79105c25618c8e91931630c641df83608111a145
 DIST vivaldi-stable_5.0.2497.35-1_amd64.deb 86963144 BLAKE2B 4064e8a9b6723bb2540004142654161784653644d290ade9a8886b4bf78207a0f74c19293963f22d80f5ede1e0d3d4f727376e22f4039546734a0f118746168d SHA512 667e0f7b6da4600b65a31190878aa11f924137811efc614765bf7fab92ffeba87e81095060b14b41daaf61d6713117e6b678333c396b0612dce6c927f572009e
 DIST vivaldi-stable_5.0.2497.35-1_arm64.deb 81631944 BLAKE2B 90f29e926c88ba75633c54f1a5210b38065ed690417e54bb3e1da59375ad4c88c269e33c377737ca5bd8541a9cbdace42a53f34c13556840e2d4c170271f1b38 SHA512 43058ebf205f858bae7f7688994dcf7c3eae9c958a69ff4f80fa64b36af4e3c8b440ca7653f435ba0979ccfae2c3a4435627abcea09e3b404ea277834aba08aa
 DIST vivaldi-stable_5.0.2497.35-1_armhf.deb 77933892 BLAKE2B 1db12bbce3e32c9fbd389d82b43eadb33f5c83ea51e90bf47c4411799c80e31e31ebe6197ae6437d8d556b49976d58533534d7e86a2e802080b3146950f8f063 SHA512 ddcffb64fd7e98737e4cc68066b56629b245e16d6d3a6a133fc502f702195662240c6c56b4c09c18e13068cc4d815c35fbdb44d0dd5b6518ad96a46a1155cb8d
+DIST vivaldi-stable_5.0.2497.38-1_amd64.deb 86973208 BLAKE2B 8c1581d2ac1382c69d1cf0c9938a7ce0bf9302d9947c5624ab80f30b028c781914189508cd2e281914682b0d55a527478e06f0072e347ee56c7adf515e94353b SHA512 81a7a6744cefadc1997fc696c6d1204e32f4fc9bc718f1eea315e4ec060d7340b6a25f777fa7f8f133c35b018e92c03d2bdd1892bf3dbef021b7cfce777252eb
+DIST vivaldi-stable_5.0.2497.38-1_arm64.deb 81614372 BLAKE2B c630a534448fda19373a316e0d7249ce7e91fed07caa2e1a30d6f1713bc4b5f29111699f8e6f6d610cd15b51a18fdd7df36547d942bc358daaf9b022a5ce10db SHA512 cdd9321cf2a2b7732bf3de1a3203f6287f87c419019705c387483852479da373172399deccf9782ab64b7f67f4e0053d76f199b29b451d15057bcf6a2a3c4383
+DIST vivaldi-stable_5.0.2497.38-1_armhf.deb 77929184 BLAKE2B 09ff00ba33be0af7ed37806e3632e6158c8e68d1788d2ad12dd994f57cda43ae3619b697d078821114d06caa6ba4aa0053cc661a10cc50ffa8579423870436e9 SHA512 fd73e158b8c234888f9ef5381d5915e9de100d6125ad30eb4355e7f1b89c2b47afa87ce168ac0da05cb8b9b15782eaad9462e3617498258f46f9e7e3a84929e3
diff --git a/www-client/vivaldi/vivaldi-5.0.2497.35.ebuild b/www-client/vivaldi/vivaldi-5.0.2497.35.ebuild
index a0fb3fa96f92..569a0ea501a7 100644
--- a/www-client/vivaldi/vivaldi-5.0.2497.35.ebuild
+++ b/www-client/vivaldi/vivaldi-5.0.2497.35.ebuild
@@ -96,7 +96,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* ~amd64 ~arm ~arm64"
+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 )"
diff --git a/www-client/vivaldi/vivaldi-5.0.2497.32.ebuild b/www-client/vivaldi/vivaldi-5.0.2497.38.ebuild
similarity index 98%
rename from www-client/vivaldi/vivaldi-5.0.2497.32.ebuild
rename to www-client/vivaldi/vivaldi-5.0.2497.38.ebuild
index 2fca6878239f..a0fb3fa96f92 100644
--- a/www-client/vivaldi/vivaldi-5.0.2497.32.ebuild
+++ b/www-client/vivaldi/vivaldi-5.0.2497.38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -96,7 +96,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* amd64 ~arm ~arm64"
+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 )"
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 65d1e365490c..f6c3a77eef01 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/wmstickynotes/Manifest b/x11-plugins/wmstickynotes/Manifest
index d7b39951ac0b..6d43755b495d 100644
--- a/x11-plugins/wmstickynotes/Manifest
+++ b/x11-plugins/wmstickynotes/Manifest
@@ -1 +1,2 @@
 DIST wmstickynotes-0.2.tar.gz 107432 BLAKE2B 2164c351adc723caa22689cbec277554b4adc1d73dce67b52f3ba30ce14a6cc70c39762ae6eb00f2d51b4c365738edfe5713580aa1c30d9256cf112efe579a4b SHA512 59e54e64157a04296f12c1c8c224c5c4b05685f2f0e05abe2a23a1c2137c0656c30e7befc4e5a39b4cb97f99e2ff68f53173cf6456b95f3fef80441661d19b63
+DIST wmstickynotes-0.7.tar.gz 121562 BLAKE2B b589f157d53791e3edbf409932616bcdc9d8915d6c2cce1d5901c04e73d76cffa5eb321c2f9b0a0ceecb8aeef3985637195d8a027687f0a94e6bd5544d56335c SHA512 986ca0bbd726488795559be9ca65390eb0d091834335d89f590cc67c40aeb14f2b48b7a61cf3170c4287a98ecf44f1a55d85b6b5d03d2d7df1cb6fe5b7ac3d0d
diff --git a/x11-plugins/wmstickynotes/wmstickynotes-0.7.ebuild b/x11-plugins/wmstickynotes/wmstickynotes-0.7.ebuild
new file mode 100644
index 000000000000..8b8830387ff3
--- /dev/null
+++ b/x11-plugins/wmstickynotes/wmstickynotes-0.7.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A dockapp for keeping small notes around on the desktop"
+HOMEPAGE="https://sourceforge.net/projects/wmstickynotes/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="x11-libs/gtk+:2"
+RDEPEND="${DEPEND}"
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 937e52e0de95..7f13e3ef16e6 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/alacritty/Manifest b/x11-terms/alacritty/Manifest
index 6ad5d974e001..f153b19d8d32 100644
--- a/x11-terms/alacritty/Manifest
+++ b/x11-terms/alacritty/Manifest
@@ -1,6 +1,6 @@
 DIST ab_glyph_rasterizer-0.1.4.crate 6641 BLAKE2B fc70a45030d969f8af31d1bc3f83069acc014b33cde31817063ab1d40f8caebe12f3896b6a249620a8f2a2d0adc149fcc402f2af25b31ebe223ad0779028d843 SHA512 a942a3b0848386677ed5c651034b001c0e24c7bd101be6a25bfed815310f3a530c8cb9e67e96ea3c36f4d7f09731552f734d5e73f705e3e8f2bf40d5151a7a91
 DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
-DIST alacritty-0.10.0_rc3.tar.gz 1437710 BLAKE2B 2fed26fc2c70f18d499b9482fc877af7c49b93fdaf683558fb3a8b2eaa50d32fac7f1ca64a23b7510230480a78fd1317b9aadb495af34dca8bfa6bd5cfd86ead SHA512 81361cc9580bedd134c0c965aafaf065fc853165802bdb247f4701c3a943dd8f2d2b4228666e70818ccc12fe8a4539b12399b1fe68feb1312315bf00f9fbb759
+DIST alacritty-0.10.0_rc4.tar.gz 1437540 BLAKE2B 097c06f983801cb54b93f66cb33b02d2e11bbbf01c02e95c564b56cf67615c7553643a7134f5c9eab822de930c937c12ebe4fbfee6bc9f1626c32bb4d9d4d2cc SHA512 00d9311b7a2f0982676e90032c432d1fe63ce2e1c9bc7fb353b92a28ee76508bfc2296a7af2c3d17813340a4689748a550bb44b8e828546dfab83f35dc769461
 DIST alacritty-0.9.0.tar.gz 1422571 BLAKE2B 0b9531b92e57e36f86ae2a855c9dca4d3789e21b2ade9df2d22d32b9cf0967748df2acd1c79a1defba4d9eac21b2477550b799e5ffc4f9cb1444793ae9ca36e4 SHA512 17b53a1f98e8435a3ab120e39040c591d96a05d793b78030732f5624e2b717ab6a06c8de67fb25c6a502f3f3064f08a2a3c64cf7a1b7f3f7fda699e7fd95f931
 DIST andrew-0.3.1.crate 14030 BLAKE2B 5224eb5a5ad5ba7dd07259a98b8dc04f92154dcc7b5a53c89b4f7fd3c1a12d834093350ce9f7cd69a935d70cff50c0fbc68305eea9f918b334ec1a6e9e979ae2 SHA512 c4fc8903d4c2542c91e7f099d5d9d2b9179ade3f4c3e83ccd8027b06cb582ef700777cf440a07c2478311c1b7c2f7ca64d53fb390f9f5753dcb32491003db8d3
 DIST android_glue-0.2.3.crate 1572 BLAKE2B 8404cc69af7d1c9e851e67a69b5b18195388b50924b6a8afc7203bc5101babe9ae007724e552a929947fa9c639eb8ae13cdae0aedbc2d54b0b8d48373f15b7a3 SHA512 16ff1f0e1f50cd120dfbe57d45ebac1725fa75447c964a5b05a1a0565b13b0bc3b6c153edb4a50083ef5d802a889c9f9007e2e21a58dc408f9fb12e9437bd01b
@@ -11,7 +11,7 @@ DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST block-0.1.6.crate 4077 BLAKE2B a2c11873b8cb1a1ea399ecc99ed45e5d0b9399bd88435cdea346910b8707b7da94eeef522dafa5cdb09929534472b2a096c03c373744a789962d4175fd1b110e SHA512 c278e3c0346cae423b533a8f5d6b822e788ec450c92ef0f5f559d5705764a0a11df49f0f66bb1c8af7e89bec8ec802934676b969e43f92255a38b210d0fbd710
-DIST bumpalo-3.8.0.crate 79835 BLAKE2B 3937c4ca9d7c5e2ffee229c8f5503c6a59f2fabfa3b7c81fefbf5df816efc5f601aaca4b606a62e647262acafa34146aa0906eedc09368e16eb76b3c6722e8e1 SHA512 c9825e7638bd54f97877adee8ac8f6a2cee308050c3f446f9da3996688ec3d779cb6eb935a440329794fb534958a6e89749b44a9bb27dfd219a963f64a6bcac1
+DIST bumpalo-3.9.1.crate 77507 BLAKE2B b248a0c2a9faaf52061f2fe0a82b9fd4efb4dae01da9dbd986493941f3ef2632f1d5608d167f2d088536dc96b4cce28981602220062892a7af51c3ead7a74a4b SHA512 40bf3f0d261aaff1f7c30a539953b9c14f4526f05586af0dbe2e4df4cc042cbe6180e3dcc2fbc6f1802e694066f72e629e74de40bc2951c5527edaf551722a52
 DIST calloop-0.6.5.crate 25180 BLAKE2B 8a660962efdd929ec7b3a815a427f39e00a8c48c9bd34f4c0660bb7d2d08bed598a518926486454bd0304a433a1b513090f06a08bbe8a3e009d47aaf2162bef9 SHA512 e96cf64c54faea423a2b3428e4cb909c4b8791f2a92705518754f6c1c98b5e96a265b74b4fc51f8c282e4a5b506525940dcb0185dd0e32ccab226b436b590a2f
 DIST calloop-0.9.3.crate 55389 BLAKE2B 60c47c5b037ca0dbfbdb737db0bf30532bde7e11ba64ca44751bb3884536c82a6d39977a177af39ba8d44ed9562524654f9a12055ad5dd180785b1273b767a8c SHA512 77ee5f508911c2c42838e29765d7e050832accb5397d4d7738f7a58a0b62c65e2d88f7c5ca9cc330e893356eb96b0ea03f67a734459e6bc11bdb89e1466c3857
 DIST cc-1.0.69.crate 56044 BLAKE2B adcd10bf4faf6835ae8feb79ce5e7a4895700d9714fc4322dd52e37bdd8db66b849d5e59aceba6ef0edcf9a5c7c0e2bc616de4acd98b71999bd63592c1c69dda SHA512 ba2b84fb61b4097a96f9013f9925b1985263ccd75274186f5d37589444e390ae8d5d1f88c210822a9e9dac2db551c24aee2b12bb61801aef8b31a72b2ac77437
@@ -23,7 +23,7 @@ DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42
 DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
 DIST clipboard-win-3.1.1.crate 11964 BLAKE2B 5e22d3a662285762128650e6b46249584683cff5e899e7ff90047fbd3d5b0ce077278f947fe12e1b04757328046ae59b6953a07e845451b1abb090dda42359e7 SHA512 5592f400830119e2512c5fb68f6ab190d8bcd16120c53d66f6f55bd0441f8dfc5c53663a3ebd5cc5e57e4d48ac55e2b2575b987ffc175664c85e2953037ad8f1
 DIST cmake-0.1.45.crate 14375 BLAKE2B aaeb4b910087bcc735f2cef65fb46184de3c3181add90715ec709c3162c081cc506ed4c7f4f3e6ed6d76aef8213ce80b9b865b2e737166b498a50b60acb7c83b SHA512 7de4ae0c3a50806f2b060e145948be6c6dd0db3975b626e0432301f454612fb7bc7fd2f4549529deaf7a1a55063a11dd553efb59a9dd5aa61ede5e63371d6b2d
-DIST cmake-0.1.46.crate 15119 BLAKE2B 0889436835c16bc47cdc671615f421a50acf6c34a3ba3b6b8b4289e11bf1b803abd15d88a65ae9c1588586151f467524517e9c60d5dcc820e41ff21711f3a536 SHA512 e2749309055c85baa242cef8d0f4a91eb7e694664c5e42339df8ccc6644d1563337b835d3d931f5a0a75351efd299a21fe6eea497941802ea041916d665c7311
+DIST cmake-0.1.48.crate 15142 BLAKE2B 5566d196c7ebcaa6b4d91e3361d7c92eb9c60c0a940b6d581d8cfc547606781f04f77d707ed128a6a391ec46fe801a4f65acac3c7c9bc90e0e43cd9e1bd6be03 SHA512 c836208d43f4a716be6ef043a6b5f526d3961b9414f1419171895903491176a2a8dc2f271062667a7568c7deb2bebfe96541b4e4fe73c31aa9aa760557b188b9
 DIST cocoa-0.23.0.crate 39052 BLAKE2B 91c2d572f41d767b77ebdad3521ec5af6927703bab36fb9b7b38846fa017210aeede3a3647915fe080092827b3a89b002119c32869f1da4a15653acb1986d1a1 SHA512 2c7a90a4d3bb1cf813e99cc51227d7e55f20cff4b67d4c67eed5193c1b4d726016cefc14f15da315ba669e521da71d702d7c7fdaf0d4f3db615291235e5b1ac4
 DIST cocoa-0.24.0.crate 39235 BLAKE2B 01078c3d96e88e0cac773f238d3d3144324594fd75cda87d18bc98d73f0a1acab4cd795471f4789d38b017e6cc90c0713bb33b0fdbdff36abcdc1cbae767da86 SHA512 accae0f676caa23c8d3fbc2e49365118a366c50a698ee9dce4ef194f1d391b3633cb789d65d5c2d1e43afdea5d7a82161f7e7042a9dab32747ecac29d1b1b20c
 DIST cocoa-foundation-0.1.0.crate 10645 BLAKE2B 8ea7db02939a5cf1785b2770743d609e28da415fdf49b881b620e0ae289976a5a737056976afa7e616fc49c15ce535304d70ce91e79bd61c39ed024078012e61 SHA512 cf0e8188bd4d0310716aad9f1e2cc77e4098e85306bd2098bdcfd9720782bc558f503033074e0f076748074a9067a4dfea263ee5356074207739d81c4a052ba6
@@ -90,14 +90,13 @@ DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db86
 DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
-DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
+DIST indexmap-1.8.0.crate 52583 BLAKE2B fce94d24af0ae74f8173dcdfd35bcc51a23451cdeebbcb10c92dda74312c1ec980e925020ba7bdfa9e4a54b72a619068ca7ae133eea66a4df8775595a3a3551a SHA512 6af44320a80c8256291cc6e3c90311ce67b7f69ce039d640bb3abbcb6057f16eb443a407060ba647d7b16f44214acf59b566772a4802ba5000f036f69ca82a43
 DIST inotify-0.7.1.crate 24637 BLAKE2B 7089e15c76ab1585850cc17d1c7d5094f6c229d2009dd90648df78d08a5b82567ccfbc116547e4d78df5b4821f4d3fdd7b46b22e0d1b8cd1569cf22c4877b4da SHA512 e98e041efbfaa932f0eb2e21f1831776280ec3873ecba8815dc3af716a37ec19c863a909d9f10a49347e964eae0aba33290a892dc0f0e178f6ccc0a4fdcf2c6f
 DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da
 DIST instant-0.1.10.crate 5218 BLAKE2B 1e4203d235006ca922134c715781a5bda5a932f6740b7e22505db21d3b675758bce10dbb370e96694574c40c43a1d71ea2e6372df7116b30fe8cb0b65a3b95fe SHA512 a6b2c7e0a7b954e961f2d904a4cd6f701617ad70a7ea13230ee157c473c903803dd64596baa0fabd075e995cd3d013e10681c8d712977341ea2b6f97dd48d596
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
-DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
 DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
 DIST jni-sys-0.3.0.crate 10232 BLAKE2B dd6334daa6db9fae6cf1b31b9c13f09f9dc3f6a0e227bf6779880a6e197189d91583cd463b9876125cf892ffa5f8417dcc51aa010cdb8c99bb4f969990e969b1 SHA512 1e47582ed4dcf608ffd218549f1eef5ee3c87a89e28c65eeb5bba801edd6cabc0f095e213e8df606e050a57608653a59ced6f01a8bc76a5eb32ba1a337a63321
 DIST js-sys-0.3.55.crate 70499 BLAKE2B 6108d6bf4be72dc93db5c2f45d59dcbd7b94edc02ccb368a05bdc0e259768be4708e449647b254bc3c542a366492a02f0569d08e69c00249f58b07a566cdf97a SHA512 bd51d61684b3683d5b80df42eb80cb2e4688096bf14fcbd30234503709b1730ab25c7b58112516aeb5d7f44ae20e0ba08bdfddb0518a20603bbb4ca74544d4ac
@@ -106,7 +105,7 @@ DIST khronos_api-3.1.0.crate 599718 BLAKE2B 945600455c85874c37c7c395162a3e56531b
 DIST lazy-bytes-cast-5.0.1.crate 4354 BLAKE2B 38c5ee1edafe88f434e942d4024ffa0231c3876960ef0d4fdd57f3f56e9ce1f8a9178466286938e55cda4254849debef9926b8ee04707c9fa9f3955f604735c0 SHA512 d660f66f6ebf588a50121c425d8fdb9769bbf4df3a2e1e3253a2bbbaf6c73950505a60787951a1e5056a73f769894bd9a510c56ef4208dceb07882d6d5bd5c7a
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
-DIST libc-0.2.109.crate 570506 BLAKE2B 629146033110c42a380a8e87f09af04773bfe9609b8430fa5ec8d85b3d8431e430b60b072e436c479aa8f0037410f1a642bfdb92e4a932ed2c875241bfd63eff SHA512 ecc5cff60ef7ef4febae95cb3ea4fc130b1844ee20d046332ea0738c85ce1c0afe9239d9ad5b1a50236918aa1166eed04b5a91ece76e49099e4a5415bde881a4
+DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
 DIST libc-0.2.98.crate 522087 BLAKE2B 950686d7cde31322e1cdf82ae189192091b8543d14d0da0dcf3892910f4216e8e46bb1d5e7e8fcb1693a372577c57a6eb6538a0fef997c1c1a0466c3a1f7acb8 SHA512 2e730b8d46c42608c7da5ff4c5475667171b552b485c2684d3821310ac0f55c1a7a12d9a2cf68a05608cdd2a0928da5e290275c70a519a379d0ed25350689689
 DIST libloading-0.6.7.crate 25037 BLAKE2B 108f5b10c60986ea89f4c754bd3c6d4b73f70a7352042dc1a177ae40a98f716171d242c9f52d81ec47972e55457cf2421ce0578995c644de1da3e15fe8a6d234 SHA512 4f4f37c5a04c20860c38407e8c7aa81386dfeb091773e480dfe87b5fb2a462dc195ec0c39a1add59cad7620373a671772e8f032f4efc624580c6227ae902e10e
 DIST libloading-0.7.0.crate 26216 BLAKE2B 83827746f57fb5f1819aa0ccce0ffd698a3ed4b85ef0e954741691003c843ca877de81b4a97ad7c53d28f79701a5caf2fee801a68c015d19c20230f2560b5fc3 SHA512 e2089a8ecacd65522b246cebcf531b6b1ce697d4eaf294e0540e1f34bfd714037177ba802406c31e6bcc722b4f391a84709427de1c6fb441cdeb8e41fd4f1e28
@@ -151,13 +150,14 @@ DIST nom-7.1.0.crate 115647 BLAKE2B 5adbe8250d168379aa7051a4fad7fce3cee74820043b
 DIST notify-4.0.17.crate 54419 BLAKE2B 826315718f1135bf49daac9d0eaa87f2c49bd34f83fb8e3b7970ca954b7942d20466d2c90a1c90c899f9c5683066fa341e38b0cd83a1942ccf387652a712aabe SHA512 78fffa1da9fafef40ac92190dfaa71e22b8999bb8bd9425e4d8e9054d234ca0fbaf7726c023987756a3900b00aa9e713b093ba7643374f2ffb20416ce19bd193
 DIST ntapi-0.3.6.crate 127221 BLAKE2B 5e530c90eab66c73fa1864084eb462490bb0cce58ecd9e22659d4933ae94871c722dd2e9b351f9ab620a0e45779cc2030cc65bc6badcf9ccc6263d0850c11447 SHA512 c07f2ae51e4fbbe55de9f617d333e4042a93de69e9bfcdd44acc1b342edd88cc2a360fe6710d9568594e2c0990776004400d0741e61d1a2a1cec4a645c4cb035
 DIST num_enum-0.4.3.crate 4840 BLAKE2B 7efd0d0913649fa34506223426459843a8056392ef5f971bd62aa47b0696ce93ab696fe433a90a36a264af35b658ad64c668e650d8a91174950af9fd9bf42d03 SHA512 393240fe92d58413e3b73fce96efc0649d96866299c99a9edf3ffdce63ac5e0bab64a21898608f9c7a078c6802b312d1691003f854bcb62542c3ebd491bae499
-DIST num_enum-0.5.4.crate 9897 BLAKE2B 7c89488d8be0580780689235376301032430b38eff06cf6507429f30fc2592684f279505c1ce8a999b4512849f4ff0178be3cbe22172f7d908ed78eb1124c3e4 SHA512 71d3dbd1fdc36d084a17c93f5b646b5dc6b10fa32d1a67513ff7414fb66fb3fe42782560b3ffec7446e2737686895d50e72fd6c9bd78b3629152311c8f5b8c3b
+DIST num_enum-0.5.6.crate 13721 BLAKE2B 8257cb2a8ba51e5936fc998d3af39b2bbff9631abdd8b0c063bd26912e562e387953d6f2002b5837accea122ed0720c870d8626c85ce08bbd0f2f1225f65a8dc SHA512 a8b73276374b9bbba4803a054af214f6a4c7569acf597f438da56b50c296aa1b6109fd9d2d83548c0bc2e31f90167dde7dc91734bca0955fd240d6a7835c301b
 DIST num_enum_derive-0.4.3.crate 4552 BLAKE2B 06b972069c62552422c0ff24d53c3d3f3c8e64fe2c50633291c6860f4ab6cfb83fc5bfd455b7b1803a90c98e222cc646d7c1270062fe12b99b620bdd37e7cf0a SHA512 865c3c070d62a865137d0b539a8a4e5ad8b3d3c74a41ccb2861516e63f7ccefe37f9df9b33f5fcc24ec33f6775cbdf3354ac604b62b8e3d8fea34399ae4684f3
-DIST num_enum_derive-0.5.4.crate 7899 BLAKE2B e470495ede15fe3b6cbee3682b770154a874fcf2d59fa229ea42633fbccad02bf6ff40c13b4b03d57634c52e4193f3bb17c11caf82c51767948b5ccf08074ec3 SHA512 028253a0c149dafb6be50605d3c3c3e4c92a6e1631ca934bb22ecec228b1b820e4622f781c39bdf085fcadd8a1b2d2be3b24bdec4f60fa7aca58004055535ffa
+DIST num_enum_derive-0.5.6.crate 11672 BLAKE2B 81535facdcb2059831f09112519683b21e2bff19e7f611dbe022501f95a57a230ce2d9c48b64b1da53963e9207e4d1b6c572b0cf0995ca2fbaa8692f1660e183 SHA512 28cedf7a7f1d00d8e9ef89ec9df1b0bfe5133108661729f1108a1c1f724f21f6c868b0f29e29cb9dd46845893bd201d9f2ea3c51168dc2d8ab80174ea707ecc9
 DIST objc-0.2.7.crate 22036 BLAKE2B 14a41a5ed6beb100d68601af12914dfef67a9f580f80d70c4578ad9df98a6b4496bc3a1003dec762a27f0ae71afe2c9e8fd41ad715bdb310722c8fc092563599 SHA512 7178870c8e4e9154b4c7b4953b3164946b7ce72c956a02b9ba18889353c72be735824bd73e44a485e42ad5f97994820d9153ac684629342755a6a63711ab5988
 DIST objc-foundation-0.1.1.crate 9063 BLAKE2B 876dd217b612278a522f2d08434537d468f8b0fd1efb0e58d0b58216e20f7f9fc80a5ff034ea25d9216d4d53b2d65552684ae5d5212f18d758c7937c91742a84 SHA512 976dcab4e62ad1c387a81723d70b969fb7d332e1f7dbeb2ea9a26c62fa999d91ff6d8f737ac5725a7611334862df16fa8b15765c036d7acfc3e42a745d051f34
 DIST objc_id-0.1.1.crate 3258 BLAKE2B 9a74fc17235ffdd7987c2735a7a9d136376fd13355f0561b4ecf234784aed077d1ab5aa11c1a82fcee7d47d4d36e471ca4ba3e5bb725a2ed0049a5565967326f SHA512 ec36fae6f5cefda00f3e44618b3c9fe6ec8f528f70d1a95def6421704bfa128a6e5b4a32e9dd686bf6ff60c4f87fe8094aa5e1c8070bcde58b17fdc06f49f9f5
 DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
+DIST once_cell-1.9.0.crate 30702 BLAKE2B 3d492e64db120d8a23c08490a34d376a006e46b28bb5f0f44c3a955896e6e597c67ced35daeb4ccc7f7748f142d3bf2cb1d81ee61a99dc6526c48730c86a2fdc SHA512 cfdb6aa4bcc0f50d4c37eb69867d2deefa70323a7b607e55180b7d417b7188c4f2889417fd04fc51671c65eac75c7d9e7eda06a87dedb846056def66d14eaa46
 DIST osmesa-sys-0.1.2.crate 1322 BLAKE2B f0768f55e02534829d47cf91e839010a394d379ac0cdb06afb7e7b4993878026be62671f68e91d7d292919ccb336e59b7bd13790985cc1afce90957096bade11 SHA512 3ab87b968f685da1a3e79ac6a56eb167b8ff76f52cbbf57e19b765cc2ca16f5ba79d7264f0da36664d0ade9fc72c5d757e1e3e430fd41224f202399663fc98c0
 DIST owned_ttf_parser-0.6.0.crate 20574 BLAKE2B 6bfd6b3e0ded1b23a8d3037137e5408aae9454f853c1b871166cab16629c7d342b6ab8f9528a175e5102cce25587303570b76f8086804b98b2bf4cd739d95f78 SHA512 cf1540beda15ec1535b03edfcc661a11ffa471d741c2f754318b5a0e4808e335d88ab7d18c3b45bf93cec88cad8d2d8bfd7c5edda177b1a1b5dccb6a9b34ec66
 DIST parking_lot-0.11.1.crate 39854 BLAKE2B 5a097d7016811de4ca7d21e8a811a96b2e857b5224b176cf7a3bc160c0a0678c9100423e3c096c5056e2df3a4dcba17a590cc64eb1d648355c153c5cdf9db228 SHA512 17e394ac8b62656177a12fcfd246d9bb59be468a5ac174e4d6d8b4ffd0411497d3ce943ca5deab184cebf5c1bbca97b4273f79bf210c78d7f4b6f5e9d68026a2
@@ -173,8 +173,9 @@ DIST proc-macro-crate-1.1.0.crate 8535 BLAKE2B 73e4d8c7c19d122a74961ddcbd04b0034
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro2-1.0.28.crate 38732 BLAKE2B f2d4765789d03d5d26c9de7e1283ce6e4086ca640d95a36649f8fdfe96533ad768b2a8ba56726e0462ba4fcd8f332fc455307987e0b7c79a5e96f2e75a641162 SHA512 2a4e34ab2bb692c3661db40ebc6d22f3dbcbc30c2f4d88e1a7f022f8522e943ffe2a1c9b92411c7e04941dc0156cb365e0de953fa45d8710e39b660ee9028741
-DIST proc-macro2-1.0.33.crate 41040 BLAKE2B b4c68569d54460a4441ff64ad1cad1c9d8109dc3a9fedf037e61ab61d204c424b69daa85199bf4e47e6e74aded91ef4676253acc9a7dfc0a5c73c84544d825b0 SHA512 a4e0aaa92eae63c6e8dbafd2fbb7105e58b10f576863eee66e764c133ce5e3360da8486581b9df4379b7b3a101976a5962d4f648c416eb4c5979480232eed40e
-DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
+DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
+DIST quick-xml-0.22.0.crate 132066 BLAKE2B 1c1d71fdaa022e430e6265530f3e40924c13457fe422e4355eedfcb5ebe8c75d0205f73ffea0968d8196d74804d7d0fbf61954852c98831d510af6c45dcf6923 SHA512 15e56fafc84e62b219977c5ab0f07a021bb71216d7cbb673a7ffec4ec6bda36f97d7b7034751b0b7d745df7c17c1a591a281cf2c97aa4fada7327979711ae3dd
+DIST quote-1.0.14.crate 27252 BLAKE2B c744f787e311f9c42b2678f88978d68eaeae87324f07cb28042152a77244ff973e3bc93b8a277f590abe1b6b7c37f6b095ac4a75c96ef9590f7d9d397382b62f SHA512 b2879fa8ae5ca80fb8aba56da016d9b8aab0f1014cc67fe597f42999e8042b2178b98dcb09109edc74b6bd1dc542341a72d11e4880273ffaaf766da243e687e4
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST raw-window-handle-0.3.3.crate 5798 BLAKE2B d6fa979aa6eb23478abb3bc85f46633ef2807208c96de9fc327eeeb53e46944a8d2cb68dd25345f2a6f4b5c4274058a01e13d1eaef4be858dab11a8d3727c1fd SHA512 1939150cbf471a33654aeb953bf2dfe48e2fa7789d4a7a43fe449585737741cf03c4f13b2d3d3855f110f2cb8b91c15cca17e7f8ce1f6b63fc8d2e32ed3fefb4
 DIST raw-window-handle-0.4.2.crate 10139 BLAKE2B f6fe7310bdb851ea4b6af25bf4d278f9d1ebed596900ae4cb6a410abcc1c6de5a58e5e41fa24bdfa8812b783b9af8b27ae3599672c069584594f92da7780cb03 SHA512 71f5c91102aea0f1299cad3877ebe28b662874089ebcd5270efac5dc07fe870449f3d813ff190789b4dac475d0ceacd089653925637948b8d34042d7a67dc29b
@@ -185,7 +186,7 @@ DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST rusttype-0.9.2.crate 31314 BLAKE2B 5c4910c91c584410bbdfc34f15c079feedd9c08fb96c41b4a0b6b93ceda385f2cb5a2079fae2f83faf33fd6476367fbd658df72943d8c1e1c05626e8f88743a0 SHA512 99fa1b6446c339f4c0c233622146bc18cf7e9f767db4bd1f1c40c334c7376e33b5fabfbfdfa7d47a4f88027323b0786bb6fe98bdd77ab6df3b898b78b11e7b2d
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
-DIST ryu-1.0.7.crate 48703 BLAKE2B e97fc012480b7304e177416185d0a6cac094d2dd9288574115e3477c2353c08880c5d88672096768f8966e52574142479e02061603fe25a93976ca92d7f98cd2 SHA512 730c77a5cb5c988533ae7fef5ae6ceeabc95d757c00142131be718d7730acff9bc70d9adbc14b1537021222e71f1163082988d176407f6b72d6a0795422c037e
+DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scoped-tls-1.0.0.crate 9146 BLAKE2B e6cecc543760a293b9ba4e71bf0d12f3360782795bc9d0f0bb054614a1c393f081b6178e98708b896037f5b8edcf371b727e7eb80f62bca24fe09a1903456729 SHA512 f09dd404bb45349ef444e7274a2aabfeaeda7c3c9f964bf5c52c39984c137f63bdf9fb3e33df8e312e52872f7721de25951a7f3b8333a670626c51afd36d314c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
@@ -201,7 +202,7 @@ DIST servo-fontconfig-0.5.1.crate 9738 BLAKE2B 427324bb5c44a5d254000b86e21b2a52c
 DIST servo-fontconfig-sys-5.1.0.crate 1790708 BLAKE2B 558927804da2698ea6538ace2732912da54216634f4b6f2578d64c4b7da78dd62339a771ed56a57bc66ec48d6f194916057d6753bd25f1d9d93bdf398d365f43 SHA512 7c73c1c3b6fe3bac24d373998e14ac875990434395e543a241f53287297ebcab4b90e0e2a32ddc6a24e1eafcc095cc5cef91f0370959249d08c6994e1c4933c7
 DIST shared_library-0.1.9.crate 10566 BLAKE2B be5497dd6ed880d33f7b4d3721d3747794e29715fae352fdcc5d153cc9512da2c2f4b21804ce68077654eb3ce989dbd1fb688120516783dd78db7f48afc8ea0e SHA512 8696f5d9ae976b04ac3f559ff1c4945c5554fc741bd9e62207a475a331f8c90fa8c2d583ac9cf96dd18fd543b65fc469aa76dad2f526c00c68182130d4396462
 DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
-DIST signal-hook-0.3.12.crate 49213 BLAKE2B 21359ea6cac09e89fcf00a4adcae5e5832927bb5b6c3bf92a588f36b11b83e6ae4e74a9bd826b83ec7e086fe20c16fbf65c1f9ffb3068b7bea4718bc07959e13 SHA512 ccc8d02aa5bd226ddb26f098d458fc46b99397c6d4432c4ce43ecb117d0fa777b249f5fb202949f198e4e8885ed24d7cb1e24e538c7c6bf8b44eb21418519364
+DIST signal-hook-0.3.13.crate 49252 BLAKE2B 21016fca85e48a2ff7d360b379e06aba6d044a282740e71b0e567e57ec16db0df7cb53e9db47f5875caffb5af00eca2167bd038103674bccc225fbe8faffa1d2 SHA512 c4632d31ca158fdfba5da44585f0d6211469ee17b7e22d86688af11b4ed976b0134e87e0ad686dc2e5a8fac0ecb08838108080ac875a7b55322e0735ff1ccfdb
 DIST signal-hook-mio-0.2.1.crate 8893 BLAKE2B d3dad6a9bdaa52c3a45b9839608fed8e79f44916a07ea36e342a7a29d2ff81c0c1928fbd8628130203f00d2562bdf7e191277d6ba2c3bc51f94edc15da455809 SHA512 ca95684574e2934e138fcc2bdd023960cb4207095916650710e76b6fa32f8bfbfc8c5119d3bc92e31a55a2edd6e63b47a2119ff31cef5ba63719b9bec0b438e8
 DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
 DIST slab-0.4.3.crate 15681 BLAKE2B d7e3eb0374de081d1870d2b46c9137e5ec75950a8fec217e3b120e455fe847e9245884990fbff4d01d512ea297c2012cb1a64f9b169264168081f5f7d6b20b39 SHA512 8649f32f26c1354b3281534fa0e062a145b62813c46f9ff5989ae688154221b00ed1b8c044c67a4b78c00a2e3478a8eb9c1c96fb424c24cd6cefd4df875fbb15
@@ -220,15 +221,13 @@ DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750
 DIST structopt-0.3.25.crate 52296 BLAKE2B 07fb1f601ff0233c5ccc15fdc45ccc6bc06636c261c96c7554c516c4cfd1f38a9541cca67c670985bfe7984da04a0cfcbdf37a83479ce1aeea9b795c7d323889 SHA512 f07c505fbabfd880ee5f931e8a3ed8a1d01fc0a66a78c0cc04a2600d2f5cb2d699ac41719062c5c4d2cb06a64ce1433641837bb7d9fb755018ce95844216811d
 DIST structopt-derive-0.4.18.crate 20996 BLAKE2B 2ae17e0d365a7ce7a4d0e007513623ee0d5acf45afdc3844114e02975b855fd1a9f7df404a24044cf33a3a4cc4142eccc34d1e97925646d54d460a89baa28275 SHA512 68a7f9c2ed987993fdd8bb7e81c31969a1fdf5351c58cba9de61a2f5957aba1626be4b0742f31d4de502301675ba24b0d91dd3acb24f5607bdeec83070626a57
 DIST syn-1.0.74.crate 232974 BLAKE2B fc17dc2645fbe2d1ee409f895732b86cb77dc14837d35d7773e7f9f055e0b56f70be86203f13c549f0b43e1e4e1e777cc5bee2f08a733fe447f907dfaa443da7 SHA512 5aae03a68a4a8c1234d4e9a69cd37b9f6c698e2b635f10a030c0fac22cf00414c2a5e7523e0efe43181bc29c17abe6abc0eab103391259c97ce566713e3349f6
-DIST syn-1.0.82.crate 234316 BLAKE2B 1d115a4fd61cfebf62657f8faf7fe8786b3715ecf0413a5d117289853b4ecad399611d92d7bed26e590236a4689bff5599787c04f83de1db7f6c771eaa032853 SHA512 9406f62404f1dec3ea37a5e583a8dd7daf646fd5a1b11359aea3004010b3b416a44e4457695ba5beb12b3cbb9fe437de6f73018faa364c4e48060f6aab8ada1d
+DIST syn-1.0.85.crate 235056 BLAKE2B f72302314edc7a4040cc6e0c95a4b8a7105d81da0cd1788703067b01437a3cad216569d96e6871e5c26ec99bac23eaa077d871f2163ee4b501b4d57eba8502b3 SHA512 f12ac93bfc8f24b2a567485fc738a40ae8c9649515783003e07bc5d0f3e377bc324a4f649d66c7fa2d1272cb0a2fb884ecfb06f8aed98dc3c03329f62d03a44e
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thiserror-1.0.26.crate 16711 BLAKE2B 4524c3ef351eaa1266cbbbafec6082695d5c1485cec7bcfdffd64719fd57efb4e40f119435eae5c6f574a80f59a68bd8c868e2493ddf36f4882e7de65fd4bf93 SHA512 bfe93a14006a3d9e0e996b310718223f8442802a384a1b999c15dd1a25f642c5cb2db7a50a69cbb097ec50ee3b0129b509f19225ca714a5c459d4dfc8255d84b
 DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
 DIST thiserror-impl-1.0.26.crate 13431 BLAKE2B dc753a4cc1e7b8b3eb44bd9462b6b19ee983fefbfe1f60a974195a536fdbc68395942a229a1d2ec7a8594669a439a6efd3cd22573a647a7fb7a371e793fba645 SHA512 43eea818b72469bc4d5c28e449c2e284c1e11b2674b9e67b1788af7ab66bd64afabfd8f5861938a7f9547a9c13387e0ce400419c6283bbe1e899d18d998cd921
 DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
-DIST time-0.3.5.crate 72732 BLAKE2B 7e7e90cdaca05f60e79b0858826fc59ea6a6e3113051c0a2cb7e0b7e7963e6c410595c8c524a97281f754008f5ad3090c7cb2a5098b00b922c0e898441f02171 SHA512 751afd33abf9879b7bc524b50c63ca4722aa39d5bef3ddb371ec4d6efc9acbee9033c5813ec7d31e5e627e3c7fcd491ad4e7016130b7b09f931023e2bf395574
-DIST time-macros-0.2.3.crate 16838 BLAKE2B 34340d9700dc3303bbef72ec25f8cff9734ba881cf8aca263c6a63a0bb2d4d4e4f3800d0ffcf79c800d9e42a1a7cfc5167ba7d26142fb52986f10809c4a2de8a SHA512 07f19f3660de094fd49404c730ba08023d0801098178760a0f24663d4e4128a93838933b8d110d77aa5fd4a3585ce2ec1b0dabcf1e1d569dc9f4d0a3c6e101d8
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST ttf-parser-0.6.2.crate 106052 BLAKE2B 8065c460b59de5d792048642c538bf7475691b0c83cbd236c20236083d5ee7109f1caf056a3e56eeac2faf722fca4f1fcfb6ea8eec4d93c389baf856ad3e3af7 SHA512 93bdb9b43761a62d43ade6d74596927b0718732d7c0b3d3660544ff4a9a76579852b94db3d26639df6f8044ef81a3bf52253f4a9f30d7299959fbfa984129df9
 DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
@@ -238,6 +237,7 @@ DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd
 DIST utf8parse-0.2.0.crate 13392 BLAKE2B 05296f48fe429a871f42e729e3540ec3a974a69892c6bc9da95e23c0aee2163c9b115a9614eb1943363076793e17ac4c89e28066a9816cab30c451524a5832c0 SHA512 1f6a2eca32e42c8e4b53d28c4fea54c426ed66fc01447b3cf8fc0fd75694453eadbe3ba000ac8ee0347d16dbfec47681254117949109081798eab5370886827c
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST vswhom-0.1.0.crate 9420 BLAKE2B ad748822fa9650d011c5f240f5e52ae1e27380fc1b22db2ceaaece4fbc814ac2f2792cf6772079199202efe88fb968618a13d91609e5245639f25b32640fad44 SHA512 0ac192e6a1d296904246d89a08021b55384b48959f26f1f0dca893f8fa1e71a012a0d731d1e48e41ca8e4427da84e50fa43ced621e435b010cbcda4f19c45a58
 DIST vswhom-sys-0.1.0.crate 15589 BLAKE2B ee13d0c15323c32d1fba2a952860042f4500c5809a62d27b33d4cfdd7be8099cd04041267bbb61c61bb84fea0892dd6e81b5ee7ec69b19334f31048d8b8c4989 SHA512 f4c4c080c25638c7ea5e96ac42d71bd92752e1fed92234f194d6b597b0f451dc19c44ae28f436aa93e5cff94bf2102e49dbec600d64d3c00c9bf03f98d3ad30e
 DIST vte-0.10.1.crate 24947 BLAKE2B c7e94b7bba2423d14e5aa85f94dba856a6c984261551f204f029c55ef923c0012b259e5b229974b54b4eb5da1e85bae3c8cdb680372b5f9dc6caf51d1075b0ba SHA512 0c8fed2cfca5ad07d2a146e1e26979d390347a409cdc2b960246fc2fadd85019b9febf2dfd618f7a144493084b55f285c58ef5204e613bd9013af26faa9f2033
@@ -277,8 +277,10 @@ DIST winreg-0.9.0.crate 23127 BLAKE2B d14f23300fb5623043acf66c414d7c9a849c6c31a0
 DIST wio-0.2.2.crate 11214 BLAKE2B 7356229f90aa50d6ac8a7651637967de3e06755a7a45eab2a144e13c876058553c22129abffb07717b1715233f6cfc1efe90ff60c1877f4291fabaa4b5ea283d SHA512 13838de6e01b20de8996c7aa9efbaca5bcd9e4551614cfc10bee45ecca4bcc70b953b2c59fe460d1a054b3ecac13445b020aa244ea70686fd19be8d65c539b0e
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 DIST x11-clipboard-0.5.2.crate 7634 BLAKE2B 03c8f76ac5da33559f90fe777b802f1c0429412d8c72e7dbc43f5d4d7359648e408da7d8c31a7bb61da8ffae71d2f302fe131fe11817005f23b7bd4f9d5975c7 SHA512 e3ab302b7b7b82e3d869d61e6349780ca67750713d51102d910b17ade033066187486743920a35b3e1c03e78b2e525f4cf5fd44b92ab0dd79e576727adf6333c
+DIST x11-clipboard-0.5.3.crate 7789 BLAKE2B 6e1b522a4956d5a5041876658fcc9ead37893f94977624445bb3fb60270514d3b40316f9fe762f9302cb29ed7a5bd8e2974f561a48020ab34bd2d9ad877168f8 SHA512 ff859af8540fc6f4df5e53d803676ecf31c43f6b6911bdac108c0120ef64357335277114bfba502ca41ba7dc3b03e778880d4350d3a2b286e8283191e4567840
 DIST x11-dl-2.18.5.crate 62951 BLAKE2B d2bd0b9a3a41b353a1daa5e74c19e5626cd1b3474bf3d2386ec138a20c3005e9a80f4d29bc8dc17659fa27f8cb64a5258f037754685ba6b3daa45a6ffc610f62 SHA512 db0b2debc8b6e2ed736e846307340600b7b39aadced946e1040f5362e2a76d037dcacc17de9cecae1d4230b4ce6a4ce721a836fd0f13d5ca124c8594fff0a460
 DIST x11-dl-2.19.1.crate 64664 BLAKE2B 0a3a74c25e72dfb8fd786226abfc2391c245bb1c1275f61a308218515d98583bb156f656765c3cc4486e77982ade69bc6b2d1bb1941653219cd5f92329fc33c1 SHA512 6d3fad40bb305304c92312330698f722d61fca9be7294b273855bd4e305062b79990b93a7cd05f3b01a13614712ea51a2936bac6c532bd2da2a1e51b397208b1
+DIST xcb-0.10.1.crate 141048 BLAKE2B 88dddfe65cefe33bd9335d9b4a2541c268bbbcc601550d7f775c288c23e3936d2e3f93d6dc62eeaaa9c81d23d464f4113918e9c86671078a45f32d8b2867e16d SHA512 f5b6485528bbca57c0971a6d5131539746b6e61d72ad2df61717294a20f8bace8ce0d75bb8aed70033d6877b44087d8fda2499c9a8797caf9e7d98f128bbdd00
 DIST xcb-0.9.0.crate 129744 BLAKE2B 5854662e87fc75e07ea707263808c8a5c6fd53a65e4f5034413227e1150a9110075449b17318861828667f47fbee0f673920cf9c6197ef15fdf0dd592dd3b1c4 SHA512 183d59745daa048335e7081add8ca1ea6db3fa77903bffa8bf34de538efc4618755fda1344cd36bc1175600d3df341ac1bde45706d3809a266a25eaf7c253dac
 DIST xcursor-0.3.3.crate 6130 BLAKE2B 46245b672fca9840436d9c26695920848c70d860a1185914f1fe39313f61f100e7d011999253d0d01211486a90709cb371c4f294bc59e13019f87dfc783ac75d SHA512 09fd0b490a8fdbb81d74a2f586fa7e1c12445fdfdfd07c116798e2f8a5a2b4c5a95b9052e0c17cefa028fb1d46da3d63f2f32eb2e7ebd676a3428605f74e9d5c
 DIST xcursor-0.3.4.crate 6069 BLAKE2B 0597eb71a6ad7ad5360674c76bab042a80f1f52f490edcdd824661288eae98f2bf2c4d7da7079bffda0fbfed0409a7ddb329d855deb784fc952d1c2f2d5dbdd1 SHA512 229ea7516d8a07c3fac46b70329e89c19fcf282134b5063b8302a64f8723d31b52b4fcf23c49aecd3a3a0a736ba4a52cd033f8c3db21a775084c6c0a0e1f6c1e
diff --git a/x11-terms/alacritty/alacritty-0.10.0_rc3.ebuild b/x11-terms/alacritty/alacritty-0.10.0_rc4.ebuild
similarity index 95%
rename from x11-terms/alacritty/alacritty-0.10.0_rc3.ebuild
rename to x11-terms/alacritty/alacritty-0.10.0_rc4.ebuild
index 62a71c9d1837..42733ab1bdee 100644
--- a/x11-terms/alacritty/alacritty-0.10.0_rc3.ebuild
+++ b/x11-terms/alacritty/alacritty-0.10.0_rc4.ebuild
@@ -12,7 +12,7 @@ CRATES="
 	base64-0.13.0
 	bitflags-1.2.1
 	block-0.1.6
-	bumpalo-3.8.0
+	bumpalo-3.9.1
 	calloop-0.9.3
 	cc-1.0.72
 	cfg-if-0.1.10
@@ -20,7 +20,7 @@ CRATES="
 	cgl-0.3.2
 	clap-2.34.0
 	clipboard-win-3.1.1
-	cmake-0.1.46
+	cmake-0.1.48
 	cocoa-0.24.0
 	cocoa-foundation-0.1.0
 	copypasta-0.7.1
@@ -39,7 +39,6 @@ CRATES="
 	darling-0.13.1
 	darling_core-0.13.1
 	darling_macro-0.13.1
-	derivative-2.2.0
 	dirs-3.0.2
 	dirs-sys-0.3.6
 	dispatch-0.2.0
@@ -73,12 +72,11 @@ CRATES="
 	heck-0.3.3
 	hermit-abi-0.1.19
 	ident_case-1.0.1
-	indexmap-1.7.0
+	indexmap-1.8.0
 	inotify-0.7.1
 	inotify-sys-0.1.5
 	instant-0.1.12
 	iovec-0.1.4
-	itoa-0.4.8
 	itoa-1.0.1
 	jni-sys-0.3.0
 	js-sys-0.3.55
@@ -87,7 +85,7 @@ CRATES="
 	lazy-bytes-cast-5.0.1
 	lazy_static-1.4.0
 	lazycell-1.3.0
-	libc-0.2.109
+	libc-0.2.112
 	libloading-0.7.2
 	linked-hash-map-0.5.4
 	lock_api-0.4.5
@@ -114,12 +112,12 @@ CRATES="
 	nom-7.1.0
 	notify-4.0.17
 	ntapi-0.3.6
-	num_enum-0.5.4
-	num_enum_derive-0.5.4
+	num_enum-0.5.6
+	num_enum_derive-0.5.6
 	objc-0.2.7
 	objc-foundation-0.1.1
 	objc_id-0.1.1
-	once_cell-1.8.0
+	once_cell-1.9.0
 	osmesa-sys-0.1.2
 	parking_lot-0.11.2
 	parking_lot_core-0.8.5
@@ -129,14 +127,15 @@ CRATES="
 	proc-macro-crate-1.1.0
 	proc-macro-error-1.0.4
 	proc-macro-error-attr-1.0.4
-	proc-macro2-1.0.33
-	quote-1.0.10
+	proc-macro2-1.0.36
+	quick-xml-0.22.0
+	quote-1.0.14
 	raw-window-handle-0.4.2
 	redox_syscall-0.2.10
 	redox_users-0.4.0
 	regex-automata-0.1.10
 	regex-syntax-0.6.25
-	ryu-1.0.7
+	ryu-1.0.9
 	same-file-1.0.6
 	scoped-tls-1.0.0
 	scopeguard-1.1.0
@@ -147,7 +146,7 @@ CRATES="
 	servo-fontconfig-0.5.1
 	servo-fontconfig-sys-5.1.0
 	shared_library-0.1.9
-	signal-hook-0.3.12
+	signal-hook-0.3.13
 	signal-hook-mio-0.2.1
 	signal-hook-registry-1.4.0
 	slab-0.4.5
@@ -159,19 +158,17 @@ CRATES="
 	strsim-0.10.0
 	structopt-0.3.25
 	structopt-derive-0.4.18
-	syn-1.0.82
+	syn-1.0.85
 	textwrap-0.11.0
 	thiserror-1.0.30
 	thiserror-impl-1.0.30
-	time-0.3.5
-	time-macros-0.2.3
 	toml-0.5.8
 	unicode-segmentation-1.8.0
 	unicode-width-0.1.9
 	unicode-xid-0.2.2
 	utf8parse-0.2.0
 	vec_map-0.8.2
-	version_check-0.9.3
+	version_check-0.9.4
 	vswhom-0.1.0
 	vswhom-sys-0.1.0
 	vte-0.10.1
@@ -201,9 +198,9 @@ CRATES="
 	winreg-0.10.1
 	wio-0.2.2
 	ws2_32-sys-0.2.1
-	x11-clipboard-0.5.2
+	x11-clipboard-0.5.3
 	x11-dl-2.19.1
-	xcb-0.9.0
+	xcb-0.10.1
 	xcursor-0.3.4
 	xdg-2.4.0
 	xml-rs-0.8.4